tango-app-api-trax 3.6.0-sec-3 → 3.6.0-sec-4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.6.0-sec-3",
+    "version": "3.6.0-sec-4",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -159,7 +159,11 @@ export async function startChecklist( req, res ) {
         currentDateTime = dayjs();
       }
     } else {
-      currentDateTime = dayjs();
+      if ( requestData.currentTime && requestData.currentTime !='' ) {
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+      } else {
+        currentDateTime = dayjs();
+      }
     }
     updateData.checklistStatus = 'inprogress';
     updateData.startMobileTime = requestData?.currentTime;
@@ -343,13 +347,29 @@ export async function startTask( req, res ) {
       }
     }
 
-    const storeTimeZone = await storeService.findOne(
-        { storeName: task.storeName },
-        { 'storeProfile.timeZone': 1 },
-    );
-    const currentDateTime = storeTimeZone?.storeProfile?.timeZone ?
-      dayjs().tz( storeTimeZone.storeProfile.timeZone ) :
-      dayjs();
+    // const storeTimeZone = await storeService.findOne(
+    //     { storeName: task.storeName },
+    //     { 'storeProfile.timeZone': 1 },
+    // );
+    // const currentDateTime = storeTimeZone?.storeProfile?.timeZone ?
+    //   dayjs().tz( storeTimeZone.storeProfile.timeZone ) :
+    //   dayjs();
+
+    let currentDateTime;
+    if ( getBeforeTask[0].storeName && getBeforeTask[0].storeName!='' ) {
+      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeTask[0].storeName, $options: 'i' }, clientId: getBeforeTask[0].client_id }, { 'storeProfile.timeZone': 1 } );
+      if ( storeTimeZone?.storeProfile?.timeZone ) {
+        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      } else {
+        currentDateTime = dayjs();
+      }
+    } else {
+      if ( requestData.currentTime && requestData.currentTime !='' ) {
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+      } else {
+        currentDateTime = dayjs();
+      }
+    }
 
     const updateData = {
       checklistStatus: 'inprogress',

package/src/dtos/validation.dtos.js

@@ -140,6 +140,7 @@ export const mobileChecklistValidation = {
 export const startSchema = joi.object( {
   date: joi.string().required(),
   processedcheckListId: joi.string().required(),
+  currentTime: joi.string().optional().allow( '' ),
 } );
 
 export const startValidation = {