tango-app-api-trax 3.3.1-beta-65 → 3.3.1-beta-66

package/package.json

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

package/src/controllers/trax.controller.js

@@ -2083,12 +2083,12 @@ export const validateUserv1 = async ( req, res ) => {
       assignDetails.forEach( ( item ) => {
         let getStoreDetails = storeDetails.find( ( store ) => store.storeName.toLowerCase() == item.storeName.toLowerCase() );
         if ( getStoreDetails ) {
-          // let storeUserDetails = userDetails.find( ( ele ) => ele.newEmail.toLowerCase() == item.userEmail.toLowerCase() );
+          let storeUserDetails = userDetails.find( ( ele ) => ele.newEmail.toLowerCase() == item.userEmail.toLowerCase() );
           item._id = getStoreDetails._id;
           item.storeId = getStoreDetails.storeId;
-          item.userName = getStoreDetails?.spocDetails?.[0]?.name || item.userName;
+          item.userName = getStoreDetails?.spocDetails?.[0]?.email.toLowerCase() == item.userEmail.toLowerCase() ? getStoreDetails?.spocDetails?.[0]?.name : storeUserDetails?.email == item.userEmail.toLowerCase() ? storeUserDetails?.userName : item.userName;
           item.storeName = getStoreDetails.storeName;
-          item.userEmail = getStoreDetails?.spocDetails?.[0]?.email || item.userEmail;
+          item.userEmail = storeUserDetails?.email || item.userEmail;
         }
       } );
     } else {

package/src/controllers/traxDashboard.controllers.js

@@ -1376,7 +1376,10 @@ export const checklistInfo = async ( req, res ) => {
     if ( !getChecklistPerformanceData[0].data.length ) {
       return res.sendError( 'No data found', 204 );
     }
-    result.checklistInfo = getChecklistPerformanceData;
+    result = {
+      totalCount: getChecklistPerformanceData?.[0]?.count?.[0]?.total || 0,
+      checklistInfo: getChecklistPerformanceData?.[0]?.data || [],
+    };
     if ( requestData.export ) {
       const exportdata = [];
       result.checklistInfo.forEach( ( element ) => {