From a26cda14acd2ea1c65ab68903b3763711622c4ea Mon Sep 17 00:00:00 2001 From: Kurt Junghanns Date: Mon, 14 Nov 2016 15:00:37 +0100 Subject: [PATCH] [SWIK-743_usergroups] Added groups joined and left to data model and route --- application/models/notification.js | 4 ++-- application/routes.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/models/notification.js b/application/models/notification.js index 12f9f36..54474a8 100644 --- a/application/models/notification.js +++ b/application/models/notification.js @@ -20,7 +20,7 @@ const notification = { activity_id: objectid, activity_type: { type: 'string', - enum: ['translate', 'share', 'add', 'edit', 'comment', 'reply', 'use', 'react', 'rate', 'download'] + enum: ['translate', 'share', 'add', 'edit', 'comment', 'reply', 'use', 'react', 'rate', 'download', 'joined', 'left'] }, timestamp: { type: 'object' @@ -31,7 +31,7 @@ const notification = { }, content_kind: { type: 'string', - enum: ['deck', 'slide'] + enum: ['deck', 'slide', 'group'] }, content_name: { type: 'string' diff --git a/application/routes.js b/application/routes.js index a8d3f2f..1571086 100644 --- a/application/routes.js +++ b/application/routes.js @@ -59,11 +59,11 @@ module.exports = function(server) { config: { validate: { payload: Joi.object().keys({ - activity_id: Joi.string(), + activity_id: Joi.string(), //what is this? The _id is created by the database. It should not be possbile for clients to create their own keys... activity_type: Joi.string(), user_id: Joi.string(), content_id: Joi.string(), - content_kind: Joi.string().valid('deck', 'slide'), + content_kind: Joi.string().valid('deck', 'slide', 'group'), content_name: Joi.string(), content_owner_id: Joi.string(), subscribed_user_id: Joi.string(),