tango-app-api-trax 3.6.0-sec-11 → 3.6.0-task-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.6.0-sec-11",
+    "version": "3.6.0-task-2",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.142",
+        "tango-api-schema": "^2.2.144",
         "tango-app-api-middleware": "^3.1.77",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/download.controller.js

@@ -18,6 +18,11 @@ import mongoose from 'mongoose';
 export const downloadInsert = async ( req, res ) => {
   try {
     let requestData = req.body;
+    let fromDate = new Date( requestData.fromDate );
+    let toDate = new Date( requestData.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
     let name;
     let fileType = requestData?.fileType || 'pdfzip';
 
@@ -39,60 +44,55 @@ export const downloadInsert = async ( req, res ) => {
       }
     }
     // console.log( requestData );
-    // // No Need to Check
-    // let fromDate = new Date( requestData.fromDate );
-    // let toDate = new Date( requestData.toDate );
-    // let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    // toDate = new Date( toDate.getTime() - userTimezoneOffset );
-    // toDate.setUTCHours( 23, 59, 59, 59 );
-    // if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id != '' ) {
-    //   let getChecklistQuery = [];
-    //   getChecklistQuery.push( { $project: { sourceCheckList_id: 1, date_iso: 1, store_id: 1, userEmail: 1, checklistStatus: 1, redoStatus: 1 } } );
-
-    //   if ( requestData.filtertype ==='Clusters' ) {
-    //     getChecklistQuery.push( {
-    //       $match: {
-    //         $and: [
-    //           { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
-    //           { date_iso: { $gte: fromDate, $lte: toDate } },
-    //           { store_id: { $in: requestData.storeIds } },
-    //         ],
-    //         $or: [
-    //           { checklistStatus: 'submit' },
-    //           { redoStatus: true },
-    //         ],
-    //       },
-    //     } );
-    //   } else {
-    //     // console.log( requestData );
-    //     getChecklistQuery.push( {
-    //       $match: {
-    //         $and: [
-    //           { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
-    //           { date_iso: { $gte: fromDate, $lte: toDate } },
-    //           { userEmail: { $in: requestData.userEmailList } },
-    //         ],
-    //         $or: [
-    //           { checklistStatus: 'submit' },
-    //           { redoStatus: true },
-    //         ],
-    //       },
-    //     } );
-    //   }
-    //   // getChecklistQuery.push( { $count: 'totalCount' } );
-
-    //   let getChecklistCount = await processedchecklistService.aggregate( getChecklistQuery );
-    //   // console.log( getChecklistCount );
-    //   if ( requestData.insertType === 'task' ) {
-    //     getChecklistCount = await processedTaskService.aggregate( getChecklistQuery );
-    //   }
-    //   if ( getChecklistCount && getChecklistCount.length > 0 ) {
-    //     // console.log( 'if' );
-    //     // console.log( 'getChecklistCountgetChecklistCount[0].totalCount =>', getChecklistCount[0]?.totalCount );
-    //   } else {
-    //     return res.sendError( { error: 'No Data Found' }, 400 );
-    //   }
-    // }
+
+    if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id != '' ) {
+      let getChecklistQuery = [];
+      getChecklistQuery.push( { $project: { sourceCheckList_id: 1, date_iso: 1, store_id: 1, userEmail: 1, checklistStatus: 1, redoStatus: 1 } } );
+
+      if ( requestData.filtertype ==='Clusters' ) {
+        getChecklistQuery.push( {
+          $match: {
+            $and: [
+              { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
+              { date_iso: { $gte: fromDate, $lte: toDate } },
+              { store_id: { $in: requestData.storeIds } },
+            ],
+            $or: [
+              { checklistStatus: 'submit' },
+              { redoStatus: true },
+            ],
+          },
+        } );
+      } else {
+        // console.log( requestData );
+        getChecklistQuery.push( {
+          $match: {
+            $and: [
+              { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
+              { date_iso: { $gte: fromDate, $lte: toDate } },
+              { userEmail: { $in: requestData.userEmailList } },
+            ],
+            $or: [
+              { checklistStatus: 'submit' },
+              { redoStatus: true },
+            ],
+          },
+        } );
+      }
+      getChecklistQuery.push( { $count: 'totalCount' } );
+
+      let getChecklistCount = await processedchecklistService.aggregate( getChecklistQuery );
+      // console.log( getChecklistCount );
+      if ( requestData.insertType === 'task' ) {
+        getChecklistCount = await processedTaskService.aggregate( getChecklistQuery );
+      }
+      if ( getChecklistCount && getChecklistCount[0]?.totalCount && getChecklistCount[0].totalCount > 0 ) {
+        // console.log( 'if' );
+        // console.log( 'getChecklistCountgetChecklistCount[0].totalCount =>', getChecklistCount[0]?.totalCount );
+      } else {
+        return res.sendError( { error: 'No Data Found' }, 400 );
+      }
+    }
 
     if ( requestData.fileType == 'pdf' ) {
       if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id != '' ) {

package/src/controllers/gallery.controller.js

@@ -1148,3 +1148,25 @@ export async function checkNotificationCount( req, res ) {
     return res.sendError( { error: error }, 500 );
   }
 }
+
+export async function vehicleCheckInUpdate( req, res ) {
+  try {
+    let requestData = req.body;
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let updateData = { _id: requestData._id };
+    let resultData = await LamdaServiceCall( url.vehicleCheckInUpdate, updateData );
+    if ( resultData ) {
+      if ( resultData.status_code == '200' ) {
+        resultData.message = '';
+        return res.sendSuccess( resultData );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'vehicleCheckInUpdate' } );
+    return res.sendError( { error: error }, 500 );
+  }
+}

package/src/controllers/internalTrax.controller.js

@@ -295,11 +295,6 @@ export async function PCLconfigCreation( req, res ) {
                   isdeleted: false,
                 },
               } );
-              sectionQuery.push( {
-                $sort: {
-                  sectionNumber: 1,
-                },
-              } );
               let getSections = await CLquestions.aggregate( sectionQuery );
               if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
@@ -307,9 +302,7 @@ export async function PCLconfigCreation( req, res ) {
                     let collectQuestions = {};
                     collectQuestions.section_id = element3._id;
                     collectQuestions.sectionName = element3.section;
-                    collectQuestions.sectionOldName = element3.sectionOldName || '';
                     collectQuestions.questions = element3.question;
-                    collectQuestions.sectionNumber = element3.sectionNumber|| '';
                     collectSections.push( collectQuestions );
                   }
                 }
