tango-app-api-trax 3.9.22 → 3.9.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.22",
+    "version": "3.9.24",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -30,7 +30,7 @@
         "path": "^0.12.7",
         "puppeteer": "^24.39.1",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.6.6",
+        "tango-api-schema": "^2.6.12",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -325,7 +325,7 @@ export async function PCLconfigCreation( req, res ) {
                 },
               } );
               let getSections = await CLquestions.aggregate( sectionQuery );
-              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection' ].includes( getCLconfig.checkListType ) ) {
+              if ( getSections.length || getCLconfig.checkListType != 'custom' ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -624,6 +624,7 @@ export async function PCLconfigCreation( req, res ) {
                         element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
                         element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
                         element4.videoUploadTimeLimit = getCLconfig?.videoUploadTimeLimit || 0;
+                        element4.userVerification = getCLconfig?.userVerification;
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -651,11 +652,11 @@ export async function PCLconfigCreation( req, res ) {
                       // }
                       }
                     } else {
-                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection' ].includes( getCLconfig.checkListType ) ) {
+                      if ( getCLconfig.checkListType != 'custom' ) {
                         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', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
+                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( getCLconfig.checkListType != 'custom' ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection' ].includes( getCLconfig.checkListType ) ) {
+                        if ( getCLconfig.checkListType != 'custom' ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -689,7 +690,7 @@ export async function PCLconfigCreation( req, res ) {
                           client_id: getCLconfig.client_id,
                           aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => store.store_id ) : [],
                         };
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection' ].includes( getCLconfig.checkListType ) ) {
+                        if ( getCLconfig.checkListType != 'custom' ) {
                           let processData = {
                             aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => {
                               return { storeName: store.storeName, storeId: store.store_id, events: store.events };
@@ -2700,10 +2701,57 @@ export async function countUpdateRunAI( req, res ) {
       runAIFlag: req.body.runAICount,
     };
 
+    // complianceCount is already populated for the other answer types; add the image/video scores on top.
+    let complianceCount = getDetails.userComplianceCount || 0;
+
+    // Pull every "Matched/Not Matched" verdict out of a runAIData array, tolerating both shapes we store:
+    //   1) [ { answerImage, results: [ { featureName, value } ] } ]  (verdict nested under results)
+    //   2) [ { featureName, value } ]                                (flat verdict)
+    const extractMatchValues = ( runAIData ) => {
+      if ( !Array.isArray( runAIData ) ) return [];
+      const values = [];
+      runAIData.forEach( ( entry ) => {
+        const results = Array.isArray( entry?.results ) ? entry.results : [ entry ];
+        results.forEach( ( r ) => {
+          if ( r?.featureName === 'Matched/Not Matched' ) values.push( r?.value );
+        } );
+      } );
+      return values;
+    };
+
+    getDetails.questionAnswers.forEach( ( section ) => {
+      section.questions.forEach( ( question ) => {
+        if ( question.compliance && [ 'image', 'image/video' ].includes( question.answerType ) ) {
+          // For 'image/video' each userAnswer carries its own answerType and runAIData only lives on
+          // the image entries; a pure 'image' question keeps runAIData directly on every userAnswer.
+          const aiAnswers = question.answerType === 'image/video' ?
+            ( question.userAnswer || [] ).filter( ( ua ) => ua?.answerType === 'image' ) :
+            ( question.userAnswer || [] );
+
+          // Compliance comes from the first configured answer: every "Matched/Not Matched" verdict
+          // across the image answers must be True to count as matched, otherwise it's not matched.
+          const matchValues = aiAnswers.flatMap( ( ua ) => extractMatchValues( ua?.runAIData ) );
+          const allMatched = matchValues.length > 0 && matchValues.every( ( v ) => v === 'True' || v === true );
+          const score = allMatched ?
+            ( question.answers?.[0]?.matchedCount ?? 0 ) :
+            ( question.answers?.[0]?.notMatchedCount ?? 0 );
+
+          // Persist the derived score back onto each userAnswer so PDF/dashboard reads stay consistent.
+          ( question.userAnswer || [] ).forEach( ( ua ) => {
+            ua.complianceScore = score;
+          } );
+
+          complianceCount += score;
+        }
+      } );
+    } );
+
+    updateData.complianceCount = complianceCount;
+
     await processedchecklist.updateOne( { _id: req.body.id }, updateData );
     return res.sendSuccess( 'RunAI Count updated successfully' );
   } catch ( e ) {
-    logger.error( { functionName: 'updateRunAI', error: e } );
+    logger.error( { functionName: 'countUpdateRunAI', error: e } );
     return res.sendError( e, 500 );
   }
 }
@@ -3532,6 +3580,7 @@ export async function runAIFlag( req, res ) {
   try {
     let checklistDetails = await CLconfig.find( {
       publish: true,
+      client_id: '467',
       runAIQuestionCount: { $ne: 0 },
       $expr: {
         $gt: [
@@ -3540,47 +3589,38 @@ export async function runAIFlag( req, res ) {
         ],
       },
     }, { _id: 1, notifyFlags: 1, approver: 1 } );
-    let date = dayjs().subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
+    let date = dayjs().format( 'YYYY-MM-DD' );
     if ( checklistDetails.length ) {
       await Promise.all( checklistDetails.map( async ( ele ) => {
-        let submitDetails = await processedchecklist.find( { sourceCheckList_id: ele._id, checklistStatus: 'submit', date_string: date }, { storeName: 1, checkListName: 1, questionAnswers: 1 } );
+        let submitDetails = await processedchecklist.find( { sourceCheckList_id: ele._id, date_string: date }, { storeName: 1, checkListName: 1, userName: 1, submitTime_string: 1, runAIFlag: 1, questionFlag: 1, checklistStatus: 1 } );
+        let emailList = ele?.notifyFlags?.notifyType.includes( 'approver' ) ? ele.approver.map( ( approver ) => approver?.value ): [];
+        emailList = [ ...emailList, ...ele?.notifyFlags?.users?.map( ( user ) => user?.value ) ];
         await Promise.all( submitDetails.map( ( store ) => {
-          if ( store.questionAnswers.length ) {
-            let runAIFlag = 0;
-            store.questionAnswers.forEach( ( section ) => {
-              section.questions.forEach( ( question ) => {
-                if ( question.answerType == 'image' && ( question?.userAnswer?.[0]?.runAIData?.value == 'False' || !question?.userAnswer?.[0]?.runAIData?.value ) ) {
-                  runAIFlag++;
-                }
-              } );
-            } );
-            if ( runAIFlag ) {
-              let emailList = ele?.notifyFlags?.notifyType.includes( 'approver' ) ? ele.approver.map( ( approver ) => approver?.value ): [];
-              emailList = [ ...emailList, ...ele?.notifyFlags?.users?.map( ( user ) => user?.value ) ];
-              let data = {
-                storeName: store.storeName,
-                flagCount: 1,
-                checklistName: store.checkListName?.trim(),
-                submittedBy: '--',
-                time: '--',
-                domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-                type: 'delay',
-              };
-              const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-              const htmlContent = handlebars.compile( fileContent );
-              const html = htmlContent( { data: data } );
-              emailList.forEach( ( email ) => {
-                let params = {
-                  toEmail: email,
-                  mailSubject: 'TangoEye | Checklist Flag',
-                  htmlBody: html,
-                  attachment: '',
-                  sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-                };
-                sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-              } );
-            }
-          }
+          let data = {
+            storeName: store.storeName,
+            flagCount: store?.runAIFlag + store?.questionFlag,
+            runAIFlag: store?.runAIFlag,
+            questionFlag: store?.questionFlag,
+            checklistName: store.checkListName?.trim(),
+            submittedBy: store?.userName,
+            time: store?.submitTime_string,
+            domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+            status: store.checklistStatus,
+          };
+          const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+          const htmlContent = handlebars.compile( fileContent );
+          const html = htmlContent( { data: data } );
+          emailList.forEach( ( email ) => {
+            console.log( email );
+            let params = {
+              toEmail: email,
+              mailSubject: 'TangoEye | Checklist Flag',
+              htmlBody: html,
+              attachment: '',
+              sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+            };
+            sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+          } );
         } ) );
       } ) );
     }

package/src/controllers/mobileTrax.controller.js

@@ -1586,7 +1586,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
     let CLQAnswers = getChecklistQA.questionAnswers;
 
     if ( requestData.submittype == 'submit' ) {
-      if ( getChecklistQA?.redoEdit ) {
+      if ( getChecklistQA?.redoEdit?.toString() != requestData?.redoEdit ) {
         requestData.submittype = 'draft';
       }
       reqAnswers.forEach( ( reqA ) => {
@@ -1677,6 +1677,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 let yn = [];
                 if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
                   for ( let k = 0; k < qaans.length; k++ ) {
+                    qaans[k].validationAnswer = '';
                     if ( requestSection[i].answer == qaans[k].answer ) {
                       if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
                         if ( requestSection[i].validationAnswer ) {
@@ -1696,6 +1697,9 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                       if ( requestSection[i]?.runAIData && requestSection[i]?.runAIData?.length ) {
                         qaans[k].runAIData = requestSection[i].runAIData;
                       }
+                      if ( requestSection[i]?.runAIAnswer ) {
+                        qaans[k].runAIAnswer = requestSection[i].runAIAnswer;
+                      }
                       yn.push( qaans[k] );
                     }
                   }
@@ -1737,6 +1741,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 };
                 structure.answers.forEach( ( ans ) => {
                   delete ans?.runAIData;
+                  delete ans?.runAIAnswer;
                 } );
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' || ( qaAnswers[j].answerType == 'dropdown' && !qaAnswers[j].allowMultiple ) ) {
@@ -1744,6 +1749,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 let ms = [];
                 if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
                   for ( let k = 0; k < qaans.length; k++ ) {
+                    qaans[k].validationAnswer = '';
                     if ( requestSection[i].answer == qaans[k].answer ) {
                       if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
                         if ( requestSection[i].validationAnswer ) {
@@ -1771,6 +1777,18 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                               };
                             }
                           }
+                          if ( requestSection[i]?.validationVideo?.length ) {
+                            for ( let video of requestSection[i].validationVideo ) {
+                              let validationAnswer = decodeURIComponent( video.split( '?' )[0] );
+                              if ( validationAnswer.length ) {
+                                let splitImgUrl = validationAnswer.split( '/' );
+                                if ( splitImgUrl.length > 1 ) {
+                                  splitImgUrl.splice( 0, 3 );
+                                  qaans[k].validationVideo.push( splitImgUrl.join( '/' ) || '' );
+                                }
+                              };
+                            }
+                          }
                         }
                         // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                         qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
@@ -1778,6 +1796,9 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                       if ( requestSection[i]?.runAIData && requestSection[i]?.runAIData?.length ) {
                         qaans[k].runAIData = requestSection[i].runAIData;
                       }
+                      if ( requestSection[i]?.runAIAnswer ) {
+                        qaans[k].runAIAnswer = requestSection[i].runAIAnswer;
+                      }
                       ms.push( qaans[k] );
                     }
                   }
@@ -1820,6 +1841,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 };
                 structure.answers.forEach( ( ans ) => {
                   delete ans?.runAIData;
+                  delete ans?.runAIAnswer;
                 } );
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' || ( qaAnswers[j].answerType == 'dropdown' && qaAnswers[j].allowMultiple ) ) {
@@ -1827,6 +1849,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 let mcmo = [];
                 if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit || ( getChecklistQA?.redoEdit && qaAnswers[j].answers.some( ( ans ) => ans.redo ) ) ) {
                   for ( let k = 0; k < qaans.length; k++ ) {
+                    qaans[k].validationAnswer = '';
                     let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
                     for ( let s = 0; s < separatedArray.length; s++ ) {
                       if ( ( separatedArray[s].answer == qaans[k].answer ) ) {
@@ -1849,6 +1872,9 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                           if ( separatedArray[s]?.runAIData && separatedArray[s]?.runAIData?.length ) {
                             qaans[k].runAIData = separatedArray[s].runAIData;
                           }
+                          if ( separatedArray[s]?.runAIAnswer ) {
+                            qaans[k].runAIAnswer = separatedArray[s].runAIAnswer;
+                          }
                           mcmo.push( qaans[k] );
                         }
                       }
@@ -1899,6 +1925,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 };
                 structure.answers.forEach( ( ans ) => {
                   delete ans?.runAIData;
+                  delete ans?.runAIAnswer;
                 } );
                 newArray.push( structure );
               } else if ( [ 'image/video', 'multipleImage' ].includes( qaAnswers[j].answerType ) ) {
@@ -1938,6 +1965,9 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                       if ( separatedArray[s]?.runAIData && separatedArray[s]?.runAIData?.length ) {
                         newAnswer.runAIData = separatedArray[s].runAIData;
                       }
+                      if ( separatedArray[s]?.runAIAnswer ) {
+                        newAnswer.runAIAnswer = separatedArray[s].runAIAnswer;
+                      }
                       mcmi.push( newAnswer );
                     }
                   }
@@ -2049,6 +2079,9 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                     if ( requestSection[i]?.runAIData && requestSection[i]?.runAIData?.length ) {
                       ansstructure.runAIData = requestSection[i].runAIData;
                     }
+                    if ( requestSection[i]?.runAIAnswer ) {
+                      ansstructure.runAIAnswer = requestSection[i].runAIAnswer;
+                    }
                     des.push( ansstructure );
                   }
                 }
@@ -2106,12 +2139,18 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
     logger.error( { message: requestData.questionAnswers, error: 'QuestionanswersPayload' } );
 
     if ( requestData.submittype == 'submit' ) {
+      requestData.userComplianceCount = 0;
       for ( let section of sectionFormat ) {
         for ( let question of section.questions ) {
           let mustValidate = !question.linkType || ( question.linkType && question.linkquestionenabled );
           if ( mustValidate && ( !question.userAnswer || !question.userAnswer.length ) ) {
             return res.sendError( 'Please Fill All Fields', 400 );
           }
+          if ( question.compliance ) {
+            const scores = ( question.userAnswer || [] ).map( ( ua ) => ua?.complianceScore ?? 0 );
+            let score = scores.length ? Math.max( ...scores ) : 0;
+            requestData.userComplianceCount += score;
+          }
         }
       }
     }
@@ -2755,6 +2794,7 @@ export async function submitChecklist( req, res ) {
         updateData.checklistStatus = 'submit';
         updateData.updatedAt = dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format();
         updateData.submitMobileTime = requestData?.currentTime;
+        updateData.userComplianceCount = requestData?.userComplianceCount;
       }
       // updateData.questionAnswers.forEach( ( section ) => {
       //   section.questions.forEach( ( question ) => {
@@ -2884,7 +2924,7 @@ export async function submitChecklist( req, res ) {
             }
           }
         }
-        if ( getchecklist?.[0]?.redoEdit ) {
+        if ( getchecklist?.[0]?.redoEdit?.toString() != requestData?.redoEdit ) {
           return res.sendSuccess( 'New Questions Added So,Checklist moved back to In Progress. Please complete the updated checklist.' );
         } else {
           return res.sendSuccess( 'Checklist Updated Successfully' );
@@ -4155,6 +4195,7 @@ export async function questionList( req, res ) {
         taskType: { $ifNull: [ '$planoType', '' ] },
         streamId: { $ifNull: [ '$streamId', '' ] },
         export: { $ifNull: [ '$export', false ] },
+        redoEdit: 1,
       },
     } );
 

package/src/controllers/teaxFlag.controller.js

@@ -2747,7 +2747,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection' ] } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection', 'vehicle_check_in' ] } },
             {
               runAIQuestionCount: { $gte: 1 },
             },
