tango-app-api-trax 3.3.1-beta-51 → 3.3.1-beta-53

package/package.json

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

package/src/controllers/trax.controller.js

@@ -993,17 +993,7 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
     // let page = parseInt( req.query.offset ) || 0;
     // let skip = limit * page;
 
-    let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ), ...( req.query.coverage ) ? { coverage: req.query.coverage } : {}, isdeleted: false } } ];
-    if ( req.query.search.trim() && req.query.search.trim() != '' ) {
-      let searchValue = req.query.search;
-      searchValue = searchValue.split( ',' ).map( ( item ) => item.trim().toLowerCase() );
-      if ( searchValue.length > 1 ) {
-        query.push( { $addFields: { storeLower: { $toLower: '$storeName' } } } );
-        query.push( { $match: { storeLower: { $in: searchValue } } } );
-      } else {
-        query.push( { $match: { storeName: { $regex: req.query.search.trim(), $options: 'i' } } } );
-      }
-    }
+    let query = [ { $match: { checkListId: new ObjectId( req.params.checklistId ), isdeleted: false, store_id: { $exists: true }, store_id: { $ne: '' } } } ];
 
     query.push( { $sort: { _id: -1 } } );
 
@@ -1013,70 +1003,22 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
     }
 
     let userDetails = [];
-    let storeList = [];
-    let userList = [];
     await Promise.all( checklistDetails.map( async ( ele ) => {
-      if ( ele?.store_id || ele?.clusterName ) {
-        storeList.push( ele.assignId );
-      } else {
-        userList.push( ele.assignId );
-      }
-
-      if ( ele?.clusterName ) {
-        let clusterDetails = await clusterServices.findOneCluster( { _id: ele.assignId }, { stores: 1 } );
-        if ( clusterDetails ) {
-          let storeDetails = await storeService.find( { _id: { $in: clusterDetails.stores.map( ( item ) => item.store ) }, status: 'active' } );
-          storeDetails.forEach( ( item ) => {
-            userDetails.push( {
-              id: ele._id,
-              userName: item.spocDetails?.[0]?.name,
-              userEmail: item.spocDetails?.[0]?.email,
-              store_id: item?.storeId,
-              storeName: item?.storeName,
-              userPhone: item.spocDetails?.[0]?.phone,
-              city: ele?.city,
-              checkFlag: ele.checkFlag,
-              clusterName: ele?.clusterName || '',
-              teamName: ele?.teamName || '',
-            } );
-          } );
-        }
-      } else if ( ele?.teamName ) {
-        let teamDetails = await teamsServices.findOneTeams( { _id: ele.assignId }, { users: 1, teamName: 1 } );
-        if ( teamDetails ) {
-          let teamUserDetails = await userService.find( { _id: { $in: teamDetails.users.map( ( item ) => item.userId ) } } );
-          teamUserDetails.forEach( ( item ) => {
-            userDetails.push( {
-              id: ele._id,
-              userName: item.userName,
-              userEmail: item.email,
-              store_id: ele?.storeId,
-              storeName: ele?.storeName,
-              userPhone: item?.mobileNumber,
-              city: ele?.city,
-              checkFlag: ele.checkFlag,
-              clusterName: ele?.clusterName || '',
-              teamName: ele?.teamName || '',
-            } );
-          } );
-        }
-      } else {
-        userDetails.push( {
-          id: ele._id,
-          userName: ele.userName,
-          userEmail: ele.userEmail,
-          store_id: ele?.store_id,
-          storeName: ele?.storeName,
-          userPhone: ele.userPhone,
-          city: ele.city,
-          checkFlag: ele.checkFlag,
-          clusterName: ele?.clusterName || '',
-          teamName: ele?.teamName || '',
-        } );
-      }
+      userDetails.push( {
+        id: ele._id,
+        userName: ele.userName,
+        userEmail: ele.userEmail,
+        store_id: ele?.store_id,
+        storeName: ele?.storeName,
+        userPhone: ele.userPhone,
+        city: ele.city,
+        checkFlag: ele.checkFlag,
+        clusterName: ele?.clusterName || '',
+        teamName: ele?.teamName || '',
+      } );
     } ) );
 
-    return res.sendSuccess( { count: userDetails.length, storeList, userList, users: limitedData } );
+    return res.sendSuccess( { count: userDetails.length, userDetails } );
   } catch ( e ) {
     logger.error( 'assignedUserDetails =>', e );
     return res.sendError( e, 500 );
@@ -2068,6 +2010,7 @@ export const validateUserv1 = async ( req, res ) => {
           'clientId': 1,
           'storeProfile.city': 1,
           'status': 1,
+          'storeId': 1,
         },
       },
       {
@@ -2095,6 +2038,7 @@ export const validateUserv1 = async ( req, res ) => {
         let getStoreId = storeDetails.find( ( store ) => store.storeName.toLowerCase() == item.storeName.toLowerCase() );
         if ( getStoreId ) {
           item._id = getStoreId._id;
+          item.storeId = getStoreId.storeId;
         }
       } );
     } else {
@@ -3566,7 +3510,7 @@ export const selectAssign = async ( req, res ) => {
       if ( requestData.assignType == 'user' ) {
         let userQuery = [
           { $match: { clientId: requestData.clientId } },
-          { $project: { 'email': 1, 'userName': 1, 'type': 'user' } },
+          { $project: { 'userEmail': '$email', 'userName': 1, 'type': 'user' } },
         ];
         resuldData = await userService.aggregate( userQuery );
       } else {
@@ -3665,7 +3609,6 @@ export async function checklistAssign( req, res ) {
 
 export async function updateAssign( req, res ) {
   try {
-    console.log( req.body );
     if ( !req.body.assignedList.length && !req.body.assignedGroup.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -3673,10 +3616,13 @@ export async function updateAssign( req, res ) {
     if ( !checklistDetails ) {
       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 };
+    } );
     await assignedService.deleteMany( { checkListId: req.body.checkListId } );
     let assignedUserList = [];
     await Promise.all( req.body.assignedList.map( async ( assign ) => {
-      delete assign.id;
       let query = [
         {
           $addFields: {
@@ -3710,6 +3656,7 @@ export async function updateAssign( req, res ) {
         userId: userDetails._id,
         checkListName: checklistDetails.checkListName,
       };
+      delete data._id;
       assignedUserList.push( data );
     } ) );
     await Promise.all( req.body.assignedGroup.map( async ( assign ) => {