tango-app-api-task 3.2.0-beta.4 → 3.2.0-beta.6

package/package.json

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

package/src/controllers/task.controller.js

@@ -722,7 +722,7 @@ export async function taskConfig( req, res ) {
     if ( inputBody.removedUsers.length ) {
       await taskAssignService.updateMany( { _id: { $in: inputBody.removedUsers } }, { checkFlag: false } );
     }
-    let storeConfigDetails = await taskAssignService.find( { checkListId: inputBody._id, checkFlag: true }, { _id: 0, store_id: 1, userEmail: 1 } );
+    let storeConfigDetails = await taskAssignService.find( { checkListId: inputBody._id, checkFlag: true }, { _id: 0, store_id: 1, userEmail: 1, storeName: 1 } );
     let storeList = storeConfigDetails.map( ( store ) => store.store_id );
 
     storeCount = storeList.length;
@@ -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/taskActionCenter.controllers.js

@@ -222,7 +222,6 @@ export const approvalTableV1 = async ( req, res ) => {
         },
         ...groupQuery,
       ];
-      promises.push( processedChecklist.aggregate( query ) );
       if ( req.body?.searchValue.trim() && req.body?.searchValue.trim().length ) {
         query.push( {
           $match: {
@@ -230,6 +229,7 @@ export const approvalTableV1 = async ( req, res ) => {
           },
         } );
       }
+      promises.push( processedChecklist.aggregate( query ) );
     } else {
       promises.push( Promise.resolve( null ) );
     }