tango-app-api-trax 3.6.0-task-2 → 3.6.0-task-4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.6.0-task-2",
+    "version": "3.6.0-task-4",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/download.controller.js

@@ -18,11 +18,6 @@ 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';
 
@@ -44,55 +39,60 @@ export const downloadInsert = async ( req, res ) => {
       }
     }
     // console.log( requestData );
-
-    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 );
-      }
-    }
+    // // 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.fileType == 'pdf' ) {
       if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id != '' ) {

package/src/controllers/internalTrax.controller.js

@@ -295,6 +295,11 @@ 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 ) {
@@ -302,7 +307,9 @@ 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 );
                   }
                 }
@@ -863,6 +870,11 @@ 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 ) {
@@ -2462,3 +2474,43 @@ 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

@@ -155,15 +155,19 @@ export async function startChecklist( req, res ) {
 
     let updateData = {};
     let currentDateTime;
-    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 ( 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 ( storeTimeZone?.storeProfile?.timeZone ) {
         currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
       } else {
         currentDateTime = dayjs();
       }
     } else {
-      currentDateTime = dayjs();
+      if ( requestData.currentTime && requestData.currentTime !='' ) {
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+      } else {
+        currentDateTime = dayjs();
+      }
     }
     updateData.checklistStatus = 'inprogress';
     updateData.startMobileTime = requestData?.currentTime;
@@ -347,13 +351,29 @@ 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();
+      }
+    } else {
+      if ( requestData.currentTime && requestData.currentTime !='' ) {
+        currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
+      } else {
+        currentDateTime = dayjs();
+      }
+    }
 
 
     let updatedNewData;
@@ -1804,8 +1824,8 @@ export async function submitChecklist( req, res ) {
 
       let currentDateTime;
       let storeTimeZone;
-      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 ( 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 ( storeTimeZone?.storeProfile?.timeZone ) {
           currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
         } else {
@@ -2024,7 +2044,7 @@ export async function submitTask( req, res ) {
 
     if ( updateResult.modifiedCount > 0 ) {
       if ( submittype === 'submit' ) {
-        const excludedChecklists = [ 'Store Hygiene Check', 'EyeTest QR Verification' ];
+        const excludedChecklists = [ 'Store Hygiene Check' ];
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
           const query1 = [
             {
@@ -2236,6 +2256,8 @@ export async function submiteyeTestTask( req, res ) {
 
     if ( updateResult.modifiedCount > 0 ) {
       if ( submittype === 'submit' ) {
+        // const excludedChecklists = [ 'Store Hygiene Check' ];
+        // if ( !excludedChecklists.includes( checklist.checkListName ) ) {
         const query1 = [
           {
             $match: {
@@ -2262,6 +2284,7 @@ export async function submiteyeTestTask( req, res ) {
             await processedTask.deleteMany( { _id: { $in: deleteIds } } );
           }
         }
+        // }
       } else if ( submittype === 'draft' ) {
         const query2 = [
           {

package/src/controllers/trax.controller.js

@@ -402,7 +402,8 @@ export const getConfigDetails = async ( req, res ) => {
         checkListId: storechecklistdetails._id,
         isdeleted: false,
       };
-      let questionDetails = await questionService.find( query );
+      let sectionSort = { sectionNumber: 1 };
+      let questionDetails = await questionService.findSort( query, {}, sectionSort );
       if ( questionDetails.length ) {
         let sections = [];
         let bucket = JSON.parse( process.env.BUCKET );
@@ -738,7 +739,7 @@ export const duplicateChecklist = async ( req, res ) => {
         }
         await assignedService.insertMany( users );
       }
-      let sectionList = await questionService.find( { checkListId: checkDetails._id, client_id: req.query.clientId, isdeleted: false } );
+      let sectionList = await questionService.findSort( { checkListId: checkDetails._id, client_id: req.query.clientId, isdeleted: false }, {}, { sectionNumber: 1 } );
       if ( sectionList.length ) {
         let sections= [];
         for ( let i = 0; i < sectionList.length; i++ ) {
@@ -810,7 +811,7 @@ export const update = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
-    let getExistQuestions = await questionService.find( { checkListId: req.params.checklistId, client_id: req.body.clientId } );
+    let getExistQuestions = await questionService.findSort( { checkListId: req.params.checklistId, client_id: req.body.clientId }, {}, { sectionNumber: 1 } );
 
     inputBody.sections.forEach( async ( element ) => {
       if ( !element.questions.length && inputBody.submitType == 'configure' ) {
@@ -2969,6 +2970,11 @@ 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 ) {
@@ -2978,6 +2984,7 @@ 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,6 +728,7 @@ export const userPerformance = async ( req, res ) => {
         userEmail: 1,
         userName: 1,
         questionCount: 1,
+        redoStatus: 1,
       },
     } );
 
@@ -745,6 +746,7 @@ export const userPerformance = async ( req, res ) => {
         submittedChecklistQuestionCount: {
           $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] },
         },
+        redo: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
       },
     } );
 
@@ -816,6 +818,7 @@ 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 || '--',
@@ -1694,7 +1697,7 @@ export const checklistInfo = async ( req, res ) => {
           exportdata.push( {
             'Date': element.date_string || '--',
             'Store Name': element.storeName || '--',
-            'Checklist Owner': element.userName || '--',
+            'User Name': element.userName || '--',
             'Status': element.checklistStatus || '--',
             'Submitted By': element.userName || '--',
             'Submitted On': element.submitTime_string || '--',
@@ -1705,7 +1708,7 @@ export const checklistInfo = async ( req, res ) => {
         } else if ( requestData.groupByType==='Store' ) {
           exportdata.push( {
             'CheckList Name': element.checkListName || '--',
-            'Checklist Owner': element.userName || '--',
+            'User Name': element.userName || '--',
             'Status': element.checklistStatus || '--',
             'Submitted By': element.userName || '--',
             'Submitted On': element.submitTime_string || '--',
@@ -1719,7 +1722,7 @@ export const checklistInfo = async ( req, res ) => {
             'Date': element.date_string || '--',
             'CheckList Name': element.checkListName || '--',
             'Store Name': element.storeName || '--',
-            'Checklist Owner': element.userName || '--',
+            'User Name': element.userName || '--',
             'Status': element.checklistStatus || '--',
             'Submitted On': element.submitTime_string || '--',
             'Flags': element.flaggedChecklist || '--',

package/src/routes/internalTraxApi.router.js

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

package/src/services/checklistQuestion.service.js

@@ -28,4 +28,8 @@ 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 );
+};
+