tango-app-api-trax 3.3.1-beta-46 → 3.3.1-beta-48

package/package.json

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

package/src/controllers/teaxFlag.controller.js

@@ -2633,7 +2633,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
     let findQuery = [
       { $match: { $and: [
         { client_id: requestData.clientId },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ] },
         { date_iso: { $gte: fromDate } },
         { date_iso: { $lte: toDate } },
         {
@@ -2643,7 +2643,6 @@ export const checklistDropdownV1 = async ( req, res ) => {
             { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } },
           ],
         },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
       ] } },
       {
         $project: {

package/src/controllers/trax.controller.js

@@ -394,9 +394,21 @@ export const getConfigDetails = async ( req, res ) => {
         result.checkListDetails.scheduleStartTime = result.openTime;
         result.checkListDetails.scheduleEndTime = result.closeTime;
       }
-      let assignedUsers = await assignedService.find( { checkListId: storechecklistdetails._id }, { _id: 1, assignId: 1 } );
-      assignedUsers = assignedUsers?.map( ( item ) => item.assignId );
-      result.checkListDetails = { ...result.checkListDetails, ...{ sections: sectionList }, ...{ assignedUsers: assignedUsers }, ...{ removedUsers: [] } };
+      let query = {
+        checkListId: storechecklistdetails._id,
+        ...( storechecklistdetails.coverage == 'store' ) ? { $or: [ { store_id: { $exists: true } }, { clusterName: { $exists: true } } ] } : { $or: [ { userEmail: { $exists: true } }, { teamsName: { $exists: true } } ] },
+      };
+      let assignList = await assignedService.find( query, { _id: 1, store_id: 1, clusterName: 1, userEmail: 1, teamName: 1, assignId: 1 } );
+      let singleAssign;
+      let groupAssign;
+      if ( storechecklistdetails.coverage == 'store' ) {
+        singleAssign = assignList.filter( ( item ) => typeof item?.store_id != 'undefined' && item?.store_id != '' ).map( ( item ) => item.assignId );
+        groupAssign = assignList.filter( ( item ) => typeof item?.clusterName != 'undefined' && item?.clusterName != '' ).map( ( item ) => item.assignId );
+      } else {
+        singleAssign = assignList.filter( ( item ) => typeof item?.userEmail != 'undefined' && item?.userEmail !='' ).map( ( item ) => item.assignId );
+        groupAssign = assignList.filter( ( item ) => typeof item?.teamName != 'undefined' && item?.teamName != '' ).map( ( item ) => item.assignId );
+      }
+      result.checkListDetails = { ...result.checkListDetails, ...{ sections: sectionList }, singleAssign, groupAssign };
     }
 
     return res.sendSuccess( result );
@@ -809,6 +821,7 @@ export const update = async ( req, res ) => {
         }
       }
     } ).catch( ( e ) => {
+      logger.error( 'update =>', e );
       return res.sendError( e, 500 );
     } );
   } catch ( e ) {
@@ -3465,43 +3478,41 @@ export const selectAssign = async ( req, res ) => {
     let resuldData;
     if ( requestData.coverage == 'store' ) {
       // //Select Store and cluster
-      let storeQuery = [
-        { $match: { clientId: requestData.clientId, status: 'active' } },
-        { $project: { 'storeName': 1, 'storeId': 1, 'type': 'store' } },
-      ];
-      let clusterQuery = [
-        { $match: { clientId: requestData.clientId } },
-        { $project: { 'clusterName': 1, 'type': 'cluster' } },
-      ];
-
-      const [ getStores, getClusters ] = await Promise.all( [
-        storeService.aggregate( storeQuery ),
-        clusterServices.aggregateCluster( clusterQuery ),
-      ] );
+      if ( requestData.assignType == 'store' ) {
+        let storeQuery = [
+          { $match: { clientId: requestData.clientId, status: 'active' } },
+          { $project: { 'storeName': 1, 'storeId': 1, 'type': 'store' } },
+        ];
+        resuldData = await storeService.aggregate( storeQuery );
+      } else {
+        let clusterQuery = [
+          { $match: { clientId: requestData.clientId } },
+          { $project: { 'clusterName': 1, 'type': 'cluster' } },
+        ];
+        resuldData = await clusterServices.aggregateCluster( clusterQuery );
+      }
       // console.log( 'getStores =>', getStores );
       // console.log( 'getClusters =>', getClusters );
-      resuldData = [ ...getStores, ...getClusters ];
-      console.log( 'resuldData =>', resuldData );
     } else if ( requestData.coverage == 'user' ) {
       // //Select User and Teams
-      let userQuery = [
-        { $match: { clientId: requestData.clientId } },
-        { $project: { 'userEmail': 1, 'userName': 1, 'type': 'user' } },
-      ];
+      if ( requestData.assignType == 'user' ) {
+        let userQuery = [
+          { $match: { clientId: requestData.clientId } },
+          { $project: { 'userEmail': 1, 'userName': 1, 'type': 'user' } },
+        ];
+        resuldData = await userService.aggregate( userQuery );
+      } else {
+        let teamQuery = [
+          { $match: { clientId: requestData.clientId } },
+          { $project: { 'teamName': 1, 'type': 'teams' } },
+        ];
+        resuldData = await teamsServices.aggregateTeams( teamQuery );
+      }
       // let getUsers = await userService.aggregate( userQuery );
       // console.log( 'getUsers =>', getUsers );
-      let teamQuery = [
-        { $match: { clientId: requestData.clientId } },
-        { $project: { 'teamName': 1, 'type': 'teams' } },
-      ];
+
       // let getTeams = await teamsServices.aggregateTeams( teamQuery );
       // console.log( 'getTeams =>', getTeams );
-      const [ getUsers, getTeams ] = await Promise.all( [
-        userService.aggregate( userQuery ),
-        teamsServices.aggregateTeams( teamQuery ),
-      ] );
-      resuldData = [ ...getUsers, ...getTeams ];
-      console.log( 'resuldData =>', resuldData );
     }
     return res.sendSuccess( { 'totalCount': resuldData.length, 'data': resuldData } );
   } catch ( e ) {
@@ -3600,7 +3611,7 @@ async function assignUsers( data ) {
         if ( !userDetails ) {
           let userData = {
             userName: storeDetails?.[0]?.spocDetails?.[0]?.name,
-            email: storeDetails?.[0]?.spocDetails[0].email,
+            email: data?.userEmail || storeDetails?.[0]?.spocDetails[0].email,
             mobileNumber: storeDetails?.[0]?.spocDetails?.[0]?.phone,
             clientId: data.clientId,
           };
@@ -3715,7 +3726,6 @@ async function assignUsers( data ) {
     }
   }
 
-  // console.log( assignedData, 'test', data );
   if ( assignedData && data?.insert ) {
     await assignedService.updateOne( { checkListId: assignedData.checkListId, assignId: assignedData.assignId }, assignedData );
   } else {
@@ -3740,7 +3750,7 @@ export async function checklistAssign( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
 
-    let userData = [];
+    let uniqueArr = [];
 
     await Promise.all( req.body.idList.map( async ( data ) => {
       let assignedData = {
@@ -3755,16 +3765,13 @@ export async function checklistAssign( req, res ) {
       let uploadData = await assignUsers( assignedData );
       if ( uploadData ) {
         if ( Array.isArray( uploadData ) ) {
-          userData.push( ...uploadData );
+          uniqueArr.push( ...uploadData );
         } else {
-          userData.push( uploadData );
+          uniqueArr.push( uploadData );
         }
       }
     } ) );
 
-    let uniqueArr = userData.filter( ( obj, index, self ) =>
-      index === self.findIndex( ( o ) => o.storeId === obj.storeId && o.userEmail === obj.userEmail ),
-    );
     return res.sendSuccess( { count: uniqueArr.length, uniqueArr } );
   } catch ( e ) {
     logger.error( { functionName: 'checklistAssign', error: e } );

package/src/dtos/validation.dtos.js

@@ -149,6 +149,7 @@ export const startValidation = {
 export const selectAssignSchema = joi.object( {
   clientId: joi.string().required(),
   coverage: joi.string().required(),
+  assignType: joi.string().required(),
 } );
 
 export const selectAssign = {