tango-app-api-task 3.2.1-beta-37 → 3.2.1-beta-38

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-37",
+    "version": "3.2.1-beta-38",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -594,12 +594,14 @@ 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 = storeUserDetails ? storeUserDetails?.userName : item?.userName;
+          item.userName = getStoreDetails?.spocDetails?.[0]?.name || item.userName;
+          // item.userName = storeUserDetails ? storeUserDetails?.userName : item?.userName;
           item.storeName = getStoreDetails.storeName;
-          item.userEmail = storeUserDetails ? storeUserDetails?.email : item.userEmail;
+          item.userEmail = getStoreDetails?.spocDetails?.[0]?.email || item.userEmail;
+          // item.userEmail = storeUserDetails ? storeUserDetails?.email : item.userEmail;
         }
       } );
     } else {

package/src/controllers/taskDashboard.controllers.js

@@ -265,7 +265,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         findQuery.push( { $addFields: { store: { $toLower: '$storeName' } } } );
         query = { store: { $in: storeList } };
       } else {
-        query = { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } };
+        query = { $or: [ { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } }, { userName: { $regex: requestData.searchValue.trim(), $options: 'i' } }, { userEmail: { $regex: requestData.searchValue.trim(), $options: 'i' } } ] };
       }
       findQuery.push( { $match: { $or: [ query ] } } );
     }
@@ -762,8 +762,9 @@ export const taskDropdownListV1 = async ( req, res ) => {
             checkListName: { $first: '$checkListName' },
             checkListType: { $first: '$checkListType' },
             createdByName: { $first: '$createdByName' },
-            storeCount: { $first: '$storeCount' },
+            storeCount: { $sum: 1 },
             scheduleEndTimeISO: { $first: '$scheduleEndTimeISO' },
+            coverage: { $first: '$coverage' },
             // submitTime_string: { $first: '$submitTime_string' },
           },
         },
@@ -778,6 +779,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
         createdByName: 1,
         storeCount: 1,
         scheduleEndTimeISO: 1,
+        coverage: 1,
         // submitTime_string: 1,
       },
     } );
@@ -1044,6 +1046,7 @@ export async function taskDetails( req, res ) {
           },
           'publishDate': { $first: '$publishDate' },
           'priorityType': { $first: '$priorityType' },
+          'createdByName': { $first: '$createdByName' },
           // storeCount: { $first: '$storeCount' },
           'storeCount': { $sum: 1 },
           'submitCount': { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },