tango-app-api-trax 3.8.14 → 3.8.15-nike

package/src/controllers/mobileTrax.controller.js

@@ -1,4 +1,4 @@
-import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData, listFileByPath, getObject, deleteFiles } from 'tango-app-api-middleware';
+import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData, listFileByPath, getObject, deleteFiles, sendMessageToQueue } from 'tango-app-api-middleware';
 import * as processedchecklist from '../services/processedchecklist.services.js';
 import * as processedtask from '../services/processedTaskList.service.js';
 import * as PCLconfig from '../services/processedchecklistconfig.services.js';
@@ -26,6 +26,7 @@ dayjs.extend( customParseFormat );
 dayjs.extend( timeZone );
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
 import * as cameraService from '../services/camera.service.js';
+import * as recurringFlagTracker from '../services/recurringFlagTracker.service.js';
 dayjs.extend( isSameOrBefore );
 import puppeteer from 'puppeteer';
 import handlebars from './handlebar-helper.js';
@@ -233,15 +234,15 @@ export async function startChecklist( req, res ) {
         },
       } );
       let getupdatedchecklist = await processedchecklist.aggregate( findQuery );
-      let bucket = JSON.parse( process.env.BUCKET );
+      // let bucket = JSON.parse( process.env.BUCKET );
       getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
         section.questions.forEach( async ( question ) => {
           if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
-            question.questionReferenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( question.questionReferenceImage ) } );
+            question.questionReferenceImage = `${cdnurl.TraxAnswerCDN}${question.questionReferenceImage}`;
           }
           question.answers.forEach( async ( answer ) => {
             if ( answer.referenceImage != '' ) {
-              answer.referenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( answer.referenceImage ) } );
+              answer.referenceImage = `${cdnurl.TraxAnswerCDN}${answer.referenceImage}`;
             }
           } );
         } );
@@ -466,19 +467,16 @@ export async function startTask( req, res ) {
     } );
     const getUpdatedTask = await processedTask.aggregate( findQuery );
 
