tango-app-api-trax 1.0.0-task.124 → 1.0.0-task.126

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.124",
+    "version": "1.0.0-task.126",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.1.91",
+        "tango-api-schema": "^2.1.94",
         "tango-app-api-middleware": "^3.1.43-alpha.10",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/internalTrax.controller.js

@@ -961,7 +961,7 @@ export async function pushNotification( req, res ) {
       return res.sendError( 'no data found', 204 );
     }
 
-    checklistDetails.forEach( async ( item ) => {
+    for ( let [ index, item ] of checklistDetails.entries() ) {
       const message = {
         tokens: item.token,
         notification: {
@@ -974,10 +974,14 @@ export async function pushNotification( req, res ) {
       };
       const response = await admin.messaging().sendEachForMulticast( message );
       if ( response.successCount ) {
-        return res.sendSuccess( 'Push notification send successfully' );
+        logger.info( { message: 'push notification', success: item.token } );
+        if ( index == checklistDetails.length - 1 ) {
+          return res.sendSuccess( 'Push notification send successfully' );
+        }
+      } else {
+        logger.error( { message: 'push notification', error: item.token } );
       }
-      return res.sendError( 'Push notification send Failed', 500 );
-    } );
+    }
   } catch ( e ) {
     logger.error( { function: 'pushNotification', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/mobileTrax.controller.js

@@ -108,136 +108,138 @@ export async function startChecklist( req, res ) {
 
     if ( getBeforeChecklist[0].checklistStatus != 'open' ) {
       return res.sendError( 'already check list started', 400 );
-    } else {
-      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 = [];
+    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 storeTimeZone = await storeService.findOne( { storeName: getBeforeChecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
-      let currentDateTime;
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-      } else {
-        currentDateTime = dayjs();
-      }
-      updateData.checklistStatus = 'inprogress';
-      updateData.startMobileTime = requestData?.currentTime;
-      updateData.questionAnswers = getBeforeChecklist.redoStatus ? getBeforeChecklist.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 ) {
-        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: [ '$checallowedStoreLocationkListName', false ] },
-            questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
-          },
-        } );
-        let getupdatedchecklist = await processedchecklist.aggregate( findQuery );
-        let bucket = JSON.parse( process.env.BUCKET );
-        getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
-          section.questions.forEach( async ( question ) => {
-            if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
-              question.questionReferenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( question.questionReferenceImage ) } );
+    let updateData = {};
+    let storeTimeZone = await storeService.findOne( { storeName: getBeforeChecklist[0].storeName }, { 'storeProfile.timeZone': 1 } );
+    let currentDateTime;
+    if ( storeTimeZone?.storeProfile?.timeZone ) {
+      currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+    } 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', '' ] },
+          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 ] },
+          questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
+          redoStatus: { $ifNull: [ '$redoStatus', '' ] },
+        },
+      } );
+      let getupdatedchecklist = await processedchecklist.aggregate( findQuery );
+      let bucket = JSON.parse( process.env.BUCKET );
+      getupdatedchecklist[0].questionAnswers.forEach( ( section ) => {
+        section.questions.forEach( async ( question ) => {
+          if ( question.questionReferenceImage && question.questionReferenceImage!='' ) {
+            question.questionReferenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( question.questionReferenceImage ) } );
+          }
+          question.answers.forEach( async ( answer ) => {
+            if ( answer.referenceImage != '' ) {
+              answer.referenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( answer.referenceImage ) } );
             }
-            question.answers.forEach( async ( answer ) => {
-              if ( answer.referenceImage != '' ) {
-                answer.referenceImage = await signedUrl( { Bucket: bucket.sop, file_path: decodeURIComponent( answer.referenceImage ) } );
-              }
-            } );
           } );
         } );