@@ -3051,7 +3051,7 @@ export const flagTablesV2 = async ( req, res ) => {
     }
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection' ] } } ] } );
+      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection', 'vehicle_check_in' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -3059,7 +3059,7 @@ export const flagTablesV2 = async ( req, res ) => {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { timeFlag: { $gte: 1 } } );
     } else if ( requestData?.filter === 'detection' ) {
-      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection' ] } } );
+      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection', 'vehicle_check_in' ] } } );
     } else if ( requestData?.filter === 'runAI' ) {
       if ( req.body.runAIChecklistName ) {
         findAndQuery.push( { checkListName: { $in: req.body.runAIChecklistName } } );
@@ -3200,6 +3200,7 @@ export const flagTablesV2 = async ( req, res ) => {
     } );
 
     let getTotalCount = await processedchecklistService.aggregate( findQuery );
+    console.log( getTotalCount );
     if ( !getTotalCount.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }

package/src/controllers/trax.controller.js

@@ -614,10 +614,13 @@ export const zoneList = async ( req, res ) => {
       'Employee Count Detection',
       'Staff Grouping Compliance',
       'Retail Shelf Monitoring',
+      'Store Mopping Compliance Checklist',
+      'Occupancy Detection',
     ];
     const allowedChecklistsStreams = [
       'Camera Angle Change Compliance',
     ];
+    console.log( allowedChecklists.includes( inputBody.checkListName ) );
 
     if ( inputBody.checkListName && allowedChecklists.includes( inputBody.checkListName ) ) {
       console.log( '==================' );
@@ -1912,7 +1915,6 @@ export const updateConfigure = async ( req, res ) => {
 
 export const updateConfigurev1 = async ( req, res ) => {
   try {
-    console.log( '123' );
     let inputBody = req.body;
     let id;
     let checklistDetails;
@@ -3970,6 +3972,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
         element4.videoUploadTimeLimit = getCLconfig?.videoUploadTimeLimit || 0;
         element4.complianceCount = getCLconfig?.complianceCount || 0;
+        element4.userVerification = getCLconfig?.userVerification;
         assignUserList.push( { ...element4 } );
       }
     } ) );
@@ -4134,7 +4137,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', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection', 'occupancydetection' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];

