WIP(teams): fix initially unassigned task, add completedBy data

website/client/src/components/tasks/taskModal.vue

@@ -1458,11 +1458,13 @@ export default {
             tasks: [this.task],
           });
           Object.assign(this.task, response);
+          if (this.assignedMember) {
             await this.$store.dispatch('tasks:assignTask', {
               taskId: this.task._id,
               userId: this.assignedMember,
             });
             this.task.group.assignedUsers = [this.assignedMember];
+          }
           this.$emit('taskCreated', this.task);
         } else {
           this.createTask(this.task);

website/server/libs/groupTasks.js

@@ -20,6 +20,7 @@ async function handleSharedCompletion (masterTask, groupMemberTask) {
   if (masterTask.type === 'reward') return;
   if (masterTask.type === 'todo') await _deleteUnfinishedTasks(groupMemberTask);
   masterTask.completed = groupMemberTask.completed;
+  masterTask.group.completedBy = groupMemberTask.userId;
   await masterTask.save();
 }
 

website/server/libs/tasks/index.js

@@ -375,6 +375,10 @@ async function scoreTask (user, task, direction, req, res) {
     }
   }
 
+  if (task.completed && task.group.id && !task.userId) {
+    task.group.completedBy = user._id;
+  }
+
   setNextDue(task, user);
 
   if (localTask) {

website/server/models/task.js

@@ -147,6 +147,7 @@ export const TaskSchema = new Schema({
       default: SHARED_COMPLETION.single,
     },
     managerNotes: { $type: String },
+    completedBy: { $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for group completing user.'] },
   },
 
   reminders: [reminderSchema],