@@ -870,11 +863,6 @@ async function insertData( requestData ) {
                   isdeleted: false,
                 },
               } );
-              sectionQuery.push( {
-                $sort: {
-                  sectionNumber: 1,
-                },
-              } );
               let getSections = await CLquestions.aggregate( sectionQuery );
               if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
@@ -2474,43 +2462,3 @@ export async function storecheckExists( data ) {
     logger.error( { error: error, function: 'internalAISendPushNotification' } );
   }
 }
-
-export async function insertAINotification( req, res ) {
-  try {
-    let requestData = req.body;
-    let insertData= [];
-    let findAllUser = await userService.find( { clientId: requestData.clientId, isActive: true } );
-    for ( let user of findAllUser ) {
-      let data= {};
-      data.userId = user._id;
-      data.storeId = requestData.storeId;
-      data.storeName = requestData.storeName;
-      data.captureTime = requestData.captureTime;
-      data.clientId = requestData.clientId;
-      data.sourceCheckList_id = requestData.sourceCheckList_id;
-      data.checkListName = requestData.checkListName;
-      data.notificationType = requestData.notificationType;
-      let payload = {
-        userType: user.userType,
-        role: user.role,
-        assignedStores: user.assignedStores,
-        clientId: user.clientId,
-        email: user.email,
-      };
-      let result = await storecheckExists( payload );
-      if ( result ) {
-        insertData.push( data );
-      }
-    }
-    // console.log( 'insertData =>', insertData );
-    let create = await notificationModel.insertManynotificationModel( insertData );
-    // console.log( 'create =>', create );
-    if ( create ) {
-      return res.sendSuccess( 'updated successfully' );
-    }
-  } catch ( e ) {
-    logger.error( { error: e, function: 'insertAINotification' } );
-    if ( e.name === 'ValidationError' ) res.sendBadRequest( e );
-    else res.sendError( e, 500 );
-  }
-}

