tango-app-api-task 3.7.38 → 3.7.40

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.7.38",
+    "version": "3.7.40",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -2029,7 +2029,7 @@ export async function createChecklistTask( req, res ) {
       await taskQuestionService.create( question );
       let storeDetails;
       if ( inputBody?.storeName ) {
-        storeDetails = await storeService.findOne( { storeName: inputBody.storeName, status: 'active' }, { storeId: 1, storeProfile: 1 } );
+        storeDetails = await storeService.findOne( { storeName: inputBody.storeName, status: 'active', clientId: inputBody.clientId }, { storeId: 1, storeProfile: 1 } );
       }
 
       let userDetails = {
@@ -2277,7 +2277,7 @@ export async function createChecklistMultiTask( req, res ) {
 
         let storeDetails;
         if ( originaldata?.storeName ) {
-          storeDetails = await storeService.findOne( { storeName: originaldata.storeName, status: 'active' }, { storeId: 1, storeProfile: 1 } );
+          storeDetails = await storeService.findOne( { storeName: originaldata.storeName, status: 'active', clientId: inputBody.clientId }, { storeId: 1, storeProfile: 1 } );
         }
         let findUser = await userService.findOne( { email: originaldata.userEmail } );
         let userDetails = {
@@ -7249,7 +7249,7 @@ export async function AITaskCreation( req, res ) {
     // Send Push Notification
     // inputBody.approver = inputBody.approver.replace( /,$/, '' );
     let title = `New Task Alert ${inputBody.taskName}-${storeData.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
-    let time = inputBody?.scheduleEndTime || '11:59 PM';
+    let time = inputBody?.scheduleEndTime ? dayjs( inputBody?.scheduleEndTime, 'hh:mm A' ).format( 'HH:mm' ) :'23:59';
     let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
     let description = `A new task has been assigned to ${storeData.storeName}. Please complete it before the due date of ${date}.`;
     await Promise.all( finduser.map( async ( ele ) => {
@@ -7258,19 +7258,18 @@ export async function AITaskCreation( req, res ) {
         sendPushNotification( title, description, fcmToken );
       }
     } ) );
-
-    inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format();
+    // inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD HH:mm' ).format();
     if ( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity?.type == 'mins' ) {
-      inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).add( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity.time, 'minute' ).format();
+      inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD HH:mm' ).add( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity.time, 'minute' ).format();
     }
     if ( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity?.type == 'hours' ) {
-      inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).add( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity.time, 'hour' ).format();
+      inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD HH:mm' ).add( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity.time, 'hour' ).format();
     }
     if ( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity?.type == 'days' ) {
-      inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).add( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity.time, 'day' ).format();
+      inputBody['scheduleEndData'] = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD HH:mm' ).add( checklistDetails?.aiConfig?.autoTaskConfig.taskValidity.time, 'day' ).format();
     }
 
-    const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
+    const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD HH:mm' );
     const currentTime = dayjs.utc();
     if ( inputDateTime.isBefore( currentTime ) ) {
       return res.sendError( 'The input date-time is before the current time.', 500 );
@@ -7566,11 +7565,11 @@ async function insertAItaskProcessedTaskCreation( checkTask, inputBody, date, ti
     delete oldData.submitMobileTime;
     delete oldData.startMobileTime;
     oldData.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
-    oldData.date_string = dayjs( date ).format( 'YYYY-MM-DD' );
+    oldData.date_string = date;
     oldData.scheduleStartTime_iso = inputBody?.scheduleEndTime ?dayjs.utc( inputBody?.scheduleEndTime, 'hh:mm A' ).format() : date;
-    oldData.scheduleEndTime_iso = dayjs.utc( inputBody.scheduleEndData, 'YYYY-MM-DD hh:mm A' ).format();
-    oldData.scheduleEndTime = dayjs.utc( inputBody.scheduleEndData, 'YYYY-MM-DD hh:mm A' ).format( 'hh:mm A' );
-    oldData.scheduleStartTime = inputBody?.scheduleEndTime ?? dayjs.utc().format( 'hh:mm A' );
+    oldData.scheduleEndTime_iso = dayjs.utc( inputBody.scheduleEndData ).format();
+    oldData.scheduleEndTime = dayjs.utc( inputBody.scheduleEndData ).format( 'hh:mm A' );
+    oldData.scheduleStartTime = inputBody?.scheduleEndTime ?? dayjs.format( 'hh:mm A' );
     oldData.store_id = storeDetails.storeId;
     oldData.storeName = storeDetails.storeName;
     oldData.country = storeDetails.storeProfile.country;
@@ -7589,6 +7588,9 @@ async function insertAItaskProcessedTaskCreation( checkTask, inputBody, date, ti
     oldData.questionAnswers = [ questions ];
     oldData.zoneName = inputBody.zoneName || '';
     oldData.checkListType = 'task' || '';
+    if ( inputBody.streamId ) {
+      oldData.streamId = inputBody?.streamId;
+    }
     if ( inputBody.aiType ) {
       oldData.aiType = inputBody.aiType;
     }