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

package/package.json

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

package/src/controllers/teaxFlag.controller.js

@@ -2399,6 +2399,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
             checklistStatus: 1,
             questionFlagCount: '$questionFlag',
             timeFlagCount: '$timeFlag',
+            userName: '$userName',
             reinitiateStatus: true,
             // detections: {
             //   $sum: {
@@ -2424,7 +2425,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
       ];
 
       if ( reqestData.search && reqestData.search != '' ) {
-        pipeline[0].$match.$and.push( { storeName: { $regex: reqestData.search, $options: 'i' } } );
+        pipeline[0].$match.$and.push( { $or: [ { storeName: { $regex: reqestData.search, $options: 'i' } }, { userName: { $regex: reqestData.search, $options: 'i' } }, { userEmail: { $regex: reqestData.search, $options: 'i' } } ] } );
       }
 
       const total = await processedchecklistService.aggregate( pipeline );
@@ -2653,12 +2654,14 @@ export const checklistDropdownV1 = async ( req, res ) => {
         $project: {
           sourceCheckList_id: 1,
           checkListName: 1,
+          coverage: 1,
         },
       },
       {
         $group: {
           _id: '$sourceCheckList_id',
           checkListName: { $last: '$checkListName' },
+          coverage: { $last: '$coverage' },
         },
       },
       {
@@ -2666,6 +2669,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           _id: 0,
           sourceCheckList_id: '$_id',
           checkListName: 1,
+          coverage: 1,
         },
       },
       {
@@ -2694,7 +2698,6 @@ export const checklistDropdownV1 = async ( req, res ) => {
                 scheduleRepeatedType: 1,
                 scheduleStartTime: 1,
                 sourceCheckList_id: '$_id',
-                storeCount: 1,
               },
             },
           ], as: 'checklistData',
@@ -2713,7 +2716,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           scheduleRepeatedType: '$checklistData.scheduleRepeatedType',
           scheduleStartTime: '$checklistData.scheduleStartTime',
           sourceCheckList_id: '$checklistData._id',
-          storeCount: '$checklistData.storeCount',
+          coverage: 1,
         },
       },
     ];

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

package/src/controllers/traxDashboard.controllers.js

@@ -1222,7 +1222,11 @@ export const checklistInfo = 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' } },
+            { userEmail: { $regex: requestData.searchValue.trim(), $options: 'i' } },
+            { userName: { $regex: requestData.searchValue.trim(), $options: 'i' } },
+          ] };
         }
         findQuery.push( { $match: { $or: [ query ] } } );
       } else {
@@ -1238,6 +1242,38 @@ export const checklistInfo = async ( req, res ) => {
         findQuery.push( { $match: { $or: [ query ] } } );
       }
     }
+    findQuery.push( { $sort: { _id: -1 } } );
+
+    findQuery.push( {
+      $group: {
+        _id: { store: '$store_id', email: '$userEmail' },
+        checkListName: { $first: '$checkListName' },
+        coverage: { $first: '$coverage' },
+        createdByName: { $first: '$createdByName' },
+        userName: { $first: '$userName' },
+        userEmail: { $first: '$userEmail' },
+        checklistStatus: { $last: '$checklistStatus' },
+        submitTime_string: { $push: '$submitTime_string' },
+        storeName: { $first: '$storeName' },
+        checkListType: { $first: '$checkListType' },
+        scheduleRepeatedType: { $first: '$scheduleRepeatedType' },
+        timeFlag: { $sum: '$timeFlag' },
+        questionFlag: { $sum: '$questionFlag' },
+        date_iso: { $first: '$date_iso' },
+        store_id: { $first: '$store_id' },
+        date_string: { $first: '$date_string' },
+        sourceCheckList_id: { $first: '$sourceCheckList_id' },
+        reinitiateStatus: { $first: '$reinitiateStatus' },
+        redoStatus: { $first: '$redoStatus' },
+        submitCount: { $sum: {
+          $cond: {
+            if: { $eq: [ '$checklistStatus', 'submit' ] },
+            then: 1,
+            else: 0,
+          },
+        } },
+      },
+    } );
 
     findQuery.push( {
       $project: {
@@ -1245,21 +1281,22 @@ export const checklistInfo = async ( req, res ) => {
         coverage: 1,
         createdByName: 1,
         userName: 1,
-        userEmail: 1,
+        userEmail: '$_id.email',
         checklistStatus: 1,
-        submitTime_string: 1,
+        submitTime_string: { $arrayElemAt: [ '$submitTime_string', -1 ] },
         storeName: 1,
         checkListType: 1,
         scheduleRepeatedType: 1,
         timeFlag: 1,
         questionFlag: 1,
         date_iso: 1,
-        store_id: 1,
+        store_id: '$_id.store',
         timeFlag: 1,
         date_string: 1,
         sourceCheckList_id: 1,
         reinitiateStatus: 1,
         redoStatus: 1,
+        submitCount: 1,
       },
     } );
 
@@ -1306,28 +1343,38 @@ export const checklistInfo = async ( req, res ) => {
         sourceCheckList_id: 1,
         reinitiateStatus: 1,
         redoStatus: 1,
+        submitCount: 1,
       },
     } );
 
