tango-app-api-task 3.2.0-beta.0 → 3.2.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.0-beta.0",
+    "version": "3.2.0-beta.10",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
         "tango-api-schema": "^2.2.16",
-        "tango-app-api-middleware": "^3.1.48",
+        "tango-app-api-middleware": "^3.1.50",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/task.controller.js

@@ -436,9 +436,9 @@ export async function validateUser( req, res ) {
           if ( !storeExists.length ) {
             storeId.push( { store: item.storeName, message: '' } );
           }
-          if ( storeExists.length && !storeExists[0]?.storeProfile?.city && !item.city ) {
-            storeId.push( { store: item.storeName, message: 'city is required' } );
-          }
+          // if ( storeExists.length && !storeExists[0]?.storeProfile?.city && !item.city ) {
+          //   storeId.push( { store: item.storeName, message: 'city is required' } );
+          // }
           if ( storeExists.length && storeExists[0].status != 'active' ) {
             storeId.push( { store: item.storeName, message: 'store is inactive' } );
           }
@@ -722,8 +722,8 @@ export async function taskConfig( req, res ) {
     if ( inputBody.removedUsers.length ) {
       await taskAssignService.updateMany( { _id: { $in: inputBody.removedUsers } }, { checkFlag: false } );
     }
-    let storeDetails = await taskAssignService.find( { checkListId: inputBody._id, checkFlag: true }, { _id: 0, store_id: 1, userEmail: 1 } );
-    let storeList = storeDetails.map( ( store ) => store.store_id );
+    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;
     if ( storeList.length ) {
@@ -752,6 +752,22 @@ export async function taskConfig( req, res ) {
     }
     await taskService.updateOne( { _id: inputBody._id }, { storeCount, locationCount } );
     if ( inputBody.submitType == 'publish' ) {
+      let taskName = checklistDetails.checkListName;
+      let dueDate = dayjs( configDetails.scheduleEndTimeISO ).format( 'YYYY-MM-DD hh:mm A' );
+
+      let assignedUsers = storeConfigDetails.map( ( store ) => {
+        return { email: store.userEmail, storeName: store.storeName };
+      } );
+
+      for ( let userDetails of assignedUsers ) {
+        let title = `New Task Alert ${taskName}`;
+        let description = `A new task has been assigned to ${userDetails.storeName}. Please complete it before the due date of ${dueDate}.`;
+        let user = await userService.findOne( { email: userDetails.email } );
+        if ( user && user.fcmToken ) {
+          sendPushNotification( title, description, user.fcmToken );
+        }
+      }
+
       let tDate = dayjs().format( 'YYYY-MM-DD' ) + ' ' + dayjs().format( 'hh:mm A' );
       let currentDate = dayjs( tDate, 'YYYY-MM-DD hh:mm A' ).format();
       if ( configDetails.scheduleEndTimeISO >= currentDate ) {
@@ -776,6 +792,7 @@ export async function taskConfig( req, res ) {
       return res.sendSuccess( { id: inputBody._id, message: message } );
     }
   } catch ( e ) {
+    console.log( 'e', e );
     logger.error( { functionName: 'taskConfig =>', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
@@ -1070,6 +1087,78 @@ async function createUser( data ) {
       role: 'user',
       password: '5dqFKAJj29PsV6P+kL+3Dw==',
       isActive: true,
+      userType: 'client',
+      rolespermission: [
+        {
+          featureName: 'Global',
+          modules: [
+            {
+              name: 'Store',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'User',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Camera',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Configuration',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Subscription',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Billing',
+              isAdd: false,
+              isEdit: false,
+
+            },
+          ],
+        },
+        {
+          featurName: 'TangoEye',
+          modules: [
+            {
+              name: 'ZoneTag',
+              isAdd: false,
+              isEdit: false,
+
+            },
+          ],
+        },
+        {
+          featurName: 'TangoTrax',
+          modules: [
+            {
+              name: 'checklist',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Task',
+              isAdd: false,
+              isEdit: false,
+
+            },
+          ],
+        },
+      ],
     };
     let response = await userService.create( params );
     return response._id;
@@ -1184,7 +1273,7 @@ export async function createChecklistTask( req, res ) {
     let description = '';
 
     if ( inputBody.checkListType === 'checklistTask' ) {
-      description = `A new task has been assigned to ${inputBody.storeName}. Please complete it before the due date of ${inputBody.scheduleDate}.`;
+      description = `A new task has been generated from the response for ${inputBody.storeName}.`;
     } else if ( inputBody.checkListType === 'CCTV' ) {
       description = `A new task has been generated from the Live view for ${inputBody.storeName}.`;
     }
@@ -1194,7 +1283,6 @@ export async function createChecklistTask( req, res ) {
       await sendPushNotification( title, description, fcmToken );
     }
 
-
     let time = inputBody?.scheduleEndTime || '11:59 PM';
     let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
     let data = {
@@ -1451,6 +1539,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,
@@ -1466,7 +1561,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,
@@ -15337,13 +15432,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 ) );
     }

package/src/controllers/taskDashboard.controllers.js

@@ -972,6 +972,18 @@ export async function taskDetails( req, res ) {
     toDate.setUTCHours( 23, 59, 59, 59 );
     let limit = req.body?.limit || 10;
     let page = req.body?.offset ? ( req.body.offset * req.body.limit ) : 0;
+    let idList = [];
+    if ( req.body.coverage.includes( 'checklist' ) ) {
+      let taskQuery;
+      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 );
+      }
+    }
 
     let query = [
       {
@@ -979,6 +991,7 @@ export async function taskDetails( req, res ) {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           client_id: req.body.clientId,
           ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
+          ...( idList.length ) ? { sourceCheckList_id: { $in: idList } } : {},
         },
       },
       { $sort: { date_iso: -1 } },