tango-app-api-task 3.2.1-beta-42 → 3.2.1-beta-44

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-42",
+    "version": "3.2.1-beta-44",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -297,7 +297,7 @@ export async function taskDetails( req, res ) {
 
 export async function validateUser( req, res ) {
   try {
-    if ( !req.body.assignedUsers.length ) {
+    if ( !req.body.assignedUsers?.length ) {
       return res.sendError( 'Please Enter User Details', 400 );
     }
 
@@ -495,11 +495,8 @@ export const validateUserv1 = async ( req, res ) => {
           };
         } else {
           if ( acc[obj.userEmail.toLowerCase()] ) {
-            if ( acc[obj.userEmail.toLowerCase()].name.includes( obj.userName.toLowerCase() ) ) {
-              acc[obj.userEmail.toLowerCase()].count++;
-            } else {
-              acc[obj.userEmail.toLowerCase()].name.push( obj.userEmail.toLowerCase() );
-            }
+            acc[obj.userEmail.toLowerCase()].name.push( obj.userName.toLowerCase() );
+            acc[obj.userEmail.toLowerCase()].count++;
           }
         }
         return acc;
@@ -801,9 +798,10 @@ export async function userDetails( req, res ) {
           } );
         }
       } else if ( ele?.teamName ) {
-        let teamDetails = await teamsServices.findOneTeams( { _id: ele.assignId }, { users: 1, teamName: 1 } );
+        let teamDetails = await teamsServices.findOneTeams( { _id: ele.assignId }, { users: 1, teamName: 1, Teamlead: 1 } );
         if ( teamDetails ) {
-          let teamUserDetails = await userService.find( { _id: { $in: teamDetails.users.map( ( item ) => item.userId ) } } );
+          let idList = [ ...teamDetails.users.map( ( ele ) => ele.userId ), ...teamDetails.Teamlead.map( ( ele ) => ele.userId ) ];
+          let teamUserDetails = await userService.find( { _id: { $in: idList } } );
           teamUserDetails.forEach( ( item ) => {
             userDetails.push( {
               id: ele.assignId,
@@ -820,18 +818,24 @@ export async function userDetails( req, res ) {
           } );
         }
       } else {
-        userDetails.push( {
-          _id: ele.assignId,
-          userName: ele.userName,
-          userEmail: ele.userEmail,
-          storeId: ele?.store_id,
-          storeName: ele?.storeName,
-          userPhone: ele.userPhone,
-          city: ele.city,
-          checkFlag: ele.checkFlag,
-          clusterName: ele?.clusterName || '',
-          teamName: ele?.teamName || '',
-        } );
+        let checkActiveUsers;
+        if ( ele?.coverage == 'user' ) {
+          checkActiveUsers = await userService.findOne( { _id: ele.userId, isActive: true } );
+        }
+        if ( checkActiveUsers || ele?.coverage == 'store' ) {
+          userDetails.push( {
+            _id: ele.assignId,
+            userName: ele.userName,
+            userEmail: ele.userEmail,
+            storeId: ele?.store_id,
+            storeName: ele?.storeName,
+            userPhone: ele.userPhone,
+            city: ele.city,
+            checkFlag: ele.checkFlag,
+            clusterName: ele?.clusterName || '',
+            teamName: ele?.teamName || '',
+          } );
+        }
       }
     } ) );
 
@@ -1650,6 +1654,8 @@ export async function createChecklistTask( req, res ) {
         checkListName: data.checkListName,
         client_id: inputBody.clientId,
         userId: userId,
+        assignId: storeDetails?._id,
+        coverage: response?.coverage || 'store',
       };
       await taskAssignService.create( userDetails );
 
