tango-app-api-trax 3.2.0-beta.9 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.2.0-beta.9",
+    "version": "3.2.1",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -349,18 +349,39 @@ export async function redoChecklist( req, res ) {
     let question = checklistDetails.questionAnswers;
 
 
-    let sectionIndex = question.findIndex( ( sec ) => sec.section_id == req.body.payload.section_id );
+    let sectionIndex = question.findIndex( ( sec ) => sec.sectionName == req.body.payload.sectionName );
     if ( sectionIndex == -1 ) {
       return res.sendError( 'section is not found', 400 );
     }
 
-    let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
+    let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
+
+    let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
+    // if ( checklistDetails.client_id == '458' ) {
+    data.answers.forEach( ( item ) => {
+      if ( item.showLinked ) {
+        item.nestedQuestion.forEach( ( ele ) => {
+          let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
+          let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
+          question[sectionIndex].questions[eleIndex] = element;
+          question[sectionIndex].questions[eleIndex].userAnswer = [];
+          question[sectionIndex].questions[eleIndex].remarks = '';
+        } );
+      }
+    } );
+    // data.answers.forEach( ( item ) => {
+    //   if ( item.showLinked ) {
+    //     item.nestedQuestion = [];
+    //     item.showLinked = false;
+    //     item.linkedQuestion = 0;
+    //   }
+    // } );
+    // }
     let userAnswer = data.userAnswer;
 
-
-    question[sectionIndex].questions[req.body.payload.qno - 1] = data;
-    question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
-    question[sectionIndex].questions[req.body.payload.qno - 1].remarks = '';
+    question[sectionIndex].questions[findQuestion] = data;
+    question[sectionIndex].questions[findQuestion].userAnswer = [];
+    question[sectionIndex].questions[findQuestion].remarks = '';
     checklistDetails.questionAnswers = question;
     let updateData = {
       checklistStatus: 'open',
@@ -384,7 +405,7 @@ export async function redoChecklist( req, res ) {
         checklistDescription: req.body.payload.checklistDescription,
         sectionId: req.body.payload.section_id,
         sectionName: question[sectionIndex].sectionName,
-        questionName: question[sectionIndex].questions[req.body.payload.qno - 1].qname,
+        questionName: question[sectionIndex].questions[findQuestion].qname,
         action: 'redo',
         store_id: checklistDetails.store_id,
         storeName: checklistDetails.storeName,
@@ -394,7 +415,7 @@ export async function redoChecklist( req, res ) {
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
         initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
-        answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
+        answerType: question[sectionIndex].questions[findQuestion].answerType,
         submitedBy: checklistDetails.userName,
         submitTime: checklistDetails.submitTime,
       };
@@ -433,7 +454,7 @@ export async function getLogs( req, res ) {
     let result = await checklistLogs.find( {
       checklistId: new mongoose.Types.ObjectId( req.body.checklistId ),
       processedChecklistId: new mongoose.Types.ObjectId( req.body.processedChecklistId ),
-      sectionId: new mongoose.Types.ObjectId( req.body.section_id ),
+      sectionName: req.body.sectionName,
       questionName: req.body.qname,
       action: 'redo',
     } );

package/src/controllers/internalTrax.controller.js

@@ -881,7 +881,8 @@ export async function pushNotification( req, res ) {
     let query = [ {
       $match: {
         date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
-        $expr: { $gt: [ { $size: '$remainder' }, 0 ] },
+        // $expr: { $gt: [ { $size: '$remainder' }, 0 ] },
+        $expr: { $gt: [ { $size: { $ifNull: [ '$remainder', [] ] } }, 0 ] },
         checklistStatus: { $ne: 'submit' },
         checkListType: { $in: [ 'custom' ] },
         timeFlag: 0,

package/src/controllers/mobileTrax.controller.js

@@ -180,7 +180,14 @@ export async function startChecklist( req, res ) {
           startTime: { $ifNull: [ '$startTime', '' ] },
           submitTime: { $ifNull: [ '$submitTime', '' ] },
           allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-          allowedStoreLocation: { $ifNull: [ '$checallowedStoreLocationkListName', false ] },
+          // allowedStoreLocation: { $ifNull: [ '$checallowedStoreLocationkListName', false ] },
+          allowedStoreLocation: {
+            $cond: {
+              if: { $eq: [ '$client_id', '11' ] },
+              then: false,
+              else: { $ifNull: [ '$allowedStoreLocation', false ] },
+            },
+          },
           questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
           redoStatus: { $ifNull: [ '$redoStatus', '' ] },
         },
@@ -344,7 +351,14 @@ export async function startTask( req, res ) {
         startTime: { $ifNull: [ '$startTime', '' ] },
         submitTime: { $ifNull: [ '$submitTime', '' ] },
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-        allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', false ] },
+        // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', false ] },
+        allowedStoreLocation: {
+          $cond: {
+            if: { $eq: [ '$client_id', '11' ] },
+            then: false,
+            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+          },
+        },
         questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
         redoStatus: { $ifNull: [ '$redoStatus', '' ] },
       },
@@ -675,6 +689,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -701,7 +719,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                         }
                       }
                     } else {
-                      qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                      // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                       qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
                     }
                     ms.push( qaans[k] );
@@ -722,6 +740,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -750,7 +772,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                           }
                         }
                       } else {
-                        qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                         qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
                       }
 
@@ -773,6 +795,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -829,6 +855,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -883,6 +913,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -1019,7 +1053,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] );
@@ -1040,6 +1074,10 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -1066,7 +1104,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 || '';
                     }
                     ms.push( qaans[k] );