package/src/controllers/traxDashboard.controllers.js

@@ -276,29 +276,10 @@ export const checklistPerformance = async ( req, res ) => {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
-    let checklistIdList = [];
 
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset ) || 0;
 
-    const detectionPayload = {
-      'fromDate': requestData.fromDate,
-      'toDate': requestData.toDate,
-      'clientId': requestData.clientId,
-      'sortColumnName': requestData.sortColumnName,
-      'sortBy': requestData.sortBy,
-      'storeId': requestData.storeId,
-    };
-
-
-    let complianceURL = JSON.parse( process.env.LAMBDAURL ).complianceURL;
-    const complianceData = await LamdaServiceCall( complianceURL, detectionPayload );
-    if ( complianceData?.data?.length && requestData?.sortColumnName == 'questionCompliance' ) {
-      const end = skip + requestData?.limit;
-      checklistIdList = complianceData.data.slice( skip, end )?.map( ( ele ) => ele?.sourceCheckList_id );
-    }
-
-
     // 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 );
@@ -314,10 +295,6 @@ export const checklistPerformance = async ( req, res ) => {
         { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
     );
 
-    if ( requestData?.sortColumnName == 'questionCompliance' ) {
-      findAndQuery.push( { sourceCheckList_id: { $in: checklistIdList } } );
-    }
-
     findQuery.push( { $match: { $and: findAndQuery } } );
 
     if ( requestData.searchValue && requestData.searchValue != '' ) {
@@ -367,6 +344,16 @@ export const checklistPerformance = async ( req, res ) => {
         timeFlag: { $sum: '$timeFlag' },
         questionFlagCount: { $sum: '$questionFlag' },
         runAIFlagCount: { $sum: '$runAIFlag' },
+        userComplianceCountTotal: {
+          $sum: {
+            $cond: [
+              { $eq: [ '$checklistStatus', 'submit' ] },
+              { $ifNull: [ '$userComplianceCount', 0 ] },
+              0,
+            ],
+          },
+        },
+        complianceCount: { $first: '$complianceCount' },
         checkListType: { $last: '$checkListType' },
         redo: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
         task: {
@@ -426,6 +413,36 @@ export const checklistPerformance = async ( req, res ) => {
         checkListType: 1,
         redo: 1,
         task: 1,
+        questionCompliance: {
+          $let: {
+            vars: {
+              divisor: {
+                $cond: [
+                  { $gt: [ '$submittedChecklist', 1 ] },
+                  { $multiply: [ { $ifNull: [ '$complianceCount', 0 ] }, '$submittedChecklist' ] },
+                  { $ifNull: [ '$complianceCount', 0 ] },
+                ],
+              },
+            },
+            in: {
+              $cond: [
+                { $gt: [ '$$divisor', 0 ] },
+                {
+                  $round: [
+                    {
+                      $multiply: [
+                        { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
+                        100,
+                      ],
+                    },
+                    0,
+                  ],
+                },
+                0,
+              ],
+            },
+          },
+        },
       },
     } );
 
@@ -450,14 +467,6 @@ export const checklistPerformance = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
-    getChecklistPerformanceData?.[0]?.data.forEach( ( ele ) => {
-      let findCompliance;
-      if ( complianceData?.data?.length ) {
-        findCompliance = complianceData?.data?.find( ( data ) => data.sourceCheckList_id == ele?.sourceCheckList_id );
-      }
-      ele['questionComplianceRate'] = findCompliance?.compliancePercentage ?? 0;
-    } );
-
     if ( requestData.export ) {
       const exportdata = [];
       getChecklistPerformanceData[0].data.forEach( ( element ) => {
@@ -4335,26 +4344,26 @@ function escapeRegex( text ) {
 //   }
 // }
 
-async function LamdaServiceCall( url, data ) {
-  try {
-    const requestOptions = {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify( data ),
-    };
-    console.log( data );
-    const response = await fetch( url, requestOptions );
-    if ( !response.ok ) {
-      throw new Error( `Response status: ${response.status}` );
-      return false;
-    }
-    const json = await response.json();
-    return json;
-  } catch ( error ) {
-    console.log( error );
-    logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
-    return false;
-  }
-}
+// async function LamdaServiceCall( url, data ) {
+//   try {
+//     const requestOptions = {
+//       method: 'POST',
+//       headers: {
+//         'Content-Type': 'application/json',
+//       },
+//       body: JSON.stringify( data ),
+//     };
+//     console.log( data );
+//     const response = await fetch( url, requestOptions );
+//     if ( !response.ok ) {
+//       throw new Error( `Response status: ${response.status}` );
+//       return false;
+//     }
+//     const json = await response.json();
+//     return json;
+//   } catch ( error ) {
+//     console.log( error );
+//     logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
+//     return false;
+//   }
+// }