-
+    let cdnurl = JSON.parse( process.env.CDNURL );
     if ( !( task.checkListFrom && task.checkListFrom == 'api' ) ) {
-      const bucket = JSON.parse( process.env.BUCKET );
+      // const bucket = JSON.parse( process.env.BUCKET );
       await Promise.all(
           getUpdatedTask[0].questionAnswers.map( ( section ) =>
             section.questions.map( async ( question ) => {
               if ( question.questionReferenceImage.length > 0 ) {
                 question.questionReferenceImage = await Promise.all(
                     question.questionReferenceImage.map( async ( image ) => {
-                      return await signedUrl( {
-                        Bucket: bucket.sop,
-                        file_path: decodeURIComponent( image ),
-                      } );
+                      return `${cdnurl.TraxAnswerCDN}${image}`;
                     } ),
                 );
               }
@@ -488,10 +486,7 @@ export async function startTask( req, res ) {
                     if ( answer.referenceImage.length > 0 ) {
                       answer.referenceImage = await Promise.all(
                           answer.referenceImage.map( async ( image ) => {
-                            return await signedUrl( {
-                              Bucket: bucket.sop,
-                              file_path: decodeURIComponent( image ),
-                            } );
+                            return `${cdnurl.TraxAnswerCDN}${image}`;
                           } ),
                       );
                     }
@@ -1087,12 +1082,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
   try {
     let requestData = req.body;
     requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
-    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1 } );
+    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1, redoEdit: 1 } );
     let reqAnswers = requestData.questionAnswers;
     logger.error( { functionName: 'updatedPayload', message: reqAnswers } );
     let CLQAnswers = getChecklistQA.questionAnswers;
 
     if ( requestData.submittype == 'submit' ) {
+      if ( getChecklistQA?.redoEdit ) {
+        requestData.submittype = 'draft';
+      }
       reqAnswers.forEach( ( reqA ) => {
         if ( ![ 'multiplechoicemultiple', 'multipleImage', 'image/video' ].includes( reqA?.answerType ) && ( reqA.answerType == 'dropDown' && !reqA.allowMultiple ) ) {
           if ( ( !reqA.linkType && ( reqA.answer == null || reqA.answer == '' ) ) || ( reqA.linkType && reqA.linkquestionenabled && ( reqA.answer == null || reqA.answer == '' ) ) ) {
@@ -1312,27 +1310,35 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 for ( let k = 0; k < qaans.length; k++ ) {
                   let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
                   for ( let s = 0; s < separatedArray.length; s++ ) {
-                    if ( separatedArray[s].answer == qaans[k].answer ) {
-                      if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
-                        if ( separatedArray[s].validationAnswer ) {
-                          let validationAnswer = decodeURIComponent( separatedArray[s].validationAnswer.split( '?' )[0] );
-                          if ( validationAnswer.length ) {
-                            let splitImgUrl = validationAnswer.split( '/' );
-                            if ( splitImgUrl.length > 1 ) {
-                              splitImgUrl.splice( 0, 3 );
-                              qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                    if ( ( separatedArray[s].answer == qaans[k].answer ) ) {
+                      if ( ( getChecklistQA?.redoEdit && qaans[k].redo == separatedArray[s].redo ) || !getChecklistQA?.redoEdit ) {
+                        if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
+                          if ( separatedArray[s].validationAnswer ) {
+                            let validationAnswer = decodeURIComponent( separatedArray[s].validationAnswer.split( '?' )[0] );
+                            if ( validationAnswer.length ) {
+                              let splitImgUrl = validationAnswer.split( '/' );
+                              if ( splitImgUrl.length > 1 ) {
+                                splitImgUrl.splice( 0, 3 );
+                                qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                              }
                             }
                           }
-                        }
-                      } else {
+                        } else {
                         // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                        qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
+                          qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
+                        }
                       }
 
                       mcmo.push( qaans[k] );
                     }
                   }
                 }
+                qaAnswers[j].answers.forEach( ( ele ) => {
+                  if ( typeof ele?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                    ele.redo = false;
+                  }
+                } );
+
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.uniqueqno = qaAnswers[j].uniqueqno;
@@ -1443,7 +1449,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 let des = [];
                 if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
                   let validationAnswer = '';
-                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
+                  if ( requestSection[i].answer.split( '?' ).length > 1 || requestSection[i].answer.includes( 'https://' ) ) {
                     validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
                   }
                   if ( validationAnswer.length ) {
@@ -1937,7 +1943,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let des = [];
                 if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
                   let validationAnswer = '';
-                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
+                  if ( requestSection[i].answer.split( '?' ).length > 1 || requestSection[i].answer.includes( 'https://' ) ) {
                     validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
                   }
                   if ( validationAnswer.length ) {
@@ -2034,6 +2040,102 @@ function QuestionFlag( req, res ) {
   }
 }
 
+async function updateRecurringFlagTracker( processedChecklist, questionAnswers, currentDateTime ) {
+  try {
+    if ( !processedChecklist?.sourceCheckList_id ) return;
+
+    const isUserBased = processedChecklist?.coverage === 'user';
+    const storeId = isUserBased ? '' : ( processedChecklist?.store_id || '' );
+    const userId = isUserBased ? ( processedChecklist?.userId ? String( processedChecklist.userId ) : ( processedChecklist?.userEmail || '' ) ) : '';
+    if ( !isUserBased && !storeId ) return;
+    if ( isUserBased && !userId ) return;
+
+    const today = currentDateTime ? currentDateTime.format( 'YYYY-MM-DD' ) : dayjs().format( 'YYYY-MM-DD' );
+    const yesterday = dayjs( today, 'YYYY-MM-DD' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
+
+    const trackerKeyBase = {
+      client_id: processedChecklist.client_id,
+      sourceCheckList_id: processedChecklist.sourceCheckList_id,
+      ...( isUserBased ) ? { user_id: userId } : { store_id: storeId },
+    };
+
+    const existingRows = await recurringFlagTracker.find( trackerKeyBase, { section_id: 1, qno: 1, consecutiveCount: 1, lastFlaggedDate: 1 } );
+    const existingMap = new Map();
+    for ( const r of existingRows ) {
+      existingMap.set( `${r.section_id || ''}::${r.qno || ''}`, r );
+    }
+
+    const ops = [];
+
+    ( questionAnswers || [] ).forEach( ( section ) => {
+      ( section?.questions || [] ).forEach( ( question ) => {
+        const sectionId = section?.section_id || '';
+        const qno = question?.qno || '';
+        if ( qno === '' ) return;
+
+        const flaggedNow = Array.isArray( question?.userAnswer ) && question.userAnswer.some( ( a ) => a?.sopFlag === true );
+        const key = `${sectionId}::${qno}`;
+        const existing = existingMap.get( key );
+        console.log( flaggedNow, 'test' );
+        if ( flaggedNow ) {
+          let newCount;
+          if ( !existing ) {
+            newCount = 1;
+          } else if ( existing.lastFlaggedDate === today ) {
+            // Multi-submit on same day: already counted, no-op.
+            return;
+          } else if ( existing.lastFlaggedDate === yesterday ) {
+            newCount = ( existing.consecutiveCount || 0 ) + 1;
+          } else {
+            // Gap broke the streak — fresh start.
+            newCount = 1;
+          }
+
+          ops.push( {
+            updateOne: {
+              filter: { ...trackerKeyBase, section_id: sectionId, qno },
+              update: {
+                $set: {
+                  coverage: isUserBased ? 'user' : 'store',
+                  checkListName: processedChecklist.checkListName,
+                  storeName: isUserBased ? '' : ( processedChecklist.storeName || '' ),
+                  userName: processedChecklist.userName || '',
+                  userEmail: processedChecklist.userEmail || '',
+                  sectionName: section?.sectionName || '',
+                  qname: question?.qname || '',
+                  consecutiveCount: newCount,
+                  lastFlaggedDate: today,
+                  lastSubmittedBy: processedChecklist.userName || processedChecklist.userEmail || '--',
+                  lastSubmissionDate: currentDateTime ? currentDateTime.format( 'hh:mm A, DD MMM YYYY' ) : today,
+                },
+              },
+              upsert: true,
+            },
+          } );
+        } else if ( existing && ( existing.consecutiveCount || 0 ) > 0 ) {
+          // Question answered correctly today — break the streak.
+          ops.push( {
+            updateOne: {
+              filter: { ...trackerKeyBase, section_id: sectionId, qno },
+              update: { $set: { lastFlaggedDate: today } },
+            },
+          } );
+        }
+      } );
+    } );
+    if ( ops.length ) {
+      try {
+        let data = await recurringFlagTracker.bulkWrite( ops, { ordered: false } );
+        console.log( 'recurringFlagTracker bulkWrite result', data );
+      } catch ( bulkErr ) {
+        logger.error( { function: 'updateRecurringFlagTracker.bulkWrite', code: bulkErr?.code, message: bulkErr?.message, writeErrors: bulkErr?.writeErrors } );
+      }
+    }
+  } catch ( error ) {
+    logger.error( { function: 'updateRecurringFlagTracker', error } );
+  }
+}
+
 export async function submitChecklist( req, res ) {
   try {
     let requestData = req.body;
@@ -2081,6 +2183,7 @@ export async function submitChecklist( req, res ) {
       let flagCount = QuestionFlag( req, res );
       updateData.questionFlag = flagCount;
       updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+      updateData.redoEdit = false;
       if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
         updateData.deviceDetails =JSON.parse( requestData.deviceDetails );
       }
@@ -2169,6 +2272,10 @@ export async function submitChecklist( req, res ) {
         // };
         // await detectionService.create( detectionData );
         if ( requestData.submittype == 'submit' ) {
+          console.log( checklistDetails?.recurringFlag?.notifyType?.length );
+          if ( checklistDetails?.recurringFlag?.notifyType?.length ) {
+            updateRecurringFlagTracker( getchecklist[0], requestData.questionAnswers, currentDateTime );
+          }
           updateOpenSearch( req.user, requestData );
           let openSearch = JSON.parse( process.env.OPENSEARCH );
           // console.log( 'openSearch', openSearch );
@@ -2340,8 +2447,17 @@ export async function submitTask( req, res ) {
       insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       if ( submittype === 'submit' ) {
         const excludedChecklists = [ 'Store Hygiene Check' ];
-        if ( checklist.checkListName.includes( 'Store Hygiene' ) ) {
-
+        if ( checklist.checkListName.includes( 'Store Hygiene' ) && checklist?.streamId ) {
+          let sqsData = {
+            'storeId': checklist.store_id,
+            'streamID': checklist.streamId,
+            'detectionTime': checklist?.questionAnswers?.[0]?.questions?.[0]?.answers?.[0]?.detectionTime,
+            'date': checklist.date_string,
+            'storeResponseTime': currentDateTime.format( 'HH:mm:ss - MMM DD, YYYY' ),
+            'message_mode': 'retriggered',
+          };
+          let sqsResponse = await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
+          console.log( sqsResponse );
         }
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
           const query1 = [
@@ -3486,7 +3602,7 @@ export async function questionList( req, res ) {
       return res.sendError( 'Check List Got Edited Please Fill Again', 422 );
     } else {
       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 bucket = JSON.parse( process.env.BUCKET );
       let cdnurl = JSON.parse( process.env.CDNURL );
       for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
         for ( let [ questionIndex, question ] of section.questions.entries() ) {
@@ -3512,12 +3628,12 @@ export async function questionList( req, res ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
                 if ( answer.validationType != 'Descriptive Answer' ) {
-                  checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                  checkvalidation = `${cdnurl.TraxAnswerCDN}${answer.validationAnswer}`;
                 } else {
                   checkvalidation = answer.validationAnswer;
                 }
               }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation, ...( answer.redo && { redo: answer.redo } ) } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
 
@@ -3533,23 +3649,23 @@ export async function questionList( req, res ) {
               answer.referenceImage= `${cdnurl.TraxAnswerCDN}${answer.referenceImage}`;
             }
             if ( ( answer.validationType == 'Capture Image' || answer.validationType == 'Capture Video' ) && answer.validationAnswer && answer.validationAnswer != '' ) {
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = `${cdnurl.TraxAnswerCDN}${answer.validationAnswer}`;
             }
           }
           if ( question?.userAnswer ) {
             for ( let [ userAnsIndex, userAns ] of question.userAnswer.entries() ) {
               if ( ( userAns.validationType == 'Capture Image' || userAns.validationType == 'Capture Video' ) && userAns.validationAnswer && userAns.validationAnswer != '' ) {
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( userAns.validationAnswer ), Bucket: bucket.sop } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = `${cdnurl.TraxAnswerCDN}${userAns.validationAnswer}`;
               }
               if ( userAns.validationType == 'Capture Multiple Image with description' ) {
                 let imageAnswers = userAns.validationImage;
                 userAns.validationImage = [];
                 for ( let image of imageAnswers ) {
-                  getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationImage.push( await signedUrl( { file_path: decodeURIComponent( image ), Bucket: bucket.sop } ) );
+                  getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationImage.push( `${cdnurl.TraxAnswerCDN}${image}` );
                 }
               }
               if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer =`${cdnurl.TraxAnswerCDN}${userAns.answer}`;
               }
               if ( userAns.referenceImage != '' ) {
                 // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( userAns.referenceImage ), Bucket: bucket.sop } );
@@ -3856,7 +3972,7 @@ export async function taskQuestionList( req, res ) {
       return res.sendError( 'Task Got Edited Please Fill Again', 422 );
     } else {
       logger.info( `v5 => Task Continue => store Name: ${getchecklist[0].storeName}, User Email: ${getchecklist[0].userEmail}, Task Name: ${getchecklist[0].checkListName}` );
-      let bucket = JSON.parse( process.env.BUCKET );
+      // let bucket = JSON.parse( process.env.BUCKET );
       let cdnurl = JSON.parse( process.env.CDNURL );
       for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
         for ( let [ questionIndex, question ] of section.questions.entries() ) {
@@ -3867,13 +3983,10 @@ export async function taskQuestionList( req, res ) {
             if ( Array.isArray( questionReferenceImage ) ) {
               questionReferenceImage = questionReferenceImage.filter( ( item ) => item != '' );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = await Promise.all(
-                  questionReferenceImage.map( async ( image ) => image ? await signedUrl( { file_path: decodeURIComponent( image ), Bucket: bucket.sop } ) : '' ),
+                  questionReferenceImage.map( async ( image ) => image ? `${cdnurl.TraxAnswerCDN}${image}` : '' ),
               );
             } else if ( questionReferenceImage !== '' ) {
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = await signedUrl( {
-                file_path: decodeURIComponent( questionReferenceImage ),
-                Bucket: bucket.sop,
-              } );
+              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = `${cdnurl.TraxAnswerCDN}${questionReferenceImage}`;
             }
           }
 
@@ -3884,13 +3997,10 @@ export async function taskQuestionList( req, res ) {
               if ( Array.isArray( referenceImage ) ) {
                 referenceImage = referenceImage.filter( ( item ) => item != '' );
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = await Promise.all(
-                    referenceImage.map( async ( image ) => image ? await signedUrl( { file_path: decodeURIComponent( image ), Bucket: bucket.sop } ) : '' ),
+                    referenceImage.map( async ( image ) => image ? `${cdnurl.TraxAnswerCDN}${image}` : '' ),
                 );
               } else if ( referenceImage !== '' ) {
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = await signedUrl( {
-                  file_path: decodeURIComponent( referenceImage ),
-                  Bucket: bucket.sop,
-                } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = `${cdnurl.TraxAnswerCDN}${referenceImage}`;
               }
             }
 
@@ -3898,7 +4008,7 @@ export async function taskQuestionList( req, res ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer != '' ) {
                 if ( answer.validationType != 'Descriptive Answer' ) {
-                  checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
+                  checkvalidation = `${cdnurl.TraxAnswerCDN}${answer.validationAnswer}`;
                 } else {
                   checkvalidation = answer.validationAnswer;
                 }
@@ -3907,10 +4017,7 @@ export async function taskQuestionList( req, res ) {
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
             if ( ( answer.validationType == 'Capture Image' || answer.validationType == 'Capture Video' ) && answer.validationAnswer && answer.validationAnswer != '' ) {
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = await signedUrl( {
-                file_path: decodeURIComponent( answer.validationAnswer ),
-                Bucket: bucket.sop,
-              } );
+              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = `${cdnurl.TraxAnswerCDN}${answer.validationAnswer}`;
             }
           }
 
@@ -3921,25 +4028,16 @@ export async function taskQuestionList( req, res ) {
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].linearType = question.answers[0].linearType;
               }
               if ( ( userAns.validationType == 'Capture Image' || userAns.validationType == 'Capture Video' ) && userAns.validationAnswer && userAns.validationAnswer != '' ) {
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = await signedUrl( {
-                  file_path: decodeURIComponent( userAns.validationAnswer ),
-                  Bucket: bucket.sop,
-                } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = `${cdnurl.TraxAnswerCDN}${userAns.validationAnswer}`;
               }
               if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && rawAnswer != '' ) {
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = await signedUrl( {
-                  file_path: decodeURIComponent( rawAnswer ),
-                  Bucket: bucket.sop,
-                } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = `${cdnurl.TraxAnswerCDN}${rawAnswer}`;
               }
               if ( question.answerType == 'image/video' && rawAnswer != '' ) {
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = `${cdnurl.TraxAnswerCDN}${rawAnswer}`;
               }
               if ( userAns.referenceImage != '' ) {
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = await signedUrl( {
-                  file_path: decodeURIComponent( userAns.referenceImage ),
-                  Bucket: bucket.sop,
-                } );
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = `${cdnurl.TraxAnswerCDN}${userAns.referenceImage}`;
               }
               if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
                 let ansIndex = Multianswer.findIndex( ( item ) => item.answer == rawAnswer );

package/src/controllers/teaxFlag.controller.js

@@ -608,7 +608,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' ] },
+          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] },
         },
         { checkListType: 1 },
     );
@@ -2743,7 +2743,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } },
             {
               runAIQuestionCount: { $gte: 1 },
             },
@@ -2945,7 +2945,7 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
           {
             client_id: requestData.clientId,
             publish: true,
-            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] },
+            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] },
           },
           { checkListType: 1 },
       );
@@ -3047,7 +3047,7 @@ export const flagTablesV2 = async ( req, res ) => {
     }
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } } ] } );
+      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -3055,7 +3055,7 @@ export const flagTablesV2 = 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', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } } );
+      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } } );
     } else if ( requestData?.filter === 'runAI' ) {
       if ( req.body.runAIChecklistName ) {
         findAndQuery.push( { checkListName: { $in: req.body.runAIChecklistName } } );

package/src/controllers/trax.controller.js

@@ -1729,6 +1729,7 @@ export const updateConfigure = async ( req, res ) => {
       owner: inputBody?.checkListDetails?.owner || [],
       restrictAttendance: inputBody?.checkListDetails?.restrictAttendance || false,
       enableNewDeployedStore: inputBody?.checkListDetails?.enableNewDeployedStore || false,
+      redoValidity: inputBody?.checkListDetails?.redoValidity || 7,
     };
 
     if ( inputBody?.checkListDetails?.approver.length ) {
@@ -3907,6 +3908,8 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
               }
             }
             getsubmitDetails[0].questionAnswers = sectionList;
+            getsubmitDetails[0].scheduleEndTime = getCLconfig.scheduleEndTime;
+            getsubmitDetails[0].scheduleEndTime_iso = endTimeIso.format();
             if ( modifiedCount ) {
               getsubmitDetails[0].checklistStatus = 'inprogress';
               getsubmitDetails[0].date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
@@ -4030,6 +4033,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }, { userId: 1, store_id: 1 } );
 
         if ( inprogressData.length ) {
+          await processedchecklist.updateMany( { _id: { $in: inprogressData.map( ( ele ) => new ObjectId( ele._id ) ) } }, { scheduleEndTime: getCLconfig.scheduleEndTime, scheduleEndTime_iso: endTimeIso.format() } );
           inprogressData.forEach( ( item ) => {
             let checkData = assignUserList.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
             if ( !checkData ) {
@@ -4127,7 +4131,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];
@@ -4140,7 +4144,7 @@ export const aiChecklist = async ( req, res ) => {
     checklistDetails = [ ...publishList, ...unpublishList ];
 
     checklistDetails.forEach( ( item ) => {
-      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( item.checkListType ) ) {
+      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( item.checkListType ) ) {
         item.storeCount = storeDetails;
       }
     } );