tango-app-api-trax 3.3.1-beta-29 → 3.3.1-beta-30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-29",
+    "version": "3.3.1-beta-30",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.49",
+        "tango-api-schema": "^2.2.52",
         "tango-app-api-middleware": "^3.1.55",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/gallery.controller.js

@@ -292,11 +292,13 @@ export async function approveChecklist( req, res ) {
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
         let inputstores = checklistDetails.filter( ( data ) => data.checklistStatus == 'submit' );
 
+
         let params = {
           'payload': {
             sourceCheckList_id: req.body.sourceCheckList_id,
             fromDate: req.body.fromDate,
             toDate: req.body.toDate,
+            filtertype: req.body.filtertype,
             store_id: inputstores,
           },
           'upsert': {
@@ -314,7 +316,7 @@ export async function approveChecklist( req, res ) {
         let url = JSON.parse( process.env.LAMBDAURL );
         let searchResponse = await fetch( url.approveChecklist, requestOptions );
 
-
+        console.log( searchResponse.ok );
         if ( searchResponse.ok ) {
           let pendingstores = checklistDetails.filter( ( data ) => data.checklistStatus != 'submit' );
           if ( pendingstores && pendingstores.length > 0 ) {

package/src/controllers/trax.controller.js

@@ -1989,11 +1989,6 @@ export const validateUserv1 = async ( req, res ) => {
         return res.sendError( 'User already Exists', 400 );
       }
     }
-    // let userChunk =await chunkArray( users, 10 );
-
-    await Promise.all( users.map( async ( chunk ) => {
-      await processUser( [ chunk ] );
-    } ) );
 
     let userEmailList = assignDetails.map( ( item ) => item.userEmail.toLowerCase() );
     let storeList = assignDetails.map( ( item ) => item.storeName.toLowerCase() );
@@ -2015,6 +2010,23 @@ export const validateUserv1 = async ( req, res ) => {
       },
     ];
 
+    let emailCheckQuery = [
+      {
+        $project: {
+          newEmail: { $toLower: '$email' },
+          isActive: 1,
+          clientId: 1,
+        },
+      },
+      {
+        $match: {
+          newEmail: { $in: userEmailList },
+          isActive: true,
+          clientId: { $ne: req.body.clientId },
+        },
+      },
+    ];
+
     let storeQuery = [
       {
         $project: {
@@ -2032,9 +2044,10 @@ export const validateUserv1 = async ( req, res ) => {
       },
     ];
 
-    let [ userDetails, storeDetails ] = await Promise.all[
+    let [ userDetails, storeDetails, existEmail ] = await Promise.all[
         await userService.aggregate( userQuery ),
-        await storeService.aggregate( storeQuery )
+        await storeService.aggregate( storeQuery ),
+        await userService.aggregate( emailCheckQuery )
     ];
 
     let existUSerEmail = userDetails.map( ( ele ) => ele.email );
@@ -2044,8 +2057,8 @@ export const validateUserv1 = async ( req, res ) => {
     let existsStore = storeDetails.map( ( ele ) => ele.storeName );
     storeDetails = storeList.filter( ( ele ) => !existsStore.includes( ele ) );
 
-    if ( userDetails.length || storeDetails.length ) {
-      return res.sendError( { validate: false, user: userDetails, store: storeDetails }, 400 );
+    if ( userDetails.length || storeDetails.length || existEmail.length ) {
+      return res.sendError( { validate: false, user: userDetails, store: storeDetails, existEmail }, 400 );
     }
     return res.sendSuccess( { validate: true } );
   } catch ( e ) {
@@ -2073,15 +2086,21 @@ export async function assignChecklistUser( req, res ) {
       };
       await createUser( userData );
     } ) );
-    let assignData = await Promise.all( assignDetails.map( async ( assign ) => {
-      assign.checklistId = inputBody.checklistId;
+    let assignData = [];
+    await Promise.all( assignDetails.map( async ( assign ) => {
+      assign.checklistId = inputBody.taskId;
       assign.checkListName = checklistDetails.checkListName;
       assign.coverage = inputBody.coverage;
       assign.clientId = inputBody.clientId;
       assign.upload = inputBody.type;
-      return await assignUsers( assign );
+      let uploadData = await assignUsers( assign );
+      if ( Array.isArray( uploadData ) ) {
+        assignData.push( ...uploadData );
+      } else {
+        assignData.push( uploadData );
+      }
     } ) );
-    return res.sendSuccess( { idList: assignData.map( ( item ) => item.assignId ), assignData } );
+    return res.sendSuccess( { idList: [ ...new Set( assignData.map( ( item ) => item.assignId.toString() ) ) ], assignData } );
   } catch ( e ) {
     logger.error( { functionName: 'assignUser', error: e } );
     return res.sendError( e, 500 );
@@ -2882,82 +2901,8 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
                   userName: store.spocDetails?.[0]?.name,
                   mobileNumber: store.spocDetails?.[0]?.phone || '',
                   email: store.spocDetails[0].email,
-                  password: '5dqFKAJj29PsV6P+kL+3Dw==',
-                  role: 'user',
-                  userType: 'client',
-                  rolespermission: [
-                    {
-                      featureName: 'Global',
-                      modules: [
-                        {
-                          name: 'Store',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                        {
-                          name: 'User',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                        {
-                          name: 'Camera',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                        {
-                          name: 'Configuration',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                        {
-                          name: 'Subscription',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                        {
-                          name: 'Billing',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                      ],
-                    },
-                    {
-                      featurName: 'TangoEye',
-                      modules: [
-                        {
-                          name: 'ZoneTag',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                      ],
-                    },
-                    {
-                      featurName: 'TangoTrax',
-                      modules: [
-                        {
-                          name: 'checklist',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                        {
-                          name: 'Task',
-                          isAdd: false,
-                          isEdit: false,
-
-                        },
-                      ],
-                    },
-                  ],
                 };
-                userDetails = await userService.create( data );
+                userDetails = await createUser( data );
               }
               let data = {
                 store_id: store?.storeId,
@@ -3175,35 +3120,37 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
           }
         }
       }
-      delete element4._id;
-      delete element4.checkFlag;
-      delete element4.isdeleted;
-      delete element4.createdAt;
-      delete element4.updatedAt;
-      element4.checkListId = updatedchecklist._id;
-      element4.checkListName = getCLconfig.checkListName;
-      element4.checkListDescription = getCLconfig.checkListDescription;
-      element4.date_iso = new Date( date );
-      element4.date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
-      element4.allowedOverTime = getCLconfig.allowedOverTime;
-      element4.allowedStoreLocation = getCLconfig.allowedStoreLocation;
-      element4.scheduleStartTime = getCLconfig.scheduleStartTime;
-      element4.scheduleStartTime_iso = startTimeIso.format();
-      element4.scheduleEndTime = getCLconfig.scheduleEndTime;
-      element4.scheduleEndTime_iso = endTimeIso.format();
-      element4.createdBy = new ObjectId( getCLconfig.createdBy );
-      element4.createdByName = getCLconfig.createdByName;
-      element4.sourceCheckList_id = getCLconfig._id;
-      element4.checkListType = getCLconfig.checkListType;
-      element4.storeCount = getCLconfig.storeCount;
-      element4.questionCount = getCLconfig.questionCount;
-      element4.publishDate = getCLconfig.publishDate;
-      element4.locationCount = getCLconfig.locationCount;
-      element4.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
-      element4.approvalEnable = getCLconfig.approver.length ? true : false;
-      element4.remainder = getCLconfig?.remainder || [];
-      element4.restrictAttendance = getCLconfig?.restrictAttendance;
-      assignUserList.push( { ...element4 } );
+      if ( !userIdList.includes( element4._id ) ) {
+        delete element4._id;
+        delete element4.checkFlag;
+        delete element4.isdeleted;
+        delete element4.createdAt;
+        delete element4.updatedAt;
+        element4.checkListId = updatedchecklist._id;
+        element4.checkListName = getCLconfig.checkListName;
+        element4.checkListDescription = getCLconfig.checkListDescription;
+        element4.date_iso = new Date( date );
+        element4.date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
+        element4.allowedOverTime = getCLconfig.allowedOverTime;
+        element4.allowedStoreLocation = getCLconfig.allowedStoreLocation;
+        element4.scheduleStartTime = getCLconfig.scheduleStartTime;
+        element4.scheduleStartTime_iso = startTimeIso.format();
+        element4.scheduleEndTime = getCLconfig.scheduleEndTime;
+        element4.scheduleEndTime_iso = endTimeIso.format();
+        element4.createdBy = new ObjectId( getCLconfig.createdBy );
+        element4.createdByName = getCLconfig.createdByName;
+        element4.sourceCheckList_id = getCLconfig._id;
+        element4.checkListType = getCLconfig.checkListType;
+        element4.storeCount = getCLconfig.storeCount;
+        element4.questionCount = getCLconfig.questionCount;
+        element4.publishDate = getCLconfig.publishDate;
+        element4.locationCount = getCLconfig.locationCount;
+        element4.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
+        element4.approvalEnable = getCLconfig.approver.length ? true : false;
+        element4.remainder = getCLconfig?.remainder || [];
+        element4.restrictAttendance = getCLconfig?.restrictAttendance;
+        assignUserList.push( { ...element4 } );
+      }
     } ) );
 
     if ( userIdList.length ) {
@@ -3606,15 +3553,46 @@ async function assignUsers( data ) {
       ];
       let clusterDetails = await clusterServices.aggregateCluster( query );
       if ( clusterDetails.length ) {
-        assignedData = {
-          checkFlag: true,
-          checkListId: data.checklistId,
-          checkListName: data.checkListName,
-          client_id: data?.clientId,
-          clusterName: clusterDetails?.[0]?.clusterName,
-          assignId: data?.id || clusterDetails?.[0]?._id,
-          coverage: 'store',
-        };
+        if ( !data.upload ) {
+          assignedData = {
+            checkFlag: true,
+            checkListId: data.checklistId,
+            checkListName: data.checkListName,
+            client_id: data?.clientId,
+            clusterName: clusterDetails?.[0]?.clusterName,
+            assignId: data?.id || clusterDetails?.[0]?._id,
+            coverage: 'store',
+          };
+        } else {
+          let clusterList = clusterDetails[0].stores.map( ( ele ) => ele.store );
+          let storeDetails = await storeService.find( { _id: clusterList } );
+          assignedData = await Promise.all( storeDetails.map( async ( store ) => {
+            let userDetails = await userService.findOne( { email: store.spocDetails?.[0]?.email, clientId: data.clientId } );
+            if ( !userDetails ) {
+              let userData = {
+                userName: store.spocDetails?.[0]?.name,
+                email: store.spocDetails[0].email,
+                mobileNumber: store.spocDetails?.[0]?.phone,
+                clientId: data.clientId,
+              };
+              userDetails = await createUser( userData );
+            }
+            let userData = {
+              userId: userDetails?._id,
+              userName: userDetails?.userName,
+              userEmail: userDetails?.email,
+              userPhone: userDetails?.mobileNumber,
+              checkFlag: true,
+              checkListId: data.checklistId,
+              checkListName: data.checkListName,
+              client_id: data.clientId,
+              assignId: data?.id || clusterDetails?.[0]?._id,
+              coverage: 'store',
+              teamName: clusterDetails?.[0]?.clusterName,
+            };
+            return userData;
+          } ) );
+        }
       }
     } else {
       let query = [
@@ -3676,17 +3654,38 @@ async function assignUsers( data ) {
           },
         },
       ];
-      let teamDetails = await teamsServices.aggregate( query );
+      let teamDetails = await teamsServices.aggregateTeams( query );
       if ( teamDetails.length ) {
-        assignedData = {
-          checkFlag: true,
-          checkListId: data.checklistId,
-          checkListName: data.checkListName,
-          client_id: data.clientId,
-          teamName: teamDetails?.[0]?.teamName,
-          assignId: data?.id || teamDetails?.[0]?._id,
-          coverage: 'user',
-        };
+        if ( !data.upload ) {
+          assignedData = {
+            checkFlag: true,
+            checkListId: data.checklistId,
+            checkListName: data.checkListName,
+            client_id: data.clientId,
+            teamName: teamDetails?.[0]?.teamName,
+            assignId: data?.id || teamDetails?.[0]?._id,
+            coverage: 'user',
+          };
+        } else {
+          let userIdList = teamDetails[0].users.map( ( ele ) => ele.userId );
+          let userDetails = await userService.find( { _id: userIdList } );
+          assignedData = userDetails.map( ( user ) => {
+            let userData = {
+              userId: user._id,
+              userName: user.userName,
+              userEmail: user.email,
+              userPhone: user.mobileNumber,
+              checkFlag: true,
+              checkListId: data.checklistId,
+              checkListName: data.checkListName,
+              client_id: data.clientId,
+              assignId: data?.id || teamDetails?.[0]?._id,
+              coverage: 'user',
+              teamName: teamDetails?.[0]?.teamName,
+            };
+            return userData;
+          } );
+        }
       }
     } else {
       let query = [
@@ -3756,9 +3755,10 @@ export async function checklistAssign( req, res ) {
     if ( req.body.coverage == 'store' ) {
       let clusterDetails = await clusterServices.findcluster( { _id: { $in: req.body.idList } }, { stores: 1, clusterName: 1 } );
       if ( clusterDetails.length ) {
+        let clusterList = clusterDetails.map( ( item ) => item._id.toString() );
         idList = [
           ...clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) ),
-          ...clusterDetails.filter( ( ele ) => !req.body.idList.includes( ele._id.toString() ) ).map( ( ele ) => ele._id ),
+          ...req.body.idList.filter( ( ele ) => !clusterList.includes( ele._id ) ),
         ];
       } else {
         idList = req.body.idList;
@@ -3792,9 +3792,10 @@ export async function checklistAssign( req, res ) {
     } else {
       let teamDetails = await teamsServices.findteams( { _id: { $in: req.body.idList } }, { users: 1, teamName: 1 } );
       if ( teamDetails.length ) {
+        let teamList = teamDetails.map( ( item ) => item._id.toString() );
         idList = [
           ...teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) ),
-          ...teamDetails.filter( ( ele ) => !req.body.idList.includes( ele._id.toString() ) ).map( ( ele ) => ele._id ),
+          ...req.body.idList.filter( ( ele ) => !teamList.includes( ele._id ) ),
         ];
       } else {
         idList = req.body.idList;