-        let logInsertData = {
-          store_id: getBeforeChecklist[0].store_id,
-          storeName: getBeforeChecklist[0].storeName,
-          action: 'started',
-          checklistId: getBeforeChecklist[0].checkListId,
-          checkListName: getBeforeChecklist[0].checkListName,
-          client_id: req.user.clientId,
-        };
-        await checklistLogs.create( logInsertData );
+      } );
+      let logInsertData = {
+        store_id: getBeforeChecklist[0].store_id,
+        storeName: getBeforeChecklist[0].storeName,
+        action: 'started',
+        checklistId: getBeforeChecklist[0].checkListId,
+        checkListName: getBeforeChecklist[0].checkListName,
+        checkListType: getBeforeChecklist[0].checkListType,
+        client_id: req.user.clientId,
+      };
+      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 );
-                }
+      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 question of section.questions ) {
-              processQuestion( question, section, questions );
-            }
-            getchecklist[index].questionAnswers[secIndex].questions = questions;
+      }
+      for ( let [ index, data ] of getchecklist.entries() ) {
+        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
+          questions = [];
+          for ( let question of section.questions ) {
+            processQuestion( question, section, questions );
           }
+          getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
-        return res.sendSuccess( getchecklist );
-      } else {
-        return res.sendError( 'something went wrong please try again', 500 );
       }
+      return res.sendSuccess( getchecklist );
+    } else {
+      return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
     logger.error( { function: 'startChecklist', error: e } );
@@ -319,7 +321,7 @@ export async function startTask( req, res ) {
 
     const updateTaskResult = await processedTask.updateOne( updateQuery, updateData );
 
-    if ( !updateTaskResult ) {
+    if ( !updateTaskResult?.matchedCount ) {
       return res.sendError( 'Something went wrong, please try again', 500 );
     }
 
@@ -340,6 +342,7 @@ export async function startTask( req, res ) {
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
         allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', false ] },
         questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
+        redoStatus: { $ifNull: [ '$redoStatus', '' ] },
       },
     } );
     const getUpdatedTask = await processedTask.aggregate( findQuery );
@@ -376,6 +379,7 @@ export async function startTask( req, res ) {
       action: 'started',
       checklistId: task.checkListId,
       checkListName: task.checkListName,
+      checkListType: task.checkListType,
       client_id: user.clientId,
     };
     await checklistLogs.create( logData );
@@ -574,12 +578,14 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 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,
-                structure.redo = qaAnswers[j]?.redo,
+                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 ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                }
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' ) {
                 let qaans = qaAnswers[j].answers;
@@ -614,12 +620,14 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 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.redo = qaAnswers[j]?.redo,
+                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 ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                }
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' ) {
                 let qaans = qaAnswers[j].answers;
@@ -658,12 +666,14 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 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.redo = qaAnswers[j]?.redo,
+                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 ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                }
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multipleImage' ) {
                 let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
@@ -707,12 +717,14 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 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.redo = qaAnswers[j]?.redo,
+                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 ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                }
                 newArray.push( structure );
               } else {
                 let des = [];
@@ -751,12 +763,14 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 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.redo = qaAnswers[j]?.redo,
+                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 ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                }
                 newArray.push( structure );
               }
             }
@@ -1138,7 +1152,7 @@ export async function submitChecklist( req, res ) {
         } );
       } );
       let updatechecklist = await processedchecklist.updateOne( updateQuery, updateData );
