tango-app-api-task 3.2.0-beta.5 → 3.2.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.0-beta.5",
+    "version": "3.2.0-beta.7",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -1468,6 +1468,13 @@ export async function redoTask( req, res ) {
 
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
     if ( response.modifiedCount || response.matchedCount ) {
+      let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+      let currentDateTime;
+      if ( storeTimeZone?.storeProfile?.timeZone ) {
+        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      } else {
+        currentDateTime = dayjs();
+      }
       data = {
         checklistId: taskDetails.sourceCheckList_id,
         checkListName: taskDetails.checkListName,
@@ -1483,7 +1490,7 @@ export async function redoTask( req, res ) {
         type: taskDetails.checkListType,
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
-        initiatedTime: dayjs().format(),
+        initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
         answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
         submitedBy: taskDetails.userName,
         submitTime: taskDetails.submitTime,
@@ -15354,13 +15361,10 @@ export async function teamMigrations( req, res ) {
                   },
                 ],
               };
-              console.log( payload );
               const teams = await createTeamsModel( payload );
-              console.log( teams );
             } else {
               let userIn = teamsExist.users.filter( ( data ) => data.email === userexits.userName );
               if ( userIn.length==0 ) {
-                console.log( '---------------------------', teamsExist.users.length );
                 let update = {
                   'userName': userexits.userName,
                   'email': userexits.email,

package/src/controllers/taskDashboard.controllers.js

@@ -973,14 +973,12 @@ export async function taskDetails( req, res ) {
     let limit = req.body?.limit || 10;
     let page = req.body?.offset ? ( req.body.offset * req.body.limit ) : 0;
     let idList = [];
-    if ( ( req.body.checklistId && req.body.checklistId != '' ) || ( req.body?.coverage && req.body?.coverage.includes( 'checklist' ) ) ) {
+    if ( req.body.coverage.includes( 'checklist' ) ) {
       let taskQuery;
-      if ( req.body.checklistId ) {
-        taskQuery = { referenceCheckListId: { $eq: req.body.checklistId } };
-      }
-      if ( req.body?.coverage && req.body.coverage.includes( 'checklist' ) ) {
-        taskQuery = { referenceCheckListId: { $exists: true } };
-      }
+      taskQuery = {
+        referenceCheckListId: { $exists: true },
+        ...( req.body.checklistId && req.body.checklistId != '' ) ? { referenceCheckListId: { $eq: req.body.checklistId } } : {},
+      };
       let getChecklistDetails = await taskService.find( taskQuery, { _id: 1 } );
       if ( getChecklistDetails ) {
         idList = getChecklistDetails.map( ( item ) => item._id );