tango-app-api-trax 3.4.1-alpha-20 → 3.4.1-approvecheck-0

package/src/controllers/mobileTrax.controller.js

@@ -1,4 +1,4 @@
-import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid } from 'tango-app-api-middleware';
+import { logger, signedUrl, fileUpload, getOtp, sendEmailWithSES, getUuid, insertOpenSearchData } 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';
@@ -25,6 +25,7 @@ import handlebars from 'handlebars';
 dayjs.extend( customParseFormat );
 dayjs.extend( timeZone );
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
+import * as cameraService from '../services/camera.service.js';
 dayjs.extend( isSameOrBefore );
 
 export async function storeList( req, res ) {
@@ -90,242 +91,6 @@ export async function storeListv1( req, res ) {
   }
 }
 
-export async function startChecklistv1( req, res ) {
-  try {
-    let requestData = req.body;
-    let findQuery = [];
-    findQuery.push( {
-      $match: {
-        $and: [
-          { _id: new ObjectId( requestData.processedcheckListId ) },
-          { userId: req.user._id },
-          { date_string: requestData.date },
-        ],
-      },
-    } );
-
-    let getBeforeChecklist = await processedchecklist.aggregate( findQuery );
-    if ( !getBeforeChecklist.length ) {
-      return res.sendError( 'Check List Got Edited Please Fill Again', 422 );
-    }
-
-    if ( getBeforeChecklist[0].checklistStatus != 'open' ) {
-      return res.sendError( 'already check list started', 400 );
-    }
-
-    logger.info( `v5 => Checklist Started => store Name: ${getBeforeChecklist[0].storeName || ''}, User Email: ${getBeforeChecklist[0].userEmail}, Checklist Name: ${getBeforeChecklist[0].checkListName}` );
-    let PCLQusestion = await PCLconfig.findOne( { _id: new ObjectId( getBeforeChecklist[0].checkListId ) } );
-    let updateQuery = {};
-    updateQuery._id = new ObjectId( requestData.processedcheckListId );
-    updateQuery.userId = req.user._id;
-    updateQuery.date_string = requestData.date;
-
-    if ( PCLQusestion && PCLQusestion?.questionAnswers && PCLQusestion?.questionAnswers.length > 0 ) {
-      await PCLQusestion.questionAnswers.forEach( ( section ) => {
-        section.questions.forEach( ( question ) => {
-          if ( question.answerType == 'multiplechoicemultiple' ) {
-            let Multianswer = [];
-            if ( question.answers.length > 0 ) {
-              question.answers.forEach( ( answer, ansIndex ) => {
-                Multianswer.push( { 'answer': null, 'no': ansIndex, 'validationAnswer': null } );
-                answer.index = ansIndex;
-              } );
-              question.Multianswer = Multianswer;
-            }
-          } else if ( question.answerType == 'multipleImage' ) {
-            let Multianswer = [];
-            if ( question.answers.length > 0 ) {
-              question.answers.forEach( ( answer, ansIndex ) => {
-                Multianswer.push( { 'answer': null, 'no': ansIndex, 'validationAnswer': null } );
-                answer.index = ansIndex;
-              } );
-              question.Multianswer = Multianswer;
-            }
-          } else {
-            question.Multianswer = [];
-          }
-        } );
-      } );
-    }
-
-    let updateData = {};
-    let currentDateTime;
-    if ( getBeforeChecklist[0].storeName && getBeforeChecklist[0].storeName!='' ) {
-      let storeTimeZone = await storeService.findOne( { storeName: { $regex: getBeforeChecklist[0].storeName, $options: 'i' }, clientId: getBeforeChecklist[0].client_id }, { 'storeProfile.timeZone': 1 } );
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-      } else {
-        currentDateTime = dayjs();
-      }
-    } else {
-      currentDateTime = dayjs();
-    }
-    updateData.checklistStatus = 'inprogress';
-    updateData.startMobileTime = requestData?.currentTime;
-    updateData.questionAnswers = getBeforeChecklist[0]?.redoStatus ? getBeforeChecklist[0].questionAnswers : PCLQusestion.questionAnswers;
-    // const newDateTime = currentDateTime.add(5, 'hours').add(30, 'minutes');
-    // updateData.startTime_string = newDateTime.format('hh:mm A, DD MMM');
-    updateData.startTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
-    updateData.startTime = dayjs.utc( updateData.startTime_string, 'hh:mm A, DD MMM YYYY' ).format();
-
-    let updatechecklist = await processedchecklist.updateOne( updateQuery, updateData );
-    PCLQusestion.startTime = dayjs.utc( updateData.startTime_string, 'hh:mm A, DD MMM YYYY' ).format();
-    PCLQusestion.save();
-    if ( updatechecklist.modifiedCount > 0 ) {
-      findQuery.push( {
-        $project: {
-          checkListName: { $ifNull: [ '$checkListName', '' ] },
-          coverage: { $ifNull: [ '$coverage', '' ] },
-          client_id: { $ifNull: [ '$client_id', '' ] },
-          scheduleStartTime: { $ifNull: [ '$scheduleStartTime', '' ] },
-          scheduleStartTime_iso: { $ifNull: [ '$scheduleStartTime_iso', '' ] },
-          scheduleEndTime: { $ifNull: [ '$scheduleEndTime', '' ] },
-          scheduleEndTime_iso: { $ifNull: [ '$scheduleEndTime_iso', '' ] },
-          checklistStatus: { $ifNull: [ '$checklistStatus', '' ] },
-          checkListId: { $ifNull: [ '$checkListId', '' ] },
-          startTime: { $ifNull: [ '$startTime', '' ] },
-          submitTime: { $ifNull: [ '$submitTime', '' ] },
-          allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-          // allowedStoreLocation: { $ifNull: [ '$checallowedStoreLocationkListName', false ] },
-          allowedStoreLocation: {
-            $cond: {
-              if: { $eq: [ '$client_id', '11' ] },
-              then: false,
-              else: {
-                '$cond': {
-                  'if': { '$eq': [ '$coverage', 'user' ] },
-                  'then': false,
-                  'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
-                },
-              },
-            },
-          },
-          questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
-          redoStatus: { $ifNull: [ '$redoStatus', '' ] },
-        },
-      } );
-      let getupdatedchecklist = await processedchecklist.aggregate( findQuery );
-      // let bucket = JSON.parse( process.env.BUCKET );
-
-      let logInsertData = {
-        store_id: getBeforeChecklist[0]?.store_id || '',
-        storeName: getBeforeChecklist[0]?.storeName || '',
-        action: 'started',
-        checklistId: getBeforeChecklist[0].sourceCheckList_id,
-        processedChecklistId: getBeforeChecklist[0]._id,
-        checkListName: getBeforeChecklist[0].checkListName,
-        type: getBeforeChecklist[0].checkListType,
-        client_id: req.user.clientId,
-        userEmail: getBeforeChecklist[0].userEmail || '',
-        userName: getBeforeChecklist[0].userName || '',
-        coverage: getBeforeChecklist[0].coverage || '',
-      };
-      await checklistLogs.create( logInsertData );
-      let getchecklist = getupdatedchecklist;
-      let questions = [];
-      // function processQuestion( question, section, questions, nested=false ) {
-      //   let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
-      //   if ( findExists && nested ) {
-      //     let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
-      //     questions.splice( findIndex, 1 );
-      //     questions.push( question );
-      //   }
-      //   if ( !findExists ) {
-      //     questions.push( question );
-      //     for ( let answer of question.answers ) {
-      //       if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-      //         let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
-      //         if ( linkedQuestion ) {
-      //           processQuestion( linkedQuestion, section, questions, true );
-      //         }
-      //       }
-      //     }
-      //   }
-      // }
-      for ( let [ index, data ] of getchecklist.entries() ) {
-        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
-          questions = [];
-          for ( let [ questionIdx, question ] of section.questions.entries() ) {
-            let linkedQuestions;
-            if ( !question.linkType ) {
-              question.uniqueNo = parseInt( getOtp() )+ Date.now() + questionIdx;
-              questions.push( question );
-              linkedQuestions = [];
-              let questionList = new Map( section.questions.map( ( ele ) => [ ele.qno, ele ] ) );
-              question.answers.forEach( ( answer ) => {
-                if ( answer.linkedQuestion ) {
-                  let nesedQuestion = [];
-                  answer.oldNestedQuestion = JSON.parse( JSON.stringify( answer.nestedQuestion ) );
-                  answer.nestedQuestion.forEach( ( qn, qidx ) => {
-                    let getQn = questionList.get( qn );
-                    if ( getQn ) {
-                      let randomNo = parseInt( getOtp() ) + Date.now() + qidx;
-                      getQn = JSON.parse( JSON.stringify( getQn ) );
-                      getQn = { ...getQn, uniqueNo: randomNo };
-                      nesedQuestion.push( getQn );
-                      if ( answer.linkedQuestion == getQn.qno ) {
-                        answer.oldLinkedQuestion = answer.linkedQuestion;
-                        answer.linkedQuestion = randomNo;
-                      }
-                      answer.nestedQuestion[qidx] = randomNo;
-                    }
-                  } );
-                  nesedQuestion.forEach( ( ele ) => {
-                    let nestedLinkqn = [];
-                    ele.answers.forEach( ( ans ) => {
-                      if ( ans.linkedQuestion ) {
-                        ans.oldNestedQuestion = JSON.parse( JSON.stringify( ans.nestedQuestion ) );
-                        ans.nestedQuestion.forEach( ( nested, idx ) => {
-                          let findRandom = nesedQuestion.find( ( qn ) => qn.qno == nested && !nestedLinkqn.includes( qn.uniqueNo ) && !qn.updated );
-                          if ( findRandom ) {
-                            if ( ans.linkedQuestion == findRandom.qno ) {
-                              ans.oldLinkedQuestion = ans.linkedQuestion;
-                              ans.linkedQuestion = findRandom.uniqueNo;
-                            }
-                            ans.nestedQuestion[idx] = findRandom.uniqueNo;
-                            nestedLinkqn.push( findRandom.uniqueNo );
-                          }
-                        } );
-                      }
-                    } );
-                    ele.updated = true;
-                  } );
-                  linkedQuestions.push( ...nesedQuestion );
-                }
-              } );
-              questions.push( ...linkedQuestions );
-            }
-            // processQuestion( question, section, questions );
-          }
-          getchecklist[index].questionAnswers[secIndex].questions = questions;
-        }
-      }
-      await processedchecklist.updateOne( updateQuery, { questionAnswers: getchecklist[0].questionAnswers } );
-      getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
-        section.questions.forEach( async ( question ) => {
-          if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
-            question.questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + question.questionReferenceImage;
-            // question.questionReferenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( question.questionReferenceImage ) } );
-          }
-          question.answers.forEach( async ( answer ) => {
-            if ( answer.referenceImage != '' ) {
-              answer.referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.referenceImage;
-              // answer.referenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( answer.referenceImage ) } );
-            }
-          } );
-        } );
-      } );
-      return res.sendSuccess( getchecklist );
-    } else {
-      return res.sendError( 'something went wrong please try again', 500 );
-    }
-  } catch ( e ) {
-    console.log( 'e =>', e );
-    logger.error( { function: 'startChecklist', error: e, body: req.body } );
-    return res.sendError( e, 500 );
-  }
-}
-
 export async function startChecklist( req, res ) {
   try {
     let requestData = req.body;
@@ -498,12 +263,32 @@ export async function startChecklist( req, res ) {
           getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
       }
+      let openSearch = JSON.parse( process.env.OPENSEARCH );
+      // console.log( 'openSearch', openSearch );
+      let inserttraxlogs = {
+        client_id: req.user.clientId,
+        createAt: new Date(),
+        sourceCheckList_id: getBeforeChecklist[0]?.sourceCheckList_id || '',
+        checkListName: getBeforeChecklist[0]?.checkListName || '',
+        fromCheckListName: '',
+        type: 'checkList',
+        action: 'start',
+        storeName: getBeforeChecklist[0]?.storeName || '',
+        store_id: getBeforeChecklist[0]?.store_id || '',
+        createdByEmail: getBeforeChecklist[0]?.userEmail || '',
+        createdBy: getBeforeChecklist[0]?.userName || '',
+        coverage: getBeforeChecklist[0]?.coverage || '',
+        logDetails: {},
+        userType: req.user.userType,
+      };
+      // let insertOS = await insertOpenSearchData( 'test-traxlogs', inserttraxlogs );
+      insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       return res.sendSuccess( getchecklist );
     } else {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
-    console.log( 'e =>', e );
+    // console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -669,6 +454,27 @@ export async function startTask( req, res ) {
     };
     await checklistLogs.create( logData );
 
+    let openSearch = JSON.parse( process.env.OPENSEARCH );
+    // console.log( 'openSearch', openSearch );
+    let inserttraxlogs = {
+      client_id: req.user.clientId,
+      createAt: new Date(),
+      sourceCheckList_id: task.sourceCheckList_id || '',
+      checkListName: task.checkListName || '',
+      fromCheckListName: '',
+      type: 'task',
+      action: 'start',
+      storeName: task.storeName || '',
+      store_id: task.store_id || '',
+      createdByEmail: task.userEmail || '',
+      createdBy: task.userName || '',
+      coverage: task.coverage || '',
+      logDetails: {},
+      userType: req.user.userType,
+    };
+    // let insertOS = await insertOpenSearchData( 'test-traxlogs', inserttraxlogs );
+    // console.log( 'inserttraxlogs', inserttraxlogs );
+    insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
     return res.sendSuccess( getUpdatedTask );
   } catch ( error ) {
     logger.error( { function: 'startTask', error, body: req.body } );
@@ -1210,7 +1016,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
   }
 };
 
-export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next ) {
+export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next ) {
   try {
     let requestData = req.body;
     requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
@@ -1298,16 +1104,11 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
         let requestSection = reqAnswers.filter( ( item ) => item.section_id == section.id );
         for ( let i = 0; i < requestSection.length; i++ ) {
           for ( let j = 0; j < qaAnswers.length; j++ ) {
-            if ( ( requestSection[i].qname == qaAnswers[j].oldQname || requestSection[i].qname == qaAnswers[j].qname ) && ( !qaAnswers[j].uniqueNo || ( qaAnswers[j].uniqueNo && requestSection[i].uniqueNo == qaAnswers[j].uniqueNo ) ) ) {
+            if ( requestSection[i].qname == qaAnswers[j].oldQname || requestSection[i].qname == qaAnswers[j].qname ) {
               if ( qaAnswers[j].answerType == 'yes/no' ) {
                 let qaans = qaAnswers[j].answers;
                 let yn = [];
                 for ( let k = 0; k < qaans.length; k++ ) {
-                  // let requestAnswer = typeof requestSection[i].questionAnswers == 'string' ? JSON.parse( requestSection[i].questionAnswers ) : requestSection[i].questionAnswers;
-                  // let findAnswer = requestAnswer.find( ( ele ) => ele.answer == qaans[k].answer && ele.);
-                  // if ( findAnswer ) {
-                  //   qaans[k].nestedQuestion = typeof findAnswer.nestedQuestion == 'string' ? JSON.parse( findAnswer.nestedQuestion ) : findAnswer.nestedQuestion;
-                  // }
                   if ( requestSection[i].answer == qaans[k].answer ) {
                     if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
                       if ( requestSection[i].validationAnswer ) {
@@ -1342,7 +1143,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                structure.uniqueNo = parseInt( requestSection[i].uniqueNo );
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
@@ -1361,11 +1162,6 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 let qaans = qaAnswers[j].answers;
                 let ms = [];
                 for ( let k = 0; k < qaans.length; k++ ) {
-                  // let requestAnswer = typeof requestSection[i].questionAnswers == 'string' ? JSON.parse( requestSection[i].questionAnswers ) : requestSection[i].questionAnswers;
-                  // let findAnswer= requestAnswer.find( ( ele ) => ele.answer == qaans[k].answer );
-                  // if ( findAnswer ) {
-                  //   qaans[k].nestedQuestion = typeof findAnswer.nestedQuestion == 'string' ? JSON.parse( findAnswer.nestedQuestion ) : findAnswer.nestedQuestion;
-                  // }
                   if ( requestSection[i].answer == qaans[k].answer ) {
                     if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
                       if ( requestSection[i].validationAnswer ) {
@@ -1400,7 +1196,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                structure.uniqueNo = parseInt( requestSection[i].uniqueNo );
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
@@ -1457,7 +1253,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                structure.uniqueNo = parseInt( requestSection[i].uniqueNo );
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
@@ -1519,7 +1315,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                structure.uniqueNo = parseInt( requestSection[i].uniqueNo );
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
@@ -1538,7 +1334,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 let des = [];
                 if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
                   let validationAnswer = '';
-                  if ( requestSection[i].answer.includes( 'https' ) ) {
+                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
                     validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
                   }
                   if ( validationAnswer.length ) {
@@ -1579,7 +1375,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                structure.uniqueNo = parseInt( requestSection[i].uniqueNo );
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
                 structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
                 if ( qaAnswers[j]?.taskId ) {
                   structure.taskId = qaAnswers[j]?.taskId;
@@ -1617,13 +1413,12 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
   }
 };
 
-export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next ) {
+export async function sopMobileTaskMultiSectionFormatter( 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 processedTask.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1 } );
     let reqAnswers = requestData.questionAnswers;
-    logger.error( { functionName: 'updatedPayload', message: reqAnswers } );
     let CLQAnswers = getChecklistQA.questionAnswers;
 
     if ( requestData.submittype == 'submit' ) {
@@ -1636,58 +1431,6 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
       } );
     }
 
-    if ( requestData?.editSubmit && requestData?.editSubmit == 'true' ) {
-      let sampleData = reqAnswers[0];
-      CLQAnswers.forEach( ( section ) => {
-        let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
-        if ( requestSection.length ) {
-          requestSection.forEach( ( item ) => item.section_id = section.section_id );
-          section.questions.forEach( ( question ) => {
-            let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
-            if ( !sectionQuestion.length ) {
-              let data = { ...requestSection[0] };
-              data.answerType = question.answerType;
-              data.qno = question.qno;
-              data.qname = question.qname;
-              data.oldQname = question?.oldQname || question.qname;
-              data.answer = 'null';
-              data.remarks = '';
-              data.validationAnswer = '';
-              data.Multianswer = [];
-              data.linkType = question.linkType;
-              data.linkquestionenabled = question.linkType;
-              data.linkedQuestion = null;
-              data.showLinked = null;
-              data.parentanswer = '';
-              data.dateRangeType = false;
-              reqAnswers.push( data );
-            }
-          } );
-        } else {
-          section.questions.forEach( ( ele ) => {
-            let data = { ...sampleData };
-            data.section_id = section.section_id;
-            data.sectionName = section.sectionName;
-            data.answerType = ele.answerType;
-            data.qno = ele.qno;
-            data.qname = ele.qname;
-            data.oldQname = ele?.oldQname || ele.qname;
-            data.answer = 'null';
-            data.remarks = '';
-            data.validationAnswer = '';
-            data.Multianswer = [];
-            data.linkType = ele.linkType;
-            data.linkquestionenabled = ele.linkType;
-            data.linkedQuestion = null;
-            data.showLinked = null;
-            data.parentanswer = '';
-            data.dateRangeType = false;
-            reqAnswers.push( data );
-          } );
-        }
-      } );
-    }
-
     let sectionFormat = [];
     let uniqueSections = {};
     reqAnswers.forEach( ( item ) => {
@@ -1698,14 +1441,14 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
     } );
     const uniqueArray = Object.values( uniqueSections );
     for ( let section of uniqueArray ) {
-      let CLQSection = CLQAnswers.find( ( item ) => item.section_id.toString() == section.id.toString() );
+      let CLQSection = CLQAnswers.find( ( item ) => item.section_id == section.id );
       if ( CLQSection ) {
         let newArray = [];
         let qaAnswers = CLQSection.questions;
         let requestSection = reqAnswers.filter( ( item ) => item.section_id == section.id );
         for ( let i = 0; i < requestSection.length; i++ ) {
           for ( let j = 0; j < qaAnswers.length; j++ ) {
-            if ( requestSection[i].qname == qaAnswers[j].oldQname || requestSection[i].qname == qaAnswers[j].qname ) {
+            if ( requestSection[i].qno == qaAnswers[j].qno ) {
               if ( qaAnswers[j].answerType == 'yes/no' ) {
                 let qaans = qaAnswers[j].answers;
                 let yn = [];
@@ -1723,7 +1466,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                         }
                       }
                     } else {
-                      // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                      qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                       qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
                     }
                     yn.push( qaans[k] );
@@ -1744,15 +1487,10 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
-                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
-                if ( qaAnswers[j]?.taskId ) {
-                  structure.taskId = qaAnswers[j]?.taskId;
-                  structure.task = true;
-                }
+
                 if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
                   structure.redo = false;
-                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
+                } else if ( requestData.submittype === 'draft' ) {
                   structure.redo = qaAnswers[j]?.redo;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1776,346 +1514,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                         }
                       }
                     } else {
-                      // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                      qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
-                    }
-                    ms.push( qaans[k] );
-                  }
-                }
-                let structure = {};
-                structure.qno = qaAnswers[j].qno;
-                structure.qname = qaAnswers[j].qname;
-                structure.answerType = qaAnswers[j].answerType;
-                structure.runAI = qaAnswers[j].runAI;
-                structure.runAIDescription = qaAnswers[j].runAIDescription;
-                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
-                structure.answers = qaAnswers[j].answers;
-                structure.userAnswer = ms;
-                structure.linkType = qaAnswers[j].linkType;
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
-                structure.parentanswer = requestSection[i].parentanswer;
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
-                structure.descriptivetype = qaAnswers[j].descriptivetype;
-                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
-                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
-                if ( qaAnswers[j]?.taskId ) {
-                  structure.taskId = qaAnswers[j]?.taskId;
-                  structure.task = true;
-                }
-                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
-                  structure.redo = false;
-                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
-                  structure.redo = qaAnswers[j]?.redo;
-                }
-                if ( qaAnswers[j]?.redoComment ) {
-                  structure.redoComment = qaAnswers[j]?.redoComment;
-                };
-                newArray.push( structure );
-              } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' ) {
-                let qaans = qaAnswers[j].answers;
-                let mcmo = [];
-                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( '/' ) || '';
-                            }
-                          }
-                        }
-                      } else {
-                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                        qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
-                      }
-
-                      mcmo.push( qaans[k] );
-                    }
-                  }
-                }
-                let structure = {};
-                structure.qno = qaAnswers[j].qno;
-                structure.qname = qaAnswers[j].qname;
-                structure.answerType = qaAnswers[j].answerType;
-                structure.runAI = qaAnswers[j].runAI;
-                structure.runAIDescription = qaAnswers[j].runAIDescription;
-                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
-                structure.answers = qaAnswers[j].answers;
-                structure.userAnswer = mcmo;
-                structure.linkType = qaAnswers[j].linkType;
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
-                structure.parentanswer = requestSection[i].parentanswer;
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
-                structure.descriptivetype = qaAnswers[j].descriptivetype;
-                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
-                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
-                if ( qaAnswers[j]?.taskId ) {
-                  structure.taskId = qaAnswers[j]?.taskId;
-                  structure.task = true;
-                }
-                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
-                  structure.redo = false;
-                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
-                  structure.redo = qaAnswers[j]?.redo;
-                }
-                if ( qaAnswers[j]?.redoComment ) {
-                  structure.redoComment = qaAnswers[j]?.redoComment;
-                };
-                newArray.push( structure );
-              } else if ( qaAnswers[j].answerType == 'multipleImage' ) {
-                let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
-                let mcmi = [];
-                // for (let k = 0; k < qaans.length; k++) {
-                for ( let s = 0; s < separatedArray.length; s++ ) {
-                  if ( separatedArray[s].answer && separatedArray[s].answer !='' ) {
-                    let newAnswer = {};
-                    let validationAnswer = decodeURIComponent( separatedArray[s].answer.split( '?' )[0] );
-                    if ( validationAnswer.length ) {
-                      let splitImgUrl = validationAnswer.split( '/' );
-                      if ( splitImgUrl.length > 1 ) {
-                        splitImgUrl.splice( 0, 3 );
-                        newAnswer.answer = splitImgUrl.join( '/' ) || '';
-                      }
-                    }
-
-                    newAnswer.answeroptionNumber = 0;
-                    newAnswer.sopFlag = false;
-                    newAnswer.validation = false;
-                    newAnswer.validationType = '';
-                    newAnswer.referenceImage = '';
-                    newAnswer.allowUploadfromGallery = false;
-                    newAnswer.runAI = false;
-                    newAnswer.descriptivetype = '';
-                    newAnswer.showLinked = false;
-                    newAnswer.linkedQuestion = 0;
-                    newAnswer.nestedQuestion = [];
-                    newAnswer.index = s;
-                    mcmi.push( newAnswer );
-                  }
-                }
-                // }
-                let structure = {};
-                structure.qno = qaAnswers[j].qno;
-                structure.qname = qaAnswers[j].qname;
-                structure.answerType = qaAnswers[j].answerType;
-                structure.runAI = qaAnswers[j].runAI;
-                structure.runAIDescription = qaAnswers[j].runAIDescription;
-                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
-                structure.answers = qaAnswers[j].answers;
-                structure.userAnswer = mcmi;
-                structure.linkType = qaAnswers[j].linkType;
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
-                structure.parentanswer = requestSection[i].parentanswer;
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
-                structure.descriptivetype = qaAnswers[j].descriptivetype;
-                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
-                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
-                if ( qaAnswers[j]?.taskId ) {
-                  structure.taskId = qaAnswers[j]?.taskId;
-                  structure.task = true;
-                }
-                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
-                  structure.redo = false;
-                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
-                  structure.redo = qaAnswers[j]?.redo;
-                }
-                if ( qaAnswers[j]?.redoComment ) {
-                  structure.redoComment = qaAnswers[j]?.redoComment;
-                };
-                newArray.push( structure );
-              } else {
-                let des = [];
-                if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
-                  let validationAnswer = '';
-                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
-                    validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
-                  }
-                  if ( validationAnswer.length ) {
-                    let splitImgUrl = validationAnswer.split( '/' );
-                    if ( splitImgUrl.length > 1 ) {
-                      splitImgUrl.splice( 0, 3 );
-                      requestSection[i].answer = splitImgUrl.join( '/' );
-                    }
-                  }
-                  let ansstructure = {
-                    answer: requestSection[i].answer,
-                    answeroptionNumber: 1,
-                    sopFlag: false,
-                    validation: false,
-                    validationType: '',
-                    validationAnswer: '',
-                    referenceImage: qaAnswers[j].answers[0].referenceImage,
-                    showLinked: qaAnswers[j].answers[0].showLinked,
-                    linkedQuestion: qaAnswers[j].answers[0].linkedQuestion,
-                  };
-                  if ( qaAnswers[j].answerType == 'date' ) {
-                    ansstructure.dateRangeType = requestSection[i].dateRangeType || false;
-                  }
-                  des.push( ansstructure );
-                }
-                let structure = {};
-                structure.qno = qaAnswers[j].qno;
-                structure.qname = qaAnswers[j].qname;
-                structure.answerType = qaAnswers[j].answerType;
-                structure.runAI = qaAnswers[j].runAI;
-                structure.runAIDescription = qaAnswers[j].runAIDescription;
-                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
-                structure.answers = qaAnswers[j].answers;
-                structure.userAnswer = des;
-                structure.linkType = qaAnswers[j].linkType;
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
-                structure.parentanswer = requestSection[i].parentanswer;
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
-                structure.descriptivetype = qaAnswers[j].descriptivetype;
-                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
-                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
-                if ( qaAnswers[j]?.taskId ) {
-                  structure.taskId = qaAnswers[j]?.taskId;
-                  structure.task = true;
-                }
-                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
-                  structure.redo = false;
-                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
-                  structure.redo = qaAnswers[j]?.redo;
-                }
-                if ( qaAnswers[j]?.redoComment ) {
-                  structure.redoComment = qaAnswers[j]?.redoComment;
-                };
-                newArray.push( structure );
-              }
-            }
-          }
-        }
-        let sectionData = {
-          'section_id': section.id,
-          'sectionName': section.name,
-          'questions': newArray,
-        };
-        sectionFormat.push( sectionData );
-      }
-    }
-
-
-    requestData.questionAnswers = sectionFormat;
-    logger.error( { message: requestData.questionAnswers, error: 'QuestionanswersPayload' } );
-    next();
-  } catch ( error ) {
-    logger.error( { function: 'sopMobilechecklistMultiSectionFormatter', error: error, body: req.body } );
-    return res.sendError( error, 500 );
-  }
-};
-
-export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
-  try {
-    let requestData = req.body;
-    requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
-    let getChecklistQA = await processedTask.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1 } );
-    let reqAnswers = requestData.questionAnswers;
-    let CLQAnswers = getChecklistQA.questionAnswers;
-
-    if ( requestData.submittype == 'submit' ) {
-      reqAnswers.forEach( ( reqA ) => {
-        if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( reqA?.answerType ) ) {
-          if ( ( !reqA.linkType && ( reqA.answer == null || reqA.answer == '' ) ) || ( reqA.linkType && reqA.linkquestionenabled && ( reqA.answer == null || reqA.answer == '' ) ) ) {
-            return res.sendError( 'Please Fill All Fields', 400 );
-          }
-        }
-      } );
-    }
-
-    let sectionFormat = [];
-    let uniqueSections = {};
-    reqAnswers.forEach( ( item ) => {
-      const key = `${item.section_id}-${item.sectionName}`;
-      if ( !uniqueSections[key] ) {
-        uniqueSections[key] = { id: item.section_id, name: item.sectionName };
-      }
-    } );
-    const uniqueArray = Object.values( uniqueSections );
-    for ( let section of uniqueArray ) {
-      let CLQSection = CLQAnswers.find( ( item ) => item.section_id == section.id );
-      if ( CLQSection ) {
-        let newArray = [];
-        let qaAnswers = CLQSection.questions;
-        let requestSection = reqAnswers.filter( ( item ) => item.section_id == section.id );
-        for ( let i = 0; i < requestSection.length; i++ ) {
-          for ( let j = 0; j < qaAnswers.length; j++ ) {
-            if ( requestSection[i].qno == qaAnswers[j].qno ) {
-              if ( qaAnswers[j].answerType == 'yes/no' ) {
-                let qaans = qaAnswers[j].answers;
-                let yn = [];
-                for ( let k = 0; k < qaans.length; k++ ) {
-                  if ( requestSection[i].answer == qaans[k].answer ) {
-                    if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
-                      if ( requestSection[i].validationAnswer ) {
-                        let validateAns = decodeURIComponent( requestSection[i].validationAnswer.split( '?' )[0] );
-                        if ( validateAns.length ) {
-                          let splitImgUrl = validateAns.split( '/' );
-                          if ( splitImgUrl.length > 1 ) {
-                            splitImgUrl.splice( 0, 3 );
-                            qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
-                          }
-                        }
-                      }
-                    } else {
-                      qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                      qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
-                    }
-                    yn.push( qaans[k] );
-                  }
-                }
-                let structure = {};
-                structure.qno = qaAnswers[j].qno;
-                structure.qname = qaAnswers[j].qname;
-                structure.answerType = qaAnswers[j].answerType;
-                structure.runAI = qaAnswers[j].runAI;
-                structure.runAIDescription = qaAnswers[j].runAIDescription;
-                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
-                structure.answers = qaAnswers[j].answers;
-                structure.userAnswer = yn;
-                structure.linkType = qaAnswers[j].linkType;
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
-                structure.parentanswer = requestSection[i].parentanswer;
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
-                structure.descriptivetype = qaAnswers[j].descriptivetype;
-
-                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
-                  structure.redo = false;
-                } else if ( requestData.submittype === 'draft' ) {
-                  structure.redo = qaAnswers[j]?.redo;
-                }
-                if ( qaAnswers[j]?.redoComment ) {
-                  structure.redoComment = qaAnswers[j]?.redoComment;
-                };
-                newArray.push( structure );
-              } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' ) {
-                let qaans = qaAnswers[j].answers;
-                let ms = [];
-                for ( let k = 0; k < qaans.length; k++ ) {
-                  if ( requestSection[i].answer == qaans[k].answer ) {
-                    if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
-                      if ( requestSection[i].validationAnswer ) {
-                        let validationAnswer = decodeURIComponent( requestSection[i].validationAnswer.split( '?' )[0] );
-                        if ( validationAnswer.length ) {
-                          let splitImgUrl = validationAnswer.split( '/' );
-                          if ( splitImgUrl.length > 1 ) {
-                            splitImgUrl.splice( 0, 3 );
-                            qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
-                          }
-                        }
-                      }
-                    } else {
-                      qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                      qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                       qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
                     }
                     ms.push( qaans[k] );
@@ -2397,6 +1796,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.deviceDetails = requestData?.deviceDetails || {};
       if ( requestData.submittype == 'draft' ) {
         logger.info( `v5 => Checklist Save => store Name: ${getchecklist[0].storeName}, User Email: ${getchecklist[0].userEmail}, Checklist Name: ${getchecklist[0].checkListName}` );
         updateData.questionAnswers = requestData.questionAnswers;
@@ -2434,72 +1834,299 @@ export async function submitChecklist( req, res ) {
           }
         }
 
-        let logInsertData = {
-          store_id: getchecklist[0].store_id || '',
-          storeName: getchecklist[0].storeName || '',
-          action: requestData?.submittype === 'draft' ? 'saved' : 'submitted',
-          checklistId: getchecklist[0].sourceCheckList_id,
-          processedChecklistId: getchecklist[0]._id,
-          checkListName: getchecklist[0].checkListName,
-          type: getchecklist[0].checkListType,
+        let logInsertData = {
+          store_id: getchecklist[0].store_id || '',
+          storeName: getchecklist[0].storeName || '',
+          action: requestData?.submittype === 'draft' ? 'saved' : 'submitted',
+          checklistId: getchecklist[0].sourceCheckList_id,
+          processedChecklistId: getchecklist[0]._id,
+          checkListName: getchecklist[0].checkListName,
+          type: getchecklist[0].checkListType,
+          client_id: req.user.clientId,
+          redoStatus: requestData?.redoStatus ? true : false,
+          userEmail: getchecklist[0].userEmail || '',
+          userName: getchecklist[0].userName || '',
+          coverage: getchecklist[0].coverage || '',
+        };
+        // console.log( 'logInsertData=>', logInsertData );
+        await checklistLogs.create( logInsertData );
+        // let time = dayjs().format( 'HH:mm:ss' );
+        // let [ hours, minutes ] = time.split( ':' ).map( Number );
+        // let nearestMultipleOf10Minutes = Math.floor( minutes / 10 ) * 10;
+        // let roundedHours = hours + Math.floor( ( minutes - nearestMultipleOf10Minutes ) / 60 );
+        // let roundedMinutes = nearestMultipleOf10Minutes;
+        // let roundedSeconds = 0;
+        // let roundedTime = `${String( roundedHours ).padStart( 2, '0' )}:${String( roundedMinutes ).padStart( 2, '0' )}:${String( roundedSeconds ).padStart( 2, '0' )}`;
+        // let createdAtDate;
+        // if ( storeTimeZone?.timezone ) {
+        //   createdAtDate = dayjs( `${getchecklist[0].date_string} ${time}`, 'YYYY-MM-DD hh:mm:ss' ).tz( storeTimeZone?.timezone ).utc( '+00:00' );
+        // } else {
+        //   createdAtDate = dayjs( `${getchecklist[0].date_string} ${time}`, 'YYYY-MM-DD hh:mm:ss' ).utc( '+00:00' );
+        // }
+        // let detectionData = {
+        //   client_id: req.user.clientId,
+        //   store_id: getchecklist[0].store_id,
+        //   userName: req.user.name,
+        //   userId: req.user._id,
+        //   time: time,
+        //   type: 'positive',
+        //   checklistName: getchecklist[0].checkListName,
+        //   checklistId: getchecklist[0].checkListId,
+        //   sourceChecklist_id: getchecklist[0].sourceCheckList_id,
+        //   category: 'custom',
+        //   scheduleTime: getchecklist[0].scheduleEndTime_iso,
+        //   startRange: roundedTime,
+        //   date_iso: getchecklist[0].date_iso,
+        //   date_string: getchecklist[0].date_string,
+        //   createdAt: createdAtDate,
+        // };
+        // await detectionService.create( detectionData );
+        if ( requestData.submittype == 'submit' ) {
+          updateOpenSearch( req.user, requestData );
+          let openSearch = JSON.parse( process.env.OPENSEARCH );
+          // console.log( 'openSearch', openSearch );
+          let inserttraxlogs = {
+            client_id: req.user.clientId,
+            createAt: new Date(),
+            sourceCheckList_id: getchecklist[0].sourceCheckList_id,
+            checkListName: getchecklist[0].checkListName,
+            type: 'checkList',
+            action: requestData?.submittype === 'draft' ? 'save' : 'submit',
+            storeName: getchecklist[0].storeName,
+            store_id: getchecklist[0].store_id,
+            userName: getchecklist[0].userName,
+            userEmail: getchecklist[0].userEmail,
+            createdByEmail: getchecklist[0].userEmail,
+            createdBy: getchecklist[0].userName,
+            coverage: getchecklist[0].coverage,
+            checkListType: getchecklist[0].checkListType,
+            logDetails: {},
+            userType: req.user.userType,
+          };
+          // console.log( 'inserttraxlogs', inserttraxlogs );
+          insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
+        }
+
+        return res.sendSuccess( 'Checklist Updated Successfully' );
+      } else {
+        return res.sendError( 'something went wrong please try again', 500 );
+      }
+    }
+  } catch ( e ) {
+    logger.error( { function: 'submitChecklist', error: e, body: req.body } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function submitTask( req, res ) {
+  try {
+    const { body: requestData, user } = req;
+    const { processedcheckListId, date, submittype, currentTime, questionAnswers } = requestData;
+
+    const findQuery = [
+      {
+        $match: {
+          _id: new ObjectId( processedcheckListId ),
+          userId: user._id,
+          date_string: date,
+        },
+      },
+    ];
+
+    const [ checklist ] = await processedTask.aggregate( findQuery );
+
+    if ( !checklist ) {
+      return res.sendError( 'Task edited. Please fill again', 422 );
+    }
+
+    // eslint-disable-next-line camelcase
+    const { checklistStatus, storeName, userEmail, checkListName, store_id } = checklist;
+
+    if ( checklistStatus === 'open' ) {
+      return res.sendError( 'Checklist is in open status. Please start.', 400 );
+    }
+
+    if ( checklistStatus === 'submit' ) {
+      return res.sendError( 'Checklist already submitted', 400 );
+    }
+
+    const storeTimeZone = await storeService.findOne( { storeName }, { 'storeProfile.timeZone': 1 } );
+    const currentDateTime = storeTimeZone?.storeProfile?.timeZone ?
+      dayjs().tz( storeTimeZone.storeProfile.timeZone ) :
+      dayjs();
+
+    const updateQuery = {
+      _id: new ObjectId( processedcheckListId ),
+      userId: user._id,
+      date_string: date,
+    };
+
+    // questionAnswers.forEach( ( section ) => {
+    //   section.questions.forEach( ( question ) => {
+    //     if ( question.redo === true ) {
+    //       question.redo = false;
+    //     }
+    //   } );
+    // } );
+
+    const updateData = {
+      questionAnswers,
+      updatedAt: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+      questionFlag: QuestionFlag( req, res ),
+    };
+
+    if ( submittype === 'draft' ) {
+      logger.info(
+          `v5 => Checklist Save => store Name: ${storeName}, User Email: ${userEmail}, Checklist Name: ${checkListName}`,
+      );
+      updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    } else if ( submittype === 'submit' ) {
+      logger.info(
+          `v5 => Checklist Submit => store Name: ${storeName}, User Email: ${userEmail}, Checklist Name: ${checkListName}`,
+      );
+      Object.assign( updateData, {
+        submitTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+        checklistStatus: 'submit',
+        submitMobileTime: currentTime,
+        submitTime_string: currentDateTime.format( 'hh:mm A, DD MMM YYYY' ),
+      } );
+    }
+
+    const updateResult = await processedTask.updateOne( updateQuery, updateData );
+
+    if ( updateResult.modifiedCount > 0 ) {
+      if ( submittype === 'submit' ) {
+        const query1 = [
+          {
+            $match: {
+              userId: user._id,
+              sourceCheckList_id: checklist.sourceCheckList_id,
+              checklistStatus: { $in: [ 'open', 'inprogress' ] },
+            },
+          },
+          {
+            $project: {
+              _id: 1,
+              date_iso: 1,
+              date_string: 1,
+            },
+          },
+        ];
+
+        const processedTasksToDelete = await processedTask.aggregate( query1 );
+
+        if ( processedTasksToDelete?.length ) {
+          const deleteIds = processedTasksToDelete?.filter( ( val ) => val?.date_string !== date )?.map( ( val ) => val?._id );
+
+          if ( deleteIds?.length ) {
+            await processedTask.deleteMany( { _id: { $in: deleteIds } } );
+          }
+        }
+      } else if ( submittype === 'draft' ) {
+        const query2 = [
+          {
+            $match: {
+              _id: checklist.sourceCheckList_id,
+            },
+          },
+        ];
+        const [ taskConfig ] = await taskConfigService.aggregate( query2 );
+
+        if ( taskConfig.scheduleEndTimeISO ) {
+          const endDate = dayjs( taskConfig.scheduleEndTimeISO ).utc();
+          const startDate = dayjs().add( 1, 'day' );
+
+          let currentDate = startDate;
+
+          while ( currentDate.isSameOrBefore( endDate ) ) {
+            const updateDate = currentDate.format( 'YYYY-MM-DD' );
+
+            const updateQuery = {
+              sourceCheckList_id: taskConfig._id,
+              date_string: updateDate,
+              userId: user._id,
+            };
+
+            if ( Object.values( updateQuery ).length === 3 ) {
+              await processedTask.updateOne( updateQuery, { questionAnswers, checklistStatus: 'inprogress' } );
+            }
+
+            currentDate = currentDate.add( 1, 'day' );
+          }
+        }
+      }
+      const logInsertData = {
+        // eslint-disable-next-line camelcase
+        store_id,
+        storeName,
+        action: submittype === 'draft' ? 'saved' : 'submitted',
+        checklistId: checklist.sourceCheckList_id,
+        processedChecklistId: checklist._id,
+        type: checklist.checkListType,
+        checkListName,
+        client_id: user.clientId,
+        redoStatus: requestData?.redoStatus ? true : false,
+      };
+      await checklistLogs.create( logInsertData );
+
+      if ( submittype == 'submit' ) {
+        updateOpenSearchTask( user, requestData );
+        let openSearch = JSON.parse( process.env.OPENSEARCH );
+        // console.log( 'openSearch', openSearch );
+        let inserttraxlogs = {
           client_id: req.user.clientId,
-          redoStatus: requestData?.redoStatus ? true : false,
-          userEmail: getchecklist[0].userEmail || '',
-          userName: getchecklist[0].userName || '',
-          coverage: getchecklist[0].coverage || '',
+          createAt: new Date(),
+          sourceCheckList_id: checklist.sourceCheckList_id,
+          checkListName: checklist.checkListName,
+          type: 'task',
+          action: requestData?.submittype === 'draft' ? 'save' : 'submit',
+          storeName: checklist.storeName,
+          store_id: checklist.store_id,
+          userName: checklist.userName,
+          userEmail: checklist.userEmail,
+          createdByEmail: checklist.userEmail,
+          createdBy: checklist.userName,
+          coverage: checklist.coverage,
+          checkListType: checklist.checkListType,
+          logDetails: {},
+          userType: req.user.userType,
         };
-        console.log( 'logInsertData=>', logInsertData );
-        await checklistLogs.create( logInsertData );
-        // let time = dayjs().format( 'HH:mm:ss' );
-        // let [ hours, minutes ] = time.split( ':' ).map( Number );
-        // let nearestMultipleOf10Minutes = Math.floor( minutes / 10 ) * 10;
-        // let roundedHours = hours + Math.floor( ( minutes - nearestMultipleOf10Minutes ) / 60 );
-        // let roundedMinutes = nearestMultipleOf10Minutes;
-        // let roundedSeconds = 0;
-        // let roundedTime = `${String( roundedHours ).padStart( 2, '0' )}:${String( roundedMinutes ).padStart( 2, '0' )}:${String( roundedSeconds ).padStart( 2, '0' )}`;
-        // let createdAtDate;
-        // if ( storeTimeZone?.timezone ) {
-        //   createdAtDate = dayjs( `${getchecklist[0].date_string} ${time}`, 'YYYY-MM-DD hh:mm:ss' ).tz( storeTimeZone?.timezone ).utc( '+00:00' );
-        // } else {
-        //   createdAtDate = dayjs( `${getchecklist[0].date_string} ${time}`, 'YYYY-MM-DD hh:mm:ss' ).utc( '+00:00' );
-        // }
-        // let detectionData = {
-        //   client_id: req.user.clientId,
-        //   store_id: getchecklist[0].store_id,
-        //   userName: req.user.name,
-        //   userId: req.user._id,
-        //   time: time,
-        //   type: 'positive',
-        //   checklistName: getchecklist[0].checkListName,
-        //   checklistId: getchecklist[0].checkListId,
-        //   sourceChecklist_id: getchecklist[0].sourceCheckList_id,
-        //   category: 'custom',
-        //   scheduleTime: getchecklist[0].scheduleEndTime_iso,
-        //   startRange: roundedTime,
-        //   date_iso: getchecklist[0].date_iso,
-        //   date_string: getchecklist[0].date_string,
-        //   createdAt: createdAtDate,
-        // };
-        // await detectionService.create( detectionData );
-        if ( requestData.submittype == 'submit' ) {
-          updateOpenSearch( req.user, requestData );
-        }
-
-        return res.sendSuccess( 'Checklist Updated Successfully' );
-      } else {
-        return res.sendError( 'something went wrong please try again', 500 );
+        // console.log( 'inserttraxlogs', inserttraxlogs );
+        insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       }
+
+      return res.sendSuccess( 'Task Updated Successfully' );
+    } else {
+      return res.sendError( 'Something went wrong. Please try again', 500 );
     }
-  } catch ( e ) {
-    logger.error( { function: 'submitChecklist', error: e, body: req.body } );
-    return res.sendError( e, 500 );
+  } catch ( error ) {
+    logger.error( { function: 'submitTask', error, body: req.body } );
+    return res.sendError( error.message || 'Internal Server Error', 500 );
   }
 }
-
-export async function submitTask( req, res ) {
+export async function submiteyeTestTask( req, res ) {
   try {
     const { body: requestData, user } = req;
-    const { processedcheckListId, date, submittype, currentTime, questionAnswers } = requestData;
+    const { processedcheckListId, date, submittype, currentTime, questionAnswers, streamId, qrCode } = requestData;
+    // console.log( requestData );
+    if ( !streamId ) {
+      return res.sendError( 'streamId is required', 400 );
+    }
+    if ( !qrCode||qrCode=='' ) {
+      return res.sendError( 'qrCode is required', 400 );
+    }
+    let findoldQrExists = await cameraService.findOne( { qrCode: qrCode } );
+    if ( findoldQrExists ) {
+      return res.sendError( 'Qr code already Exists', 400 );
+    }
+    let findQrExists = await cameraService.findOne( { streamName: streamId, qrCode: qrCode } );
+    // console.log( findQrExists );
+    if ( findQrExists ) {
+      return res.sendError( 'Qr code already Exists', 400 );
+    }
+
+    await cameraService.updateOne( { streamName: streamId }, { qrCode: qrCode } );
+    return res.sendSuccess( 'Qr code added successfully' );
 
     const findQuery = [
       {
@@ -2656,7 +2283,7 @@ export async function submitTask( req, res ) {
       return res.sendError( 'Something went wrong. Please try again', 500 );
     }
   } catch ( error ) {
-    logger.error( { function: 'submitTask', error, body: req.body } );
+    logger.error( { function: 'submiteyeTestTask', error, body: req.body } );
     return res.sendError( error.message || 'Internal Server Error', 500 );
   }
 }
@@ -2931,7 +2558,7 @@ export async function dashboardv1( req, res ) {
 
     return res.sendSuccess( totalResult );
   } catch ( e ) {
-    console.log( 'v1 =>', e );
+    // console.log( 'v1 =>', e );
     logger.error( { function: 'dashboardv1', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -3106,6 +2733,7 @@ export async function checklistv1( req, res ) {
             client_id: { $ifNull: [ '$client_id', '' ] },
             coverage: { $ifNull: [ '$coverage', '' ] },
             taskType: { $ifNull: [ '$planoType', '' ] },
+            streamId: { $ifNull: [ '$streamId', '' ] },
           },
         },
       ];
@@ -3155,261 +2783,6 @@ export async function checklistv1( req, res ) {
   }
 }
 
-export async function questionListv1( req, res ) {
-  try {
-    let requestData = req.query;
-    if ( !requestData.processedcheckListId ) {
-      res.sendError( 'processedcheckListId is Required', 400 );
-    }
-
-    let findQuery = [];
-    let findAndQuery = [];
-    findAndQuery.push( { _id: new ObjectId( requestData.processedcheckListId ) } );
-    findQuery.push( { $match: { $and: findAndQuery } } );
-
-    findQuery.push( {
-      $project: {
-        checkListName: { $ifNull: [ '$checkListName', '' ] },
-        scheduleStartTime: { $ifNull: [ '$scheduleStartTime', '' ] },
-        scheduleStartTime_iso: { $ifNull: [ '$scheduleStartTime_iso', '' ] },
-        scheduleEndTime: { $ifNull: [ '$scheduleEndTime', '' ] },
-        scheduleEndTime_iso: { $ifNull: [ '$scheduleEndTime_iso', '' ] },
-        checklistStatus: { $ifNull: [ '$checklistStatus', '' ] },
-        checkListId: { $ifNull: [ '$checkListId', '' ] },
-        startTime: { $ifNull: [ '$startTime', '' ] },
-        submitTime: { $ifNull: [ '$submitTime', '' ] },
-        allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-        // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
-        allowedStoreLocation: {
-          $cond: {
-            if: { $eq: [ '$client_id', '11' ] },
-            then: false,
-            else: {
-              '$cond': {
-                'if': { '$eq': [ '$coverage', 'user' ] },
-                'then': false,
-                'else': { '$ifNull': [ '$allowedStoreLocation', false ] },
-              },
-            },
-          },
-        },
-        reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
-        questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
-        getchecklist: { $ifNull: [ '$getchecklist', '' ] },
-        userEmail: { $ifNull: [ '$userEmail', '' ] },
-        storeName: { $ifNull: [ '$storeName', '' ] },
-        redoStatus: { $ifNull: [ '$redoStatus', false ] },
-        rawImageUpload: { $ifNull: [ '$rawImageUpload', false ] },
-      },
-    } );
-
-    let getchecklist = await processedchecklist.aggregate( findQuery );
-    if ( !getchecklist.length ) {
-      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 );
-      for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
-        for ( let [ questionIndex, question ] of section.questions.entries() ) {
-          let Multianswer = [];
-          if ( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage && getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage !='' ) {
-            // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = await signedUrl( { file_path: decodeURIComponent( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage ), Bucket: bucket.sop } );
-            getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage;
-          }
-          for ( let [ ansIndex, answer ] of question.answers.entries() ) {
-            if ( question.answerType == 'multiplechoicemultiple' ) {
-              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 = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + answer.validationAnswer;
-                } else {
-                  checkvalidation = answer.validationAnswer;
-                }
-              }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
-            }
-            if ( answer.referenceImage != '' ) {
-              // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( answer.referenceImage ), Bucket: bucket.sop } );
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = JSON.parse( process.env.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 = JSON.parse( process.env.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 = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.validationAnswer;
-              }
-              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 = JSON.parse( process.env.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 } );
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.referenceImage;
-              }
-              if ( question.answerType == 'multiplechoicemultiple' ) {
-                let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
-                if ( ansIndex ) {
-                  Multianswer[ansIndex].validationAnswer = userAns.validationAnswer;
-                }
-              }
-              if ( question.answerType == 'multipleImage' ) {
-                if ( userAns && userAns.answer && userAns.answer !='' ) {
-                  // let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
-                  let manswer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + userAns.answer;
-                  Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
-                } else {
-
-                }
-              }
-            }
-          }
-          if ( question.answerType == 'multiplechoicemultiple' ) {
-            Multianswer.forEach( ( item ) => {
-              if ( item.validationAnswer == null ) {
-                item.answer = null;
-              }
-            } );
-            if ( Multianswer.length ) {
-              question.Multianswer = Multianswer;
-            } else {
-              question.Multianswer = Multianswer;
-            }
-          }
-          if ( question.answerType == 'multipleImage' ) {
-            if ( Multianswer.length ) {
-              question.Multianswer = Multianswer;
-            } else {
-              Multianswer.push( { 'answer': null, 'no': 0, 'validationAnswer': null } );
-              question.Multianswer = Multianswer;
-            }
-          }
-        }
-      }
-
-      let questions = [];
-      // function processQuestion( question, section, questions, nested=false ) {
-      //   let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
-      //   if ( findExists && nested ) {
-      //     let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
-      //     questions.splice( findIndex, 1 );
-      //     questions.push( question );
-      //     for ( let answer of question.answers ) {
-      //       if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-      //         let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
-      //         if ( linkedQuestion ) {
-      //           processQuestion( linkedQuestion, section, questions, true );
-      //         }
-      //       }
-      //     }
-      //   }
-      //   if ( !findExists ) {
-      //     questions.push( question );
-      //     for ( let answer of question.answers ) {
-      //       if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-      //         let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
-      //         if ( linkedQuestion ) {
-      //           processQuestion( linkedQuestion, section, questions, true );
-      //         }
-      //       }
-      //     }
-      //   }
-      // }
-
-      for ( let [ index, data ] of getchecklist.entries() ) {
-        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
-          questions = [];
-          for ( let [ questionIndex, question ] of section.questions.entries() ) {
-            let linkedQuestions;
-            let uniqueShow = false;
-            if ( !question.linkType ) {
-              if ( !question?.uniqueNo ) {
-                uniqueShow = true;
-                question.uniqueNo = parseInt( getOtp() ) + Date.now() + questionIndex;
-              }
-              questions.push( question );
-              linkedQuestions = [];
-              let questionList;
-              if ( uniqueShow ) {
-                questionList = new Map( section.questions.map( ( ele ) => [ ele.qno, ele ] ) );
-              } else {
-                let uniqueList = question.answers.flatMap( ( ele ) => ele.nestedQuestion );
-                let filteredQuestion = section.questions.filter( ( ele ) => uniqueList.includes( ele?.uniqueNo ) );
-                questionList = new Map( filteredQuestion.map( ( ele ) => [ ele.uniqueNo, ele ] ) );
-              }
-              question.answers.forEach( ( answer ) => {
-                if ( answer.linkedQuestion ) {
-                  let nesedQuestion = [];
-                  answer.oldNestedQuestion = !uniqueShow ? JSON.parse( JSON.stringify( answer.oldNestedQuestion ) ) : JSON.parse( JSON.stringify( answer.nestedQuestion ) );
-                  answer.nestedQuestion.forEach( ( qn, qidx ) => {
-                    let getQn = questionList.get( qn );
-                    if ( getQn ) {
-                      let randomNo;
-                      if ( !getQn?.uniqueNo || uniqueShow ) {
-                        randomNo = parseInt( getOtp() ) + Date.now() + qidx;
-                      } else {
-                        randomNo = getQn?.uniqueNo;
-                      }
-                      getQn = JSON.parse( JSON.stringify( getQn ) );
-                      getQn = { ...getQn, uniqueNo: randomNo };
-                      nesedQuestion.push( getQn );
-                      if ( answer.linkedQuestion == getQn.qno ) {
-                        answer.oldLinkedQuestion = answer.linkedQuestion;
-                        answer.linkedQuestion = randomNo;
-                      }
-                      answer.nestedQuestion[qidx] = randomNo;
-                    }
-                  } );
-                  console.log( nesedQuestion );
-                  nesedQuestion.forEach( ( ele ) => {
-                    let nestedLinkqn = [];
-                    ele.answers.forEach( ( ans ) => {
-                      if ( ans.linkedQuestion ) {
-                        ans.oldNestedQuestion = !uniqueShow ? JSON.parse( JSON.stringify( ans.oldNestedQuestion ) ) : JSON.parse( JSON.stringify( ans.nestedQuestion ) );
-                        ans.nestedQuestion.forEach( ( nested, idx ) => {
-                          console.log( nested, uniqueShow, 'nested', nestedLinkqn );
-                          let findRandom = nesedQuestion.find( ( qn ) => ( uniqueShow ? qn.qno == nested : qn.uniqueNo == nested ) && !nestedLinkqn.includes( qn.uniqueNo ) && !qn.updated );
-                          console.log( findRandom );
-                          if ( findRandom ) {
-                            if ( ans.linkedQuestion == findRandom.qno ) {
-                              ans.oldLinkedQuestion = ans.linkedQuestion;
-                              ans.linkedQuestion = findRandom.uniqueNo;
-                            }
-                            ans.nestedQuestion[idx] = findRandom.uniqueNo;
-                            nestedLinkqn.push( findRandom.uniqueNo );
-                          }
-                        } );
-                      }
-                    } );
-                    ele.updated = true;
-                  } );
-                  linkedQuestions.push( ...nesedQuestion );
-                }
-              } );
-              questions.push( ...linkedQuestions );
-            }
-            // processQuestion( question, section, questions );
-          }
-          getchecklist[index].questionAnswers[secIndex].questions = questions;
-        }
-      }
-
-      await processedchecklist.updateOne( { _id: requestData.processedcheckListId }, { questionAnswers: getchecklist[0].questionAnswers } );
-
-      return res.sendSuccess( getchecklist );
-    }
-  } catch ( e ) {
-    logger.error( { function: 'questionList', error: e, body: req.body } );
-    return res.sendError( e, 500 );
-  }
-}
-
 export async function questionList( req, res ) {
   try {
     let requestData = req.query;
@@ -3455,6 +2828,9 @@ export async function questionList( req, res ) {
         storeName: { $ifNull: [ '$storeName', '' ] },
         redoStatus: { $ifNull: [ '$redoStatus', false ] },
         rawImageUpload: { $ifNull: [ '$rawImageUpload', false ] },
+        rawVideoUpload: { $ifNull: [ '$rawVideoUpload', false ] },
+        taskType: { $ifNull: [ '$planoType', '' ] },
+        streamId: { $ifNull: [ '$streamId', '' ] },
       },
     } );
 
@@ -3984,12 +3360,10 @@ export async function uploadAnswerImage( req, res ) {
       }
 
       if ( imageUrl != '' ) {
-        // imageUrl = await signedUrl( { file_path: imageUrl.Key, Bucket: bucket.sop } );
-        imageUrl = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN + imageUrl.Key;
+        imageUrl = await signedUrl( { file_path: imageUrl.Key, Bucket: bucket.sop } );
 
         return res.sendSuccess( {
           bucketName: bucket.sop,
-          path: imageUrl.Key,
           imageUrl: imageUrl,
           message: 'Image uploaded successfully!',
         } );
@@ -4146,7 +3520,7 @@ export const sendSignInOtpEmail = async ( emailVars ) => {
     const result = await sendEmailWithSES( emailVars.email, subject, html, attachments, ses.adminEmail );
     return result;
   } catch ( error ) {
-    logger.error( { error: error, function: 'sendSignInOtpEmail', body: req.body } );
+    logger.error( { error: error, function: 'sendSignInOtpEmail', body: emailVars } );
     return error;
   }
 };
@@ -4297,8 +3671,8 @@ export async function clientConfig( req, res ) {
   try {
     let requestData = req.body;
     if ( requestData.clientId && requestData.clientId !='' ) {
-      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1 } );
-      console.log( ' getClientData=>', getClientData );
+      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1, traxBlockMobileTimeUpdate: 1, traxSectionSave: 1 } );
+      // console.log( ' getClientData=>', getClientData );
       if ( getClientData ) {
         return res.sendSuccess( getClientData );
       } else {
@@ -4308,7 +3682,6 @@ export async function clientConfig( req, res ) {
       return res.sendError( 'clientId is Required', 400 );
     }
   } catch ( e ) {
-    console.log( 'e =>', e );
     logger.error( { error: e, function: 'clientConfig' } );
     return res.sendError( e, 500 );
   }