tango-app-api-task 3.2.1-beta-18 → 3.2.1-beta-20

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-18",
+    "version": "3.2.1-beta-20",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
-        "tango-api-schema": "^2.2.16",
-        "tango-app-api-middleware": "^3.1.50",
+        "tango-api-schema": "^2.2.49",
+        "tango-app-api-middleware": "^3.1.55",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/task.controller.js

@@ -1361,16 +1361,17 @@ export async function createChecklistTask( req, res ) {
         client_id: inputBody.clientId,
       };
       await taskQuestionService.create( question );
-      let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, status: 'active' }, { storeId: 1, storeProfile: 1 } );
-      if ( !storeDetails ) {
-        return res.sendError( 'No data found', 204 );
+      let storeDetails;
+      if ( inputBody?.storeName ) {
+        storeDetails = await storeService.findOne( { storeName: inputBody.storeName, status: 'active' }, { storeId: 1, storeProfile: 1 } );
       }
+
       let userDetails = {
         userName: inputBody.userName,
         userEmail: inputBody.userEmail,
-        store_id: storeDetails.storeId,
-        storeName: inputBody.storeName,
-        city: storeDetails?.storeProfile?.city,
+        store_id: storeDetails?.storeId?storeDetails.storeId:'',
+        storeName: inputBody?.storeName?inputBody?.storeName:'',
+        city: storeDetails?.storeProfile?.city?storeDetails?.storeProfile?.city:'',
         checkFlag: true,
         checkListId: response?._id,
         checkListName: data.checkListName,
@@ -1403,6 +1404,7 @@ export async function createChecklistTask( req, res ) {
             _id: inputBody.processedChecklistId,
             section_id: inputBody.sectionId,
             qno: inputBody.qno,
+            parentQuestion: inputBody.parentQuestion,
           },
           'upsert': {
             taskId: String( response?._id ),
@@ -1539,6 +1541,7 @@ export async function redoTask( req, res ) {
     };
 
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
+    console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
       let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
@@ -1555,8 +1558,8 @@ export async function redoTask( req, res ) {
         sectionName: question[sectionIndex].sectionName,
         questionName: question[sectionIndex].questions[req.body.payload.qno - 1].qname,
         action: 'redo',
-        store_id: taskDetails.store_id,
-        storeName: taskDetails.storeName,
+        store_id: taskDetails?.store_id?taskDetails?.store_id:'',
+        storeName: taskDetails.storeName?taskDetails.storeName:'',
         client_id: taskDetails.client_id,
         processedChecklistId: taskDetails._id,
         type: taskDetails.checkListType,
@@ -1578,6 +1581,7 @@ export async function redoTask( req, res ) {
       };
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoTask, requestOptions );
+      console.log( searchResponse.ok );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
       } else {
@@ -1674,6 +1678,7 @@ export const taskDropdown = async ( req, res ) => {
         scheduleRepeatedType: 1,
         scheduleStartTime: 1,
         scheduleEndTime: 1,
+        coverage: 1,
       },
     } );
 
@@ -1688,6 +1693,7 @@ export const taskDropdown = async ( req, res ) => {
         scheduleRepeatedType: { $last: '$scheduleRepeatedType' },
         scheduleStartTime: { $last: '$scheduleStartTime' },
         scheduleEndTime: { $last: '$scheduleEndTime' },
+        coverage: { $last: '$coverage' },
       },
     } );
 
@@ -1726,6 +1732,7 @@ export const taskDropdown = async ( req, res ) => {
         scheduleRepeatedType: 1,
         scheduleStartTime: 1,
         scheduleEndTime: 1,
+        coverage: 1,
         checkListDescription: '$checklistconfigs.checkListDescription',
         publish: '$checklistconfigs.publish',
       },
