tango-app-api-task 3.3.1-beta-2 → 3.3.1-beta-4

package/package.json

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

package/src/controllers/task.controller.js

@@ -1185,7 +1185,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
       if ( teamsList.length ) {
         let teamDetails = await teamsServices.findteams( { _id: { $in: teamsList } } );
         if ( teamDetails.length ) {
-          let idList = teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) );
+          let idList = [ ...teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) ), ...teamDetails.flatMap( ( item ) => item.Teamlead.map( ( ele ) => ele.userId ) ) ];
           let userIdList = allQuestion.filter( ( qn ) => !qn?.teamName ).map( ( qn ) => qn.assignId.toString() );
           idList = idList.filter( ( id ) => !userIdList.includes( id.toString() ) );
           let getUserDetails = await userService.find( { _id: { $in: idList } } );

package/src/controllers/taskActionCenter.controllers.js

@@ -60,7 +60,7 @@ export const overallCardsV1 = async ( req, res ) => {
           checklistStatus: 'submit',
           approvalStatus: false,
           // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
       { ...groupQuery },
@@ -74,7 +74,7 @@ export const overallCardsV1 = async ( req, res ) => {
           checklistStatus: 'submit',
           approvalStatus: false,
           // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
       { ...groupQuery },
@@ -203,7 +203,7 @@ export const approvalTableV1 = async ( req, res ) => {
             date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: taskIdList },
             // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
           },
         },
         ...groupQuery,
@@ -235,7 +235,7 @@ export const approvalTableV1 = async ( req, res ) => {
             date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: checklistIdList },
             // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
-            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
           },
         },
         ...groupQuery,
@@ -308,7 +308,7 @@ export const activityLogV1 = async ( req, res ) => {
         { client_id: requestData.clientId },
         { action: { $in: [ 'submitted', 'started' ] } },
         // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
     );
 
 

package/src/controllers/taskDashboard.controllers.js

@@ -66,7 +66,7 @@ export const overallCardsV1 = async ( req, res ) => {
         { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
         // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -244,7 +244,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         { client_id: requestData.clientId },
         { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.taskId ) },
         // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
     );
     if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
       if ( requestData.checklistStatus == 'redo' ) {
@@ -1027,7 +1027,7 @@ export async function taskDetails( req, res ) {
           client_id: req.body.clientId,
           ...( idList.length ) ? { sourceCheckList_id: { $in: idList } } : {},
           // store_id: { $in: req.body.storeId },
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
       { $sort: { date_iso: -1 } },