tango-app-api-trax 3.3.1-beta-70 → 3.3.1-beta-71

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-70",
+    "version": "3.3.1-beta-71",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalTrax.controller.js

@@ -463,7 +463,7 @@ async function insertData( requestData ) {
                         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 getUserDetails = await userService.find( { _id: { $in: idList } } );
                             if ( getUserDetails.length ) {
                               assignList = getUserDetails.map( ( user ) => {

package/src/controllers/mobileTrax.controller.js

@@ -3179,7 +3179,7 @@ export async function login( req, res ) {
       return res.sendError( `User mail not Exists`, 401 );
     }
     if ( !result.isActive ) {
-      return res.sendError( 'The user has been unauthorized to login', 401 );
+      return res.sendError( 'Your account is currently inactive. Please contact your admin.', 401 );
     }
     if ( inputData.otp ) {
       const otpMatching = await findOTP( { email: result.email, type: 'login', otp: inputData.otp } );

package/src/controllers/teaxFlag.controller.js

@@ -28,7 +28,7 @@ export const overallFlagMetrics = async ( req, res ) => {
                   { date_iso: { $gte: new Date( req.body.startDate ) } },
                   { date_iso: { $lte: new Date( req.body.endDate ) } },
                   // { store_id: { $in: req.body.stores } },
-                  { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
                 ],
               },
             },
@@ -105,10 +105,7 @@ export const overallFlagMetrics = async ( req, res ) => {
                   { date_iso: { $gte: dayjs.utc( req.body.endDate ).subtract( 7, 'days' ).startOf( 'day' ).toDate() } },
                   { date_iso: { $lte: dayjs.utc( req.body.startDate ).subtract( 1, 'day' ).startOf( 'day' ).toDate() } },
                   // { store_id: { $in: req.body.stores } },
-                  { '$or': [
-                    { '$and': findORQuery1 },
-                    { '$and': findORQuery2 },
-                  ] },
+                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
                 ],
               },
             },
@@ -1973,10 +1970,7 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
               client_id: reqestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ),
               // store_id: { $in: reqestData.storeId },
-              $or: [
-                { '$and': findORQuery1 },
-                { '$and': findORQuery2 },
-              ],
+              $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
             },
         },
         {

package/src/controllers/trax.controller.js

@@ -1024,9 +1024,10 @@ export const assignedUserDetailsv1 = async ( 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 }, isActive: true } );
           teamUserDetails.forEach( ( item ) => {
             userDetails.push( {
               id: ele.assignId,
@@ -1043,18 +1044,24 @@ export const assignedUserDetailsv1 = async ( 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 || '',
+          } );
+        }
       }
     } ) );
 
