tango-app-api-trax 3.9.66 → 3.9.68

package/package.json

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

package/src/controllers/gallery.controller.js

@@ -451,7 +451,7 @@ export async function redoChecklist( req, res ) {
 
     let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
 
-    let data = { ...question[sectionIndex].questions[findQuestion], redo: true, ...( !req.body.payload?.answerIndex && { redoComment: req.body.payload?.checklistDescription || '' } ) };
+    let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoCount: ( question[sectionIndex].questions[findQuestion]?.redoCount || 0 ) + 1, ...( !req.body.payload?.answerIndex && { redoComment: req.body.payload?.checklistDescription || '' } ) };
     let answerIndex = req.body.payload?.answerIndex;
     let isSingleAnswerRedo = answerIndex != null;
 
@@ -575,7 +575,7 @@ export async function redoChecklist( req, res ) {
         type: checklistDetails.checkListType,
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
-        initiatedTime: dayjs.utc( ).format(),
+        initiatedTime: dayjs().format(),
         answerType: question[sectionIndex].questions[findQuestion].answerType,
         submitedBy: checklistDetails.userName,
         submitTime: dayjs.utc( checklistDetails.submitTime ).format(),
@@ -667,7 +667,7 @@ export async function redomultiChecklist( req, res ) {
 
       let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
 
-      let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.showcomment ? req.body.payload?.checklistDescription : findcomment?.Comments };
+      let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoCount: ( question[sectionIndex].questions[findQuestion]?.redoCount || 0 ) + 1, redoComment: req.body.payload?.showcomment ? req.body.payload?.checklistDescription : findcomment?.Comments };
       // if ( checklistDetails.client_id == '458' ) {
       data.answers.forEach( ( item ) => {
         if ( item.showLinked ) {

package/src/controllers/mobileTrax.controller.js

@@ -2669,7 +2669,12 @@ function QuestionFlag( req, res ) {
           let answervalidate = question.userAnswer.filter( ( answer ) => {
             return answer.sopFlag == true;
           } );
-          flagCount = flagCount + answervalidate.length;
+          let answerCount = 0;
+          if ( answervalidate?.length ) {
+            answerCount = 1;
+          }
+          // flagCount = flagCount + answervalidate.length;
+          flagCount = flagCount + answerCount;
         }
       } );
     } );

package/src/controllers/teaxFlag.controller.js

@@ -444,13 +444,47 @@ export const flagCardsV1 = async ( req, res ) => {
       },
     ];
 
-    // These three lookups are independent of one another, so run them concurrently
-    // instead of sequentially (Mongo aggregation + config find + detection Lambda).
+    // Fast path: return only the Mongo-derived flag counts. The detection Lambda
+    // (slow) is fetched separately via flagCardsDetectionV1 and merged into these
+    // cards on the client once it resolves.
+    const getOverallChecklistData = await processedchecklistService.aggregate( findQuery );
+
+    if ( !getOverallChecklistData.length ) {
+      return res.sendSuccess( { flagCards } );
+    }
+
+    const [ data ] = getOverallChecklistData;
+    if ( data.questionFlag ) flagCards.questionFlag.count = data.questionFlag;
+    if ( data.delayInSubmission ) flagCards.delayInSubmission.count = data.delayInSubmission;
+    flagCards.totalFlag = flagCards.questionFlag.count + flagCards.delayInSubmission.count;
+
+    return res.sendSuccess( { flagCards } );
+  } catch ( error ) {
+    console.error( 'Error in flagCardsV1:', error );
+    logger.error( { error, function: 'flagCardsV1' } );
+    return res.sendError( error, 500 );
+  }
+};
+
+// Detection-only companion for flagCardsV1. Runs the published-checklist lookup
+// + the detection Lambda (the slow part) and returns just the detection
+// contribution, so the UI can merge it into the cards returned by flagCardsV1:
+//   flagCards.detectionFlag = res.flagCards.detectionFlag;
+//   flagCards.runAIFlag     = res.flagCards.runAIFlag;          // when present
+//   flagCards.totalFlag    += res.flagCards.detectionTotalFlag;
+export const flagCardsDetectionV1 = async ( req, res ) => {
+  try {
+    const { clientId, storeId, fromDate, toDate } = req.body;
+
+    const flagCards = {
+      detectionFlag: { count: 0 },
+      detectionTotalFlag: 0,
+    };
+
     const detectionPayload = { fromDate, toDate, storeId, clientId };
     const lambdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
 
-    const [ getOverallChecklistData, publishedAiChecklists, resultData ] = await Promise.all( [
-      processedchecklistService.aggregate( findQuery ),
+    const [ publishedAiChecklists, resultData ] = await Promise.all( [
       checklistconfigService.find(
           {
             client_id: clientId,
@@ -462,15 +496,6 @@ export const flagCardsV1 = async ( req, res ) => {
       LamdaServiceCall( lambdaURL, detectionPayload ),
     ] );
 
-    if ( !getOverallChecklistData.length ) {
-      return res.sendSuccess( { flagCards } );
-    }
-
-    const [ data ] = getOverallChecklistData;
-    if ( data.questionFlag ) flagCards.questionFlag.count = data.questionFlag;
-    if ( data.delayInSubmission ) flagCards.delayInSubmission.count = data.delayInSubmission;
-    flagCards.totalFlag = flagCards.questionFlag.count + flagCards.delayInSubmission.count;
-
     const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
     if ( resultData && resultData.status_code === '200' ) {
       published.forEach( ( item ) => {
@@ -478,18 +503,18 @@ export const flagCardsV1 = async ( req, res ) => {
           flagCards.detectionFlag.count += resultData[item];
         }
       } );
-      flagCards.totalFlag += flagCards.detectionFlag.count;
+      flagCards.detectionTotalFlag += flagCards.detectionFlag.count;
       if ( resultData?.runAI ) {
         resultData.runAI.flagCount = resultData.runaiflags;
         flagCards.runAIFlag = resultData?.runAI;
-        flagCards.totalFlag += resultData.runaiflags;
+        flagCards.detectionTotalFlag += resultData.runaiflags;
       }
     }
 
     return res.sendSuccess( { flagCards } );
   } catch ( error ) {
-    console.error( 'Error in flagCardsV1:', error );
-    logger.error( { error, function: 'flagCardsV1' } );
+    console.error( 'Error in flagCardsDetectionV1:', error );
+    logger.error( { error, function: 'flagCardsDetectionV1' } );
     return res.sendError( error, 500 );
   }
 };
@@ -925,8 +950,6 @@ export const flagTablesV1 = async ( req, res ) => {
 
 // Lamda Service Call //
 async function LamdaServiceCall( url, data, timeoutMs = 8000 ) {
-  const controller = new AbortController();
-  const timer = setTimeout( () => controller.abort(), timeoutMs );
   try {
     const requestOptions = {
       method: 'POST',
@@ -934,8 +957,6 @@ async function LamdaServiceCall( url, data, timeoutMs = 8000 ) {
         'Content-Type': 'application/json',
       },
       body: JSON.stringify( data ),
-      keepalive: true,
-      signal: controller.signal,
     };
     const response = await fetch( url, requestOptions );
     if ( !response.ok ) {
@@ -946,8 +967,6 @@ async function LamdaServiceCall( url, data, timeoutMs = 8000 ) {
   } catch ( error ) {
     logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
     return false;
-  } finally {
-    clearTimeout( timer );
   }
 }
 
@@ -2002,6 +2021,151 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       return { comparisonData, ComparisonFlag };
     };
 
+    // Fast path: only the Mongo aggregations + client flag. The detection Lambda
+    // (slow) is fetched separately via flagComparisonCardsDetectionV2, which
+    // returns the total/detection/runAI comparisons for the UI to overwrite.
+    const [ rangeOneData, rangeTwoData, traxMonthlyComparisonData ] = await Promise.all( [
+      processedchecklistService.aggregate( createFindQuery( rangeOneFromDate, rangeOneToDate ) ),
+      processedchecklistService.aggregate( createFindQuery( rangeTwoFromDate, rangeTwoToDate ) ),
+      clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } ),
+    ] );
+
+    // console.log( 'rangeOneFromDate =>', rangeOneFromDate );
+    // console.log( 'rangeOneToDate =>', rangeOneToDate );
+    // console.log( 'rangeOneData =>', rangeOneData );
+
+    // console.log( 'rangeTwoFromDate =>', rangeTwoFromDate );
+    // console.log( 'rangeTwoToDate =>', rangeTwoToDate );
+    // console.log( 'rangeTwoData =>', rangeTwoData );
+
+    const flagComparisonCards = {
+      totalComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
+      questionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
+      delayInSubmissionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
+      detectionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
+      runAIComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
+    };
+
+    if ( rangeOneData.length && rangeTwoData.length ) {
+      // Mongo-only total (question + delay). flagComparisonCardsDetectionV2 returns
+      // the detection-inclusive total plus the detection/runAI comparisons, which
+      // the UI overwrites onto these cards once the Lambda resolves.
+      flagComparisonCards.totalComparisonFlag = calculateComparison( rangeOneData[0].totalFlag, rangeTwoData[0].totalFlag );
+      flagComparisonCards.questionComparisonFlag = calculateComparison( rangeOneData[0].questionFlag, rangeTwoData[0].questionFlag );
+      flagComparisonCards.delayInSubmissionComparisonFlag = calculateComparison( rangeOneData[0].delayInSubmission, rangeTwoData[0].delayInSubmission );
+    }
+    flagComparisonCards.traxMonthlyComparison = false;
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      flagComparisonCards.traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
+    return res.sendSuccess( { flagComparisonCards } );
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error, function: 'flagComparisonCardsV2' } );
+    return res.sendError( error, 500 );
+  }
+};
+
+// Detection-only companion for flagComparisonCardsV2. Re-runs the (cheap) range
+// aggregations alongside the two detection Lambda calls, and returns only the
+// comparisons that depend on detection data. The UI overwrites these three keys
+// onto the cards from flagComparisonCardsV2 once this resolves:
+//   totalComparisonFlag, detectionComparisonFlag, runAIComparisonFlag.
+// NOTE: the date-range / createFindQuery logic below mirrors flagComparisonCardsV2 —
+// keep the two in sync if that logic changes.
+export const flagComparisonCardsDetectionV2 = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let toDate = new Date( requestData.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+
+    let rangeOneFromDate;
+    let rangeOneToDate;
+    let rangeTwoFromDate;
+    let rangeTwoToDate;
+    if ( requestData.dateType == 'weekly' ) {
+      rangeOneFromDate = new Date( requestData.toDate );
+      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 6 );
+      rangeOneToDate = new Date( requestData.toDate );
+      rangeOneToDate = new Date( rangeOneToDate.getTime() - userTimezoneOffset );
+      rangeOneToDate.setUTCHours( 23, 59, 59, 59 );
+      rangeTwoToDate = new Date( requestData.toDate );
+      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 7 );
+      rangeTwoFromDate = new Date( rangeTwoToDate );
+      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 6 );
+      rangeTwoToDate = new Date( rangeTwoToDate.getTime() - userTimezoneOffset );
+      rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
+    } else if ( requestData.dateType == 'monthly' ) {
+      rangeOneFromDate = new Date( requestData.toDate );
+      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 29 );
+      rangeOneToDate = new Date( requestData.toDate );
+      rangeOneToDate = new Date( rangeOneToDate.getTime() - userTimezoneOffset );
+      rangeOneToDate.setUTCHours( 23, 59, 59, 59 );
+      rangeTwoToDate = new Date( requestData.toDate );
+      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 30 );
+      rangeTwoFromDate = new Date( rangeTwoToDate );
+      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 29 );
+      rangeTwoToDate = new Date( rangeTwoToDate.getTime() - userTimezoneOffset );
+      rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
+    } else {
+      rangeOneFromDate = new Date( requestData.toDate );
+      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 0 );
+      rangeOneToDate = new Date( requestData.toDate );
+      rangeOneToDate = new Date( rangeOneToDate.getTime() - userTimezoneOffset );
+      rangeOneToDate.setUTCHours( 23, 59, 59, 59 );
+      rangeTwoToDate = new Date( requestData.toDate );
+      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 1 );
+      rangeTwoFromDate = new Date( rangeTwoToDate );
+      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 0 );
+      rangeTwoToDate = new Date( rangeTwoToDate.getTime() - userTimezoneOffset );
+      rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
+    }
+
+    const createFindQuery = ( fromDate, toDate ) => [
+      { $match: { client_id: requestData.clientId,
+        date_iso: { $gte: fromDate, $lte: toDate },
+        $or: requestData.clientId === '11' ?
+        [
+          { store_id: { $in: requestData.storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+        ] :
+        [
+          { store_id: { $in: requestData.storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+          { aiStoreList: { $in: requestData.storeId } },
+        ],
+      } },
+      {
+        $project: {
+          timeFlag: 1,
+          questionFlag: 1,
+        },
+      },
+      {
+        $group: {
+          _id: '',
+          totalFlag: { $sum: { $add: [ '$questionFlag', '$timeFlag' ] } },
+          questionFlag: { $sum: '$questionFlag' },
+          delayInSubmission: { $sum: '$timeFlag' },
+        },
+      },
+    ];
+
+    const calculateComparison = ( rangeOneVal, rangeTwoVal ) => {
+      if ( rangeOneVal === 0 ) {
+        return { comparisonData: 0, ComparisonFlag: false };
+      }
+
+      let comparisonData = Math.abs( ( ( rangeOneVal - rangeTwoVal ) / rangeTwoVal ) * 100 );
+      if ( comparisonData === Infinity ) comparisonData = 0;
+      comparisonData = comparisonData % 1 === 0 ? comparisonData.toFixed( 0 ) : comparisonData.toFixed( 1 );
+      comparisonData = parseInt( comparisonData );
+      const ComparisonFlag = rangeOneVal > rangeTwoVal;
+      return { comparisonData, ComparisonFlag };
+    };
+
     const getDetectionCount = async ( fromDate, toDate ) => {
       const detectionPayload = {
         fromDate: dayjs( fromDate ).format( 'YYYY-MM-DD' ),
@@ -2010,7 +2174,6 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
         clientId: requestData.clientId,
       };
 
-      // The config lookup and the detection Lambda are independent — run them together.
       const LamdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
       const [ publishedAiChecklists, resultData ] = await Promise.all( [
         checklistconfigService.find(
@@ -2023,9 +2186,6 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
         ),
         LamdaServiceCall( LamdaURL, detectionPayload ),
       ] );
-      // if ( !publishedAiChecklists?.length ) {
-      //   return 0;
-      // }
       const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
       if ( resultData?.status_code === '200' ) {
         let result = 0;
@@ -2043,51 +2203,268 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       return 0;
     };
 
-    const [ rangeOneData, rangeTwoData, rangeOneDetectionCount, rangeTwoDetectionCount, traxMonthlyComparisonData ] = await Promise.all( [
+    const [ rangeOneData, rangeTwoData, rangeOneDetectionCount, rangeTwoDetectionCount ] = await Promise.all( [
       processedchecklistService.aggregate( createFindQuery( rangeOneFromDate, rangeOneToDate ) ),
       processedchecklistService.aggregate( createFindQuery( rangeTwoFromDate, rangeTwoToDate ) ),
       getDetectionCount( rangeOneFromDate, rangeOneToDate ),
       getDetectionCount( rangeTwoFromDate, rangeTwoToDate ),
-      clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } ),
     ] );
 
-    // console.log( 'rangeOneFromDate =>', rangeOneFromDate );
-    // console.log( 'rangeOneToDate =>', rangeOneToDate );
-    // console.log( 'rangeOneData =>', rangeOneData );
-
-    // console.log( 'rangeTwoFromDate =>', rangeTwoFromDate );
-    // console.log( 'rangeTwoToDate =>', rangeTwoToDate );
-    // console.log( 'rangeTwoData =>', rangeTwoData );
-
     const flagComparisonCards = {
       totalComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
-      questionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
-      delayInSubmissionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
       detectionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
       runAIComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
     };
 
     if ( rangeOneData.length && rangeTwoData.length ) {
-      let rangeOneTotalFlag = rangeOneData[0].totalFlag + rangeOneDetectionCount.result || 0;
-      let rangeTwoTotalFlag = rangeTwoData[0].totalFlag + rangeTwoDetectionCount.result || 0;
+      // Guard against detection failure (getDetectionCount returns 0, not an object).
+      const rangeOneDetection = ( rangeOneDetectionCount && rangeOneDetectionCount.result ) || 0;
+      const rangeTwoDetection = ( rangeTwoDetectionCount && rangeTwoDetectionCount.result ) || 0;
+      const rangeOneAi = ( rangeOneDetectionCount && rangeOneDetectionCount.ai ) || 0;
+      const rangeTwoAi = ( rangeTwoDetectionCount && rangeTwoDetectionCount.ai ) || 0;
+
+      const rangeOneTotalFlag = rangeOneData[0].totalFlag + rangeOneDetection;
+      const rangeTwoTotalFlag = rangeTwoData[0].totalFlag + rangeTwoDetection;
       flagComparisonCards.totalComparisonFlag = calculateComparison( rangeOneTotalFlag, rangeTwoTotalFlag );
-      flagComparisonCards.questionComparisonFlag = calculateComparison( rangeOneData[0].questionFlag, rangeTwoData[0].questionFlag );
-      flagComparisonCards.delayInSubmissionComparisonFlag = calculateComparison( rangeOneData[0].delayInSubmission, rangeTwoData[0].delayInSubmission );
-      flagComparisonCards.detectionComparisonFlag = calculateComparison( rangeOneDetectionCount.result, rangeTwoDetectionCount.result );
-      flagComparisonCards.runAIComparisonFlag = calculateComparison( rangeOneDetectionCount.ai, rangeTwoDetectionCount.ai );
-    }
-    flagComparisonCards.traxMonthlyComparison = false;
-    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
-      flagComparisonCards.traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+      flagComparisonCards.detectionComparisonFlag = calculateComparison( rangeOneDetection, rangeTwoDetection );
+      flagComparisonCards.runAIComparisonFlag = calculateComparison( rangeOneAi, rangeTwoAi );
     }
+
     return res.sendSuccess( { flagComparisonCards } );
   } catch ( error ) {
     console.log( 'error =>', error );
-    logger.error( { error, function: 'flagComparisonCardsV1' } );
+    logger.error( { error, function: 'flagComparisonCardsDetectionV2' } );
     return res.sendError( error, 500 );
   }
 };
 
+// Builds the per-checklist aggregation pipeline for the flag table. Used by the
+// detection endpoint (flagTablesDetectionV2) and mirrored by flagTablesV2's own
+// inline build — the two MUST produce an identical pipeline so the detection map
+// keys line up with the rows the client already rendered from flagTablesV2.
+function buildFlagTablesFindQuery( requestData ) {
+  let fromDate = new Date( requestData.fromDate );
+  let toDate = new Date( requestData.toDate );
+  let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+  toDate = new Date( toDate.getTime() - userTimezoneOffset );
+  toDate.setUTCHours( 23, 59, 59, 59 );
+
+  const findQuery = [];
+  const findAndQuery = [];
+  findAndQuery.push(
+      { client_id: requestData.clientId },
+      { date_iso: { $gte: fromDate, $lte: toDate } },
+      { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
+  );
+
+  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', 'vehicle_check_in', 'employeemonitoring', 'activitymonitoring' ] } } ] } );
+  } else if ( requestData?.filter === 'question' ) {
+    findAndQuery.push( { checkListType: 'custom' } );
+    findAndQuery.push( { questionFlag: { $gte: 1 } } );
+  } else if ( requestData?.filter === 'time' ) {
+    findAndQuery.push( { checkListType: 'custom' } );
+    findAndQuery.push( { timeFlag: { $gte: 1 } } );
+  } else if ( requestData?.filter === 'detection' ) {
+    findAndQuery.push( { checkListType: { $ne: 'custom' } } );
+  } else if ( requestData?.filter === 'runAI' ) {
+    if ( requestData.runAIChecklistName ) {
+      findAndQuery.push( { checkListName: { $in: requestData.runAIChecklistName } } );
+    }
+  }
+
+  findQuery.push( { $match: { $and: findAndQuery } } );
+
+  if ( requestData.searchValue && requestData.searchValue != '' ) {
+    findQuery.push( { $match: { $or: [ { checkListName: { $regex: requestData.searchValue, $options: 'i' } } ] } } );
+  }
+
+  findQuery.push( {
+    $project: {
+      sourceCheckList_id: 1,
+      checkListId: 1,
+      checkListName: 1,
+      coverage: 1,
+      storeCount: 1,
+      createdBy: 1,
+      createdByName: 1,
+      checklistStatus: 1,
+      timeFlag: 1,
+      questionFlag: 1,
+      questionCount: 1,
+      mobileDetectionFlag: 1,
+      storeOpenCloseFlag: 1,
+      uniformDetectionFlag: 1,
+      checkListType: 1,
+      scheduleRepeatedType: 1,
+      store_id: 1,
+      aiStoreList: 1,
+      runAIQuestionCount: 1,
+    },
+  } );
+
+  findQuery.push( {
+    $group: {
+      _id: '$sourceCheckList_id',
+      checkListName: { $last: '$checkListName' },
+      checkListChar: { $last: { $substr: [ '$checkListName', 0, 2 ] } },
+      coverage: { $last: '$coverage' },
+      sourceCheckList_id: { $last: '$sourceCheckList_id' },
+      checkListType: { $last: '$checkListType' },
+      storeCount: { $sum: 1 },
+      storeCountAi: { $max: '$storeCount' },
+      flaggedStores: { $sum: { $cond: [
+        {
+          $or: [
+            { '$gt': [ '$timeFlag', 0 ] },
+            { '$gt': [ '$questionFlag', 0 ] },
+            { '$gt': [ '$mobileDetectionFlag', 0 ] },
+            { '$gt': [ '$storeOpenCloseFlag', 0 ] },
+            { '$gt': [ '$uniformDetectionFlag', 0 ] },
+            { '$gt': [ '$customerUnattended', 0 ] },
+            { '$gt': [ '$staffLeftInTheMiddle', 0 ] },
+            { '$gt': [ '$cleaning', 0 ] },
+            { '$gt': [ '$scrum', 0 ] },
+            { '$gt': [ '$employeeCount', 0 ] },
+            { '$gt': [ '$employeemonitoring', 0 ] },
+            { '$gt': [ '$activitymonitoring', 0 ] },
+          ],
+        },
+        1,
+        0,
+      ] } },
+      flagCount: {
+        $sum: {
+          $add: [ '$questionFlag', '$timeFlag' ],
+        },
+      },
+      submittedChecklist: {
+        $sum: {
+          $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ],
+        },
+      },
+      questionFlag: { $sum: '$questionFlag' },
+      timeFlag: { $sum: '$timeFlag' },
+      questionCount: { $sum: '$questionCount' },
+      aiStoreList: { $max: '$aiStoreList' },
+      aiStoreListNew: { $sum: { $size: '$aiStoreList' } },
+      submittedQuestionCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] } },
+      runAIQuestionCount: { $last: '$runAIQuestionCount' },
+    },
+  } );
+
+  findQuery.push( {
+    $project: {
+      assignedStores: '$storeCount',
+      assignedStoresAi: '$aiStoreListNew',
+      checkListName: 1,
+      coverage: 1,
+      checkListChar: 1,
+      sourceCheckList_id: 1,
+      checkListType: 1,
+      flagType: 1,
+      uniqueFlaggedStores: 1,
+      flaggedStores: '$flaggedStores',
+      flagCount: 1,
+      questionCount: 1,
+      correctAnswers: { $subtract: [ '$submittedQuestionCount', '$questionFlag' ] },
+      customQuestionFlagCount: '$questionFlag',
+      customTimeFlagCount: '$timeFlag',
+      submittedChecklist: 1,
+      aiStoreList: 1,
+      runAIQuestionCount: 1,
+    },
+  } );
+
+  findQuery.push( {
+    $project: {
+      checkListName: 1,
+      checkListChar: 1,
+      coverage: {
+        $concat: [
+          { $toUpper: { $substr: [ { $ifNull: [ '$coverage', '' ] }, 0, 1 ] } },
+          { $substr: [ { $ifNull: [ '$coverage', '' ] }, 1, { $strLenCP: { $ifNull: [ '$coverage', '' ] } } ] },
+        ],
+      },
+      sourceCheckList_id: 1,
+      checkListType: 1,
+      flagType: 1,
+      assignedStores: 1,
+      assignedStoresAi: 1,
+      flaggedStores: 1,
+      flagCount: 1,
+      uniqueFlaggedStores: 1,
+      complianceRate: {
+        $cond: {
+          if: { $eq: [ '$questionCount', 0 ] },
+          then: 0,
+          else: {
+            $round: [ { $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ] }, 2 ],
+          },
+        },
+      },
+      customQuestionFlagCount: 1,
+      customTimeFlagCount: 1,
+      submittedChecklist: 1,
+      aiStoreList: 1,
+      runAIQuestionCount: 1,
+    },
+  } );
+
+  findQuery.push( { $sort: { ['submittedChecklist']: -1 } } );
+  return findQuery;
+}
+
+// Merges detection / runAI / all flag values from the Lambda into the aggregated
+// rows (mutates in place). Single source of truth shared by flagTablesV2's export
+// path and flagTablesDetectionV2 — the detection-column values (flaggedStores,
+// flagCount, complianceRate, assignedStores) and their edge cases live here only.
+function mergeDetectionIntoRows( getChecklistPerformanceData, lambdaResultData, requestData ) {
+  if ( !getChecklistPerformanceData?.length ) return;
+  const detectionChecklists = getChecklistPerformanceData?.filter( ( val ) => val?.checkListType !== 'custom' );
+  if ( !( detectionChecklists?.length || [ 'runAI', 'all' ].includes( requestData?.filter ) ) ) return;
+  const resultData = lambdaResultData;
+  if ( !resultData || resultData.status_code != '200' ) return;
+
+  for ( let index = 0; index < getChecklistPerformanceData.length; index++ ) {
+    if ( [ 'runAI', 'all' ].includes( requestData?.filter ) ) {
+      let findCheckList = resultData?.runAI?.list?.find( ( ele ) => ele.checkListName == getChecklistPerformanceData[index].checkListName );
+      if ( findCheckList ) {
+        if ( requestData?.filter == 'all' ) {
+          getChecklistPerformanceData[index].runAIFlag = findCheckList.flagCount;
+          getChecklistPerformanceData[index].flaggedStores = getChecklistPerformanceData[index].flaggedStores + findCheckList.flagCount;
+        } else {
+          getChecklistPerformanceData[index].flagCount = findCheckList.flagCount;
+          getChecklistPerformanceData[index].flaggedStores = findCheckList.flagStoreCount;
+        }
+      } else {
+        if ( getChecklistPerformanceData[index].checkListType !== 'custom' ) {
+          if ( requestData?.filter == 'all' ) {
+            getChecklistPerformanceData[index].runAIFlag = 0;
+            getChecklistPerformanceData[index].flagCount = resultData?.[getChecklistPerformanceData[index]?.checkListType] || 0;
+            getChecklistPerformanceData[index].flaggedStores = resultData?.[`${getChecklistPerformanceData[index]?.checkListType}_flaggedstores`] || 0;
+          } else {
+            getChecklistPerformanceData[index].flagCount = 0;
+            getChecklistPerformanceData[index].flaggedStores = 0;
+          }
+        }
+      }
+      getChecklistPerformanceData[index].complianceRate = ( 100- ( getChecklistPerformanceData[index].flaggedStores / getChecklistPerformanceData[index].assignedStores ) * 100 );
+      getChecklistPerformanceData[index].complianceRate = Math.min( 100, Math.max( 0, getChecklistPerformanceData[index].complianceRate ) );
+      getChecklistPerformanceData[index].complianceRate = ( getChecklistPerformanceData[index].complianceRate % 1 === 0 ) ? getChecklistPerformanceData[index].complianceRate.toFixed( 0 ) : getChecklistPerformanceData[index].complianceRate.toFixed( 2 );
+    } else {
+      if ( getChecklistPerformanceData[index].checkListType !== 'custom' ) {
+        getChecklistPerformanceData[index].flagCount = resultData?.[getChecklistPerformanceData[index]?.checkListType] || 0;
+        getChecklistPerformanceData[index].flaggedStores = resultData?.[`${getChecklistPerformanceData[index]?.checkListType}_flaggedstores`] || 0;
+        getChecklistPerformanceData[index].assignedStores = getChecklistPerformanceData[index]?.aiStoreList?.filter( ( element ) => requestData.storeId.includes( element ) )?.length || 0;
+        getChecklistPerformanceData[index].complianceRate = ( 100- ( getChecklistPerformanceData[index].flaggedStores / getChecklistPerformanceData[index].assignedStores ) * 100 );
+        getChecklistPerformanceData[index].complianceRate = Math.min( 100, Math.max( 0, getChecklistPerformanceData[index].complianceRate ) );
+        getChecklistPerformanceData[index].complianceRate = ( getChecklistPerformanceData[index].complianceRate % 1 === 0 ) ? getChecklistPerformanceData[index].complianceRate.toFixed( 0 ) : getChecklistPerformanceData[index].complianceRate.toFixed( 2 );
+      }
+    }
+  }
+}
+
 export const flagTablesV2 = async ( req, res ) => {
   try {
     let requestData = req.body;
@@ -2097,8 +2474,6 @@ export const flagTablesV2 = async ( req, res ) => {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
-    let limit = parseInt( requestData?.limit ) || 10;
-    let skip = limit * ( requestData?.offset ) || 0;
 
     const lamdaUrl = JSON.parse( process.env.LAMBDAURL );
 
@@ -2287,10 +2662,11 @@ export const flagTablesV2 = async ( req, res ) => {
     // 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.
+    // Only the export download needs the detection values merged inline (a one-off
+    // download can tolerate the ~8s Lambda). The interactive table load skips the
+    // Lambda entirely and hydrates detection values via flagTablesDetectionV2.
     // 'question'/'time' filters are custom-only, so the Lambda is never needed there.
-    const mayNeedLambda = ![ 'question', 'time' ].includes( requestData?.filter );
+    const mayNeedLambda = !!requestData.export && ![ 'question', 'time' ].includes( requestData?.filter );
     const detectionPayload = {
       'fromDate': requestData.fromDate,
       'toDate': requestData.toDate,
@@ -2306,59 +2682,17 @@ export const flagTablesV2 = async ( req, res ) => {
       mayNeedLambda ? LamdaServiceCall( LamdaURL, detectionPayload ) : Promise.resolve( null ),
     ] );
 
+    console.log( lambdaResultData );
+
     if ( !getChecklistPerformanceData?.length ) {
       return res.sendError( 'No data found', 204 );
     }
 
     let getTotalCount = getChecklistPerformanceData.length;
-    if ( getChecklistPerformanceData.length ) {
-      const detectionChecklists = getChecklistPerformanceData?.filter( ( val ) => val?.checkListType !== 'custom' );
-
-      if ( detectionChecklists?.length || [ 'runAI', 'all' ].includes( requestData?.filter ) ) {
-        let resultData = lambdaResultData;
-        if ( resultData ) {
-          if ( resultData.status_code == '200' ) {
-            for ( let index = 0; index < getChecklistPerformanceData.length; index++ ) {
-              if ( [ 'runAI', 'all' ].includes( requestData?.filter ) ) {
-                let findCheckList = resultData?.runAI?.list?.find( ( ele ) => ele.checkListName == getChecklistPerformanceData[index].checkListName );
-                if ( findCheckList ) {
-                  if ( requestData?.filter == 'all' ) {
-                    getChecklistPerformanceData[index].runAIFlag = findCheckList.flagCount;
-                    getChecklistPerformanceData[index].flaggedStores = getChecklistPerformanceData[index].flaggedStores + findCheckList.flagCount;
-                  } else {
-                    getChecklistPerformanceData[index].flagCount = findCheckList.flagCount;
-                    getChecklistPerformanceData[index].flaggedStores = findCheckList.flagStoreCount;
-                  }
-                } else {
-                  if ( getChecklistPerformanceData[index].checkListType !== 'custom' ) {
-                    if ( requestData?.filter == 'all' ) {
-                      getChecklistPerformanceData[index].runAIFlag = 0;
-                      getChecklistPerformanceData[index].flagCount = resultData?.[getChecklistPerformanceData[index]?.checkListType] || 0;
-                      getChecklistPerformanceData[index].flaggedStores = resultData?.[`${getChecklistPerformanceData[index]?.checkListType}_flaggedstores`] || 0;
-                    } else {
-                      getChecklistPerformanceData[index].flagCount = 0;
-                      getChecklistPerformanceData[index].flaggedStores = 0;
-                    }
-                  }
-                }
-                getChecklistPerformanceData[index].complianceRate = ( 100- ( getChecklistPerformanceData[index].flaggedStores / getChecklistPerformanceData[index].assignedStores ) * 100 );
-                getChecklistPerformanceData[index].complianceRate = Math.min( 100, Math.max( 0, getChecklistPerformanceData[index].complianceRate ) );
-                getChecklistPerformanceData[index].complianceRate = ( getChecklistPerformanceData[index].complianceRate % 1 === 0 ) ? getChecklistPerformanceData[index].complianceRate.toFixed( 0 ) : getChecklistPerformanceData[index].complianceRate.toFixed( 2 );
-              } else {
-                if ( getChecklistPerformanceData[index].checkListType !== 'custom' ) {
-                  getChecklistPerformanceData[index].flagCount = resultData?.[getChecklistPerformanceData[index]?.checkListType] || 0;
-                  getChecklistPerformanceData[index].flaggedStores = resultData?.[`${getChecklistPerformanceData[index]?.checkListType}_flaggedstores`] || 0;
-                  getChecklistPerformanceData[index].assignedStores = getChecklistPerformanceData[index]?.aiStoreList?.filter( ( element ) => requestData.storeId.includes( element ) )?.length || 0;
-                  getChecklistPerformanceData[index].complianceRate = ( 100- ( getChecklistPerformanceData[index].flaggedStores / getChecklistPerformanceData[index].assignedStores ) * 100 );
-                  getChecklistPerformanceData[index].complianceRate = Math.min( 100, Math.max( 0, getChecklistPerformanceData[index].complianceRate ) );
-                  getChecklistPerformanceData[index].complianceRate = ( getChecklistPerformanceData[index].complianceRate % 1 === 0 ) ? getChecklistPerformanceData[index].complianceRate.toFixed( 0 ) : getChecklistPerformanceData[index].complianceRate.toFixed( 2 );
-                }
-              }
-            }
-          }
-        }
-      }
-    }
+    // For export, lambdaResultData is populated and detection values are merged in
+    // here. For the interactive load lambdaResultData is null, so this is a no-op
+    // and the detection values are hydrated later via flagTablesDetectionV2.
+    mergeDetectionIntoRows( getChecklistPerformanceData, lambdaResultData, requestData );
 
     // Sort in JS AFTER the Lambda merge so detection / runAI / all rows order by
     // their real (merged) flaggedStores / flagCount / complianceRate / assignedStores
@@ -2450,8 +2784,10 @@ export const flagTablesV2 = async ( req, res ) => {
     }
 
     result.totalCount = getTotalCount;
-    // Paginate in JS now that the full set is sorted by the merged values.
-    result.checklistPerformance = getChecklistPerformanceData.slice( skip, skip + limit );
+    // Fast path returns the FULL Mongo-only set (one row per checklist); the client
+    // paginates and re-sorts after merging the detection values from
+    // flagTablesDetectionV2. Export returns earlier via download() above.
+    result.checklistPerformance = getChecklistPerformanceData;
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -2460,6 +2796,71 @@ export const flagTablesV2 = async ( req, res ) => {
   }
 };
 
+// Detection-only companion for flagTablesV2. Re-runs the SAME (cheap) aggregation
+// alongside the detection Lambda (the slow part), merges the detection values, and
+// returns them keyed by sourceCheckList_id. The client patches these onto the rows
+// it already rendered from flagTablesV2, then re-sorts / re-paginates:
+//   for ( const row of rows ) {
+//     const d = res.detection[ row.sourceCheckList_id ];
+//     if ( d ) Object.assign( row, d );
+//   }
+// The aggregation is re-run (not passed in) so the two endpoints stay independent
+// and the Lambda still runs concurrently with Mongo; the aggregation is cheap
+// relative to the ~8s Lambda that dominates this call's latency.
+export const flagTablesDetectionV2 = async ( req, res ) => {
+  try {
+    const requestData = req.body;
+
+    // 'question'/'time' filters are custom-only — no detection data to fetch.
+    const mayNeedLambda = ![ 'question', 'time' ].includes( requestData?.filter );
+    if ( !mayNeedLambda ) {
+      return res.sendSuccess( { detection: {} } );
+    }
+
+    const findQuery = buildFlagTablesFindQuery( requestData );
+
+    const lamdaUrl = JSON.parse( process.env.LAMBDAURL );
+    const LamdaURL = lamdaUrl.flagTablesV2;
+    const detectionPayload = {
+      'fromDate': requestData.fromDate,
+      'toDate': requestData.toDate,
+      'storeId': requestData.storeId,
+      'clientId': requestData.clientId,
+    };
+
+    const [ getChecklistPerformanceData, lambdaResultData ] = await Promise.all( [
+      processedchecklistService.aggregate( findQuery ),
+      LamdaServiceCall( LamdaURL, detectionPayload ),
+    ] );
+
+    if ( !getChecklistPerformanceData?.length ) {
+      return res.sendSuccess( { detection: {} } );
+    }
+
+    mergeDetectionIntoRows( getChecklistPerformanceData, lambdaResultData, requestData );
+
+    // Return only the detection-affected fields, keyed by sourceCheckList_id, so the
+    // client can patch them onto its already-rendered rows.
+    const detection = {};
+    getChecklistPerformanceData.forEach( ( row ) => {
+      const key = String( row.sourceCheckList_id ?? row._id );
+      detection[key] = {
+        flagCount: row.flagCount,
+        flaggedStores: row.flaggedStores,
+        complianceRate: row.complianceRate,
+        assignedStores: row.assignedStores,
+        ...( row.runAIFlag !== undefined ? { runAIFlag: row.runAIFlag } : {} ),
+      };
+    } );
+
+    return res.sendSuccess( { detection } );
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, message: req.query, function: 'flagTablesDetectionV2' } );
+    return res.sendError( { error: error }, 500 );
+  }
+};
+
 export const checklistCountByType = async ( req, res ) => {
   try {
     let { clientId, fromDate, toDate } = req.body;

package/src/routes/traxFlag.router.js

@@ -9,11 +9,14 @@ import {
   flagChecklistTableV1,
   overallFlagMetrics,
   flagCardsV1,
+  flagCardsDetectionV1,
   flagComparisonCardsV1,
   flagTablesV1,
   checklistDropdownV1,
   flagTablesV2,
+  flagTablesDetectionV2,
   flagComparisonCardsV2,
+  flagComparisonCardsDetectionV2,
   checklistCountByType,
 } from '../controllers/teaxFlag.controller.js';
 import { isAllowedSessionHandler } from 'tango-app-api-middleware';
@@ -42,6 +45,9 @@ traxFlagRouter
     .post( '/flagCardsV1', isAllowedSessionHandler,
         accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
         flagCardsV1 )
+    .post( '/flagCardsDetectionV1', isAllowedSessionHandler,
+        accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
+        flagCardsDetectionV1 )
     .post( '/flagComparisonCardsV1', isAllowedSessionHandler,
         accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
         flagComparisonCardsV1 )
@@ -51,9 +57,15 @@ traxFlagRouter
     .post( '/flagComparisonCardsV2', isAllowedSessionHandler,
         accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
         flagComparisonCardsV2 )
+    .post( '/flagComparisonCardsDetectionV2', isAllowedSessionHandler,
+        accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
+        flagComparisonCardsDetectionV2 )
     .post( '/flagTablesV2', isAllowedSessionHandler,
         accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
         flagTablesV2 )
+    .post( '/flagTablesDetectionV2', isAllowedSessionHandler,
+        accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
+        flagTablesDetectionV2 )
     .post( '/checklistCountByType', isAllowedSessionHandler,
         accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [] } ] } ),
         checklistCountByType );