Skip to content
This repository was archived by the owner on Sep 2, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions app/migrations/20140630132510-instance-evidence.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
var dbm = require('db-migrate');
var type = dbm.dataType;

exports.up = function(db, callback) {
db.runSql("ALTER TABLE `badgeInstances` "
+ " ADD `evidenceUrl` VARCHAR(255) "
, callback);
};

exports.down = function(db, callback) {
db.runSql("ALTER TABLE `badgeInstances` "
+ " DROP COLUMN `evidenceUrl` "
, callback);
};
4 changes: 4 additions & 0 deletions app/models/badge-instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const BadgeInstances = db.table('badgeInstances', {
'issuedOn',
'expires',
'claimCode',
'evidenceUrl',
'badgeId',
],
relationships: {
Expand All @@ -34,6 +35,7 @@ BadgeInstances.formatUserInput = function formatUserInput(obj) {
issuedOn: obj.issuedOn || dateFromUnixtime(Date.now()),
expires: obj.expires ? dateFromUnixtime(obj.expires) : null,
claimCode: obj.claimCode,
evidenceUrl: obj.evidenceUrl,
}
}

Expand All @@ -47,6 +49,7 @@ BadgeInstances.toResponse = function toResponse(row, req) {
expires: row.expires,
issuedOn: row.issuedOn,
claimCode: row.claimCode,
evidenceUrl: row.evidenceUrl,
assertionUrl: assertionUrl,
badge: row.badge ? row.badge.toResponse(req) : null
}
Expand All @@ -56,6 +59,7 @@ BadgeInstances.validateRow = makeValidator({
id: optional('isInt'),
email: required('isEmail'),
claimCode: optional('len', 0, 255),
evidenceUrl: optional('isUrl'),
badgeId: required('isInt'),
})

Expand Down
4 changes: 3 additions & 1 deletion app/routes/badge-instances.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ exports = module.exports = function applyBadgeRoutes (server) {
email: instance.email,
assertionUrl: instance.assertionUrl,
issuedOn: unixtimeFromDate(instance.issuedOn),
evidenceUrl: instance.evidenceUrl,
comment: comment
}
}
Expand All @@ -181,7 +182,7 @@ exports = module.exports = function applyBadgeRoutes (server) {
next()

const comment = req.body.comment || null;
hookData.push(instanceToHookData(instance))
hookData.push(instanceToHookData(instance, comment))

return Milestones.findAndAward(instance.email, badge);
})
Expand Down Expand Up @@ -448,6 +449,7 @@ exports = module.exports = function applyBadgeRoutes (server) {
type: 'hosted',
},
issuedOn: unixtimeFromDate(instance.issuedOn),
evidence: instance.evidenceUrl,
expires: unixtimeFromDate(instance.expires),
}
}
Expand Down