@@ -1944,7 +1951,7 @@ export const validateUser = async ( req, res ) => {
 
 export const validateUserv1 = async ( req, res ) => {
   try {
-    if ( !req.body.assignedUsers.length ) {
+    if ( !req.body.assignedUsers?.length ) {
       return res.sendError( 'Please Enter user Details', 400 );
     }
 
@@ -3053,74 +3060,90 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
     let notifyUserList = [];
     let status = [ { checklistStatus: { $ne: 'open' } } ];
     let assignUserList = [];
-    await Promise.all( allQuestion.map( async ( element4 ) => {
-      let getToken = await userService.findOne( { _id: element4.userId }, { fcmToken: 1 } );
-      if ( getToken && getToken?.fcmToken && element4?.sendNotification && showEdit ) {
-        tokenList.push( getToken.fcmToken );
-      }
-      if ( !element4?.sendNotification ) {
-        notifyUserList.push( { token: getToken?.fcmToken, storeName: element4.storeName, id: element4._id } );
-      }
-      if ( !getCLconfig?.allowedMultiSubmit ) {
-        let query;
-        if ( getCLconfig.allowOnce && ![ 'onetime', 'daily' ].includes( getCLconfig.schedule ) ) {
-          if ( [ 'weekday', 'weekly', 'monthly' ].includes( getCLconfig.schedule ) ) {
-            let startDate; let endDate;
-            if ( [ 'weekday', 'weekly' ].includes( getCLconfig.schedule ) ) {
-              startDate = dayjs.utc( date ).clone().startOf( 'week' );
-              endDate = dayjs.utc( date ).clone().endOf( 'week' );
-            } else {
-              startDate = dayjs.utc( date ).clone().startOf( 'month' );
-              endDate = dayjs.utc( date ).clone().endOf( 'month' );
-            }
+    let userList = allQuestion.map( ( item ) => item.userId );
+    let submittedDetails = [];
+    let userDetails = await userService.find( { _id: { $in: userList } }, { fcmToken: 1 } );
+    userDetails = new Map( userDetails.map( ( ele ) => [ ele._id.toString(), ele.fcmToken ] ) );
+    if ( !getCLconfig?.allowedMultiSubmit ) {
+      let query;
+      if ( getCLconfig.allowOnce && ![ 'onetime', 'daily' ].includes( getCLconfig.schedule ) ) {
+        if ( [ 'weekday', 'weekly', 'monthly' ].includes( getCLconfig.schedule ) ) {
+          let startDate; let endDate;
+          if ( [ 'weekday', 'weekly' ].includes( getCLconfig.schedule ) ) {
+            startDate = dayjs.utc( date ).clone().startOf( 'week' );
+            endDate = dayjs.utc( date ).clone().endOf( 'week' );
+          } else {
+            startDate = dayjs.utc( date ).clone().startOf( 'month' );
+            endDate = dayjs.utc( date ).clone().endOf( 'month' );
+          }
+          query = {
+            sourceCheckList_id: getCLconfig._id,
+            $or: [
+              { submitTime: { $exists: true } },
+              ...status,
+            ],
+            // userId: { $in: userList },
+            // ...( getCLconfig.coverage == 'store' ) ? { store_id: element4.store_id }:{},
+            $and: [ {
+              date_iso: {
+                $gte: new Date( startDate.format( 'YYYY-MM-DD' ) ),
+                $lte: new Date( endDate.format( 'YYYY-MM-DD' ) ) },
+            } ],
+          };
+        } else {
+          if ( getCLconfig.schedule == 'range' ) {
             query = {
               sourceCheckList_id: getCLconfig._id,
               $or: [
                 { submitTime: { $exists: true } },
                 ...status,
               ],
-              userId: element4.userId,
-              ...( getCLconfig.coverage == 'store' ) ? { store_id: element4.store_id }:{},
-              $and: [ {
-                date_iso: {
-                  $gte: new Date( startDate.format( 'YYYY-MM-DD' ) ),
-                  $lte: new Date( endDate.format( 'YYYY-MM-DD' ) ) },
-              } ],
-            };
-          } else {
-            if ( getCLconfig.schedule == 'range' ) {
-              query = {
-                sourceCheckList_id: getCLconfig._id,
-                $or: [
-                  { submitTime: { $exists: true } },
-                  ...status,
-                ],
-                userId: element4.userId,
-                ...( getCLconfig.coverage == 'store' ) ? { store_id: element4.store_id }:{},
-                $and: [
-                  {
-                    date_iso: {
-                      $gte: new Date( dayjs( getCLconfig.configStartDate ).format( 'YYYY-MM-DD' ) ),
-                      $lte: new Date( dayjs( getCLconfig.configEndDate ).format( 'YYYY-MM-DD' ) ),
-                    },
+              // userId: element4.userId,
+              // ...( getCLconfig.coverage == 'store' ) ? { store_id: element4.store_id }:{},
+              $and: [
+                {
+                  date_iso: {
+                    $gte: new Date( dayjs( getCLconfig.configStartDate ).format( 'YYYY-MM-DD' ) ),
+                    $lte: new Date( dayjs( getCLconfig.configEndDate ).format( 'YYYY-MM-DD' ) ),
                   },
-                ],
-              };
-            }
+                },
+              ],
+            };
           }
+        }
+      } else {
+        query = {
+          date_string: date,
+          sourceCheckList_id: getCLconfig._id,
+          $or: [
+            ...status,
+            { submitTime: { $exists: true } },
+          ],
+          // userId: element4.userId,
+          // ...( getCLconfig.coverage == 'store' ) ? { store_id: element4.store_id }:{},
+        };
+      }
+      submittedDetails = await processedchecklist.find( query );
+    }
+    await Promise.all( allQuestion.map( async ( element4 ) => {
+      let getToken = userDetails.get( element4.userId.toString() );
+      if ( getToken && element4?.sendNotification && showEdit ) {
+        tokenList.push( getToken );
+      }
+      if ( !element4?.sendNotification ) {
+        notifyUserList.push( { token: getToken, storeName: element4.storeName, id: element4._id } );
+      }
+      if ( !getCLconfig?.allowedMultiSubmit ) {
+        let getsubmitDetails;
+        if ( getCLconfig.coverage == 'store' ) {
+          getsubmitDetails = submittedDetails.find( ( checklist ) => checklist.userId.toString() == element4.userId.toString() && checklist.store_id == element4.store_id );
         } else {
-          query = {
-            date_string: date,
-            sourceCheckList_id: getCLconfig._id,
-            $or: [
-              ...status,
-              { submitTime: { $exists: true } },
-            ],
-            userId: element4.userId,
-            ...( getCLconfig.coverage == 'store' ) ? { store_id: element4.store_id }:{},
-          };
+          getsubmitDetails = submittedDetails.find( ( checklist ) => checklist.userId.toString() == element4.userId.toString() );
+        }
+        if ( getsubmitDetails ) {
+          getsubmitDetails = [ getsubmitDetails ];
+          console.log( submittedDetails, getsubmitDetails );
         }
-        let getsubmitDetails = await processedchecklist.find( query );
         function findDifferences( obj1, obj2 ) {
           return Object.keys( obj1 ).reduce( ( diff, key ) => {
             if ( !isEqual( obj1[key], obj2[key] ) ) {
@@ -3129,7 +3152,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
             return diff;
           }, {} );
         }
-        if ( getsubmitDetails.length ) {
+        if ( getsubmitDetails?.length ) {
           if ( showEdit && ( ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) || getsubmitDetails[0].checklistStatus == 'inprogress' ) ) {
             let modifiedCount = 0;
             let questionList = insertdata.questionAnswers;
@@ -3282,29 +3305,52 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
           }
         }
       } else {
-        // let unAssignedList = assignUserList.reduce( ( acc, item ) => {
-        //   if ( !acc[item.userEmail] ) {
-        //     acc[item.userEmail]=[ item.store_id ];
-        //   } else {
-        //     acc[item.userEmail].push( item.store_id );
-        //   }
-        //   return acc;
-        // }, {} );
-
-        // let userList = Object.keys( unAssignedList );
-
-        // await processedchecklist.deleteMany( { userEmail: { $nin: userList }, date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, checklistStatus: { $nin: [ 'submit' ] } } );
-        await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, checklistStatus: { $nin: [ 'submit' ] } } );
-
-        // for ( let key in assignUserList ) {
-        //   if ( assignUserList.hasOwnProperty( key ) ) {
-        //     await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, $and: [ { userEmail: key }, { store_id: { $nin: unAssignedList[key] } } ], checklistStatus: { $nin: [ 'submit' ] } } );
-        //   }
-        // }
+        let unAssignedList = assignUserList.reduce( ( acc, item ) => {
+          if ( !acc[item.userEmail] ) {
+            acc[item.userEmail]=[ item.store_id ];
+          } else {
+            acc[item.userEmail].push( item.store_id );
+          }
+          return acc;
+        }, {} );
 
-        Promise.all( assignUserList.map( async ( ele ) => {
-          await processedchecklist.updateOne( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, userEmail: ele.userEmail, store_id: ele.store_id }, ele );
-        } ) );
+        let userList = Object.keys( unAssignedList );
+
+        await processedchecklist.deleteMany( { userEmail: { $nin: userList }, date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, checklistStatus: { $nin: [ 'submit' ] } } );
+        if ( getCLconfig.coverage == 'store' ) {
+          await Promise.all( assignUserList.map( async ( item ) => {
+            if ( unAssignedList.hasOwnProperty( item.userEmail ) ) {
+              await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, $and: [ { userEmail: item.userEmail }, { store_id: { $nin: unAssignedList[item.userEmail] } } ], checklistStatus: { $nin: [ 'submit' ] } } );
+            }
+          } ) );
+          // for ( let key in unAssignedList ) {
+          //   if ( unAssignedList.hasOwnProperty( key ) ) {
+          //     await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, $and: [ { userEmail: key }, { store_id: { $nin: unAssignedList[key] } } ], checklistStatus: { $nin: [ 'submit' ] } } );
+          //   }
+          // }
+        }
+
+        let inprogressData = await processedchecklist.find( {
+          date_string: insertdata.date_string,
+          date_iso: insertdata.date_iso,
+          client_id: insertdata.client_id,
+          checkListId: updatedchecklist._id,
+        }, { userId: 1, store_id: 1 } );
+
+        if ( inprogressData.length ) {
+          assignUserList = assignUserList.filter( ( item ) => {
+            let findData = inprogressData.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
+            if ( !findData ) {
+              return item;
+            }
+          } );
+        }
+
+        await processedchecklist.deleteMany( { date_string: insertdata.date_string,
+          date_iso: insertdata.date_iso,
+          client_id: insertdata.client_id,
+          checkListId: updatedchecklist._id, checklistStatus: 'open' } );
+        await processedchecklist.insertMany( assignUserList );
       }
 
       tokenList.forEach( ( item ) => {
@@ -3604,7 +3650,7 @@ export const selectAssign = async ( req, res ) => {
       // //Select User and Teams
       if ( requestData.assignType == 'user' ) {
         let userQuery = [
-          { $match: { clientId: requestData.clientId } },
+          { $match: { clientId: requestData.clientId, isActive: true } },
           { $project: { 'userEmail': '$email', 'userName': 1, 'type': 'user' } },
         ];
         resuldData = await userService.aggregate( userQuery );
@@ -3651,7 +3697,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 = {
@@ -3739,27 +3785,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 assignedService.deleteMany( { checkListId: req.body.checkListId } );
     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,
@@ -3767,7 +3815,7 @@ export async function updateAssign( req, res ) {
           clientId: req.body.clientId,
         };
         userDetails = await createUser( userData );
-        userDetails = [ userDetails ];
+        userDetails = userDetails;
       }
       let data = {
         ...assign,
@@ -3776,25 +3824,26 @@ export async function updateAssign( req, res ) {
         checkListId: req.body.checkListId,
         coverage: req.body.coverage,
         assignId: assign._id,
-        userId: userDetails?.[0]?._id,
+        userId: userDetails?._id,
         checkListName: checklistDetails.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.checkListId,
           coverage: req.body.coverage,
-          assignId: assign.id,
+          assignId: assign,
           checkListName: checklistDetails.checkListName,
           ...( req.body.coverage == 'store' ) ? { clusterName: groupDetails?.clusterName } : { teamName: groupDetails?.teamName },
         };