tango-app-api-trax 3.9.41 → 3.9.42

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.41",
+    "version": "3.9.42",
     "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.17",
+        "tango-api-schema": "^2.6.23",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -931,7 +931,7 @@ async function insertData( requestData ) {
                 },
               } );
               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', 'employeemonitoring' ].includes( getCLconfig.checkListType ) ) {
+              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', 'employeemonitoring', 'activitymonitoring' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -1226,11 +1226,11 @@ async function insertData( requestData ) {
                         // }
                       }
                     } 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', 'employeemonitoring' ].includes( getCLconfig.checkListType ) ) {
+                      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', 'employeemonitoring', 'activitymonitoring' ].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', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection', 'employeemonitoring' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
+                        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', 'employeemonitoring', 'activitymonitoring' ].includes( getCLconfig.checkListType ) ) ? { 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', 'employeemonitoring' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection', 'employeemonitoring', 'activitymonitoring' ].includes( getCLconfig.checkListType ) ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -2790,7 +2790,7 @@ export async function countUpdateRunAI( req, res ) {
     };
 
     // complianceCount is already populated for the other answer types; add the image/video scores on top.
-    let userComplianceTotal = getDetails.userComplianceCount || 0;
+    let userComplianceTotal = 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)
@@ -2809,26 +2809,31 @@ export async function countUpdateRunAI( req, res ) {
 
     getDetails.questionAnswers.forEach( ( section ) => {
       section.questions.forEach( ( question ) => {
-        if ( question.compliance && [ 'image', 'image/video' ].includes( question.answerType ) && question?.answers?.[0]?.multiReferenceImage?.some( ( img ) => img.runAI ) ) {
-          // 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;
-          } );
-
+        if ( question.compliance ) {
+          let score = 0;
+          if ( [ 'image', 'image/video' ].includes( question.answerType ) && question?.answers?.[0]?.multiReferenceImage?.some( ( img ) => img.runAI ) ) {
+            // 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 );
+            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;
+            } );
+          } else {
+            const scores = ( question.userAnswer || [] ).map( ( ua ) => ua.complianceScore ?? 0 );
+            score = scores.length ? Math.max( ...scores ) : 0;
+          }
           userComplianceTotal += score;
         }
       } );