@@ -3780,7 +3786,7 @@ async function assignUsers( data ) {
   } else {
     let teamDetails = await teamsServices.findteams( { clientId: data.clientId, _id: new mongoose.Types.ObjectId( data.id ) } );
     if ( teamDetails.length ) {
-      let userIdList = teamDetails[0].users.map( ( ele ) => ele.userId );
+      let userIdList = [ ...teamDetails[0].users.map( ( ele ) => ele.userId ), ...teamDetails[0].Teamlead.map( ( ele ) => ele.userId ) ];
       let userDetails = await userService.find( { _id: userIdList } );
       assignedData = userDetails.map( ( user ) => {
         let userData = {
@@ -3892,27 +3898,29 @@ export async function updateAssign( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
     req.body.assignedGroup = [ ...new Set( req.body.assignedGroup.map( ( item ) => item.id ) ) ];
-    req.body.assignedGroup = req.body.assignedGroup.map( ( ele ) => {
-      return { id: ele };
-    } );
+    // req.body.assignedGroup = req.body.assignedGroup.map( ( ele ) => {
+    //   return { id: ele };
+    // } );
     await taskAssignService.deleteMany( { checkListId: req.body.taskId } );
     let assignedUserList = [];
-    await Promise.all( req.body.assignedList.map( async ( assign ) => {
-      let query = [
-        {
-          $addFields: {
-            emailToLower: { $toLower: '$email' },
-          },
+    let userEmailList = req.body.assignedList.map( ( ele ) => ele.userEmail.toLowerCase() );
+    let query = [
+      {
+        $addFields: {
+          emailToLower: { $toLower: '$email' },
         },
-        {
-          $match: {
-            clientId: req.body.clientId,
-            emailToLower: assign.userEmail.toLowerCase(),
-          },
+      },
+      {
+        $match: {
+          clientId: req.body.clientId,
+          emailToLower: { $in: userEmailList },
         },
-      ];
-      let userDetails = await userService.aggregate( query );
-      if ( !userDetails.length ) {
+      },
+    ];
+    let assignUserDetails = await userService.aggregate( query );
+    await Promise.all( req.body.assignedList.map( async ( assign ) => {
+      let userDetails = assignUserDetails.find( ( ele ) => ele.email.toLowerCase() == assign.userEmail.toLowerCase() );
+      if ( !userDetails ) {
         let userData = {
           userName: assign.userName,
           email: assign.userEmail,
@@ -3920,7 +3928,6 @@ export async function updateAssign( req, res ) {
           clientId: req.body.clientId,
         };
         userDetails = await createUser( userData );
-        userDetails = [ userDetails ];
       }
       let data = {
         ...assign,
@@ -3929,25 +3936,26 @@ export async function updateAssign( req, res ) {
         checkListId: req.body.taskId,
         coverage: req.body.coverage,
         assignId: assign._id,
-        userId: userDetails?.[0]?._id,
+        userId: userDetails?._id,
         checkListName: taskDetails.checkListName,
       };
       delete data._id;
       assignedUserList.push( data );
     } ) );
+    let assignGroupDetails = [];
+    if ( req.body.coverage == 'store' ) {
+      assignGroupDetails = await clusterServices.findcluster( { _id: { $in: req.body.assignedGroup } } );
+    } else {
+      assignGroupDetails = await teamsServices.findteams( { _id: { $in: req.body.assignedGroup } } );
+    }
     await Promise.all( req.body.assignedGroup.map( async ( assign ) => {
-      let groupDetails;
-      if ( req.body.coverage == 'store' ) {
-        groupDetails = await clusterServices.findOneCluster( { _id: assign.id } );
-      } else {
-        groupDetails = await teamsServices.findOneTeams( { _id: assign.id } );
-      }
+      let groupDetails = assignGroupDetails.find( ( ele ) => ele._id.toString() == assign );
       if ( groupDetails ) {
         let groupData = {
           client_id: req.body.clientId,
           checkListId: req.body.taskId,
           coverage: req.body.coverage,
-          assignId: assign.id,
+          assignId: assign,
           checkListName: taskDetails.checkListName,
           ...( req.body.coverage == 'store' ) ? { clusterName: groupDetails?.clusterName } : { teamName: groupDetails?.teamName },
         };