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

package/package.json

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

package/src/controllers/task.controller.js

@@ -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 } );
+    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 );
   }
@@ -1184,7 +1201,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}.`;
     }

package/src/controllers/taskDashboard.controllers.js

@@ -972,6 +972,20 @@ 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.checklistId && req.body.checklistId != '' ) || req.body.coverage.includes( 'checklist' ) ) {
+      let taskQuery;
+      if ( req.body.checklistId ) {
+        taskQuery = { referenceCheckListId: { $eq: req.body.checklistId } };
+      }
+      if ( req.body.coverage.includes( 'checklist' ) ) {
+        taskQuery = { referenceCheckListId: { $exists: true } };
+      }
+      let getChecklistDetails = await taskService.find( taskQuery, { _id: 1 } );
+      if ( getChecklistDetails ) {
+        idList = getChecklistDetails.map( ( item ) => item._id );
+      }
+    }
 
     let query = [
       {
@@ -979,6 +993,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 } },