tango-app-api-trax 3.3.1-beta-60 → 3.3.1-beta-62

package/package.json

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

package/src/controllers/trax.controller.js

@@ -1010,7 +1010,7 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
           let storeDetails = await storeService.find( { _id: { $in: clusterDetails.stores.map( ( item ) => item.store ) }, status: 'active' } );
           storeDetails.forEach( ( item ) => {
             userDetails.push( {
-              _id: ele.assignId,
+              id: ele.assignId,
               userName: item.spocDetails?.[0]?.name,
               userEmail: item.spocDetails?.[0]?.email,
               storeId: item?.storeId,
@@ -1029,7 +1029,7 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
           let teamUserDetails = await userService.find( { _id: { $in: teamDetails.users.map( ( item ) => item.userId ) } } );
           teamUserDetails.forEach( ( item ) => {
             userDetails.push( {
-              _id: ele.assignId,
+              id: ele.assignId,
               userName: item.userName,
               userEmail: item.email,
               storeId: ele?.storeId,
@@ -1496,7 +1496,6 @@ export const updateConfigurev1 =async ( req, res ) => {
       approver: inputBody?.checkListDetails?.approver.length ? inputBody?.checkListDetails?.approver.map( ( item ) => {
         return { name: item.name, value: item.value };
       } ) : [],
-      storeCount: inputBody.checkListDetails?.assignedUsers?.length || 0,
     };
 
     if ( inputBody?.checkListDetails?.approver.length ) {
@@ -2006,8 +2005,8 @@ export const validateUserv1 = async ( req, res ) => {
       }
     }
 
-    let userEmailList = assignDetails.map( ( item ) => item.userEmail.toLowerCase() );
-    let storeList = assignDetails.map( ( item ) => item?.storeName?.toLowerCase() );
+    let userEmailList = assignDetails.map( ( item ) => item?.userEmail?.trim()?.toLowerCase() );
+    let storeList = assignDetails.map( ( item ) => item?.storeName?.trim()?.toLowerCase() );
 
     let userQuery = [
       {
@@ -2016,6 +2015,7 @@ export const validateUserv1 = async ( req, res ) => {
           isActive: 1,
           clientId: 1,
           userName: 1,
+          email: 1,
         },
       },
       {
@@ -2033,6 +2033,7 @@ export const validateUserv1 = async ( req, res ) => {
           newEmail: { $toLower: '$email' },
           isActive: 1,
           clientId: 1,
+          email: 1,
         },
       },
       {
@@ -2047,17 +2048,19 @@ export const validateUserv1 = async ( req, res ) => {
     let storeQuery = [
       {
         $project: {
-          'storeName': { $toLower: '$storeName' },
+          'store': { $toLower: '$storeName' },
           'clientId': 1,
           'storeProfile.city': 1,
           'status': 1,
           'storeId': 1,
+          'spocDetails': 1,
+          'storeName': 1,
         },
       },
       {
         $match: {
           clientId: req.body.clientId,
-          storeName: { $in: storeList },
+          store: { $in: storeList },
         },
       },
     ];
@@ -2074,14 +2077,18 @@ export const validateUserv1 = async ( req, res ) => {
     let newUserList = userEmailList.filter( ( ele ) => !existUserEmail.includes( ele ) && !existEmail.includes( ele ) );
     let inActiveStores = storeDetails.filter( ( ele ) => ele.status == 'deactive' ).map( ( ele ) => ele.storeName );
 
-    let existsStore = storeDetails.map( ( ele ) => ele?.storeName );
+    let existsStore = storeDetails.map( ( ele ) => ele.storeName.toLowerCase() );
     let newStoreList = storeList.filter( ( ele ) => ele != null && !existsStore.includes( ele.toLowerCase() ) );
     if ( req.body.coverage == 'store' ) {
       assignDetails.forEach( ( item ) => {
-        let getStoreId = storeDetails.find( ( store ) => store.storeName.toLowerCase() == item.storeName.toLowerCase() );
-        if ( getStoreId ) {
-          item._id = getStoreId._id;
-          item.storeId = getStoreId.storeId;
+        let getStoreDetails = storeDetails.find( ( store ) => store.storeName.toLowerCase() == item.storeName.toLowerCase() );
+        if ( getStoreDetails ) {
+          let storeUserDetails = userDetails.find( ( ele ) => ele.newEmail.toLowerCase() == item.userEmail.toLowerCase() );
+          item._id = getStoreDetails._id;
+          item.storeId = getStoreDetails.storeId;
+          item.userName = storeUserDetails ? storeUserDetails?.userName : item.userName;
+          item.storeName = getStoreDetails.storeName;
+          item.userEmail = storeUserDetails ? storeUserDetails?.email : item.userEmail;
         }
       } );
     } else {
@@ -2090,6 +2097,7 @@ export const validateUserv1 = async ( req, res ) => {
         if ( getUserDetails ) {
           item._id = getUserDetails._id;
           item.userName = getUserDetails.userName;
+          item.userEmail = getUserDetails.email;
         }
       } );
     }
@@ -2097,21 +2105,21 @@ export const validateUserv1 = async ( req, res ) => {
     if ( ( newUserList.length || newStoreList.length || existEmail.length || inActiveStores.length ) && !req.body?.addUser ) {
       return res.sendError( { validate: false, user: newUserList, store: newStoreList, existEmail, inActiveStores, data: assignDetails }, 400 );
     }
-    if ( req.body.coverage == 'user' ) {
-      await Promise.all( newUserList.map( async ( ele ) => {
-        let findUserIndex = assignDetails.findIndex( ( item ) => item?.userEmail?.toLowerCase() == ele?.toLowerCase() );
-        if ( findUserIndex != -1 ) {
-          let data = {
-            userName: assignDetails[findUserIndex]?.userName,
-            email: ele,
-            mobileNumber: assignDetails[findUserIndex]?.mobileNumber,
-            clientId: req.body.clientId,
-          };
-          let response = await createUser( data );
+    await Promise.all( newUserList.map( async ( ele ) => {
+      let findUserIndex = assignDetails.findIndex( ( item ) => item?.userEmail?.toLowerCase() == ele?.toLowerCase() );
+      if ( findUserIndex != -1 ) {
+        let data = {
+          userName: assignDetails[findUserIndex]?.userName,
+          email: ele,
+          mobileNumber: assignDetails[findUserIndex]?.mobileNumber,
+          clientId: req.body.clientId,
+        };
+        let response = await createUser( data );
+        if ( req.body.coverage == 'user' ) {
           assignDetails[findUserIndex]._id = response._id;
         }
-      } ) );
-    }
+      }
+    } ) );
     return res.sendSuccess( { validate: true, data: assignDetails } );
   } catch ( e ) {
     logger.error( 'validateUser 2=>', e );
@@ -2933,7 +2941,6 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
     getquestionQuery.push( {
       $match: {
         checkListId: new ObjectId( checklistId ),
-        checkFlag: true,
         isdeleted: false,
       },
     } );
@@ -2949,9 +2956,35 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
           let idList = clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) );
           let getStoreDetails = await storeService.find( { _id: { $in: idList }, status: 'active' } );
           if ( getStoreDetails.length ) {
+            getStoreDetails = getStoreDetails.filter( ( store ) => {
+              let findStore = allQuestion.find( ( storeList ) => storeList.assignId.toString() == store._id.toString() );
+              if ( findStore ) {
+                return store?.spocDetails?.[0]?.email.toLowerCase() != findStore.userEmail.toLowerCase();
+              } else {
+                return true;
+              }
+            } );
             assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
-              let userDetails = await userService.findOne( { email: store?.spocDetails?.[0]?.email, clientId: store.clientId } );
-              if ( !userDetails ) {
+              let userQuery = [
+                {
+                  $project: {
+                    newEmail: { $toLower: '$email' },
+                    isActive: 1,
+                    clientId: 1,
+                    userName: 1,
+                    email: 1,
+                  },
+                },
+                {
+                  $match: {
+                    newEmail: store?.spocDetails?.[0]?.email.toLowerCase(),
+                    isActive: true,
+                    clientId: store.clientId,
+                  },
+                },
+              ];
+              let userDetails = await userService.aggregate( userQuery );
+              if ( !userDetails.length ) {
                 let data = {
                   clientId: store.clientId,
                   userName: store.spocDetails?.[0]?.name,
@@ -2959,14 +2992,15 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
                   email: store.spocDetails[0].email,
                 };
                 userDetails = await createUser( data );
+                userDetails = [ userDetails ];
               }
               let data = {
                 store_id: store?.storeId,
                 storeName: store?.storeName,
-                userId: userDetails._id,
-                userName: userDetails.userName,
-                userEmail: userDetails.email,
-                userPhone: userDetails?.mobileNumber,
+                userId: userDetails?.[0]?._id,
+                userName: userDetails?.[0]?.userName,
+                userEmail: userDetails?.[0]?.email,
+                userPhone: userDetails?.[0]?.mobileNumber,
                 city: store?.storeProfile?.city,
                 country: store?.storeProfile?.country,
                 checkFlag: true,
@@ -2987,6 +3021,8 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         let teamDetails = await teamsServices.findteams( { _id: { $in: teamsList } } );
         if ( teamDetails.length ) {
           let idList = teamDetails.flatMap( ( item ) => item.users.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 } } );
           if ( getUserDetails.length ) {
             assignList = getUserDetails.map( ( user ) => {
@@ -3163,7 +3199,6 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
             let data = { ...getsubmitDetails[0]._doc };
             await processedchecklist.updateOne( { _id: getsubmitDetails[0]._id }, data );
             if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
-              console.log( editSubmit );
               let user = {
                 _id: getsubmitDetails[0].userId,
                 clientId: getsubmitDetails[0].client_id,
@@ -3246,25 +3281,25 @@ 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' ] } } );
-
-        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 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' ] } } );
+        //   }
+        // }
 
         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 );
@@ -3614,7 +3649,6 @@ async function assignUsers( data ) {
     }
   } else {
     let teamDetails = await teamsServices.findteams( { clientId: data.clientId, _id: new mongoose.Types.ObjectId( data.id ) } );
-    console.log( teamDetails, 'team' );
     if ( teamDetails.length ) {
       let userIdList = teamDetails[0].users.map( ( ele ) => ele.userId );
       let userDetails = await userService.find( { _id: userIdList } );
@@ -3696,9 +3730,9 @@ export async function checklistAssign( req, res ) {
 
 export async function updateAssign( req, res ) {
   try {
-    if ( !req.body.assignedList.length && !req.body.assignedGroup.length ) {
-      return res.sendError( 'No data found', 204 );
-    }
+    // if ( !req.body.assignedList.length && !req.body.assignedGroup.length ) {
+    //   return res.sendError( 'No data found', 204 );
+    // }
     let checklistDetails = await checklistService.findOne( { _id: req.body.checkListId, client_id: req.body.clientId } );
     if ( !checklistDetails ) {
       return res.sendError( 'No data found', 204 );

package/src/routes/trax.routes.js

@@ -16,7 +16,7 @@ traxRouter
     .post( '/validateUser', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( uploadUserValidation ), traxController.validateUser )
     .post( '/validateUserv1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( uploadUserValidation ), traxController.validateUserv1 )
     .get( '/userDetails/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( duplicateValidation ), traxController.assignedUserDetails )
-    .get( '/userDetailsv1/:checklistId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( duplicateValidation ), traxController.assignedUserDetailsv1 )
+    .get( '/userDetailsv1/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( duplicateValidation ), traxController.assignedUserDetailsv1 )
     .post( '/checklistConfigure', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), traxController.updateConfigure )
     .post( '/checklistConfigurev1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), traxController.updateConfigurev1 )
     .delete( '/deleteChecklist/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( duplicateValidation ), traxController.deleteChecklist )