tango-app-api-task 3.7.45 → 3.7.46

package/package.json

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

package/src/controllers/task.controller.js

@@ -17,8 +17,10 @@ const ObjectId = mongoose.Types.ObjectId;
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
 import utc from 'dayjs/plugin/utc.js';
+import timeZone from 'dayjs/plugin/timezone.js';
 dayjs.extend( utc );
 dayjs.extend( customParseFormat );
+dayjs.extend( timeZone );
 import * as taskProcessedConfigService from '../service/processedTaskConfig.service.js';
 import * as taskProcessedService from '../service/processedTaskList.service.js';
 import * as ApproverModel from '../service/approver.service.js';
@@ -1238,7 +1240,7 @@ function findObjectDifference( oldObj, newObj ) {
 
 export async function insertSingleProcessData( checklistId, answerTypechange, inputBody, insertfrom ) {
   try {
-    let currentdate = new Date();
+    let currentdate = dayjs.utc().format();
     let date = dayjs( currentdate ).format();
     let getCLconfig = await taskService.findOne( { _id: new ObjectId( checklistId ), publish: true } );
     if ( getCLconfig ) {
@@ -1256,13 +1258,13 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
       startTimeIso = dayjs.utc( sTime, 'hh:mm A' );
       endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
       let insertdata = {};
-      insertdata.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
-      insertdata.date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
+      insertdata.date_iso = startTimeIso.startOf( 'day' );
+      insertdata.date_string = startTimeIso.format( 'YYYY-MM-DD' );
       insertdata.sourceCheckList_id = getCLconfig._id;
       insertdata.checkListName = getCLconfig.checkListName;
       insertdata.checkListDescription = getCLconfig.checkListDescription;
       insertdata.publish = getCLconfig.publish;
-      insertdata.scheduleStartTime = '12:00 AM';
+      insertdata.scheduleStartTime = sTime;
       insertdata.scheduleStartTime_iso = startTimeIso.format();
       insertdata.scheduleEndTime = getCLconfig.scheduleEndTime;
       insertdata.scheduleEndTime_iso = endTimeIso.format();
@@ -1951,7 +1953,7 @@ export async function createChecklistTask( req, res ) {
       priorityType: 'high',
       client_id: inputBody.clientId,
       checkListType: inputBody.checkListType,
-      publishDate: new Date(),
+      publishDate: dayjs.utc().format(),
       locationCount: 1,
       ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
       coverage: checklistDetails?.coverage || 'store',
@@ -2824,6 +2826,7 @@ export const taskDropdown = async ( req, res ) => {
         scheduleStartTime: 1,
         scheduleEndTime: 1,
         coverage: 1,
+        checkListDescription: 1,
       },
     } );
 
@@ -2839,6 +2842,7 @@ export const taskDropdown = async ( req, res ) => {
         scheduleStartTime: { $last: '$scheduleStartTime' },
         scheduleEndTime: { $last: '$scheduleEndTime' },
         coverage: { $last: '$coverage' },
+        checkListDescription: { $last: '$checkListDescription' },
       },
     } );
 
@@ -2878,27 +2882,26 @@ export const taskDropdown = async ( req, res ) => {
         scheduleStartTime: 1,
         scheduleEndTime: 1,
         coverage: 1,
-        checkListDescription: '$checklistconfigs.checkListDescription',
+        checkListDescription: 1,
+        checklistconfigs: 1,
         publish: '$checklistconfigs.publish',
       },
     } );
 
-    let getTotalCount = await taskProcessedConfigService.aggregate( findQuery );
-    if ( !getTotalCount.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
-
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy != '' ) {
-      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
+      findQuery.push( { $sort: { [requestData.sortColumnName]: Number( requestData.sortBy ) } } );
     } else {
       findQuery.push( { $sort: { ['checkListName']: -1 } } );
     }
 
     let getChecklistData = await taskProcessedConfigService.aggregate( findQuery );
+    if ( !getChecklistData.length ) {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
     result.checklistData = getChecklistData;
     return res.sendSuccess( result );
   } catch ( error ) {
-    logger.error( { error: error, message: req.query, function: 'checklistDropdown' } );
+    logger.error( { error: error, message: req.query, function: 'taskDropdown' } );
     return res.sendError( { error: error }, 500 );
   }
 };
@@ -5078,7 +5081,7 @@ export async function taskcreation( req, res ) {
     }
 
 
-    let finduser = await userService.findOne( { clientId: inputBody.clientId, email: req.body.user, userType: 'client', isActive: true }, { userName: '$userName', email: 1, userId: '$_id' } );
+    let finduser = await userService.findOne( { clientId: inputBody.clientId, email: req.body.user, userType: 'client', isActive: true }, { userName: '$userName', email: 1, userId: '$_id', fcmToken: 1 } );
     // console.log( finduser );
 
     if ( !finduser ) {
@@ -5092,10 +5095,10 @@ export async function taskcreation( req, res ) {
 
     let title = `New Task Alert ${inputBody.taskName}-`+storeDetails?.storeName ? storeDetails?.storeName : ``+`-${dayjs().format( 'YYYY-MM-DD' )}`;
     let time = inputBody?.scheduleEndTime || '11:59 PM';
-    let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
+    let date = inputBody?.scheduleDate || dayjs.utc().format( 'YYYY-MM-DD' );
     let description = `A new task has been assigned to`+storeDetails?.storeName ? storeDetails?.storeName : `you` +`. Please complete it before the due date of ${date}.`;
-    if ( userDetails && userDetails.fcmToken ) {
-      const fcmToken = userDetails.fcmToken;
+    if ( finduser && finduser.fcmToken ) {
+      const fcmToken = finduser.fcmToken;
       await sendPushNotification( title, description, fcmToken );
     }
     const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
@@ -5134,13 +5137,13 @@ export async function taskcreation( req, res ) {
       publish: true,
       questionCount: inputBody?.questions?.length || 1,
       storeCount: 1,
-      scheduleDate: date,
+      scheduleDate: dayjs.utc( inputBody.scheduleDate ).format(),
       scheduleEndTime: time,
       scheduleEndTimeISO: dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format(),
       priorityType: 'high',
       client_id: inputBody.clientId,
       checkListType: 'task',
-      publishDate: new Date(),
+      publishDate: dayjs().format(),
       locationCount: 1,
       ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
       coverage: inputBody?.storeName ? 'store' : 'user',