tango-app-api-task 3.2.1-beta-34 → 3.2.1-beta-36

package/package.json

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

package/src/controllers/task.controller.js

@@ -518,8 +518,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 = [
       {
@@ -528,6 +528,7 @@ export const validateUserv1 = async ( req, res ) => {
           isActive: 1,
           clientId: 1,
           userName: 1,
+          email: 1,
         },
       },
       {
@@ -559,17 +560,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 },
         },
       },
     ];
@@ -585,14 +588,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 {
@@ -601,6 +608,7 @@ export const validateUserv1 = async ( req, res ) => {
         if ( getUserDetails ) {
           item._id = getUserDetails._id;
           item.userName = getUserDetails.userName;
+          item.userEmail = getUserDetails.email;
         }
       } );
     }
@@ -608,21 +616,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 );
@@ -779,7 +787,7 @@ export async function userDetails( 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,
@@ -798,7 +806,7 @@ export async function userDetails( 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,
@@ -883,7 +891,6 @@ export async function taskConfig( req, res ) {
     let endDate = dayjs.utc( configDetails?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + configDetails.scheduleEndTime;
     configDetails.scheduleEndTimeISO = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
     configDetails.publishDate = dayjs.utc( dayjs().format( 'hh:mm A' ), 'hh:mm A' ).format();
-    configDetails.storeCount = inputBody?.assignedUsers?.length || 0;
 
     let response = await taskService.updateOne( { _id: inputBody._id }, configDetails );
     if ( inputBody?.approver.length ) {
@@ -1084,12 +1091,11 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
   let getquestionQuery = [];
   if ( dayjs( getCLconfig.publishDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
     let todayDate = `${dayjs( date ).format( 'YYYY-MM-DD' )} 00:00 AM`;
-    startTimeIso = dayjs( todayDate, 'YYYY-MM-DD HH:mm A' );
+    startTimeIso = dayjs.utc( todayDate, 'YYYY-MM-DD HH:mm A' );
   }
   getquestionQuery.push( {
     $match: {
       checkListId: new ObjectId( checklistId ),
-      checkFlag: true,
       isdeleted: false,
     },
   } );
@@ -1108,9 +1114,35 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
           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,
@@ -1118,14 +1150,15 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
                   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,
@@ -1146,6 +1179,8 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
         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 ) => {
@@ -1221,10 +1256,10 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
       }
     } ) );
     if ( userIdList.length ) {
-      allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
+      assignUserList = assignUserList.filter( ( item ) => typeof item._id == 'undefined' );
     }
 
-    if ( allQuestion ) {
+    if ( assignUserList ) {
       let assigndeletequery = {
         date_iso: date,
         client_id: insertdata.client_id,
@@ -1247,7 +1282,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
 
       const taskToRetain = await taskProcessedService.find( retainTaskQuery );
 
-      const insertList = allQuestion.filter( ( item2 ) =>
+      const insertList = assignUserList.filter( ( item2 ) =>
         !taskToRetain.some( ( item1 ) =>
           item1.store_id === item2.store_id && item1.userEmail === item2.userEmail,
         ),
@@ -3637,9 +3672,9 @@ export async function taskAssign( 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 taskDetails = await taskService.findOne( { _id: req.body.taskId, client_id: req.body.clientId } );
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );

package/src/routes/task.routes.js

@@ -9,7 +9,7 @@ taskRouter
     .post( '/create', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isAdd' ] } ] } ), taskController.createUpdateTask )
     .post( '/delete/:taskIds', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.deleteTask )
     .get( '/details', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskController.taskDetails )
-    .get( '/userDetails', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskController.userDetails )
+    .get( '/userDetails', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskController.userDetails )
     .post( '/upload', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.validateUserv1 )
     .post( '/uploadImage', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.uploadImage )
     .post( '/config', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.taskConfig )