tango-app-api-trax 3.5.2-alpha-6 → 3.5.2-alpha-8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.5.2-alpha-6",
+    "version": "3.5.2-alpha-8",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -286,7 +286,8 @@ export async function approveChecklist( req, res ) {
     toDate.setUTCHours( 23, 59, 59, 59 );
     let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
     if ( req.body?.storeId?.length ) {
-      query['store_id'] = { $in: req.body.storeId };
+      const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
+      query['store_id'] = { $in: filteredStoreIds };
     }
     let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1, checkListName: 1 } );
     if ( !checklistDetails.length ) {
@@ -324,7 +325,7 @@ export async function approveChecklist( req, res ) {
             approvalByEmail: req.user.email,
           },
         };
-
+        console.log( params );
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -334,6 +335,8 @@ export async function approveChecklist( req, res ) {
         };
         let url = JSON.parse( process.env.LAMBDAURL );
         let searchResponse = await fetch( url.approveChecklist, requestOptions );
+        console.log( searchResponse );
+        const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
         let logData= {
           'client_id': checklistDetails[0].client_id,
           'createAt': new Date(),
@@ -351,6 +354,7 @@ export async function approveChecklist( req, res ) {
             'approved': storeNames,
           },
           'userType': req.user.userType,
+          'requestedStores': filteredStoreIds,
         };
         console.log( 'logData', logData );
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );

package/src/controllers/internalTrax.controller.js

@@ -296,7 +296,7 @@ export async function PCLconfigCreation( req, res ) {
                 },
               } );
               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 || [ '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 ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -591,7 +591,7 @@ export async function PCLconfigCreation( req, res ) {
                       // }
                       }
                     } else {
-                      if ( [ '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 ( [ '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 ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
                         let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );
@@ -864,7 +864,7 @@ async function insertData( requestData ) {
                 },
               } );
               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 || [ '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 ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -1158,7 +1158,7 @@ async function insertData( requestData ) {
                         // }
                       }
                     } else {
-                      if ( [ '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 ( [ '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 ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
                         let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );

package/src/controllers/trax.controller.js

@@ -3821,7 +3821,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo','vehicle_check_in' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];

package/src/controllers/traxDashboard.controllers.js

@@ -2947,13 +2947,13 @@ export const overallComparisonCardsV1 = async ( req, res ) => {
       processedchecklistService.aggregate( rangeTwoFindQuery ),
     ] );
 
-    console.log( 'rangeOneFromDate =>', rangeOneFromDate );
-    console.log( 'rangeOneToDate =>', rangeOneToDate );
-    console.log( 'rangeOneData =>', rangeOneData );
+    // console.log( 'rangeOneFromDate =>', rangeOneFromDate );
+    // console.log( 'rangeOneToDate =>', rangeOneToDate );
+    // console.log( 'rangeOneData =>', rangeOneData );
 
-    console.log( 'rangeTwoFromDate =>', rangeTwoFromDate );
-    console.log( 'rangeTwoToDate =>', rangeTwoToDate );
-    console.log( 'rangeTwoData =>', rangeTwoData );
+    // console.log( 'rangeTwoFromDate =>', rangeTwoFromDate );
+    // console.log( 'rangeTwoToDate =>', rangeTwoToDate );
+    // console.log( 'rangeTwoData =>', rangeTwoData );
 
     if ( rangeOneData.length >0 && rangeTwoData.length >0 ) {
       overallComparisonCards.flags.comparisonData = Math.round( ( ( ( rangeOneData[0].flaggedChecklist - rangeTwoData[0].flaggedChecklist )/rangeTwoData[0].flaggedChecklist )*100 ) ); // .toFixed( 2 )

package/src/routes/gallery.routes.js

@@ -22,7 +22,7 @@ galleryRouter
 
 
 galleryRouter
-    .post( '/updateApprove', isAllowedSessionHandler, approveChecklist )
+    .post( '/updateApprove', isAllowedSessionHandler, getAssinedStore, approveChecklist )
     .post( '/redo', isAllowedSessionHandler, redoChecklist )
     .post( '/multiredo', isAllowedSessionHandler, redomultiChecklist )
     .post( '/approvalstatus', isAllowedSessionHandler, approvalstatus )