tango-app-api-trax 3.3.1-beta-40 → 3.3.1-beta-42

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-40",
+    "version": "3.3.1-beta-42",
     "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.56",
+        "tango-api-schema": "^2.2.58",
         "tango-app-api-middleware": "^3.1.55",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/mobileTrax.controller.js

@@ -2480,8 +2480,8 @@ export async function checklistv1( req, res ) {
     };
 
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
-      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1 } ) ),
-      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1 } ) ),
+      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1, planoType: 1 } ) ),
+      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1 } ) ),
     ] );
 
     const checklistData = checklistResult.status === 'fulfilled' ? checklistResult.value : [];

package/src/controllers/trax.controller.js

@@ -1961,38 +1961,15 @@ export const validateUserv1 = async ( req, res ) => {
 
     let assignDetails = req.body.assignedUsers;
 
-    const duplicateStore = assignDetails.reduce( ( acc, obj ) => {
-      if ( !acc[obj.storeName.toLowerCase()] ) {
-        acc[obj.storeName.toLowerCase()] = {
-          email: [ obj.userEmail.toLowerCase() ],
-          count: 1,
-        };
-      } else {
-        if ( acc[obj.storeName.toLowerCase()] ) {
-          if ( acc[obj.storeName.toLowerCase()].email.includes( obj.userEmail.toLowerCase() ) ) {
-            acc[obj.storeName.toLowerCase()].count++;
-          } else {
-            acc[obj.storeName.toLowerCase()].email.push( obj.userEmail.toLowerCase() );
-          }
-        }
-      }
-      return acc;
-    }, {} );
-
-    const duplicateStores = Object.keys( duplicateStore ).filter( ( storeName ) => duplicateStore[storeName].count > 1 );
-    if ( duplicateStores.length ) {
-      return res.sendSuccess( { validate: false, ExistsEmail: duplicateStores, message: 'store and email is Duplicated' } );
-    }
-
-    if ( req.body.hasOwnProperty( 'delete' ) ) {
-      let checkExists = await assignedService.findOne( { userEmail: assignDetails[0].userEmail, storeName: assignDetails[0].storeName, checkListId: req.body.id } );
+    if ( req.body.hasOwnProperty( 'addSingle' ) ) {
+      let checkExists = await assignedService.findOne( { userEmail: assignDetails[0]?.userEmail, storeName: assignDetails[0]?.storeName, checkListId: req.body.id } );
       if ( checkExists ) {
         return res.sendError( 'User already Exists', 400 );
       }
     }
 
     let userEmailList = assignDetails.map( ( item ) => item.userEmail.toLowerCase() );
-    let storeList = assignDetails.map( ( item ) => item.storeName.toLowerCase() );
+    let storeList = assignDetails.map( ( item ) => item?.storeName?.toLowerCase() );
 
     let userQuery = [
       {
@@ -2045,18 +2022,20 @@ export const validateUserv1 = async ( req, res ) => {
       },
     ];
 
-    let [ userDetails, storeDetails, existEmail ] = await Promise.all[
-        await userService.aggregate( userQuery ),
-        await storeService.aggregate( storeQuery ),
-        await userService.aggregate( emailCheckQuery )
-    ];
+    console.log( storeQuery );
+
+    let [ userDetails, storeDetails, existEmail ] = await Promise.all( [
+      await userService.aggregate( userQuery ),
+      await storeService.aggregate( storeQuery ),
+      await userService.aggregate( emailCheckQuery ),
+    ] );
 
     let existUSerEmail = userDetails.map( ( ele ) => ele.email );
 
     userDetails = userEmailList.filter( ( ele ) => !existUSerEmail.includes( ele ) );
 
-    let existsStore = storeDetails.map( ( ele ) => ele.storeName );
-    storeDetails = storeList.filter( ( ele ) => !existsStore.includes( ele ) );
+    let existsStore = storeDetails.map( ( ele ) => ele.storeName && ele.storeName != null );
+    storeDetails = storeList.filter( ( ele ) => ele != null && !existsStore.includes( ele ) );
 
     if ( userDetails.length || storeDetails.length || existEmail.length ) {
       return res.sendError( { validate: false, user: userDetails, store: storeDetails, existEmail }, 400 );
@@ -3487,7 +3466,7 @@ export const selectAssign = async ( req, res ) => {
     if ( requestData.coverage == 'store' ) {
       // //Select Store and cluster
       let storeQuery = [
-        { $match: { clientId: requestData.clientId } },
+        { $match: { clientId: requestData.clientId, status: 'active' } },
         { $project: { 'storeName': 1, 'storeId': 1, 'type': 'store' } },
       ];
       let clusterQuery = [