refactor: merge conflict changes

Author: harshith-venkatesh

controllers/tasks.js

@@ -1,4 +1,5 @@
 const tasks = require('../models/tasks')
+const { TASK_STATUS } = require('../constants/tasks')
 /**
  * Creates new task
  *
@@ -52,8 +53,15 @@ const fetchTasks = async (req, res) => {
  */
 const getUserTasks = async (req, res) => {
   try {
+    const { status } = req.query
     const { username } = req.params
-    const allTasks = await tasks.fetchUserTasks(username)
+    let allTasks = []
+
+    if (!Object.values(TASK_STATUS).includes(status)) {
+      return res.boom.notFound('Status not found!')
+    }
+
+    allTasks = await tasks.fetchUserTasks(username, status ? [status] : [])
 
     if (allTasks.userNotFound) {
       return res.boom.notFound('User doesn\'t exist')

test/integration/tasks.test.js

@@ -173,7 +173,7 @@ describe('Tasks', function () {
         title: 'Assigned task',
         purpose: 'To Test mocha',
         featureUrl: '<testUrl>',
-        type: 'Dev | Group',
+        type: 'group',
         links: [
           'test1'
         ],
@@ -185,11 +185,10 @@ describe('Tasks', function () {
           'd12',
           'd23'
         ],
-        participants: [appOwner.username],
+        participants: ['user1'],
         completionAward: { [DINERO]: 3, [NEELAM]: 300 },
         lossRate: { [DINERO]: 1 },
-        isNoteworthy: true,
-        assignee: 'sagar'
+        isNoteworthy: true
       }
       const { taskId } = await tasks.updateTask(assignedTask)
       const res = await chai
@@ -261,7 +260,7 @@ describe('Tasks', function () {
     it('Should return 200 when username is valid', function (done) {
       chai
         .request(app)
-        .get(`/tasks/${appOwner.username}`)
+        .get(`/tasks/${appOwner.username}?status=active`)
         .end((err, res) => {
           if (err) { return done(err) }
           expect(res).to.have.status(200)
@@ -284,7 +283,7 @@ describe('Tasks', function () {
     it('Should return 404 when username is invalid', function (done) {
       chai
         .request(app)
-        .get('/tasks/dummyUser')
+        .get('/tasks/dummyUser?status=active')
         .end((err, res) => {
           if (err) { return done(err) }
           expect(res).to.have.status(404)

utils/tasks.js

@@ -1,19 +1,23 @@
 
 const { getUsername, getUserId, getParticipantUsernames, getParticipantUserIds } = require('./users')
+const { TASK_TYPE } = require('../constants/tasks')
 
 const fromFirestoreData = async (task) => {
   if (!task) {
     return task
   }
-  let { createdBy, assignee, participants } = task
+
+  let { createdBy, assignee, participants, type } = task
+
   if (createdBy) {
     createdBy = await getUsername(createdBy)
   }
+
   if (assignee) {
     assignee = await getUsername(assignee)
   }
 
-  if (Array.isArray(participants)) {
+  if (type === TASK_TYPE.GROUP) {
     participants = await getParticipantUsernames(participants)
   }