-      if ( updatechecklist ) {
+      if ( updatechecklist?.modifiedCount > 0 ) {
         if ( checklistDetails && checklistDetails.allowedMultiSubmit && requestData.submittype == 'submit' ) {
           let currentTime;
           let date = getchecklist[0].date_string +' '+ getchecklist[0].scheduleEndTime;
@@ -1158,11 +1172,14 @@ export async function submitChecklist( req, res ) {
         let logInsertData = {
           store_id: getchecklist[0].store_id,
           storeName: getchecklist[0].storeName,
-          action: 'submitted',
-          checklistId: getchecklist[0].checkListId,
+          action: requestData?.submittype === 'draft' ? 'saved' : 'submitted',
+          checklistId: getchecklist[0].sourceCheckList_id,
+          processedChecklistId: getchecklist[0]._id,
           checkListName: getchecklist[0].checkListName,
+          checkListType: getchecklist[0].checkListType,
           client_id: req.user.clientId,
         };
+
         await checklistLogs.create( logInsertData );
         // let time = dayjs().format( 'HH:mm:ss' );
         // let [ hours, minutes ] = time.split( ':' ).map( Number );
@@ -1231,7 +1248,7 @@ export async function submitTask( req, res ) {
     }
 
     // eslint-disable-next-line camelcase
-    const { checklistStatus, storeName, userEmail, checkListName, store_id, checkListId } = checklist;
+    const { checklistStatus, storeName, userEmail, checkListName, store_id } = checklist;
 
     if ( checklistStatus === 'open' ) {
       return res.sendError( 'Checklist is in open status. Please start.', 400 );
@@ -1291,7 +1308,9 @@ export async function submitTask( req, res ) {
         store_id,
         storeName,
         action: submittype === 'draft' ? 'saved' : 'submitted',
-        checklistId: checkListId,
+        checklistId: checklist.sourceCheckList_id,
+        processedChecklistId: checklist._id,
+        checkListType: checklist.checkListType,
         checkListName,
         client_id: user.clientId,
       };
@@ -1329,6 +1348,7 @@ async function updateOpenSearch( user, data ) {
       action: 'OpenSearch insert Triggered',
       checklistId: getchecklist[0].checkListId,
       checkListName: getchecklist[0].checkListName,
+      checkListType: getchecklist[0].checkListType,
       client_id: user.clientId,
     };
     await checklistLogs.create( logInsertData );
@@ -1348,6 +1368,7 @@ async function updateOpenSearch( user, data ) {
         action: 'OpenSearch inserted Successfully',
         checklistId: getchecklist[0].checkListId,
         checkListName: getchecklist[0].checkListName,
+        checkListType: getchecklist[0].checkListType,
         client_id: user.clientId,
       };
       await checklistLogs.create( logInsertData );
@@ -1374,6 +1395,7 @@ async function updateOpenSearchTask( user, data ) {
       action: 'OpenSearch insert Triggered',
       checklistId: getchecklist[0].checkListId,
       checkListName: getchecklist[0].checkListName,
+      checkListType: getchecklist[0].checkListType,
       client_id: user.clientId,
     };
     await checklistLogs.create( logInsertData );
@@ -1393,6 +1415,7 @@ async function updateOpenSearchTask( user, data ) {
         action: 'OpenSearch inserted Successfully',
         checklistId: getchecklist[0].checkListId,
         checkListName: getchecklist[0].checkListName,
+        checkListType: getchecklist[0].checkListType,
         client_id: user.clientId,
       };
       await checklistLogs.create( logInsertData );
@@ -1767,6 +1790,7 @@ export async function questionList( req, res ) {
         getchecklist: { $ifNull: [ '$getchecklist', '' ] },
         userEmail: { $ifNull: [ '$userEmail', '' ] },
         storeName: { $ifNull: [ '$storeName', '' ] },
+        redoStatus: { $ifNull: [ '$redoStatus', false ] },
       },
     } );
 

package/src/controllers/trax.controller.js

@@ -28,13 +28,14 @@ export const checklist = async ( req, res ) => {
     let offset = parseInt( req.query.offset - 1 ) || 0;
     let page = offset * limit;
     let query = [];
-
+    console.log( req.user.email, 'email' );
     query.push(
         {
           $match: {
             type: 'checklist',
             client_id: req.query.clientId,
             isdeleted: false,
+            ...( req.user.userType == 'client' && req.user.role != 'superadmin' ) ? { owner: { $in: [ req.user.email ] } } : {},
           },
         },
     );
@@ -948,6 +949,7 @@ export const updateConfigure =async ( req, res ) => {
       allowOnce: inputBody?.checkListDetails?.allowOnce || false,
       approver: inputBody?.checkListDetails?.approver || [],
       remainder: inputBody?.checkListDetails?.remainder || [],
+      owner: inputBody?.checkListDetails?.owner || [],
     };
 
     if ( inputBody?.checkListDetails?.approver.length ) {
@@ -1173,8 +1175,17 @@ export const updatePublish = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
+    if ( getCheckDetails?.publishDate ) {
+      let date = dayjs();
+      let diff = date.diff( dayjs.utc( getCheckDetails?.publishDate ), 'minutes' );
+      if ( diff < 5 ) {
+        let mins = ( 5 - diff ) > 1 ? 'minutes' : 'minute';
+        return res.sendError( `Please try after ${5 - diff} ${mins}`, 400 );
+      }
+    }
+
     getCheckDetails.publish = req.body.publish;
-    getCheckDetails.publishDate = new Date();
+    getCheckDetails.publishDate = req.body.publish ? new Date() : getCheckDetails?.publishDate;
     let currentDate = dayjs();
     if ( !req.body.publish ) {
       await processedchecklistConfig.deleteMany( { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId } );

package/src/services/processedchecklist.services.js

@@ -34,5 +34,3 @@ export const getClientCount = ( query = {} ) => {
 export const create = ( data = {} ) => {
   return model.processedchecklistModel.create( data );
 };
-
-