package/src/controllers/mobileTrax.controller.js

@@ -64,7 +64,11 @@ export async function storeListv1( req, res ) {
     }
     let userChecklist = await processedchecklist.find( { userId: req.user._id, userEmail: req.user.email, date_string: dayjs( req.query.date ).format( 'YYYY-MM-DD' ) }, { store_id: 1, storeName: 1 } );
 
-    let userTask = await processedTask.find( { userId: req.user._id, userEmail: req.user.email, date_string: dayjs( req.query.date ).format( 'YYYY-MM-DD' ) }, { store_id: 1, storeName: 1 } );
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
+    let taskFindQuery = { userId: req.user._id, userEmail: req.user.email, scheduleStartTime_iso: { $lt: toDate }, scheduleEndTime_iso: { $gte: fromDate } };
+    let userTask = await processedTask.find( taskFindQuery, { store_id: 1, storeName: 1 } );
 
     if ( !userChecklist.length && !userTask.length ) {
       return res.sendSuccess( [] );
@@ -151,19 +155,15 @@ export async function startChecklist( req, res ) {
 
     let updateData = {};
     let currentDateTime;
-    if ( getBeforeChecklist[0]?.store_id && getBeforeChecklist[0]?.store_id != '' ) {
-      let storeTimeZone = await storeService.findOne( { storeId: getBeforeChecklist[0].store_id, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+    if ( getBeforeChecklist[0].storeName && getBeforeChecklist[0].storeName!='' ) {
+      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
       if ( storeTimeZone?.storeProfile?.timeZone ) {
         currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
       } else {
         currentDateTime = dayjs();
       }
     } else {
-      if ( requestData.currentTime && requestData.currentTime !='' ) {
-        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
-      } else {
-        currentDateTime = dayjs();
-      }
+      currentDateTime = dayjs();
     }
     updateData.checklistStatus = 'inprogress';
     updateData.startMobileTime = requestData?.currentTime;
@@ -347,40 +347,40 @@ export async function startTask( req, res ) {
       }
     }
 
-    // const storeTimeZone = await storeService.findOne(
-    //     { storeName: task.storeName },
-    //     { 'storeProfile.timeZone': 1 },
-    // );
-    // const currentDateTime = storeTimeZone?.storeProfile?.timeZone ?
-    //   dayjs().tz( storeTimeZone.storeProfile.timeZone ) :
-    //   dayjs();
+    const storeTimeZone = await storeService.findOne(
+        { storeName: task.storeName },
+        { 'storeProfile.timeZone': 1 },
+    );
+    const currentDateTime = storeTimeZone?.storeProfile?.timeZone ?
+      dayjs().tz( storeTimeZone.storeProfile.timeZone ) :
+      dayjs();
 
-    let currentDateTime;
-    if ( getBeforeTask[0].storeName && getBeforeTask[0].storeName!='' ) {
-      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeTask[0].storeName, $options: 'i' }, clientId: getBeforeTask[0].client_id }, { 'storeProfile.timeZone': 1 } );
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-      } else {
-        currentDateTime = dayjs();
-      }
+
+    let updatedNewData;
+    if ( task.checkListFrom && task.checkListFrom == 'api' ) {
+      console.log( 'api if=>' );
+      updatedNewData = {
+        checklistStatus: 'inprogress',
+        startMobileTime: requestData?.currentTime,
+        startTime_string: currentDateTime.format( 'hh:mm A, DD MMM YYYY' ),
+        startTime: dayjs
+            .utc( currentDateTime.format( 'hh:mm A, DD MMM YYYY' ), 'hh:mm A, DD MMM YYYY' )
+            .format(),
+      };
     } else {
-      if ( requestData.currentTime && requestData.currentTime !='' ) {
-        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
-      } else {
-        currentDateTime = dayjs();
-      }
+      console.log( 'api else=>' );
+      updatedNewData = {
+        checklistStatus: 'inprogress',
+        startMobileTime: requestData?.currentTime,
+        questionAnswers: task.redoStatus ? task.questionAnswers : processedTaskConfig.questionAnswers,
+        startTime_string: currentDateTime.format( 'hh:mm A, DD MMM YYYY' ),
+        startTime: dayjs
+            .utc( currentDateTime.format( 'hh:mm A, DD MMM YYYY' ), 'hh:mm A, DD MMM YYYY' )
+            .format(),
+      };
     }
 
-    const updateData = {
-      checklistStatus: 'inprogress',
-      startMobileTime: requestData?.currentTime,
-      questionAnswers: task.redoStatus ? task.questionAnswers : processedTaskConfig.questionAnswers,
-      startTime_string: currentDateTime.format( 'hh:mm A, DD MMM YYYY' ),
-      startTime: dayjs
-          .utc( currentDateTime.format( 'hh:mm A, DD MMM YYYY' ), 'hh:mm A, DD MMM YYYY' )
-          .format(),
-    };
-
+    const updateData = updatedNewData;
     const updateQuery = {
       _id: new ObjectId( requestData.processedcheckListId ),
       userId: user._id,
@@ -429,39 +429,40 @@ export async function startTask( req, res ) {
     const getUpdatedTask = await processedTask.aggregate( findQuery );
 
 
-    const bucket = JSON.parse( process.env.BUCKET );
-    await Promise.all(
-        getUpdatedTask[0].questionAnswers.map( ( section ) =>
-          section.questions.map( async ( question ) => {
-            if ( question.questionReferenceImage.length > 0 ) {
-              question.questionReferenceImage = await Promise.all(
-                  question.questionReferenceImage.map( async ( image ) => {
-                    return await signedUrl( {
-                      Bucket: bucket.sop,
-                      file_path: decodeURIComponent( image ),
-                    } );
+    if ( !( task.checkListFrom && task.checkListFrom == 'api' ) ) {
+      const bucket = JSON.parse( process.env.BUCKET );
+      await Promise.all(
+          getUpdatedTask[0].questionAnswers.map( ( section ) =>
+            section.questions.map( async ( question ) => {
+              if ( question.questionReferenceImage.length > 0 ) {
+                question.questionReferenceImage = await Promise.all(
+                    question.questionReferenceImage.map( async ( image ) => {
+                      return await signedUrl( {
+                        Bucket: bucket.sop,
+                        file_path: decodeURIComponent( image ),
+                      } );
+                    } ),
+                );
+              }
+
+              await Promise.all(
+                  question.answers.map( async ( answer ) => {
+                    if ( answer.referenceImage.length > 0 ) {
+                      answer.referenceImage = await Promise.all(
+                          answer.referenceImage.map( async ( image ) => {
+                            return await signedUrl( {
+                              Bucket: bucket.sop,
+                              file_path: decodeURIComponent( image ),
+                            } );
+                          } ),
+                      );
+                    }
                   } ),
               );
-            }
-
-            await Promise.all(
-                question.answers.map( async ( answer ) => {
-                  if ( answer.referenceImage.length > 0 ) {
-                    answer.referenceImage = await Promise.all(
-                        answer.referenceImage.map( async ( image ) => {
-                          return await signedUrl( {
-                            Bucket: bucket.sop,
-                            file_path: decodeURIComponent( image ),
-                          } );
-                        } ),
-                    );
-                  }
-                } ),
-            );
-          } ),
-        ).flat(),
-    );
-
+            } ),
+          ).flat(),
+      );
+    }
 
     const logData = {
       store_id: task.store_id,
@@ -1803,8 +1804,8 @@ export async function submitChecklist( req, res ) {
 
       let currentDateTime;
       let storeTimeZone;
-      if ( getchecklist[0]?.store_id && getchecklist[0]?.store_id !='' ) {
-        storeTimeZone = await storeService.findOne( { storeId: getchecklist[0].store_id, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
+      if ( getchecklist[0].storeName && getchecklist[0].storeName !='' ) {
+        storeTimeZone = await storeService.findOne( { storeName: { $regex: getchecklist[0].storeName, $options: 'i' }, clientId: getchecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
         if ( storeTimeZone?.storeProfile?.timeZone ) {
           currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
         } else {
@@ -2023,30 +2024,33 @@ export async function submitTask( req, res ) {
 
     if ( updateResult.modifiedCount > 0 ) {
       if ( submittype === 'submit' ) {
-        const query1 = [
-          {
-            $match: {
-              userId: user._id,
-              sourceCheckList_id: checklist.sourceCheckList_id,
-              checklistStatus: { $in: [ 'open', 'inprogress' ] },
+        const excludedChecklists = [ 'Store Hygiene Check', 'EyeTest QR Verification' ];
+        if ( !excludedChecklists.includes( checklist.checkListName ) ) {
+          const query1 = [
+            {
+              $match: {
+                userId: user._id,
+                sourceCheckList_id: checklist.sourceCheckList_id,
+                checklistStatus: { $in: [ 'open', 'inprogress' ] },
+              },
             },
-          },
-          {
-            $project: {
-              _id: 1,
-              date_iso: 1,
-              date_string: 1,
+            {
+              $project: {
+                _id: 1,
+                date_iso: 1,
+                date_string: 1,
+              },
             },
-          },
-        ];
+          ];
 
-        const processedTasksToDelete = await processedTask.aggregate( query1 );
+          const processedTasksToDelete = await processedTask.aggregate( query1 );
 
-        if ( processedTasksToDelete?.length ) {
-          const deleteIds = processedTasksToDelete?.filter( ( val ) => val?.date_string !== date )?.map( ( val ) => val?._id );
+          if ( processedTasksToDelete?.length ) {
+            const deleteIds = processedTasksToDelete?.filter( ( val ) => val?.date_string !== date )?.map( ( val ) => val?._id );
 
-          if ( deleteIds?.length ) {
-            await processedTask.deleteMany( { _id: { $in: deleteIds } } );
+            if ( deleteIds?.length ) {
+              await processedTask.deleteMany( { _id: { $in: deleteIds } } );
+            }
           }
         }
       } else if ( submittype === 'draft' ) {
@@ -2555,6 +2559,42 @@ export async function dashboardv1( req, res ) {
       },
     ];
 
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
+    const taskBaseMatch = {
+      // eslint-disable-next-line camelcase
+      // store_id,
+      userId,
+      scheduleStartTime_iso: { $lt: toDate },
+      scheduleEndTime_iso: { $gte: fromDate },
+      timeFlagStatus: true,
+      ...clientId,
+      ...storeMatch,
+    };
+
+    console.log( 'taskBaseMatch =>', taskBaseMatch );
+    const taskBuildPipeline = ( matchExtraConditions = {} ) => [
+      { $match: { ...taskBaseMatch, ...matchExtraConditions } },
+      {
+        $facet: {
+          total: [ { $count: 'total' } ],
+          toDo: [
+            { $match: { checklistStatus: 'open' } },
+            { $group: { _id: '', count: { $sum: 1 } } },
+          ],
+          inprogress: [
+            { $match: { checklistStatus: 'inprogress' } },
+            { $group: { _id: '', count: { $sum: 1 } } },
+          ],
+          submit: [
+            { $match: { checklistStatus: 'submit' } },
+            { $group: { _id: '', count: { $sum: 1 } } },
+          ],
+        },
+      },
+    ];
+
     const processResult = ( result ) => ( {
       totalchecklist: result[0]?.total[0]?.total || 0,
       todo: result[0]?.toDo[0]?.count || 0,
@@ -2563,7 +2603,7 @@ export async function dashboardv1( req, res ) {
     } );
 
     const checklistQuery = buildPipeline( { checkListType: 'custom' } );
-    const taskQuery = buildPipeline();
+    const taskQuery = taskBuildPipeline();
 
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
       processedchecklist.aggregate( checklistQuery ),
@@ -2772,9 +2812,80 @@ export async function checklistv1( req, res ) {
       return pipeline;
     };
 
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
+    const taskBuildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
+      const matchConditions = [
+        // eslint-disable-next-line camelcase
+        // { store_id },
+        { userId },
+        { scheduleStartTime_iso: { $lt: toDate } },
+        { scheduleEndTime_iso: { $gte: fromDate } },
+        { timeFlagStatus: true },
+        ...matchExtraConditions,
+        clientId,
+        storeMatch,
+      ];
+      if ( checklistStatus ) {
+        matchConditions.push( { checklistStatus } );
+      }
+
+      const pipeline = [
+        { $match: { $and: matchConditions } },
+        ...( searchValue ?
+          [ { $match: { $or: [ { checkListName: { $regex: searchValue, $options: 'i' } } ] } } ] :
+          [] ),
+        {
+          $project: {
+            checkListName: { $ifNull: [ '$checkListName', '' ] },
+            scheduleStartTime: { $ifNull: [ '$scheduleStartTime', '' ] },
+            scheduleStartTime_iso: { $ifNull: [ '$scheduleStartTime_iso', '' ] },
+            scheduleEndTime: { $ifNull: [ '$scheduleEndTime', '' ] },
+            scheduleEndTime_iso: { $ifNull: [ '$scheduleEndTime_iso', '' ] },
+            checklistStatus: { $ifNull: [ '$checklistStatus', '' ] },
+            checkListId: { $ifNull: [ '$checkListId', '' ] },
+            startTime: { $ifNull: [ '$startTime', '' ] },
+            submitTime: { $ifNull: [ '$submitTime', '' ] },
+            allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
+            // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+            allowedStoreLocation: {
+              $cond: {
+                if: { $eq: [ '$client_id', '11' ] },
+                then: false,
+                else: {
+                  '$cond': {
+                    'if': { '$eq': [ '$coverage', 'user' ] },
+                    'then': false,
+                    'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
+                  },
+                },
+              },
+            },
+            reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
+            startTime_string: { $ifNull: [ '$startTime_string', '' ] },
+            submitTime_string: { $ifNull: [ '$submitTime_string', '' ] },
+            timeFlag: { $ifNull: [ '$timeFlag', '' ] },
+            scheduleRepeatedType: { $ifNull: [ '$scheduleRepeatedType', '' ] },
+            timeDifference: { $subtract: [ '$scheduleEndTime_iso', '$date_iso' ] },
+            redoStatus: { $ifNull: [ '$redoStatus', false ] },
+            type: { $ifNull: [ '$checkListType', '' ] },
+            priorityType: { $ifNull: [ '$priorityType', '' ] },
+            ...projectExtraConditions,
+            client_id: { $ifNull: [ '$client_id', '' ] },
+            coverage: { $ifNull: [ '$coverage', '' ] },
+            taskType: { $ifNull: [ '$planoType', '' ] },
+            streamId: { $ifNull: [ '$streamId', '' ] },
+          },
+        },
+      ];
+
+      return pipeline;
+    };
+
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
       processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1 } ) ),
-      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1 } ) ),
+      processedTask.aggregate( taskBuildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1 } ) ),
     ] );
 
     const checklistData = checklistResult.status === 'fulfilled' ? checklistResult.value : [];

package/src/controllers/trax.controller.js

@@ -402,8 +402,7 @@ export const getConfigDetails = async ( req, res ) => {
         checkListId: storechecklistdetails._id,
         isdeleted: false,
       };
-      let sectionSort = { sectionNumber: 1 };
-      let questionDetails = await questionService.findSort( query, {}, sectionSort );
+      let questionDetails = await questionService.find( query );
       if ( questionDetails.length ) {
         let sections = [];
         let bucket = JSON.parse( process.env.BUCKET );
@@ -739,7 +738,7 @@ export const duplicateChecklist = async ( req, res ) => {
         }
         await assignedService.insertMany( users );
       }
-      let sectionList = await questionService.findSort( { checkListId: checkDetails._id, client_id: req.query.clientId, isdeleted: false }, {}, { sectionNumber: 1 } );
+      let sectionList = await questionService.find( { checkListId: checkDetails._id, client_id: req.query.clientId, isdeleted: false } );
       if ( sectionList.length ) {
         let sections= [];
         for ( let i = 0; i < sectionList.length; i++ ) {
@@ -811,7 +810,7 @@ export const update = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
-    let getExistQuestions = await questionService.findSort( { checkListId: req.params.checklistId, client_id: req.body.clientId }, {}, { sectionNumber: 1 } );
+    let getExistQuestions = await questionService.find( { checkListId: req.params.checklistId, client_id: req.body.clientId } );
 
     inputBody.sections.forEach( async ( element ) => {
       if ( !element.questions.length && inputBody.submitType == 'configure' ) {
@@ -2970,11 +2969,6 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
           isdeleted: false,
         },
       } );
-      sectionQuery.push( {
-        $sort: {
-          sectionNumber: 1,
-        },
-      } );
       let getSections = await questionService.aggregate( sectionQuery );
       if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection' ].includes( getCLconfig.checkListType ) ) {
         if ( getSections.length ) {
@@ -2984,7 +2978,6 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
             collectQuestions.sectionName = element3.section;
             collectQuestions.sectionOldName = element3.sectionOldName;
             collectQuestions.questions = element3.question;
-            collectQuestions.sectionNumber = element3.sectionNumber || 0;
             collectSections.push( collectQuestions );
           }
         }

package/src/controllers/traxDashboard.controllers.js

@@ -728,7 +728,6 @@ export const userPerformance = async ( req, res ) => {
         userEmail: 1,
         userName: 1,
         questionCount: 1,
-        redoStatus: 1,
       },
     } );
 
@@ -746,7 +745,6 @@ export const userPerformance = async ( req, res ) => {
         submittedChecklistQuestionCount: {
           $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] },
         },
-        redo: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
       },
     } );
 
@@ -818,7 +816,6 @@ export const userPerformance = async ( req, res ) => {
           'Email': element.userEmail || '--',
           'Checklist Assigned': element.checkListCount || '--',
           'Flags': element.flaggedCount || '--',
-          'ReDo': element.redo || '--',
           'Completion %': element.completion || '--',
           'Compliance %': element.compliance || '--',
           'Performance %': element.performance || '--',

package/src/routes/gallery.routes.js

@@ -2,7 +2,7 @@
 
 import { getchecklist, viewchecklist, getMobileUseagelist, storeOpencloselist, getcustomerunattendedlist,
   storesList, checklistDropdown, redoChecklist, redomultiChecklist, approveChecklist,
-  approvalstatus, getLogs, headerStoresV2, teamsList, userList, checkNotificationCount } from '../controllers/gallery.controller.js';
+  approvalstatus, getLogs, headerStoresV2, teamsList, userList, checkNotificationCount, vehicleCheckInUpdate } from '../controllers/gallery.controller.js';
 import express from 'express';
 export const galleryRouter = express.Router();
 import { validate, isAllowedSessionHandler, isAllowedClient, getAssinedStore } from 'tango-app-api-middleware';
@@ -32,4 +32,5 @@ galleryRouter
     .post( '/headerStores_v2', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateHeaderParamsv2 ), getAssinedStore, headerStoresV2 )
     .get( '/teamsList', isAllowedSessionHandler, isAllowedClient, teamsList )
     .post( '/userList', isAllowedSessionHandler, isAllowedClient, userList )
-    .post( '/checkNotificationCount', isAllowedSessionHandler, getAssinedStore, checkNotificationCount );
+    .post( '/checkNotificationCount', isAllowedSessionHandler, getAssinedStore, checkNotificationCount )
+    .post( '/vehicleCheckInUpdate', isAllowedSessionHandler, vehicleCheckInUpdate );

package/src/routes/internalTraxApi.router.js

@@ -24,7 +24,6 @@ internalTraxRouter
     .post( '/sendPushNotification', isAllowedInternalAPIHandler, internalController.internalSendPushNotification )
     .post( '/sendAiPushNotification', isAllowedInternalAPIHandler, internalController.internalAISendPushNotification )
     .post( '/getLiveChecklistClients', isAllowedInternalAPIHandler, internalController.getLiveChecklistClients )
-    .post( '/notificationCreate', isAllowedInternalAPIHandler, internalController.notificationCreate )
-    .post( '/insertAINotification', isAllowedInternalAPIHandler, internalController.insertAINotification );
+    .post( '/notificationCreate', isAllowedInternalAPIHandler, internalController.notificationCreate );
 
 

package/src/services/checklistQuestion.service.js

@@ -28,8 +28,4 @@ export const aggregate = async ( query = {} ) => {
   return model.checklistquestionconfigModel.aggregate( query );
 };
 
-export const findSort = async ( query={}, field={}, sort = {} ) => {
-  return model.checklistquestionconfigModel.find( query, field ).sort( sort );
-};
-