tango-app-api-trax 3.9.64 → 3.9.66

package/package.json

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

package/src/controllers/teaxFlag.controller.js

@@ -455,7 +455,7 @@ export const flagCardsV1 = async ( req, res ) => {
           {
             client_id: clientId,
             publish: true,
-            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring', 'unattendeddetection' ] },
+            checkListType: { $ne: 'custom' },
           },
           { checkListType: 1 },
       ),
@@ -472,7 +472,6 @@ export const flagCardsV1 = async ( req, res ) => {
     flagCards.totalFlag = flagCards.questionFlag.count + flagCards.delayInSubmission.count;
 
     const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
-
     if ( resultData && resultData.status_code === '200' ) {
       published.forEach( ( item ) => {
         if ( resultData[item] ) {
@@ -591,7 +590,7 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
           {
             client_id: requestData.clientId,
             publish: true,
-            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'employeeCount', 'employeemonitoring', 'activitymonitoring' ] },
+            checkListType: { $ne: 'custom' },
           },
           { checkListType: 1 },
       );
@@ -660,7 +659,10 @@ export const flagTablesV1 = async ( req, res ) => {
     );
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'employeeCount', 'employeemonitoring', 'activitymonitoring' ] } } ] } );
+      // 'all' = every checklist type (custom + all detection types); $eq|$ne 'custom'
+      // spans both. Needs the '$' prefix — 'eq'/'ne' without it matches literally
+      // nothing, which is why the 'all' filter returned no rows.
+      findAndQuery.push( { $or: [ { checkListType: { $eq: 'custom' } }, { checkListType: { $ne: 'custom' } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -668,7 +670,7 @@ export const flagTablesV1 = 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', 'employeeCount', 'employeemonitoring', 'activitymonitoring' ] } } );
+      findAndQuery.push( { checkListType: { $ne: 'custom' } } );
     } else if ( requestData?.filter === 'runAI' ) {
       findAndQuery.push( { runAIQuestionCount: { $gte: 1 } } );
     }
@@ -2232,6 +2234,7 @@ export const flagTablesV2 = async ( req, res ) => {
         correctAnswers: { $subtract: [ '$submittedQuestionCount', '$questionFlag' ] },
         customQuestionFlagCount: '$questionFlag',
         customTimeFlagCount: '$timeFlag',
+        submittedChecklist: 1,
         aiStoreList: 1,
         runAIQuestionCount: 1,
       },
@@ -2266,6 +2269,7 @@ export const flagTablesV2 = async ( req, res ) => {
         },
         customQuestionFlagCount: 1,
         customTimeFlagCount: 1,
+        submittedChecklist: 1,
         aiStoreList: 1,
         runAIQuestionCount: 1,
       },
@@ -2276,23 +2280,12 @@ export const flagTablesV2 = async ( req, res ) => {
     //   return res.sendError( { error: 'No Data Found' }, 204 );
     // }
 
-    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
-      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
-    } else {
-      findQuery.push( { $sort: { ['submittedChecklist']: -1 } } );
-    }
-
-    findQuery.push( {
-      $facet: {
-        total: [
-          { $count: 'count' },
-        ],
-
-        data: [
-          { $skip: skip }, { $limit: limit },
-        ],
-      },
-    } );
+    // Detection / runAI / all flag values (flaggedStores, flagCount,
+    // complianceRate, assignedStores) are merged from the Lambda AFTER this
+    // aggregation, so sorting and pagination are done in JS post-merge (below).
+    // Sorting here would order rows by stale pre-Lambda values — the bug this
+    // fixes. One row per checklist keeps the in-memory set small.
+    findQuery.push( { $sort: { ['submittedChecklist']: -1 } } );
 
     // The detection Lambda only needs request params (not the aggregation result),
     // so fire it concurrently with the Mongo aggregation instead of after it.
@@ -2313,12 +2306,11 @@ export const flagTablesV2 = async ( req, res ) => {
       mayNeedLambda ? LamdaServiceCall( LamdaURL, detectionPayload ) : Promise.resolve( null ),
     ] );
 
-    if ( !getChecklistPerformanceData?.[0]?.total?.[0]?.count ) {
+    if ( !getChecklistPerformanceData?.length ) {
       return res.sendError( 'No data found', 204 );
     }
 
-    let getTotalCount = getChecklistPerformanceData?.[0]?.total?.[0]?.count;
-    getChecklistPerformanceData = getChecklistPerformanceData?.[0]?.data;
+    let getTotalCount = getChecklistPerformanceData.length;
     if ( getChecklistPerformanceData.length ) {
       const detectionChecklists = getChecklistPerformanceData?.filter( ( val ) => val?.checkListType !== 'custom' );
 
@@ -2368,6 +2360,38 @@ export const flagTablesV2 = async ( req, res ) => {
       }
     }
 
+    // Sort in JS AFTER the Lambda merge so detection / runAI / all rows order by
+    // their real (merged) flaggedStores / flagCount / complianceRate / assignedStores
+    // instead of the stale pre-merge values. Numeric columns (incl. complianceRate,
+    // which is a fixed-point string) compare numerically; text columns fall back to locale.
+    // The UI sends some columns as display labels (e.g. 'Compliance') rather than the
+    // data field name, so map those to the real keys; raw field names pass through.
+    const SORT_FIELD_MAP = {
+      'Compliance': 'complianceRate',
+      'Checklist Name': 'checkListName',
+      'Coverage': 'coverage',
+      'Assigned Stores': 'assignedStores',
+      'Flagged Stores': 'flaggedStores',
+      'Question Flags': 'customQuestionFlagCount',
+      'Not Submitted Flags': 'customTimeFlagCount',
+      'Detection Flags': 'flagCount',
+      'Flags': 'flagCount',
+    };
+    const sortColumnName = SORT_FIELD_MAP[requestData.sortColumnName] || requestData.sortColumnName;
+    if ( sortColumnName && sortColumnName != '' && requestData.sortBy && requestData.sortBy != '' ) {
+      const sortDir = parseInt( requestData.sortBy, 10 ) === -1 ? -1 : 1;
+      getChecklistPerformanceData.sort( ( a, b ) => {
+        const av = a?.[sortColumnName];
+        const bv = b?.[sortColumnName];
+        const an = typeof av === 'number' ? av : parseFloat( av );
+        const bn = typeof bv === 'number' ? bv : parseFloat( bv );
+        if ( !Number.isNaN( an ) && !Number.isNaN( bn ) ) return ( an - bn ) * sortDir;
+        return String( av ?? '' ).localeCompare( String( bv ?? '' ) ) * sortDir;
+      } );
+    } else {
+      getChecklistPerformanceData.sort( ( a, b ) => ( b?.submittedChecklist || 0 ) - ( a?.submittedChecklist || 0 ) );
+    }
+
     if ( requestData.export ) {
       const exportdata = [];
       getChecklistPerformanceData.forEach( ( element ) => {
@@ -2426,7 +2450,8 @@ export const flagTablesV2 = async ( req, res ) => {
     }
 
     result.totalCount = getTotalCount;
-    result.checklistPerformance = getChecklistPerformanceData;
+    // Paginate in JS now that the full set is sorted by the merged values.
+    result.checklistPerformance = getChecklistPerformanceData.slice( skip, skip + limit );
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );