tango-app-api-trax 1.0.0-beta-task.14 → 1.0.0-beta-task.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-beta-task.14",
+    "version": "1.0.0-beta-task.17",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,8 +26,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.5",
-        "tango-app-api-middleware": "3.1.43-alpha.10",
+        "tango-api-schema": "^2.2.7",
+        "tango-app-api-middleware": "^3.1.43-alpha.10",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/teaxFlag.controller.js

@@ -3,6 +3,7 @@ import { aggregate } from '../services/processedchecklist.services.js';
 import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
+import * as checklistconfigService from '../services/checklist.service.js';
 
 
 import utc from 'dayjs/plugin/utc.js';
@@ -608,13 +609,23 @@ export const flagCardsV1 = async ( req, res ) => {
     if ( data.questionFlag ) flagCards.questionFlag.count = data.questionFlag;
     if ( data.delayInSubmission ) flagCards.delayInSubmission.count = data.delayInSubmission;
 
+    const publishedAiChecklists = await checklistconfigService.find( { client_id: clientId, publish: true, checkListType: { $ne: 'custom' } }, { checkListType: 1 } );
+
+    if ( !publishedAiChecklists?.length ) {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+
     const detectionPayload = { fromDate, toDate, storeId, clientId };
     const lambdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
     const resultData = await LamdaServiceCall( lambdaURL, detectionPayload );
 
+    const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
+
     if ( resultData && resultData.status_code === '200' ) {
-      flagCards.detectionFlag.count = resultData.totalDetection;
-      flagCards.totalFlag += flagCards.detectionFlag.count;
+      published.forEach( ( item ) => {
+        flagCards.detectionFlag.count += resultData[item];
+      } );
+      flagCards.totalFlag = flagCards.detectionFlag.count;
     }
 
     return res.sendSuccess( { flagCards } );
@@ -726,11 +737,21 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
 
       console.log( dayjs( toDate ).startOf( 'day' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'new start of' );
 
+      const publishedAiChecklists = await checklistconfigService.find( { client_id: requestData.clientId, publish: true, checkListType: { $ne: 'custom' } }, { checkListType: 1 } );
+
+      if ( !publishedAiChecklists?.length ) {
+        return 0;
+      }
+
       const LamdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
       const resultData = await LamdaServiceCall( LamdaURL, detectionPayload );
 
+      const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
+
       if ( resultData?.status_code === '200' ) {
-        return resultData.totalDetection;
+        let result = 0;
+        published.forEach( ( item ) => result += resultData[item] );
+        return result;
       }
       return 0;
     };

package/src/controllers/trax.controller.js

@@ -530,7 +530,7 @@ export const duplicateChecklist = async ( req, res ) => {
 
     let dupDetails = { ...checkDetails._doc };
     let name = `^${dupDetails.checkListName.split( '(' )[0]}\\(.*\\)$`;
-    let checkListNameDetails = await checklistService.find( { checkListName: { $regex: name }, client_id: req.query.clientId, type: 'checklist', isdeleted: false } );
+    let checkListNameDetails = await checklistService.find( { checkListName: { $regex: name }, client_id: req.query.clientId, type: 'checklist' } );
     if ( checkListNameDetails.length ) {
       let nameLength = checkListNameDetails.length + 1;
       dupDetails.checkListName = dupDetails.checkListName.split( '(' )[0] + '(' + nameLength +')';