tango-app-api-trax 3.2.1-beta-7 → 3.2.1-beta-9

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -149,7 +149,7 @@ export async function startChecklist( req, res ) {
     }
 
     let updateData = {};
-    let storeTimeZone = await storeService.findOne( { storeName: getBeforeChecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
+    let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
     let currentDateTime;
     if ( storeTimeZone?.storeProfile?.timeZone ) {
       currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
@@ -1700,12 +1700,12 @@ export async function submitChecklist( req, res ) {
       updateQuery._id = new ObjectId( requestData.processedcheckListId );
       updateQuery.userId = req.user._id;
       updateQuery.date_string = requestData.date;
-      let storeTimeZone = await storeService.findOne( { storeName: getchecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
+      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getchecklist[0].storeName, $options: 'i' }, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
       if ( storeTimeZone?.storeProfile?.timeZone ) {
         currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
       } else {
-        currentDateTime = dayjs();
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
       }
       let updateData = {};
       let flagCount = QuestionFlag( req, res );

package/src/controllers/teaxFlag.controller.js

@@ -564,7 +564,10 @@ export const flagCardsV1 = async ( req, res ) => {
       {
         $match: {
           client_id: clientId,
-          store_id: { $in: storeId },
+          $or: [
+            { store_id: { $in: storeId } },
+            { aiStoreList: { $in: storeId } },
+          ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
         },
       },
@@ -697,7 +700,12 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
     }
 
     const createFindQuery = ( fromDate, toDate ) => [
-      { $match: { client_id: requestData.clientId, store_id: { $in: requestData.storeId }, date_iso: { $gte: fromDate, $lte: toDate } } },
+      { $match: { client_id: requestData.clientId,
+        $or: [
+          { store_id: { $in: requestData.storeId } },
+          { aiStoreList: { $in: requestData.storeId } },
+        ],
+        date_iso: { $gte: fromDate, $lte: toDate } } },
       {
         $project: {
           timeFlag: 1,