@@ -1087,6 +1125,10 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -1115,7 +1157,7 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                           }
                         }
                       } else {
-                        qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                         qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
                       }
 
@@ -1138,6 +1180,10 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -1194,6 +1240,10 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -1248,6 +1298,10 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
+                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 ( requestData.submittype === 'draft' ) {
@@ -2228,7 +2282,14 @@ export async function checklist( req, res ) {
         startTime: { $ifNull: [ '$startTime', '' ] },
         submitTime: { $ifNull: [ '$submitTime', '' ] },
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-        allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+        // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+        allowedStoreLocation: {
+          $cond: {
+            if: { $eq: [ '$client_id', '11' ] },
+            then: false,
+            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+          },
+        },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
         startTime_string: { $ifNull: [ '$startTime_string', '' ] },
         submitTime_string: { $ifNull: [ '$submitTime_string', '' ] },
@@ -2292,7 +2353,14 @@ export async function checklistv1( req, res ) {
             startTime: { $ifNull: [ '$startTime', '' ] },
             submitTime: { $ifNull: [ '$submitTime', '' ] },
             allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-            allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+            // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+            allowedStoreLocation: {
+              $cond: {
+                if: { $eq: [ '$client_id', '11' ] },
+                then: false,
+                else: { $ifNull: [ '$allowedStoreLocation', false ] },
+              },
+            },
             reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
             startTime_string: { $ifNull: [ '$startTime_string', '' ] },
             submitTime_string: { $ifNull: [ '$submitTime_string', '' ] },
@@ -2375,7 +2443,14 @@ export async function questionList( req, res ) {
         startTime: { $ifNull: [ '$startTime', '' ] },
         submitTime: { $ifNull: [ '$submitTime', '' ] },
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-        allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+        // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+        allowedStoreLocation: {
+          $cond: {
+            if: { $eq: [ '$client_id', '11' ] },
+            then: false,
+            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+          },
+        },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
         questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
         getchecklist: { $ifNull: [ '$getchecklist', '' ] },
@@ -2673,7 +2748,14 @@ export async function taskQuestionList( req, res ) {
         startTime: { $ifNull: [ '$startTime', '' ] },
         submitTime: { $ifNull: [ '$submitTime', '' ] },
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
-        allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+        // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
+        allowedStoreLocation: {
+          $cond: {
+            if: { $eq: [ '$client_id', '11' ] },
+            then: false,
+            else: { $ifNull: [ '$allowedStoreLocation', false ] },
+          },
+        },
         reinitiateStatus: { $ifNull: [ '$reinitiateStatus', '' ] },
         questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
         getchecklist: { $ifNull: [ '$getchecklist', '' ] },
@@ -2866,6 +2948,11 @@ export async function uploadAnswerImage( req, res ) {
     let date = dayjs().format( 'YYYY-MM-DD' );
     let folder;
 
+    let getChecklistDetails = await processedchecklist.findOne( { _id: input.checklistId } );
+    if ( getChecklistDetails ) {
+      input.type = 'custom';
+    }
+
     if ( input.type == 'custom' ) {
       folder = 'checklist-answers';
     } else {

package/src/controllers/teaxFlag.controller.js

@@ -618,9 +618,9 @@ export const flagCardsV1 = async ( req, res ) => {
         { checkListType: 1 },
     );
 
-    if ( !publishedAiChecklists?.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
+    // if ( !publishedAiChecklists?.length ) {
+    //   return res.sendError( { error: 'No Data Found' }, 204 );
+    // }
 
     const detectionPayload = { fromDate, toDate, storeId, clientId };
     const lambdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';

package/src/controllers/trax.controller.js

@@ -468,6 +468,78 @@ async function createUser( data ) {
       role: 'user',
       password: '5dqFKAJj29PsV6P+kL+3Dw==',
       isActive: true,
+      userType: 'client',
+      rolespermission: [
+        {
+          featureName: 'Global',
+          modules: [
+            {
+              name: 'Store',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'User',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Camera',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Configuration',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Subscription',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Billing',
+              isAdd: false,
+              isEdit: false,
+
+            },
+          ],
+        },
+        {
+          featurName: 'TangoEye',
+          modules: [
+            {
+              name: 'ZoneTag',
+              isAdd: false,
+              isEdit: false,
+
+            },
+          ],
+        },
+        {
+          featurName: 'TangoTrax',
+          modules: [
+            {
+              name: 'checklist',
+              isAdd: false,
+              isEdit: false,
+
+            },
+            {
+              name: 'Task',
+              isAdd: false,
+              isEdit: false,
+
+            },
+          ],
+        },
+      ],
     };
     let response = await userService.create( params );
     return response._id;
@@ -937,7 +1009,7 @@ export const updateConfigure =async ( req, res ) => {
     }
 
     let currentDate = dayjs.utc().format();
-    let updatedscheduleEndTimeISO = dayjs.utc( inputBody?.checkListDetails?.scheduleStartTime, 'hh:mm A' ).format( 'HH:mm:ss' );
+    let updatedscheduleEndTimeISO = dayjs.utc( inputBody?.checkListDetails?.scheduleEndTime, 'hh:mm A' ).format( 'HH:mm:ss' );
     let newUpdatedDate = dayjs.utc( updatedscheduleEndTimeISO, 'HH:mm:ss' ).format();
 
     if ( inputBody.submitType == 'publish' && inputBody?.showEdit && typeof inputBody?.editSubmit == 'undefined' && newUpdatedDate > currentDate ) {
@@ -1471,9 +1543,9 @@ export const validateUser = async ( req, res ) => {
           if ( !storeExists.length ) {
             storeId.push( { store: item.storeName, message: '' } );
           }
-          if ( storeExists.length && !storeExists[0]?.storeProfile?.city && !item.city ) {
-            storeId.push( { store: item.storeName, message: 'city is required' } );
-          }
+          // if ( storeExists.length && !storeExists[0]?.storeProfile?.city && !item.city ) {
+          //   storeId.push( { store: item.storeName, message: 'city is required' } );
+          // }
           if ( storeExists.length && storeExists[0].status != 'active' ) {
             storeId.push( { store: item.storeName, message: 'store is inactive' } );
           }
@@ -1970,7 +2042,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
         tokenList.push( getToken.fcmToken );
       }
       if ( !element4?.sendNotification ) {
-        notifyUserList.push( { token: getToken.fcmToken, storeName: element4.storeName, id: element4._id } );
+        notifyUserList.push( { token: getToken?.fcmToken, storeName: element4.storeName, id: element4._id } );
       }
       if ( !getCLconfig?.allowedMultiSubmit ) {
         let query;
@@ -2103,6 +2175,17 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
               getsubmitDetails[0].checklistStatus = 'inprogress';
               getsubmitDetails[0].date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
               getsubmitDetails[0].date_iso = new Date( date );
+              getsubmitDetails[0].redoStatus = false;
+              getsubmitDetails[0].approvalStatus = false;
+            } else {
+              if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
+                console.log( editSubmit );
+                let user = {
+                  _id: getsubmitDetails[0].userId,
+                  clientId: getsubmitDetails[0].client_id,
+                };
+                updateOpenSearch( user, { processedcheckListId: getsubmitDetails[0]._id, date: getsubmitDetails[0].date_string } );
+              }
             }
             let data = { ...getsubmitDetails[0]._doc };
             await processedchecklist.updateOne( { _id: getsubmitDetails[0]._id }, data );
@@ -2146,11 +2229,23 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
     }
     if ( allQuestion ) {
-      if ( getCLconfig?.allowedMultiSubmit && processId ) {
-        let processedDetails = await processedchecklist.findOne( { _id: processId } );
-        if ( processedDetails ) {
-          let submitUser = allQuestion.find( ( item ) => item.userId.toString() == processedDetails.userId.toString() && item.store_id == processedDetails.store_id );
-          await processedchecklist.insertMany( submitUser );
+      if ( getCLconfig?.allowedMultiSubmit || processId ) {
+        if ( processId ) {
+          let processedDetails = await processedchecklist.findOne( { _id: processId } );
+          if ( processedDetails ) {
+            let submitUser = allQuestion.find( ( item ) => item.userId.toString() == processedDetails.userId.toString() && item.store_id == processedDetails.store_id );
+            await processedchecklist.insertMany( submitUser );
+          }
+        } else {
+          let deleteQuery = {
+            date_string: insertdata.date_string,
+            date_iso: insertdata.date_iso,
+            client_id: insertdata.client_id,
+            checkListId: updatedchecklist._id,
+            checklistStatus: { $nin: [ 'submit' ] },
+          };
+          await processedchecklist.deleteMany( deleteQuery );
+          await processedchecklist.insertMany( allQuestion );
         }
       } else {
         let unAssignedList = allQuestion.reduce( ( acc, item ) => {
@@ -2172,6 +2267,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
           }
         }
 
+
         Promise.all( allQuestion.map( async ( ele ) => {
           await processedchecklist.updateOne( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, userEmail: ele.userEmail, store_id: ele.store_id }, ele );
         } ) );
@@ -2197,6 +2293,55 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
   }
 }
 
+async function updateOpenSearch( user, data ) {
+  let findQuery = [ {
+    $match: {
+      $and: [
+        { _id: new ObjectId( data.processedcheckListId ) },
+        { userId: user._id },
+        { date_string: data.date },
+      ],
+    },
+  } ];
+
+  let getchecklist = await processedchecklist.aggregate( findQuery );
+  if ( getchecklist.length ) {
+    let logInsertData = {
+      store_id: getchecklist[0].store_id,
+      storeName: getchecklist[0].storeName,
+      action: 'Republish OpenSearch insert Triggered',
+      checklistId: getchecklist[0].sourceCheckList_id,
+      processedChecklistId: getchecklist[0]._id,
+      checkListName: getchecklist[0].checkListName,
+      type: getchecklist[0].checkListType,
+      client_id: user.clientId,
+    };
+    await checklistLogs.create( logInsertData );
+    const requestOptions = {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify( { doc: { ...getchecklist[0] } } ),
+    };
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let searchResponse = await fetch( url.submitChecklist, requestOptions );
+    if ( searchResponse.ok ) {
+      let logInsertData = {
+        store_id: getchecklist[0].store_id,
+        storeName: getchecklist[0].storeName,
+        action: 'Republish OpenSearch inserted Successfully',
+        checklistId: getchecklist[0].sourceCheckList_id,
+        processedChecklistId: getchecklist[0]._id,
+        checkListName: getchecklist[0].checkListName,
+        type: getchecklist[0].checkListType,
+        client_id: user.clientId,
+      };
+      await checklistLogs.create( logInsertData );
+    }
+  }
+}
+
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );

package/src/controllers/traxDashboard.controllers.js

@@ -3552,8 +3552,9 @@ export async function sendAlert( req, res ) {
     let query = {
       date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
       ...( inputBody?.sourceCheckList_id ) ? { sourceCheckList_id: new mongoose.Types.ObjectId( inputBody.sourceCheckList_id ) } : { _id: { $in: inputBody.id } },
-      timeFlag: 0,
-      ...( inputBody?.checklistStatus && inputBody?.checklistStatus != 'all' ) ? { checklistStatus: inputBody.status } : { checklistStatus: { $ne: 'submit' } },
+      // timeFlag: 0,
+      // ...( inputBody?.checklistStatus && inputBody?.checklistStatus != 'all' ) ? { checklistStatus: inputBody.status } : { checklistStatus: { $ne: 'submit' } },
+      ...( inputBody?.checklistStatus && ( inputBody?.checklistStatus == 'all' || inputBody?.checklistStatus == 'redo' ) ) ? { checklistStatus: { $ne: 'submit' } } : { checklistStatus: inputBody.checklistStatus },
     };
 
     query = [ { $match: query } ];