Merge branch 'develop' into api-v3

This commit is contained in:
Matteo Pagliazzi
2016-03-10 18:30:09 +01:00
157 changed files with 8200 additions and 7329 deletions

View File

@@ -32,6 +32,12 @@ export let TaskSchema = new Schema({
broken: {type: String, enum: ['CHALLENGE_DELETED', 'TASK_DELETED', 'UNSUBSCRIBED', 'CHALLENGE_CLOSED']},
winner: String, // user.profile.name TODO necessary?
},
reminders: [{
id: {type: String, validate: [validator.isUUID, 'Invalid uuid.'], default: shared.uuid, required: true},
startDate: {type: Date, required: true},
time: {type: Date, required: true},
}],
}, _.defaults({
minimize: true, // So empty objects are returned
strict: true,
@@ -63,6 +69,12 @@ TaskSchema.statics.sanitizeChecklist = function sanitizeChecklist (checklistObj)
return checklistObj;
};
// Sanitize reminder objects (disallowing id)
TaskSchema.statics.sanitizeChecklist = function sanitizeChecklist (reminderObj) {
delete reminderObj.id;
return reminderObj;
};
export let Task = mongoose.model('Task', TaskSchema);
// habits and dailies shared fields