tango-app-api-trax 3.8.18-nike → 3.8.19-nike

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.8.18-nike",
+    "version": "3.8.19-nike",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -3001,13 +3001,13 @@ export async function dashboardv1( req, res ) {
       // eslint-disable-next-line camelcase
       // store_id,
       userId,
-      $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ],
+      date_string: date,
       timeFlagStatus: true,
       ...clientId,
       ...storeMatch,
     };
     const buildPipeline = ( matchExtraConditions = {} ) => [
-      { $match: { ...baseMatch, ...matchExtraConditions } },
+      { $match: { $or: [ { ...baseMatch, ...matchExtraConditions }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } }, { userId }, { ...storeMatch } ] } ] } },
       {
         $facet: {
           total: [ { $count: 'total' } ],
@@ -3221,18 +3221,13 @@ export async function checklistv1( req, res ) {
         // eslint-disable-next-line camelcase
         // { store_id },
         { userId },
-        // { $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ] },
+        { $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ] },
         { timeFlagStatus: true },
         ...matchExtraConditions,
         clientId,
         storeMatch,
       ];
-      if ( checklistStatus != 'submit' ) {
-        matchConditions.push( { $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ] } );
-      }
-      if ( checklistStatus == 'submit' ) {
-        matchConditions.push( { date_string: date } );
-      }
+
       if ( checklistStatus ) {
         matchConditions.push( { checklistStatus } );
       }