tango-app-api-task 1.0.0-alpha.9 → 1.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-alpha.9",
+    "version": "1.0.0-beta.2",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,8 @@
         "handlebars": "^4.7.8",
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
-        "tango-api-schema": "^2.1.91",
+        "npm": "^10.9.2",
+        "tango-api-schema": "^2.1.99",
         "tango-app-api-middleware": "^3.1.43-alpha.10",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/internalAPI.controller.js

@@ -133,21 +133,22 @@ async function insertData( requestData ) {
           for ( let [ index2, element2 ] of resultchecklist.entries() ) {
             let getCLconfig = await taskService.findOne( { _id: element2 } );
             if ( getCLconfig ) {
-              if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
-                getCLconfig.scheduleEndTime = '11:59 PM';
-              }
-              console.log( getCLconfig.scheduleEndTime );
-
+              // if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
+              //   getCLconfig.scheduleEndTime = '11:59 PM';
+              // }
+              // console.log( getCLconfig.scheduleEndTime );
+              let sTime = dayjs.utc( getCLconfig.publishDate ).format( 'hh:mm A' );
               let startTimeIso; let endTimeIso;
-              startTimeIso = dayjs.utc( `${currentdate} 12:00 AM`, 'YYYY-MM-DD hh:mm A' );
-              endTimeIso = dayjs.utc( `${currentdate} ${getCLconfig.scheduleEndTime}`, 'YYYY-MM-DD hh:mm A' );
+              startTimeIso = dayjs.utc( `${currentdate} ${sTime}`, 'YYYY-MM-DD hh:mm A' );
+              endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
               console.log( endTimeIso );
 
               let insertdata = {};
-              insertdata.date_iso = startTimeIso.format();
+              insertdata.date_iso = new Date( dayjs( currentdate, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
               insertdata.date_string = currentdate;
               insertdata.sourceCheckList_id = getCLconfig._id;
               insertdata.checkListName = getCLconfig.checkListName;
+              insertdata.checkListDescription = getCLconfig.checkListDescription;
               insertdata.publish = getCLconfig.publish;
               insertdata.scheduleStartTime = startTimeIso.format();
               insertdata.scheduleStartTime_iso = startTimeIso.format();
@@ -209,7 +210,7 @@ async function insertData( requestData ) {
                         checkListId: element2,
                         checkFlag: true,
                         isdeleted: false,
-                        ...( getCLconfig?.reinitiate ) ? { reinitiate: true } : {},
+                        // ...( getCLconfig?.reinitiate ) ? { reinitiate: true } : {},
                       },
                     } );
                     let allQuestion = await taskAssignService.aggregate( getquestionQuery );
@@ -244,6 +245,7 @@ async function insertData( requestData ) {
                         delete element4.updatedAt;
                         element4.checkListId = updatedchecklist._id;
                         element4.checkListName = getCLconfig.checkListName;
+                        element4.checkListDescription = getCLconfig.checkListDescription;
                         element4.date_iso = new Date( currentdate );
                         element4.date_string = currentdate;
                         element4.allowedOverTime = false;
@@ -261,6 +263,7 @@ async function insertData( requestData ) {
                         element4.publishDate = getCLconfig.publishDate;
                         element4.locationCount = getCLconfig.locationCount;
                         element4.scheduleRepeatedType = 'daily';
+                        element4.priorityType = getCLconfig.priorityType;
                         element4.approvalEnable = getCLconfig.approver.length ? true : false;
                       }
                       if ( userIdList.length ) {

package/src/controllers/task.controller.js

@@ -17,6 +17,7 @@ dayjs.extend( utc );
 dayjs.extend( customParseFormat );
 import * as taskProcessedConfigService from '../service/processedTaskConfig.service.js';
 import * as taskProcessedService from '../service/processedTaskList.service.js';
+import * as ApproverModel from '../service/approver.service.js';
 async function LamdaServiceCall( url, data ) {
   try {
     const requestOptions = {
@@ -107,11 +108,13 @@ export async function createUpdateTask( req, res ) {
               section.questionReferenceImage = image;
             }
             section.answers.forEach( ( answer ) => {
-              if ( answer.referenceImage != '' ) {
-                let imgUrl = decodeURIComponent( answer.referenceImage?.split( '?' )[0] );
-                let url = imgUrl.split( '/' );
-                url.splice( 0, 3 );
-                answer.referenceImage = url.join( '/' );
+              if ( answer.referenceImage.length ) {
+                answer.referenceImage = answer.referenceImage.map( ( value ) => {
+                  let imgUrl = decodeURIComponent( value?.split( '?' )[0] );
+                  let url = imgUrl.split( '/' );
+                  url.splice( 0, 3 );
+                  return url.join( '/' );
+                } );
               }
             } );
           } );
@@ -120,7 +123,7 @@ export async function createUpdateTask( req, res ) {
             await processNested( index, question );
           }
 
-          async function processNested( qIdx, question, nestedIndex=-1 ) {
+          async function processNested( qIdx, question, nestedIndex = -1 ) {
             if ( question?.answers?.length ) {
               for ( let [ index, answer ] of question?.answers?.entries() ) {
                 if ( !section.questions[qIdx].answers[index]?.nestedQuestion && nestedIndex == -1 ) {
@@ -161,6 +164,7 @@ export async function createUpdateTask( req, res ) {
 
         if ( req.body._id ) {
           await taskQuestionService.deleteMany( { checkListId: checkListId } );
+          await taskAssignService.updateMany( { checkListId: req.body._id }, { checkListName: inputBody.checklistName } );
         }
         await taskQuestionService.insertMany( sectionList );
         let message = req.body?._id ? 'Task Updated Successfully' : 'Task Created Successfully';
@@ -174,7 +178,7 @@ export async function createUpdateTask( req, res ) {
       return res.sendError( { message: 'something went wrong' }, 500 );
     }
   } catch ( e ) {
-    logger.error( { functionName: 'createTask', error: e } );
+    logger.error( { functionName: 'createTask', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -235,7 +239,7 @@ export async function taskDetails( req, res ) {
       let bucket = JSON.parse( process.env.BUCKET );
       questionDetails.forEach( ( item ) => {
         item.question.forEach( async ( question ) => {
-          if ( question.questionReferenceImage && question.questionReferenceImage !='' && typeof question.questionReferenceImage == 'string' ) {
+          if ( question.questionReferenceImage && question.questionReferenceImage != '' && typeof question.questionReferenceImage == 'string' ) {
             let inputData = {
               Bucket: bucket.sop,
               file_path: decodeURIComponent( question.questionReferenceImage ),
@@ -255,12 +259,16 @@ export async function taskDetails( req, res ) {
             }
           }
           question.answers.forEach( async ( answer ) => {
-            if ( answer.referenceImage != '' ) {
-              let inputData = {
-                Bucket: bucket.sop,
-                file_path: decodeURIComponent( answer.referenceImage ),
-              };
-              answer.referenceImage = await signedUrl( inputData );
+            if ( answer.referenceImage.length > 0 ) {
+              let updatedImages = [];
+              for ( let refImage of answer.referenceImage ) {
+                let inputData = {
+                  Bucket: bucket.sop,
+                  file_path: decodeURIComponent( refImage ),
+                };
+                updatedImages.push( await signedUrl( inputData ) );
+              }
+              answer.referenceImage = updatedImages;
             }
           } );
         } );
@@ -558,7 +566,7 @@ async function uploadUser( req, res ) {
       }
     }
   } catch ( e ) {
-    logger.error( { functionName: 'upload User', error: e } );
+    logger.error( { functionName: 'upload User', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -616,7 +624,7 @@ export async function userDetails( req, res ) {
     } );
     return res.sendSuccess( { users: userDetails, count: taskDetails[0].count[0].total } );
   } catch ( e ) {
-    logger.error( { functionName: 'userDetails', error: e } );
+    logger.error( { functionName: 'userDetails', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 };
@@ -638,9 +646,12 @@ export async function taskConfig( req, res ) {
         return res.sendError( { message: 'Please assign a user' }, 400 );
       }
     }
+    if ( !inputBody?.approver.length && inputBody.submitType == 'publish' ) {
+      return res.sendError( { message: 'Please assign approver' }, 400 );
+    }
 
     let logInsertData = {
-      action: inputBody.submitType == 'publish' ? 'checklistPublishUsingConfigPage' : 'checklistConfigDraft',
+      action: inputBody.submitType == 'publish' ? 'taskPublishUsingConfigPage' : 'taskConfigDraft',
       checklistId: inputBody._id,
       checkListName: inputBody?.checkListName,
       createdBy: req.user._id,
@@ -656,13 +667,17 @@ export async function taskConfig( req, res ) {
     }
 
     let configDetails = { ...req.body };
-    configDetails.scheduleEndTimeISO = dayjs.utc( configDetails.scheduleEndTime, 'hh:mm A' ).format();
-    configDetails.publishDate = dayjs().format();
+    configDetails.approver = configDetails.approver.length ? configDetails.approver.map( ( item ) => {
+      return { name: item.name, value: item.value };
+    } ) : [];
+    let endDate = dayjs.utc( configDetails?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + configDetails.scheduleEndTime;
+    configDetails.scheduleEndTimeISO = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
+    configDetails.publishDate = dayjs.utc( dayjs().format( 'hh:mm A' ), 'hh:mm A' ).format();
 
     let response = await taskService.updateOne( { _id: inputBody._id }, configDetails );
     if ( inputBody?.approver.length ) {
       let data = [];
-      let existEmail = await traxApprover.find( { checkListId: inputBody._id, isDeleted: false } );
+      let existEmail = await traxApprover.find( { checkListId: inputBody._id, isdeleted: false } );
       let mailList = existEmail.map( ( item ) => item.userEmail );
       existEmail = inputBody?.approver.filter( ( item ) => mailList.includes( item.value ) ).map( ( item ) => item.value );
       let userMailList = inputBody?.approver.map( ( ele ) => ele.value );
@@ -677,7 +692,7 @@ export async function taskConfig( req, res ) {
         }
       } );
 
-      await traxApprover.updateMany( { checkListId: inputBody._id, userEmail: { $nin: userMailList } }, { isDeleted: true } );
+      await traxApprover.updateMany( { checkListId: inputBody._id, userEmail: { $nin: userMailList } }, { isdeleted: true } );
       if ( data.length ) {
         await traxApprover.insertMany( data );
       }
@@ -716,10 +731,9 @@ export async function taskConfig( req, res ) {
     }
     await taskService.updateOne( { _id: inputBody._id }, { storeCount, locationCount } );
     if ( inputBody.submitType == 'publish' ) {
-      let currentDate = dayjs.utc().format();
-      let updatedscheduleEndTimeISO = dayjs.utc( checklistDetails?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + checklistDetails.scheduleEndTime;
-      updatedscheduleEndTimeISO = dayjs.utc( updatedscheduleEndTimeISO, 'YYYY-MM-DD hh:mm A' ).format();
-      if ( updatedscheduleEndTimeISO >= currentDate ) {
+      let tDate = dayjs().format( 'YYYY-MM-DD' ) + ' ' + dayjs().format( 'hh:mm A' );
+      let currentDate = dayjs( tDate, 'YYYY-MM-DD hh:mm A' ).format();
+      if ( configDetails.scheduleEndTimeISO >= currentDate ) {
         let deleteQuery = {
           $and: [
             { date_string: dayjs().format( 'YYYY-MM-DD' ) },
@@ -745,7 +759,7 @@ export async function taskConfig( req, res ) {
       }
     }
   } catch ( e ) {
-    logger.error( { functionName: 'updateConfigure =>', error: e } );
+    logger.error( { functionName: 'taskConfig =>', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -760,20 +774,21 @@ export async function insertSingleProcessData( checklistId ) {
       let endDate = dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + getCLconfig.scheduleEndTime;
       endDate = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
       if ( endDate >= date ) {
-        if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( currentdate ).format( 'YYYY-MM-DD' ) ) {
-          getCLconfig.scheduleEndTime = '11:59 PM';
-        }
+        // if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( currentdate ).format( 'YYYY-MM-DD' ) ) {
+        //   getCLconfig.scheduleEndTime = '11:59 PM';
+        // }
       } else {
         return false;
       }
-
-      startTimeIso = dayjs.utc( '12:00 AM', 'hh:mm A' );
-      endTimeIso = dayjs.utc( getCLconfig.scheduleEndTime, 'hh:mm A' );
+      let sTime = dayjs.utc( getCLconfig.publishDate ).format( 'hh:mm A' );
+      startTimeIso = dayjs.utc( sTime, 'hh:mm A' );
+      endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
       let insertdata = {};
-      insertdata.date_iso = startTimeIso.format();
+      insertdata.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
       insertdata.date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
       insertdata.sourceCheckList_id = getCLconfig._id;
       insertdata.checkListName = getCLconfig.checkListName;
+      insertdata.checkListDescription = getCLconfig.checkListDescription;
       insertdata.publish = getCLconfig.publish;
       insertdata.scheduleStartTime = '12:00 AM';
       insertdata.scheduleStartTime_iso = startTimeIso.format();
@@ -832,7 +847,7 @@ export async function insertSingleProcessData( checklistId ) {
     }
     return true;
   } catch ( error ) {
-    logger.error( 'PCLchecklistCreationValidator error =>', error );
+    logger.error( { function: 'PCLchecklistCreationValidator error =>', error: error } );
     return false;
   }
 };
@@ -844,10 +859,11 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       checkListId: new ObjectId( checklistId ),
       checkFlag: true,
       isdeleted: false,
-      ...( getCLconfig?.reinitiate ) ? { reinitiate: true } : {},
+      // ...( getCLconfig?.reinitiate ) ? { reinitiate: true } : {},
     },
   } );
   let allQuestion = await taskAssignService.aggregate( getquestionQuery );
+
   if ( allQuestion ) {
     let userIdList = [];
     for ( let element4 of allQuestion ) {
@@ -856,7 +872,8 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
         date_string: date,
         sourceCheckList_id: getCLconfig._id,
         $or: [ {
-          checklistStatus: { $in: [ 'submit' ] } },
+          checklistStatus: { $in: [ 'submit' ] },
+        },
         { submitTime: { $exists: true } },
         ],
         userId: element4.userId,
@@ -874,7 +891,8 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       delete element4.updatedAt;
       element4.checkListId = updatedchecklist._id;
       element4.checkListName = getCLconfig.checkListName;
-      element4.date_iso = startTimeIso.format();
+      element4.checkListDescription = getCLconfig.checkListDescription;
+      element4.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
       element4.date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
       element4.allowedOverTime = false;
       element4.allowedStoreLocation = getCLconfig.allowedStoreLocation;
@@ -892,6 +910,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       element4.locationCount = getCLconfig.locationCount;
       element4.scheduleRepeatedType = 'daily';
       element4.approvalEnable = getCLconfig.approver.length ? true : false;
+      element4.priorityType = getCLconfig.priorityType;
     }
     if ( userIdList.length ) {
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -901,7 +920,6 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       assigndeletequery.date_string = insertdata.date_string;
       assigndeletequery.date_iso = insertdata.date_iso;
       assigndeletequery.client_id = insertdata.client_id;
-      assigndeletequery.brandId = insertdata.brandId;
       assigndeletequery.checkListId = updatedchecklist._id;
       assigndeletequery.checklistStatus = { $nin: [ 'submit' ] };
       await taskProcessedService.deleteMany( assigndeletequery );
@@ -985,7 +1003,7 @@ async function createUser( data ) {
 
 export async function reinitiateTask( req, res ) {
   try {
-    let taskDetails = await taskService.findOne( { _id: req.body.taskId, isDeleted: false } );
+    let taskDetails = await taskService.findOne( { _id: req.body.taskId, isdeleted: false } );
     if ( !taskDetails ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -1001,7 +1019,7 @@ export async function reinitiateTask( req, res ) {
 
     if ( req.body?.approver.length ) {
       let data = [];
-      let existEmail = await traxApprover.find( { checkListId: req.body.taskId, isDeleted: false } );
+      let existEmail = await traxApprover.find( { checkListId: req.body.taskId, isdeleted: false } );
       let mailList = existEmail.map( ( item ) => item.userEmail );
       existEmail = req.body?.approver.filter( ( item ) => mailList.includes( item.value ) ).map( ( item ) => item.value );
       let userMailList = req.body?.approver.map( ( ele ) => ele.value );
@@ -1016,7 +1034,7 @@ export async function reinitiateTask( req, res ) {
         }
       } );
 
-      await traxApprover.updateMany( { checkListId: req.body.taskId, userEmail: { $nin: userMailList } }, { isDeleted: true } );
+      await traxApprover.updateMany( { checkListId: req.body.taskId, userEmail: { $nin: userMailList } }, { isdeleted: true } );
       if ( data.length ) {
         await traxApprover.insertMany( data );
       }
@@ -1066,10 +1084,39 @@ export async function createChecklistTask( req, res ) {
       checkListType: inputBody.checkListType,
       publishDate: new Date(),
       locationCount: 1,
-      referenceCheckListId: inputBody?.checkListId || '',
+      ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
     };
 
+    if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.user.role ) ) ) {
+      let userList = await userService.findOne( { clientId: inputBody.clientId, role: 'superadmin' }, { userName: 1, email: 1 } );
+      if ( userList ) {
+        data['approver'] = { name: userList.userName, value: userList.email };
+      }
+    } else {
+      data['approver'] = { name: req.user.userName, value: req.user.email };
+    }
+
+    let taskNameDetails = await taskService.find( { checkListName: { $regex: data.checkListName, $options: 'i' }, client_id: data.client_id, isdeleted: false } );
+    if ( taskNameDetails.length ) {
+      let nameLength = taskNameDetails.length;
+      data.checkListName = data.checkListName.split( '(' )[0] + '(' + nameLength +')';
+    } else {
+      data.checkListName = data.checkListName;
+    }
+
     let response = await taskService.create( data );
+    if ( response?.approver.length ) {
+      let data = [];
+      response?.approver.forEach( ( ele ) => {
+        data.push( {
+          userEmail: ele.value,
+          checkListId: response._id,
+          type: 'task',
+          client_id: inputBody.clientId,
+        } );
+      } );
+      await traxApprover.insertMany( data );
+    }
 
     if ( response?._id ) {
       if ( inputBody.question[0].questionReferenceImage.length ) {
@@ -1082,11 +1129,23 @@ export async function createChecklistTask( req, res ) {
         } );
         inputBody.question[0].questionReferenceImage = images;
       }
+      if ( inputBody.question[0].answers[0].referenceImage.length ) {
+        let images = [];
+        inputBody.question[0].answers[0].referenceImage.forEach( ( ele ) => {
+          let imgUrl = decodeURIComponent( ele.split( '?' )[0] );
+          let url = imgUrl.split( '/' );
+          if ( url.includes( 'https' ) || url.includes( 'http' ) ) {
+            url.splice( 0, 3 );
+          }
+          images.push( url.join( '/' ) );
+        } );
+        inputBody.question[0].answers[0].referenceImage = images;
+      }
       let question = {
         checkListId: response?._id,
         question: inputBody.question,
         section: 'Section 1',
-        checkList: inputBody.checkListName,
+        checkList: data.checkListName,
         client_id: inputBody.clientId,
       };
       await taskQuestionService.create( question );
@@ -1102,7 +1161,7 @@ export async function createChecklistTask( req, res ) {
         city: storeDetails?.storeProfile?.city,
         checkFlag: true,
         checkListId: response?._id,
-        checkListName: inputBody.checkListName,
+        checkListName: data.checkListName,
         client_id: inputBody.clientId,
         userId: userId,
       };
@@ -1154,7 +1213,7 @@ export async function createChecklistTask( req, res ) {
       return res.sendSuccess( 'Task created successfully' );
     }
   } catch ( e ) {
-    logger.error( { functionName: 'createChecklistTask', error: e } );
+    logger.error( { functionName: 'createChecklistTask', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -1194,7 +1253,9 @@ export async function approveTask( req, res ) {
         },
         body: JSON.stringify( params ),
       };
-      let searchResponse = await fetch( 'https://wnx32v5mtyqx6kh3nt6xuosjqa0xvdfq.lambda-url.ap-south-1.on.aws', requestOptions );
+      let url = JSON.parse( process.env.LAMBDAURL );
+
+      let searchResponse = await fetch( url.approveTask, requestOptions );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Task Approved successfully' );
       } else {
@@ -1202,7 +1263,7 @@ export async function approveTask( req, res ) {
       }
     }
   } catch ( e ) {
-    logger.error( { function: 'approveTask', error: e } );
+    logger.error( { function: 'approveTask', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -1219,7 +1280,7 @@ export async function redoTask( req, res ) {
       return res.sendError( 'Question number is Required', 400 );
     }
 
-    let taskDetails = await taskProcessedService.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1 } );
+    let taskDetails = await taskProcessedService.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1 } );
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -1244,6 +1305,7 @@ export async function redoTask( req, res ) {
       data = {
         checklistId: taskDetails.sourceCheckList_id,
         checkListName: taskDetails.checkListName,
+        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,
@@ -1254,6 +1316,11 @@ export async function redoTask( req, res ) {
         processedChecklistId: taskDetails._id,
         type: taskDetails.checkListType,
         userAnswer: userAnswer,
+        initiatedBy: req.user.userName,
+        initiatedTime: dayjs().format(),
+        answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
+        submitedBy: taskDetails.userName,
+        submitTime: taskDetails.submitTime,
       };
       await checklistLogs.create( data );
       const requestOptions = {
@@ -1263,7 +1330,8 @@ export async function redoTask( req, res ) {
         },
         body: JSON.stringify( req.body ),
       };
-      let searchResponse = await fetch( 'https://ottrgmadjmqptsxdmlckjxdjuy0qvpnt.lambda-url.ap-south-1.on.aws/', requestOptions );
+      let url = JSON.parse( process.env.LAMBDAURL );
+      let searchResponse = await fetch( url.redoTask, requestOptions );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
       } else {
@@ -1273,7 +1341,7 @@ export async function redoTask( req, res ) {
       return res.sendError( 'Something went wrong', 500 );
     }
   } catch ( e ) {
-    logger.error( { function: 'redoChecklist', error: e } );
+    logger.error( { function: 'redoChecklist', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -1422,7 +1490,7 @@ export const taskDropdown = async ( req, res ) => {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }
 
-    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
+    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy != '' ) {
       findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
     } else {
       findQuery.push( { $sort: { ['checkListName']: -1 } } );
@@ -1436,3 +1504,325 @@ export const taskDropdown = async ( req, res ) => {
     return res.sendError( { error: error }, 500 );
   }
 };
+export async function approvalstatus( req, res ) {
+  try {
+    let Approver = await ApproverModel.find( { checkListId: req.body.checklistId } );
+    if ( Approver.length === 0 ) {
+      return res.sendSuccess( 'suceess' );
+    }
+    let filterApprover = Approver.filter( ( data ) => data.userEmail=== req.user.email );
+    if ( filterApprover.length === 0 ) {
+      return res.sendSuccess( 'suceess' );
+    }
+
+
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let resultData = await LamdaServiceCall( url.approvalstatus, req.body );
+    console.log( resultData );
+    if ( resultData ) {
+      if ( resultData.status_code == '200' ) {
+        return res.sendSuccess( resultData );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( error, 'approvalstatus' );
+    return res.sendError( error, 500 );
+  }
+}
+
+export const taskList = async ( req, res ) => {
+  try {
+    let limit = parseInt( req.query.limit ) || 10;
+    let offset = parseInt( req.query.offset - 1 ) || 0;
+    let page = offset * limit;
+    let query = [];
+    query.push(
+        {
+          $match: {
+            checkListType: { $in: [ 'task', 'checklistTask', 'cctv' ] },
+            client_id: req.query.clientId,
+            isdeleted: false,
+          },
+        },
+    );
+
+    if ( req.query.search && req.query.search != '' ) {
+      req.query.search = req.query.search.replace( /([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1' );
+      query.push( {
+        $match: {
+          checkListName: { $regex: new RegExp( req.query.search, 'i' ) },
+        },
+      } );
+    }
+
+    query.push(
+        {
+          $project: {
+            checkList: { $toLower: '$checkListName' },
+            checkListName: 1,
+            createdBy: 1,
+            userName: { $toLower: '$createdByName' },
+            createdByName: 1,
+            storeCount: 1,
+            createdAt: 1,
+            publish: 1,
+            checkListType: 1,
+            questionCount: 1,
+            checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
+            priorityType: 1,
+            scheduleEndTimeISO: 1,
+          },
+        },
+    );
+
+    if ( req.query.sortColumnName && req.query.sortColumnName != '' && req.query.sortBy != '' ) {
+      if ( req.query.sortColumnName == 'status' ) {
+        req.query.sortColumnName = 'publish';
+      }
+      if ( req.query.sortColumnName != 'publish' ) {
+        query.push( {
+          $addFields: { lowerName: { $toLower: `$${req.query.sortColumnName}` } },
+        } );
+        query.push( {
+          $sort: { lowerName: parseInt( req.query.sortBy ) },
+        } );
+      } else {
+        query.push( {
+          $sort: { publish: parseInt( req.query.sortBy ) },
+        } );
+      }
+    } else {
+      query.push(
+          { $sort: { createdAt: -1 } },
+      );
+    }
+
+    query.push( {
+      $facet: {
+        data: [
+          { $skip: page },
+          { $limit: limit },
+        ],
+        count: [
+          { $count: 'totalCount' },
+        ],
+      },
+    } );
+
+    let checkList = await taskService.aggregate( query );
+    if ( !checkList[0].data.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+
+    checkList[0].data.forEach( ( item ) => {
+      if ( item.storeCount > 0 && item.storeCount <= 9 ) {
+        item.storeCount = '0' + item.storeCount;
+      }
+      if ( item.questionCount > 0 && item.questionCount <= 9 ) {
+        item.questionCount = '0' + item.questionCount;
+      }
+      item.createdAt = dayjs( item.createdAt ).format( 'DD MMM, YYYY' );
+    } );
+
+    return res.sendSuccess( { result: checkList[0].data, count: checkList[0].count[0].totalCount } );
+  } catch ( e ) {
+    logger.error( 'taskList', e );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updatePublish = async ( req, res ) => {
+  try {
+    if ( typeof req?.body?.checklistId == 'undefined' && typeof req.body.type == 'undefined' ) {
+      return res.sendError( { message: 'checklistId or type is required' }, 400 );
+    }
+
+    if ( typeof req?.body?.publish == 'undefined' ) {
+      return res.sendError( { message: 'publish is required' }, 400 );
+    }
+    let getCheckDetails;
+    let query;
+
+    if ( req.body.checklistId ) {
+      query = { _id: req.body.checklistId };
+      getCheckDetails = await taskService.findOne( { _id: req.body.checklistId, client_id: req.body.clientId } );
+    }
+
+    if ( !getCheckDetails ) {
+      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 = req.body.publish ? new Date() : getCheckDetails?.publishDate;
+    let currentDate = dayjs();
+    if ( !req.body.publish ) {
+      await taskProcessedConfigService.deleteMany( { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId } );
+      await taskProcessedService.deleteMany( { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId, checklistStatus: { $ne: 'submit' } } );
+      logger.info( { function: 'updatePublish', query: { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId, checklistStatus: { $ne: 'submit' } } } );
+    }
+
+
+    await taskService.updateOne( query, getCheckDetails );
+    if ( true ) {
+      let currentDate = dayjs.utc().format();
+      let updatedscheduleEndTimeISO = dayjs.utc( getCheckDetails.scheduleEndTimeISO ).format( 'HH:mm:ss' );
+      let newUpdatedDate = dayjs.utc( updatedscheduleEndTimeISO, 'HH:mm:ss' ).format();
+
+      if ( req.body.publish && req.body.publish == true ) {
+        if ( newUpdatedDate > currentDate ) {
+          let deleteQuery = {
+            $and: [
+              { date_string: dayjs().format( 'YYYY-MM-DD' ) },
+              { sourceCheckList_id: new ObjectId( req.body.checklistId ) },
+              { scheduleEndTime_iso: { $gt: currentDate } },
+            ],
+          };
+          deleteQuery.$and.push( { checklistStatus: { $ne: 'submit' } } );
+          let PClicklist = await taskProcessedService.deleteMany( deleteQuery );
+          logger.info( { function: 'updatePublish', query: deleteQuery } );
+          logger.info( `Deleted Checklist Before Insert => Checklist Name: ${getCheckDetails.checkListName}, PChecklist Count: ${PClicklist.deletedCount}` );
+          if ( PClicklist.acknowledged ) {
+            await insertSingleProcessData( req.body.checklistId );
+          } else {
+            res.sendError( 'something went wrong, please try again', 500 );
+          }
+        } else {
+          logger.info( `Schudled End Time Breached Checklist publish true => Checklist Name: ${getCheckDetails.checkListName}` );
+        }
+
+        futureDaysDataRemove( currentDate, req.body.checklistId, getCheckDetails.checkListName, '111' );
+      } else {
+        if ( newUpdatedDate > currentDate ) {
+          let deleteQuery = {
+            $and: [
+              { date_string: dayjs().format( 'YYYY-MM-DD' ) },
+              { sourceCheckList_id: new ObjectId( req.body.checklistId ) },
+              { scheduleEndTime_iso: { $gt: currentDate } },
+            ],
+          };
+          await taskProcessedConfigService.deleteMany( deleteQuery );
+          deleteQuery.$and.push( { checklistStatus: { $ne: 'submit' } } );
+          await taskProcessedService.deleteMany( deleteQuery );
+          logger.info( { function: 'updatePublish', query: deleteQuery } );
+
+          let checklistLogQuery = {};
+          checklistLogQuery.checkListName = getCheckDetails.checkListName;
+          checklistLogQuery.createdAt = { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) };
+          await checklistLogs.deleteMany( checklistLogQuery );
+
+          let checklistDetectionsQuery = {};
+          checklistDetectionsQuery.sourceChecklist_id = new ObjectId( req.body.checklistId );
+          checklistDetectionsQuery.date_iso = { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) };
+          // await processeddetections.deleteMany( checklistDetectionsQuery );
+          logger.info( { function: 'updatePublish', query: checklistDetectionsQuery } );
+        } else {
+          logger.info( `Schudled End Time Breached Checklist Unpublish false => Checklist Name: ${getCheckDetails.checkListName}` );
+        }
+
+        // //Delete Future Data////
+        futureDaysDataRemove( currentDate, req.body.checklistId, getCheckDetails.checkListName, '222' );
+      }
+    }
+    let logInsertData = {
+      action: req.body.publish ? 'publishTask' : 'unPublishTask',
+      checklistId: req.body?.checklistId,
+      checkListName: getCheckDetails.checkListName,
+      createdBy: req.user._id,
+      createdByName: req.user.userName,
+      client_id: req.body.clientId,
+    };
+    await checklistLogs.create( logInsertData );
+    return res.sendSuccess( { checklistName: getCheckDetails.checkListName, message: 'Updated Successfully' } );
+  } catch ( e ) {
+    logger.error( 'updatePublish task erroe =>', e );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const duplicateChecklist = async ( req, res ) => {
+  try {
+    if ( !req.params.checklistId ) {
+      return res.sendError( { message: 'Task id is required' }, 400 );
+    }
+
+    let checkDetails = await taskService.findOne( { _id: req.params.checklistId, client_id: req.query.clientId, isdeleted: false } );
+
+    if ( !checkDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    let dupDetails = { ...checkDetails._doc };
+    let name = `^${dupDetails.checkListName.split( '(' )[0]}\\(.*\\)$`;
+    let checkListNameDetails = await taskService.find( { checkListName: { $regex: name }, client_id: req.query.clientId, isdeleted: false } );
+    if ( checkListNameDetails.length ) {
+      let nameLength = checkListNameDetails.length + 1;
+      dupDetails.checkListName = dupDetails.checkListName.split( '(' )[0] + '(' + nameLength +')';
+    } else {
+      dupDetails.checkListName = dupDetails.checkListName + '(1)';
+    }
+    dupDetails.publish = false;
+    dupDetails.reinitiate = false;
+    dupDetails.createdAt = new Date();
+    dupDetails.updatedAt = new Date();
+    dupDetails.publishDate = '';
+    delete dupDetails._id;
+    let logInsertData = {
+      action: 'duplicateTask',
+      checklistId: req.params.checklistId,
+      checkListName: checkDetails.checkListName,
+      createdBy: req.user._id,
+      createdByName: req.user.userName,
+      client_id: req.query.clientId,
+    };
+    await checklistLogs.create( logInsertData );
+    taskService.create( dupDetails ).then( async ( data ) => {
+      let userList = await taskAssignService.find( { checkListId: checkDetails._id, client_id: req.query.clientId } );
+      if ( userList.length ) {
+        let users = [];
+        for ( let i = 0; i < userList.length; i++ ) {
+          let userDetails = { ...userList[i]._doc };
+          userDetails.checkListId = data._id;
+          userDetails.checkListName = data.checkListName;
+          delete userDetails['_id'];
+          users.push( userDetails );
+        }
+        await taskAssignService.insertMany( users );
+      }
+      let sectionList = await taskQuestionService.find( { checkListId: checkDetails._id, client_id: req.query.clientId, isdeleted: false } );
+      if ( sectionList.length ) {
+        let sections= [];
+        for ( let i = 0; i < sectionList.length; i++ ) {
+          let sectionDetails = { ...sectionList[i]._doc };
+          sectionDetails.checkListId = data._id;
+          sectionDetails.checkList = dupDetails.checkListName;
+          sectionDetails.createdAt = new Date();
+          sectionDetails.updatedAt = new Date();
+          delete sectionDetails['_id'];
+          sections.push( sectionDetails );
+        }
+        await taskQuestionService.insertMany( sections );
+        return res.sendSuccess( { message: 'Task Duplicated Successfully' } );
+      } else {
+        return res.sendSuccess( { message: 'Duplicated Successfully' } );
+      }
+    } ).catch( ( e ) => {
+      return res.sendError( e, 500 );
+    } );
+  } catch ( e ) {
+    logger.error( 'duplicateTask =>', e );
+    return res.sendError( e, 500 );
+  }
+};

package/src/controllers/taskActionCenter.controllers.js

@@ -51,6 +51,7 @@ export const overallCardsV1 = async ( req, res ) => {
         $match: {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: taskIdList },
+          checklistStatus: 'submit',
           ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
         },
@@ -63,6 +64,7 @@ export const overallCardsV1 = async ( req, res ) => {
         $match: {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: checklistIdList },
+          checklistStatus: 'submit',
           ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
         },
@@ -121,6 +123,10 @@ export const approvalTableV1 = async ( req, res ) => {
     toDate.setUTCHours( 23, 59, 59, 59 );
 
     let groupQuery = [ {
+      $sort: {
+        checkListName: 1,
+      },
+    }, {
       $group: {
         _id: { checklistId: '$sourceCheckList_id', redoType: '$redoStatus' },
         checkListName: { $first: '$checkListName' },
@@ -132,6 +138,7 @@ export const approvalTableV1 = async ( req, res ) => {
           $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ],
         },
         },
+        storeName: { $first: '$storeName' },
         publishDate: { $first: '$publishDate' },
         priorityType: { $first: '$priorityType' },
         approveCount: { $sum: {
@@ -160,9 +167,16 @@ export const approvalTableV1 = async ( req, res ) => {
         priorityType: 1,
         approveCount: 1,
         unApproveCount: 1,
+        storeName: 1,
         redo: '$_id.redoType',
       },
-    } ];
+    },
+    {
+      $match: {
+        submitCount: { $gte: 1 },
+      },
+    },
+    ];
 
     const promises = [];
 
@@ -282,8 +296,13 @@ export const activityLogV1 = async ( req, res ) => {
         storeName: 1,
         action: 1,
         createdAt: 1,
+        type: 1,
+        store_id: 1,
+        checklistId: 1,
+        redoStatus: 1,
       },
     } );
+    findQuery.push( { $sort: { ['_id']: -1 } } );
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset -1 ) || 0;
 
@@ -302,7 +321,7 @@ export const activityLogV1 = async ( req, res ) => {
 
     let activityLogData = await checklistLog.aggregate( findQuery );
 
-    if ( activityLogData && activityLogData.length > 0 ) {
+    if ( activityLogData && activityLogData?.[0]?.count?.length > 0 ) {
       return res.sendSuccess( activityLogData );
     } else {
       return res.sendError( { error: 'No Data Found' }, 204 );

package/src/controllers/taskDashboard.controllers.js

@@ -1,6 +1,6 @@
 import * as taskService from '../service/task.service.js';
 import * as processedTaskService from '../service/processedTaskList.service.js';
-import { logger } from 'tango-app-api-middleware';
+import { logger, download } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 import mongoose from 'mongoose';
 // const ObjectId = mongoose.Types.ObjectId;
@@ -218,25 +218,31 @@ export const taskTableV1 = async ( req, res ) => {
 export const taskInfoTableV1 = async ( req, res ) => {
   try {
     let requestData = req.body;
-    let fromDate = new Date( requestData.fromDate );
-    let toDate = new Date( requestData.toDate );
-    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    toDate = new Date( toDate.getTime() - userTimezoneOffset );
-    toDate.setUTCHours( 23, 59, 59, 59 );
+    // let fromDate = new Date( requestData.fromDate );
+    // let toDate = new Date( requestData.toDate );
+    // let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    // toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    // toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
 
     let findQuery = [];
     let findAndQuery = [];
 
     findAndQuery.push(
-        { date_iso: { $gte: fromDate, $lte: toDate } },
+        // { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
         // { checkListType: { $eq: 'task' } },
         { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.taskId ) },
     );
     if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
-      findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
+      if ( requestData.checklistStatus == 'redo' ) {
+        findAndQuery.push(
+            { redoStatus: true },
+            { checklistStatus: { $ne: 'submit' } } );
+      } else {
+        findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
+      }
     }
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -677,11 +683,25 @@ export const taskDropdownListV1 = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         // { checkListType: 'task' },
-        { isdeleted: false },
+        // { isdeleted: false },
+    );
+    findQuery.push( { $match: { $and: findAndQuery } }, { $sort: { date_iso: -1 } } );
+    findQuery.push(
+        {
+          $group: {
+            _id: '$sourceCheckList_id',
+            checkListName: { $first: '$checkListName' },
+            checkListType: { $first: '$checkListType' },
+            createdByName: { $first: '$createdByName' },
+            storeCount: { $first: '$storeCount' },
+            scheduleEndTimeISO: { $first: '$scheduleEndTime_iso' },
+            submitTime_string: { $first: '$submitTime_string' },
+          },
+        },
     );
-    findQuery.push( { $match: { $and: findAndQuery } } );
     findQuery.push( {
       $project: {
+        _id: 1,
         sourceCheckList_id: '$_id',
         checkListName: 1,
         checkListNameLowercase: { $toLower: '$checkListName' },
@@ -697,7 +717,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     } else {
       findQuery.push( { $sort: { ['checkListNameLowercase']: 1 } } );
     }
-    let getChecklistData = await taskService.aggregate( findQuery );
+    let getChecklistData = await processedTaskService.aggregate( findQuery );
     if ( !getChecklistData.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }
@@ -713,6 +733,114 @@ export const taskDropdownListV1 = async ( req, res ) => {
     return res.sendError( { error: error }, 500 );
   }
 };
+export const taskDropdownListNew = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let fromDate = new Date( requestData.fromDate );
+    let toDate = new Date( requestData.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+    let result = {};
+
+    let findQuery = [
+      { $match: { $and: [
+        { client_id: requestData.clientId },
+        { store_id: { $in: requestData.storeId } },
+        { date_iso: { $gte: fromDate, $lte: toDate } },
+        { checkListType: { $in: [ 'task', 'checklistTask', 'cctv' ] } },
+      ] } },
+      {
+        $project: {
+          sourceCheckList_id: 1,
+          checkListName: 1,
+        },
+      },
+      {
+        $group: {
+          _id: '$sourceCheckList_id',
+          checkListName: { $last: '$checkListName' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          sourceCheckList_id: '$_id',
+          checkListName: 1,
+        },
+      },
+      {
+        $lookup: {
+          from: 'taskconfigs',
+          let: { sourceId: '$sourceCheckList_id' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    { $eq: [ '$_id', '$$sourceId' ] },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                _id: 1,
+                checkListName: 1,
+                checkListNameLowercase: { $toLower: '$checkListName' },
+                checkListType: 1,
+                createdByName: 1,
+                publish: 1,
+                scheduleEndTime: 1,
+                scheduleRepeatedType: 1,
+                scheduleStartTime: 1,
+                sourceCheckList_id: '$_id',
+                storeCount: 1,
+                submitTime_string: 1,
+                scheduleEndTimeISO: 1,
+              },
+            },
+          ], as: 'checklistData',
+        },
+      },
+      { $unwind: { path: '$checklistData', preserveNullAndEmptyArrays: true } },
+      {
+        $project: {
+          sourceCheckList_id: '$checklistData._id',
+          checkListName: '$checklistData.checkListName',
+          checkListNameLowercase: { $toLower: '$checkListName' },
+          checkListType: '$checklistData.checkListType',
+          createdByName: '$checklistData.createdByName',
+          storeCount: '$checklistData.storeCount',
+          scheduleEndTimeISO: '$checklistData.scheduleEndTimeISO',
+          submitTime_string: '$checklistData.submitTime_string',
+          _id: '$checklistData._id',
+          publish: '$checklistData.publish',
+          scheduleEndTime: '$checklistData.scheduleEndTime',
+          scheduleRepeatedType: '$checklistData.scheduleRepeatedType',
+          scheduleStartTime: '$checklistData.scheduleStartTime',
+        },
+      },
+    ];
+    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
+      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
+    } else {
+      findQuery.push( { $sort: { ['checkListNameLowercase']: -1 } } );
+    }
+
+    let getChecklistData = await processedTaskService.aggregate( findQuery );
+    if ( !getChecklistData.length ) {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+    result.totalCount = getChecklistData.length;
+    result.taskDropdown = getChecklistData;
+    return res.sendSuccess( result );
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, message: req.query, function: 'checklistDropdownV1' } );
+    return res.sendError( { error: error }, 500 );
+  }
+};
 export const taskInfoView = async ( req, res ) => {
   try {
     let requestData = req.body;
@@ -787,3 +915,112 @@ export const taskDeleteV1 = async ( req, res ) => {
 };
 
 
+export async function taskDetails( req, res ) {
+  try {
+    if ( !req.body.fromDate || !req.body.toDate ) {
+      return res.sendError( 'fromDate or toDate is missing', 400 );
+    }
+    if ( !req.body.clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+
+    let toDate = new Date( req.body.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+    let limit = req.body?.limit || 10;
+    let page = req.body?.offset ? ( req.body.offset * req.body.limit ) : 0;
+
+    let query = [
+      {
+        $match: {
+          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          client_id: req.body.clientId,
+          ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
+        },
+      },
+      { $sort: { date_iso: -1 } },
+      {
+        $group: {
+          _id: '$sourceCheckList_id',
+          checkListName: { $first: '$checkListName' },
+          createdByName: { $first: '$createdByName' },
+          publishDate: { $first: '$publishDate' },
+          priorityType: { $first: '$priorityType' },
+          storeCount: { $first: '$storeCount' },
+          submitCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },
+          redoCount: { $sum: { $cond: [ { $and: [ { $eq: [ '$redoStatus', true ] }, { $ne: [ '$checklistStatus', 'submit' ] } ] }, 1, 0 ] } },
+          scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
+          checkListChar: { $first: { $toUpper: { $substr: [ '$createdByName', 0, 2 ] } } },
+        },
+      },
+    ];
+
+    if ( req.body?.searchValue.trim().length ) {
+      query.push(
+          {
+            $match: {
+              checkListName: { $regex: req.body.searchValue, $options: 'i' },
+            },
+          },
+      );
+    }
+
+    if ( req.body.sortColumnName && req.body.sortBy ) {
+      query.push( {
+        $sort: { [req.body.sortColumnName]: req.body.sortBy },
+      } );
+    } else {
+      query.push( {
+        $sort: { checkListName: 1 },
+      } );
+    }
+
+    if ( req.body.filter.length ) {
+      query.push( {
+        $match: { priorityType: { $in: req.body.filter } },
+      } );
+    }
+
+    query.push( {
+      $facet: {
+        data: [
+          { $skip: page }, { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    } );
+
+
+    let taskDetails = await processedTaskService.aggregate( query );
+
+    if ( req.body.export ) {
+      const exportResult = [];
+      for ( let task of taskDetails[0].data ) {
+        exportResult.push( {
+          'Task Name': task?.checkListName ||'',
+          'Created by': task?.createdByName ||'--',
+          'Created On': dayjs.utc( task?.publishDate ).format( 'DD MMM, YYYY' ) || '',
+          'Priority': task?.priorityType || '--',
+          'Assigned To': task?.storeCount ||'--',
+          'Submitted': task?.submitCount ||'--',
+          'Redo': task?.redoCount ||'--',
+          'Due on': dayjs.utc( task?.scheduleEndTime_iso ).format( 'DD MMM, YYYY' ) || '',
+        } );
+      }
+      await download( exportResult, res );
+      return;
+    }
+
+    if ( !taskDetails[0].data.length ) {
+      return res.sendError( 'no date found', 204 );
+    }
+
+    return res.sendSuccess( { data: taskDetails?.[0]?.data || [], count: taskDetails?.[0]?.count?.[0]?.total || 0 } );
+  } catch ( e ) {
+    logger.error( { function: 'taskDetails', error: e, message: req.body } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/task.routes.js

@@ -20,6 +20,10 @@ taskRouter
     .post( '/taskDropdown', isAllowedSessionHandler, taskController.taskDropdown )
     .post( '/getQuestions', isAllowedSessionHandler, taskController.getQuestions )
     .post( '/getAnswers', isAllowedSessionHandler, taskController.getAnswers )
-    .post( '/getAnswerCount', isAllowedSessionHandler, taskController.getAnswerCount );
+    .post( '/getAnswerCount', isAllowedSessionHandler, taskController.getAnswerCount )
+    .post( '/approvalstatus', isAllowedSessionHandler, taskController.approvalstatus )
+    .get( '/task-list', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ ] } ] } ), taskController.taskList )
+    .put( '/publish', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.updatePublish )
+    .get( '/duplicateTask/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.duplicateChecklist );
 
 

package/src/routes/taskDashboard.routes.js

@@ -1,19 +1,21 @@
 import express from 'express';
 export const taskDashboardRouter = express.Router();
+import { isAllowedSessionHandler, accessVerification, isAllowedClient } from 'tango-app-api-middleware';
 
 import {
-  overallCards, taskTable, taskInfoTable, taskDropdownList, taskTableV1, overallCardsV1, taskInfoTableV1, taskDropdownListV1, taskDeleteV1,
+  overallCards, taskTable, taskInfoTable, taskDropdownList, taskTableV1, overallCardsV1, taskInfoTableV1, taskDropdownListV1, taskDeleteV1, taskDetails,
 } from '../controllers/taskDashboard.controllers.js';
 
 taskDashboardRouter
-    .post( '/overallcards', overallCards )
-    .post( '/overallcardsV1', overallCardsV1 )
-    .post( '/taskTable', taskTable )
-    .post( '/taskTableV1', taskTableV1 )
-    .post( '/taskInfoTable', taskInfoTable )
-    .post( '/taskInfoTableV1', taskInfoTableV1 )
-    .post( '/taskDropdownList', taskDropdownList )
-    .post( '/taskDropdownListV1', taskDropdownListV1 )
-    .post( '/taskDeleteV1', taskDeleteV1 );
+    .post( '/overallcards', isAllowedSessionHandler, overallCards )
+    .post( '/overallcardsV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), overallCardsV1 )
+    .post( '/taskTable', isAllowedSessionHandler, taskTable )
+    .post( '/taskTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskTableV1 )
+    .post( '/taskInfoTable', isAllowedSessionHandler, taskInfoTable )
+    .post( '/taskInfoTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskInfoTableV1 )
+    .post( '/taskDropdownList', isAllowedSessionHandler, taskDropdownList )
+    .post( '/taskDropdownListV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskDropdownListV1 )
+    .post( '/taskDeleteV1', isAllowedSessionHandler, taskDeleteV1 )
+    .post( '/taskDetails', isAllowedSessionHandler, taskDetails );
 
 export default taskDashboardRouter;

package/src/service/user.service.js

@@ -1,7 +1,7 @@
 import model from 'tango-api-schema';
 
 export const findOne = async ( query={}, field={} ) => {
-  return model.userModel.findOne( query, field );
+  return model.userModel.findOne( query, field ).sort( { userName: 1 } );
 };
 
 export const find = async ( query={}, field={} ) => {