@@ -2389,14 +2396,16 @@ export async function StoreHygienetask( req, res ) {
     inputBody.approver = inputBody.approver.replace( /,$/, '' );
 
 
-    // let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
+    let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
     let time = inputBody?.scheduleEndTime || '11:59 PM';
     let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
-    // let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
-    // if ( userDetails&&userDetails.fcmToken ) {
-    //   const fcmToken = userDetails.fcmToken;
-    //   await sendPushNotification( title, description, fcmToken );
-    // }
+    let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
+    let userDetails = await userService.findOne( { _id: new mongoose.Types.ObjectId( finduser.userId ) } );
+    console.log( userDetails.fcmToken );
+    if ( userDetails&&userDetails.fcmToken ) {
+      const fcmToken = userDetails.fcmToken;
+      await sendPushNotification( title, description, fcmToken );
+    }
     const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
     const currentTime = dayjs.utc();
     if ( inputDateTime.isBefore( currentTime ) ) {
@@ -2607,14 +2616,16 @@ export async function eyeTesttask( req, res ) {
     inputBody.approver = inputBody.approver.replace( /,$/, '' );
 
 
-    // let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
+    let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
     let time = inputBody?.scheduleEndTime || '11:59 PM';
     let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
-    // let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
-    // if ( userDetails&&userDetails.fcmToken ) {
-    //   const fcmToken = userDetails.fcmToken;
-    //   await sendPushNotification( title, description, fcmToken );
-    // }
+    let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
+    let userDetails = await userService.findOne( { _id: new mongoose.Types.ObjectId( finduser.userId ) } );
+    console.log( userDetails.fcmToken );
+    if ( userDetails&&userDetails.fcmToken ) {
+      const fcmToken = userDetails.fcmToken;
+      await sendPushNotification( title, description, fcmToken );
+    }
     const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
     const currentTime = dayjs.utc();
     if ( inputDateTime.isBefore( currentTime ) ) {

package/src/controllers/taskActionCenter.controllers.js

@@ -1,6 +1,6 @@
 import * as traxApprover from '../service/approver.service.js';
 import * as processedTask from '../service/processedTaskList.service.js';
-import { logger } from 'tango-app-api-middleware';
+import { logger, getChecklistUsers } from 'tango-app-api-middleware';
 import * as processedChecklist from '../service/processedChecklist.service.js';
 import * as checklistLog from '../service/checklistLog.service.js';
 import mongoose from 'mongoose';
@@ -46,14 +46,21 @@ export const overallCardsV1 = async ( req, res ) => {
       },
     };
 
+    let requestData = req.body;
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+
     let taskQuery = [
       {
         $match: {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: taskIdList },
           checklistStatus: 'submit',
-          ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
+          // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
         },
       },
       { ...groupQuery },
@@ -65,8 +72,9 @@ export const overallCardsV1 = async ( req, res ) => {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: checklistIdList },
           checklistStatus: 'submit',
-          ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
+          // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
         },
       },
       { ...groupQuery },
@@ -180,13 +188,20 @@ export const approvalTableV1 = async ( req, res ) => {
 
     const promises = [];
 
+    let requestData = req.body;
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+
     if ( [ 'task', 'all' ].includes( req.body.type ) ) {
       query = [
         {
           $match: {
             date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: taskIdList },
-            ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
+            // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
+            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
           },
         },
         ...groupQuery,
@@ -217,7 +232,8 @@ export const approvalTableV1 = async ( req, res ) => {
           $match: {
             date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: checklistIdList },
-            ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
+            // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
+            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
           },
         },
         ...groupQuery,
@@ -281,11 +297,16 @@ export const activityLogV1 = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
 
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
 
     findAndQuery.push(
         { client_id: requestData.clientId },
-        { store_id: { $in: requestData.storeId } },
         { action: { $in: [ 'submitted', 'started' ] } },
+        // { store_id: { $in: requestData.storeId } },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
     );
 
 

package/src/controllers/taskDashboard.controllers.js

@@ -1,6 +1,6 @@
 import * as taskService from '../service/task.service.js';
 import * as processedTaskService from '../service/processedTaskList.service.js';
-import { logger, download } from 'tango-app-api-middleware';
+import { logger, download, getChecklistUsers } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 import mongoose from 'mongoose';
 // const ObjectId = mongoose.Types.ObjectId;
@@ -57,10 +57,16 @@ export const overallCardsV1 = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
 
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+
     findAndQuery.push(
         { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
-        { store_id: { $in: requestData.storeId } },
+        // { store_id: { $in: requestData.storeId } },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -228,11 +234,17 @@ export const taskInfoTableV1 = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
 
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+
     findAndQuery.push(
         { date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } },
         { client_id: requestData.clientId },
-        { store_id: { $in: requestData.storeId } },
         { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.taskId ) },
+        // { store_id: { $in: requestData.storeId } },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
     );
     if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
       if ( requestData.checklistStatus == 'redo' ) {
@@ -966,6 +978,12 @@ export async function taskDetails( req, res ) {
       return res.sendError( 'clientId is required', 400 );
     }
 
+    let requestData = req.body;
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+
     let toDate = new Date( req.body.toDate );
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
@@ -990,23 +1008,33 @@ export async function taskDetails( req, res ) {
         $match: {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           client_id: req.body.clientId,
-          store_id: { $in: req.body.storeId },
           ...( idList.length ) ? { sourceCheckList_id: { $in: idList } } : {},
+          // store_id: { $in: req.body.storeId },
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
         },
       },
       { $sort: { date_iso: -1 } },
       {
         $group: {
-          _id: '$sourceCheckList_id',
-          checkListName: { $first: '$checkListName' },
-          createdByName: { $first: '$createdByName' },
-          publishDate: { $first: '$publishDate' },
-          priorityType: { $first: '$priorityType' },
-          storeCount: { $first: '$storeCount' },
-          submitCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },
-          redoCount: { $sum: { $cond: [ { $and: [ { $eq: [ '$redoStatus', true ] }, { $ne: [ '$checklistStatus', 'submit' ] } ] }, 1, 0 ] } },
-          scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
-          checkListChar: { $first: { $toUpper: { $substr: [ '$createdByName', 0, 2 ] } } },
+          '_id': '$sourceCheckList_id',
+          'checkListName': { $first: '$checkListName' },
+          'coverage': {
+            '$first': {
+              '$cond': {
+                'if': { '$gt': [ { '$ifNull': [ '$referenceCheckListId', '' ] }, '' ] },
+                'then': 'checklist',
+                'else': '$coverage',
+              },
+            },
+          },
+          'publishDate': { $first: '$publishDate' },
+          'priorityType': { $first: '$priorityType' },
+          // storeCount: { $first: '$storeCount' },
+          'storeCount': { $sum: 1 },
+          'submitCount': { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },
+          'redoCount': { $sum: { $cond: [ { $and: [ { $eq: [ '$redoStatus', true ] }, { $ne: [ '$checklistStatus', 'submit' ] } ] }, 1, 0 ] } },
+          'scheduleEndTime_iso': { $first: '$scheduleEndTime_iso' },
+          'checkListChar': { $first: { $toUpper: { $substr: [ '$createdByName', 0, 2 ] } } },
         },
       },
     ];

package/src/routes/taskDashboard.routes.js

@@ -8,14 +8,14 @@ import {
 
 taskDashboardRouter
     .post( '/overallcards', isAllowedSessionHandler, overallCards )
-    .post( '/overallcardsV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), overallCardsV1 )
     .post( '/taskTable', isAllowedSessionHandler, taskTable )
     .post( '/taskTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskTableV1 )
     .post( '/taskInfoTable', isAllowedSessionHandler, taskInfoTable )
-    .post( '/taskInfoTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskInfoTableV1 )
     .post( '/taskDropdownList', isAllowedSessionHandler, taskDropdownList )
-    .post( '/taskDropdownListV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskDropdownListV1 )
     .post( '/taskDeleteV1', isAllowedSessionHandler, taskDeleteV1 )
-    .post( '/taskDetails', isAllowedSessionHandler, taskDetails );
+    .post( '/taskDropdownListV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskDropdownListV1 )
+    .post( '/overallcardsV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), overallCardsV1 )
+    .post( '/taskDetails', isAllowedSessionHandler, taskDetails )
+    .post( '/taskInfoTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskInfoTableV1 );
 
 export default taskDashboardRouter;