-    let getTotalCount = await processedchecklistService.aggregate( findQuery );
-    if ( !getTotalCount.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
+    // let getTotalCount = await processedchecklistService.aggregate( findQuery );
+    // if ( !getTotalCount.length ) {
+    //   return res.sendError( { error: 'No Data Found' }, 204 );
+    // }
 
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
       findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
-    } else {
-      findQuery.push( { $sort: { ['date_iso']: -1 } } );
     }
-
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset ) || 0;
-    findQuery.push( { $skip: skip }, { $limit: limit } );
-    let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
 
-    result.totalCount = getTotalCount.length;
-    for ( let i = 0; i < getChecklistPerformanceData.length; i++ ) {
-      getChecklistPerformanceData[i].date_string = dayjs( getChecklistPerformanceData[i].date_string ).format( 'DD MMM YYYY' );
+    findQuery.push(
+        {
+          $facet: {
+            data: [
+              { $skip: skip }, { $limit: limit },
+            ],
+            count: [
+              { $count: 'total' },
+            ],
+          },
+        },
+    );
+
+
+    let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
+    if ( !getChecklistPerformanceData[0].data.length ) {
+      return res.sendError( 'No data found', 204 );
     }
     result.checklistInfo = getChecklistPerformanceData;
     if ( requestData.export ) {
@@ -3574,12 +3621,15 @@ export const checklistDropdown = async ( req, res ) => {
         $project: {
           sourceCheckList_id: 1,
           checkListName: 1,
+          coverage: 1,
         },
       },
       {
         $group: {
           _id: '$sourceCheckList_id',
           checkListName: { $last: '$checkListName' },
+          storeCount: { $sum: 1 },
+          coverage: { $last: '$coverage' },
         },
       },
       {
@@ -3587,6 +3637,8 @@ export const checklistDropdown = async ( req, res ) => {
           _id: 0,
           sourceCheckList_id: '$_id',
           checkListName: 1,
+          storeCount: 1,
+          coverage: 1,
         },
       },
       {
@@ -3615,7 +3667,7 @@ export const checklistDropdown = async ( req, res ) => {
                 scheduleRepeatedType: 1,
                 scheduleStartTime: 1,
                 sourceCheckList_id: '$_id',
-                storeCount: 1,
+                allowedMultiSubmit: 1,
               },
             },
           ], as: 'checklistData',
@@ -3634,7 +3686,10 @@ export const checklistDropdown = async ( req, res ) => {
           scheduleRepeatedType: '$checklistData.scheduleRepeatedType',
           scheduleStartTime: '$checklistData.scheduleStartTime',
           sourceCheckList_id: '$checklistData._id',
-          storeCount: '$checklistData.storeCount',
+          storeCount: 1,
+          coverage: 1,
+          allowedMultiSubmit: '$checklistData.allowedMultiSubmit',
+
         },
       },
     ];