tango-app-api-trax 3.9.59 → 3.9.61

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.59",
+    "version": "3.9.61",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -31,7 +31,7 @@
         "puppeteer": "^24.39.1",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.6.30",
-        "tango-app-api-middleware": "^3.5.2",
+        "tango-app-api-middleware": "^3.6.19",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/teaxFlag.controller.js

@@ -2027,7 +2027,7 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       if ( resultData?.status_code === '200' ) {
         let result = 0;
         let ai = 0;
-        if ( !publishedAiChecklists?.length ) {
+        if ( publishedAiChecklists?.length ) {
           published.forEach( ( item ) => {
             if ( resultData[item] ) {
               result += resultData[item];

package/src/controllers/trax.controller.js

@@ -12,6 +12,7 @@ import * as processedchecklistConfig from '../services/processedchecklistconfig.
 import * as processedchecklist from '../services/processedchecklist.services.js';
 // import * as checklistLogs from '../services/checklistlog.service.js';
 import * as tagService from '../services/tagging.service.js';
+import * as cameraService from '../services/camera.service.js';
 import * as alertsServices from '../services/clientRequest.service.js';
 import * as traxApprover from '../services/approver.service.js';
 const ObjectId = mongoose.Types.ObjectId;
@@ -651,11 +652,50 @@ export const zoneList = async ( req, res ) => {
       ];
       let zoneList = await tagService.aggregate( query );
 
-      if ( !zoneList.length ) {
+
+      let cameraQuery = [
+        {
+          $match: {
+            'clientId': inputBody.clientId,
+            'taggedChecklist.checkListName': inputBody.checkListName,
+          },
+        },
+        // taggedChecklist is an array of objects → unwind to one element per doc
+        { $unwind: '$taggedChecklist' },
+        // keep only the elements matching the requested checklist
+        {
+          $match: {
+            'taggedChecklist.checkListName': inputBody.checkListName,
+          },
+        },
+        {
+          $project: {
+            _id: 0,
+            zone: '$taggedChecklist.checkListName', // expose checkListName under the same `zone` key
+          },
+        },
+        {
+          $group: {
+            _id: '',
+            zone: { $addToSet: '$zone' },
+          },
+        },
+        {
+          $project: {
+            _id: 0,
+            zone: 1,
+          },
+        },
+      ];
+      let cameraList = await cameraService.aggregate( cameraQuery );
+
+      let mergedData = [ ...zoneList, ...cameraList ];
+
+      if ( !mergedData.length ) {
         return res.sendError( 'no data found', 204 );
       }
 
-      return res.sendSuccess( zoneList );
+      return res.sendSuccess( mergedData );
     } else if ( inputBody.checkListName && allowedChecklistsStreams.includes( inputBody.checkListName ) ) {
       return res.sendSuccess( [ { zone: 'Camera Angle Change Compliance' } ] );
     } else {
@@ -686,7 +726,7 @@ export const zoneList = async ( req, res ) => {
   }
 };
 
-async function createUser( data ) {
+export async function createUser( data ) {
   try {
     let params = {
       userName: data.userName,

package/src/controllers/traxDashboard.controllers.js

@@ -428,11 +428,16 @@ export const checklistPerformance = async ( req, res ) => {
               $cond: [
                 { $gt: [ '$$divisor', 0 ] },
                 {
-                  $round: [
+                  $max: [
                     {
-                      $multiply: [
-                        { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
-                        100,
+                      $round: [
+                        {
+                          $multiply: [
+                            { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
+                            100,
+                          ],
+                        },
+                        0,
                       ],
                     },
                     0,