Moved approval fields to group subdoc

test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js

@@ -63,8 +63,8 @@ describe('POST /tasks/:id/approve/:userId', () => {
     expect(member.notifications[0].type).to.equal('GROUP');
     expect(member.notifications[0].data.message).to.equal(t('yourTaskHasBeenApproved'));
 
-    expect(syncedTask.approved).to.be.true;
+    expect(syncedTask.group.approved).to.be.true;
-    expect(syncedTask.approvingUser).to.equal(user._id);
+    expect(syncedTask.group.approvingUser).to.equal(user._id);
-    expect(syncedTask.approvedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
+    expect(syncedTask.group.approvedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
   });
 });

test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js

@@ -50,8 +50,8 @@ describe('POST /tasks/:id/score/:direction', () => {
     }));
 
     expect(response.message).to.equal(t('taskApprovalHasBeenRequested'));
-    expect(updatedTask.approvalRequested).to.equal(true);
+    expect(updatedTask.group.approvalRequested).to.equal(true);
-    expect(updatedTask.approvalRequestedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
+    expect(updatedTask.group.approvalRequestedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
   });
 
   it('errors when approval has already been requested', async () => {

website/server/controllers/api-v3/tasks.js

@@ -316,13 +316,13 @@ api.scoreTask = {
 
     if (!task) throw new NotFound(res.t('taskNotFound'));
 
-    if (task.requiresApproval && !task.approved) {
+    if (task.group.requiresApproval && !task.group.approved) {
-      if (task.approvalRequested) {
+      if (task.group.approvalRequested) {
         throw new NotAuthorized(res.t('taskRequiresApproval'));
       }
 
-      task.approvalRequested = true;
+      task.group.approvalRequested = true;
-      task.approvalRequestedDate = new Date();
+      task.group.approvalRequestedDate = new Date();
 
       let group = await Group.getGroup({user, groupId: task.group.id, fields: requiredGroupFields});
       let groupLeader = await User.findById(group.leader); // Use this method so we can get access to notifications

website/server/controllers/api-v3/tasks/groups.js

@@ -221,9 +221,9 @@ api.approveTask = {
 
     if (group.leader !== user._id) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
 
-    task.approvedDate = new Date();
+    task.group.approvedDate = new Date();
-    task.approvingUser = user._id;
+    task.group.approvingUser = user._id;
-    task.approved = true;
+    task.group.approved = true;
 
     assignedUser.addNotification('GROUP', {message: res.t('yourTaskHasBeenApproved')});
 
@@ -264,8 +264,8 @@ api.getGroupApprovals = {
 
     let approvals = await Tasks.Task.find({
       'group.id': groupId,
-      approved: false,
+      'group.approved': false,
-      approvalRequested: true,
+      'group.approvalRequested': true,
     }).exec();
 
     res.respond(200, approvals);

website/server/libs/taskManager.js

@@ -51,6 +51,10 @@ export async function createTasks (req, res, options = {}) {
     let taskType = taskData.type;
     let newTask = new Tasks[taskType](Tasks.Task.sanitize(taskData));
 
+    if (taskData.requiresApproval) {
+      newTask.group.requiresApproval = true;
+    }
+
     if (challenge) {
       newTask.challenge.id = challenge.id;
     } else if (group) {

website/server/models/group.js

@@ -938,6 +938,8 @@ schema.methods.syncTask = async function groupSyncTask (taskToSync, user) {
     if (orderList.indexOf(matchingTask._id) === -1 && (matchingTask.type !== 'todo' || !matchingTask.completed)) orderList.push(matchingTask._id);
   }
 
+  matchingTask.group.requiresApproval = taskToSync.group.requiresApproval;
+
   if (!matchingTask.notes) matchingTask.notes = taskToSync.notes; // don't override the notes, but provide it if not provided
   if (matchingTask.tags.indexOf(group._id) === -1) matchingTask.tags.push(group._id); // add tag if missing
 

website/server/models/task.js

@@ -69,15 +69,14 @@ export let TaskSchema = new Schema({
     broken: {type: String, enum: ['GROUP_DELETED', 'TASK_DELETED', 'UNSUBSCRIBED']},
     assignedUsers: [{type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']}],
     taskId: {type: String, ref: 'Task', validate: [validator.isUUID, 'Invalid uuid.']},
+    requiresApproval: {type: Boolean, default: false},
+    approved: {type: Boolean, default: false},
+    approvedDate: {type: Date},
+    approvingUser: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']},
+    approvalRequested: {type: Boolean, default: false},
+    approvalRequestedDate: {type: Date},
   },
 
-  requiresApproval: {type: Boolean, default: false},
-  approved: {type: Boolean, default: false},
-  approvedDate: {type: Date},
-  approvingUser: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']},
-  approvalRequested: {type: Boolean, default: false},
-  approvalRequestedDate: {type: Date},
-
   reminders: [{
     _id: false,
     id: {type: String, validate: [validator.isUUID, 'Invalid uuid.'], default: shared.uuid, required: true},