tango-app-api-trax 3.9.38 → 3.9.39

package/index.js

@@ -9,6 +9,5 @@ import { mobileRouter } from './src/routes/mobileTrax.routes.js';
 import { internalTraxRouter } from './src/routes/internalTraxApi.router.js';
 import { locusOrderRouter } from './src/routes/locus.router.js';
 import { traxActivityLogRouter } from './src/routes/activityLog.router.js';
-import traxActivityLogMiddleware from './src/logging/activityLogMiddleware.js';
 
-export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, traxActivityLogRouter, traxActivityLogMiddleware };
+export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, traxActivityLogRouter };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.38",
+    "version": "3.9.39",
     "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.20",
+        "tango-api-schema": "^2.6.17",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -18,7 +18,7 @@ import timeZone from 'dayjs/plugin/timezone.js';
 import utc from 'dayjs/plugin/utc.js';
 import { logger } from 'tango-app-api-middleware';
 import mongoose from 'mongoose';
-import { sendPushNotification, sendAiPushNotification, sendEmailWithSES, signedUrl, fileUpload } from 'tango-app-api-middleware';
+import { sendPushNotification, sendAiPushNotification, sendEmailWithSES, signedUrl, fileUpload, getOpenSearchData } from 'tango-app-api-middleware';
 // import * as planoService from '../services/planogram.service.js';
 import * as clusterServices from '../services/cluster.service.js';
 import * as teamsServices from '../services/teams.service.js';
@@ -624,7 +624,6 @@ export async function PCLconfigCreation( req, res ) {
                         element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
                         element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
                         element4.videoUploadTimeLimit = getCLconfig?.videoUploadTimeLimit || 0;
-                        element4.userVerification = getCLconfig?.userVerification;
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -931,7 +930,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', 'activitymonitoring' ].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' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -1226,11 +1225,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', 'activitymonitoring' ].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' ].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', 'activitymonitoring' ].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' ].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', 'activitymonitoring' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'unattendeddetection', 'employeemonitoring' ].includes( getCLconfig.checkListType ) ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -1384,40 +1383,40 @@ export async function insertTimeDelayFlags( req, res ) {
     let updatedDetails = await processedchecklist.updateMany( { _id: { $in: checklistId } }, { timeFlag: 1 } );
 
 
-    // let notifyStores = await processedchecklist.find( { _id: { $in: checklistId }, notify: { $exists: false } } );
-
-    // if ( notifyStores.length ) {
-    //   Promise.all( notifyStores.map( async ( store ) => {
-    //     let checklistDetails = await CLconfig.findOne( { _id: store.sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
-    //     if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
-    //       let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
-    //       emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
-    //       let data = {
-    //         storeName: store.storeName,
-    //         flagCount: 1,
-    //         checklistName: store.checkListName?.trim(),
-    //         submittedBy: '--',
-    //         time: '--',
-    //         domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-    //         type: 'delay',
-    //       };
-    //       const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-    //       const htmlContent = handlebars.compile( fileContent );
-    //       const html = htmlContent( { data: data } );
-    //       emailList.forEach( ( email ) => {
-    //         let params = {
-    //           toEmail: email,
-    //           mailSubject: 'TangoEye | Checklist Flag',
-    //           htmlBody: html,
-    //           attachment: '',
-    //           sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-    //         };
-    //         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-    //       } );
-    //     }
-    //     await processedchecklist.updateOne( { _id: store._id }, { notify: true } );
-    //   } ) );
-    // }
+    let notifyStores = await processedchecklist.find( { _id: { $in: checklistId }, notify: { $exists: false } } );
+
+    if ( notifyStores.length ) {
+      Promise.all( notifyStores.map( async ( store ) => {
+        let checklistDetails = await CLconfig.findOne( { _id: store.sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
+        if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
+          let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
+          emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
+          let data = {
+            storeName: store.storeName,
+            flagCount: 1,
+            checklistName: store.checkListName?.trim(),
+            submittedBy: '--',
+            time: '--',
+            domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+            type: 'delay',
+          };
+          const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+          const htmlContent = handlebars.compile( fileContent );
+          const html = htmlContent( { data: data } );
+          emailList.forEach( ( email ) => {
+            let params = {
+              toEmail: email,
+              mailSubject: 'TangoEye | Checklist Flag',
+              htmlBody: html,
+              attachment: '',
+              sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+            };
+            sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+          } );
+        }
+        await processedchecklist.updateOne( { _id: store._id }, { notify: true } );
+      } ) );
+    }
 
     if ( updatedDetails ) {
       return res.sendSuccess( { message: 'Time Delay Updated Successfully' } );
@@ -1703,85 +1702,6 @@ export async function saleUpdateCollection( req, res ) {
   }
 };
 
-/**
- * One-off migration: in checklistquestionsconfigs, when a question's answerType
- * is 'multiplechoicesingle' and one of its answers has validationType
- * 'Capture Image', replace it with 'Capture Multiple Image with description'.
- *
- * Document shape: { question: [ { answerType, answers: [ { validationType } ] } ] }
- * Defaults to a dry run; pass apply:true (body) or ?apply=true to write changes.
- * @param {Object} req Express request — body.apply / query.apply toggles writing
- * @param {Object} res Express response
- * @return {Promise<void>}
- */
-export async function updateMultipleChoiceSingleValidationType( req, res ) {
-  try {
-    const TARGET_ANSWER_TYPE = 'multiplechoicesingle';
-    const FROM_VALIDATION_TYPE = 'Capture Image';
-    const TO_VALIDATION_TYPE = 'Capture Multiple Image with description';
-
-    const apply = req.body?.apply === true || req.query?.apply === 'true';
-
-    // Only load docs that actually contain a matching question + answer.
-    const query = {
-      question: {
-        $elemMatch: {
-          answerType: TARGET_ANSWER_TYPE,
-          answers: { $elemMatch: { validationType: FROM_VALIDATION_TYPE } },
-        },
-      },
-    };
-
-    const docs = await CLquestions.find( query );
-
-    let documentsUpdated = 0;
-    let answersUpdated = 0;
-    const updatedIds = [];
-
-    for ( const doc of docs ) {
-      const questions = Array.isArray( doc.question ) ? doc.question : [];
-      let changedInDoc = 0;
-
-      for ( const q of questions ) {
-        if ( !q || q.answerType !== TARGET_ANSWER_TYPE ) continue;
-
-        const answers = Array.isArray( q.answers ) ? q.answers : [];
-        for ( const a of answers ) {
-          if ( a && a.validationType === FROM_VALIDATION_TYPE ) {
-            a.validationType = TO_VALIDATION_TYPE;
-            changedInDoc++;
-          }
-        }
-      }
-
-      if ( changedInDoc > 0 ) {
-        documentsUpdated++;
-        answersUpdated += changedInDoc;
-        updatedIds.push( doc._id );
-
-        // `question` is a Mixed array, so write the whole rebuilt array.
-        if ( apply ) {
-          await CLquestions.updateMany( { _id: doc._id }, { question: questions } );
-        }
-      }
-    }
-
-    return res.sendSuccess( {
-      message: apply ?
-        'Validation type updated successfully' :
-        'Dry run — pass apply:true to write these changes',
-      apply,
-      matchedDocuments: docs.length,
-      documentsUpdated,
-      answersUpdated,
-      updatedIds,
-    } );
-  } catch ( error ) {
-    logger.error( { function: 'updateMultipleChoiceSingleValidationType', error: error } );
-    return res.sendError( error, 500 );
-  }
-};
-
 export async function getUserStoreList( req, res ) {
   try {
     let details = [];
@@ -2515,6 +2435,7 @@ export async function internalAISendPushNotification( req, res ) {
       storeId: req.body?.storeId,
       date: req.body?.date,
       clientId: req.body?.clientId,
+      ...( req.body?.checklistType && { checklistType: req.body?.checklistType } ),
     };
     let responseData = await sendAiPushNotification( userData.fcmToken, custom, userData.loginFrom );
     if ( responseData ) {
@@ -2768,69 +2689,22 @@ export async function countUpdateRunAI( req, res ) {
     if ( !req.body.id ) {
       return res.sendError( 'Checklist id is required', 400 );
     }
-    // if ( !req.body.runAICount ) {
-    //   return res.sendError( 'runAICount is required', 400 );
-    // }
+    if ( !req.body.runAICount ) {
+      return res.sendError( 'runAICount is required', 400 );
+    }
     let getDetails = await processedchecklist.findOne( { _id: req.body.id } );
     if ( !getDetails ) {
       return res.sendError( 'No data found', 204 );
     }
 
     let updateData = {
-      runAIFlag: req.body?.runAICount ?? 0,
+      runAIFlag: req.body.runAICount,
     };
 
-    // complianceCount is already populated for the other answer types; add the image/video scores on top.
-    let complianceCount = getDetails.userComplianceCount || 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)
-    //   2) [ { featureName, value } ]                                (flat verdict)
-    const extractMatchValues = ( runAIData ) => {
-      if ( !Array.isArray( runAIData ) ) return [];
-      const values = [];
-      runAIData.forEach( ( entry ) => {
-        const results = Array.isArray( entry?.results ) ? entry.results : [ entry ];
-        results.forEach( ( r ) => {
-          if ( r?.featureName === 'Matched/Not Matched' ) values.push( r?.value );
-        } );
-      } );
-      return values;
-    };
-
-    getDetails.questionAnswers.forEach( ( section ) => {
-      section.questions.forEach( ( question ) => {
-        if ( question.compliance && [ 'image', 'image/video' ].includes( question.answerType ) ) {
-          // 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;
-          } );
-
-          complianceCount += score;
-        }
-      } );
-    } );
-
-    updateData.complianceCount = complianceCount;
-
     await processedchecklist.updateOne( { _id: req.body.id }, updateData );
     return res.sendSuccess( 'RunAI Count updated successfully' );
   } catch ( e ) {
-    logger.error( { functionName: 'countUpdateRunAI', error: e } );
+    logger.error( { functionName: 'updateRunAI', error: e } );
     return res.sendError( e, 500 );
   }
 }
@@ -3667,38 +3541,47 @@ export async function runAIFlag( req, res ) {
         ],
       },
     }, { _id: 1, notifyFlags: 1, approver: 1 } );
-    let date = dayjs().format( 'YYYY-MM-DD' );
+    let date = dayjs().subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
     if ( checklistDetails.length ) {
       await Promise.all( checklistDetails.map( async ( ele ) => {
-        let submitDetails = await processedchecklist.find( { sourceCheckList_id: ele._id, date_string: date, $or: [ { timeFlag: { $gt: 0 } }, { questionFlag: { $gt: 0 } }, { runAIFlag: { $gt: 0 } } ] }, { storeName: 1, checkListName: 1, userName: 1, submitTime_string: 1, runAIFlag: 1, questionFlag: 1, checklistStatus: 1 } );
-        let emailList = ele?.notifyFlags?.notifyType.includes( 'approver' ) ? ele.approver.map( ( approver ) => approver?.value ): [];
-        emailList = [ ...emailList, ...ele?.notifyFlags?.users?.map( ( user ) => user?.value ) ];
+        let submitDetails = await processedchecklist.find( { sourceCheckList_id: ele._id, checklistStatus: 'submit', date_string: date }, { storeName: 1, checkListName: 1, questionAnswers: 1 } );
         await Promise.all( submitDetails.map( ( store ) => {
-          let data = {
-            storeName: store.storeName,
-            flagCount: store.timeFlag ? 1 : store?.runAIFlag + store?.questionFlag,
-            runAIFlag: store?.runAIFlag,
-            questionFlag: store?.questionFlag,
-            checklistName: store.checkListName?.trim(),
-            submittedBy: store.timeFlag ? '--' : store?.userName,
-            time: store?.submitTime_string ?? '--',
-            domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-            status: store.checklistStatus,
-          };
-          const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-          const htmlContent = handlebars.compile( fileContent );
-          const html = htmlContent( { data: data } );
-          emailList.forEach( ( email ) => {
-            console.log( email );
-            let params = {
-              toEmail: email,
-              mailSubject: 'TangoEye | Checklist Flag',
-              htmlBody: html,
-              attachment: '',
-              sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-            };
-            sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-          } );
+          if ( store.questionAnswers.length ) {
+            let runAIFlag = 0;
+            store.questionAnswers.forEach( ( section ) => {
+              section.questions.forEach( ( question ) => {
+                if ( question.answerType == 'image' && ( question?.userAnswer?.[0]?.runAIData?.value == 'False' || !question?.userAnswer?.[0]?.runAIData?.value ) ) {
+                  runAIFlag++;
+                }
+              } );
+            } );
+            if ( runAIFlag ) {
+              let emailList = ele?.notifyFlags?.notifyType.includes( 'approver' ) ? ele.approver.map( ( approver ) => approver?.value ): [];
+              emailList = [ ...emailList, ...ele?.notifyFlags?.users?.map( ( user ) => user?.value ) ];
+              let data = {
+                storeName: store.storeName,
+                flagCount: 1,
+                checklistName: store.checkListName?.trim(),
+                submittedBy: '--',
+                time: '--',
+                domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+                type: 'delay',
+              };
+              const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+              const htmlContent = handlebars.compile( fileContent );
+              const html = htmlContent( { data: data } );
+              emailList.forEach( ( email ) => {
+                let params = {
+                  toEmail: email,
+                  mailSubject: 'TangoEye | Checklist Flag',
+                  htmlBody: html,
+                  attachment: '',
+                  sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+                };
+                sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+              } );
+            }
+          }
         } ) );
       } ) );
     }
@@ -3746,36 +3629,31 @@ export const downloadInsertPdf = async ( req, res ) => {
     const safeName = ( str ) =>
       ( str || '' ).toString().replace( /[<>:"/\\|?*]+/g, '_' );
 
-    // const query = {
-    //   query: {
-    //     bool: {
-    //       must: [
-    //         {
-    //           term: {
-    //             _id: req.body.checklistId,
-    //           },
-    //         },
-    //       ],
-    //     },
-    //   },
-    // };
-
+    const query = {
+      query: {
+        bool: {
+          must: [
+            {
+              term: {
+                _id: req.body.checklistId,
+              },
+            },
+          ],
+        },
+      },
+    };
 
     // 1) Launch browser page + fetch OpenSearch data in parallel
     const [ browser, aiDetails ] = await Promise.all( [
       getBrowserInstance(),
-      // getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxIndex, query ),
-      processedchecklist.findOne( { _id: req.body.checklistId } ),
+      getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxIndex, query ),
     ] );
-    console.log( aiDetails );
 
-    if ( !aiDetails ) {
+    if ( aiDetails?.statusCode != 200 || !aiDetails?.body?.hits?.hits.length ) {
       return res.sendError( 'Checklist not found', 404 );
     }
 
-    const doc = { ...aiDetails?.toObject() };
-
-    console.log( doc );
+    const doc = { ...aiDetails.body.hits.hits[0]._source };
 
     // 2) Fetch brandInfo + compliance data in parallel
     const complianceURL = JSON.parse( process.env.LAMBDAURL ).complianceHistory;

package/src/controllers/mobileTrax.controller.js

@@ -1765,7 +1765,6 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                       } else {
                         if ( qaans[k].validationType == 'Capture Multiple Image with description' ) {
                           qaans[k]['validationImage']=[];
-                          qaans[k]['validationVideo']=[];
                           if ( requestSection[i].validationImage.length ) {
                             for ( let image of requestSection[i].validationImage ) {
                               let validationAnswer = decodeURIComponent( image.split( '?' )[0] );
@@ -1778,18 +1777,6 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                               };
                             }
                           }
-                          if ( requestSection[i]?.validationVideo?.length ) {
-                            for ( let video of requestSection[i].validationVideo ) {
-                              let validationAnswer = decodeURIComponent( video.split( '?' )[0] );
-                              if ( validationAnswer.length ) {
-                                let splitImgUrl = validationAnswer.split( '/' );
-                                if ( splitImgUrl.length > 1 ) {
-                                  splitImgUrl.splice( 0, 3 );
-                                  qaans[k].validationVideo.push( splitImgUrl.join( '/' ) || '' );
-                                }
-                              };
-                            }
-                          }
                         }
                         // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                         qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
@@ -2140,18 +2127,12 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
     logger.error( { message: requestData.questionAnswers, error: 'QuestionanswersPayload' } );
 
     if ( requestData.submittype == 'submit' ) {
-      requestData.userComplianceCount = 0;
       for ( let section of sectionFormat ) {
         for ( let question of section.questions ) {
           let mustValidate = !question.linkType || ( question.linkType && question.linkquestionenabled );
           if ( mustValidate && ( !question.userAnswer || !question.userAnswer.length ) ) {
             return res.sendError( 'Please Fill All Fields', 400 );
           }
-          if ( question.compliance ) {
-            const scores = ( question.userAnswer || [] ).map( ( ua ) => ua?.complianceScore ?? 0 );
-            let score = scores.length ? Math.max( ...scores ) : 0;
-            requestData.userComplianceCount += score;
-          }
         }
       }
     }
@@ -2795,15 +2776,6 @@ export async function submitChecklist( req, res ) {
         updateData.checklistStatus = 'submit';
         updateData.updatedAt = dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format();
         updateData.submitMobileTime = requestData?.currentTime;
-        updateData.userComplianceCount = requestData?.userComplianceCount;
-        updateData.userSignature = requestData?.userSignature;
-        if ( requestData?.userImage ) {
-          let splitImgUrl = requestData?.userImage.split( '/' );
-          if ( splitImgUrl.length > 1 ) {
-            splitImgUrl.splice( 0, 3 );
-            updateData.userImage = splitImgUrl.join( '/' ) || '';
-          }
-        }
       }
       // updateData.questionAnswers.forEach( ( section ) => {
       //   section.questions.forEach( ( question ) => {
@@ -2904,34 +2876,34 @@ export async function submitChecklist( req, res ) {
             userType: req.user.userType,
           };
           insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-          // if ( updateData.questionFlag ) {
-          //   let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
-          //   if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
-          //     let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
-          //     emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
-          //     let data = {
-          //       storeName: getchecklist[0].storeName,
-          //       flagCount: updateData.questionFlag,
-          //       checklistName: getchecklist[0].checkListName,
-          //       submittedBy: getchecklist[0].userName,
-          //       time: updateData.submitTime_string,
-          //       domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-          //     };
-          //     const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-          //     const htmlContent = handlebars.compile( fileContent );
-          //     const html = htmlContent( { data: data } );
-          //     emailList.forEach( ( email ) => {
-          //       let params = {
-          //         toEmail: email,
-          //         mailSubject: 'TangoEye | Checklist Flag',
-          //         htmlBody: html,
-          //         attachment: '',
-          //         sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-          //       };
-          //       sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-          //     } );
-          //   }
-          // }
+          if ( updateData.questionFlag ) {
+            let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
+            if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
+              let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
+              emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
+              let data = {
+                storeName: getchecklist[0].storeName,
+                flagCount: updateData.questionFlag,
+                checklistName: getchecklist[0].checkListName,
+                submittedBy: getchecklist[0].userName,
+                time: updateData.submitTime_string,
+                domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+              };
+              const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+              const htmlContent = handlebars.compile( fileContent );
+              const html = htmlContent( { data: data } );
+              emailList.forEach( ( email ) => {
+                let params = {
+                  toEmail: email,
+                  mailSubject: 'TangoEye | Checklist Flag',
+                  htmlBody: html,
+                  attachment: '',
+                  sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+                };
+                sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+              } );
+            }
+          }
         }
         if ( getchecklist?.[0]?.redoEdit?.toString() != requestData?.redoEdit ) {
           return res.sendSuccess( 'New Questions Added So,Checklist moved back to In Progress. Please complete the updated checklist.' );
@@ -4205,9 +4177,6 @@ export async function questionList( req, res ) {
         streamId: { $ifNull: [ '$streamId', '' ] },
         export: { $ifNull: [ '$export', false ] },
         redoEdit: 1,
-        userVerification: 1,
-        userSignature: 1,
-        userImage: 1,
       },
     } );
 
@@ -4218,7 +4187,6 @@ export async function questionList( req, res ) {
       logger.info( `v5 => Checklist Continue => store Name: ${getchecklist[0].storeName}, User Email: ${getchecklist[0].userEmail}, Checklist Name: ${getchecklist[0].checkListName}` );
       // let bucket = JSON.parse( process.env.BUCKET );
       let cdnurl = JSON.parse( process.env.CDNURL );
-      getchecklist[0].userImage = `${cdnurl}/${getchecklist[0].userImage}`;
       for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
         for ( let [ questionIndex, question ] of section.questions.entries() ) {
           let Multianswer = [];
@@ -4274,15 +4242,10 @@ export async function questionList( req, res ) {
               }
               if ( userAns.validationType == 'Capture Multiple Image with description' ) {
                 let imageAnswers = userAns.validationImage;
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationImage = [];
+                userAns.validationImage = [];
                 for ( let image of imageAnswers ) {
                   getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationImage.push( `${cdnurl.TraxAnswerCDN}${image}` );
                 }
-                let videoAnswer = userAns.validationVideo;
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationVideo = [];
-                for ( let image of videoAnswer ) {
-                  getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationVideo.push( `${cdnurl.TraxAnswerCDN}${image}` );
-                }
               }
               if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer =`${cdnurl.TraxAnswerCDN}${userAns.answer}`;
@@ -5527,9 +5490,6 @@ export async function downloadChecklist( req, res ) {
           if ( [ 'Capture Multiple Image with description' ].includes( answer.validationType ) && answer?.validationImage?.length ) {
             answer.validationImage = answer?.validationImage?.map( ( ele ) => JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+ele );
           }
-          if ( [ 'Capture Multiple Image with description' ].includes( answer.validationType ) && answer?.validationVideo?.length ) {
-            answer.validationVideo = answer?.validationVideo?.map( ( ele ) => JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+ele );
-          }
           if ( answer?.answer?.trim() && [ 'image', 'descriptiveImage', 'multipleImage', 'image/video', 'video' ].includes( question.answerType ) ) {
             answer.answer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+answer.answer;
           }