tango-app-api-task 1.0.0-beta.2 → 1.0.0-beta.20

package/package.json

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

package/src/controllers/task.controller.js

@@ -83,13 +83,15 @@ export async function createUpdateTask( req, res ) {
     if ( data.upsertedId || req.body._id ) {
       checkListId = data?.upsertedId || req.body._id;
       let logInsertData = {
-        action: req.body?._id ? 'checklistupdate' : 'checklistCreate',
+        action: req.body?._id ? 'taskUpdate' : 'taskCreate',
+        type: 'task',
         checklistId: checkListId,
         checkListName: inputBody.checklistName,
         createdBy: req.user._id,
         createdByName: req.user.userName,
         client_id: req.body.clientId,
         sections: inputBody?.sections,
+        createdByEmail: req.user.email,
       };
       await checklistLogs.create( logInsertData );
       let sectionList = [];
@@ -168,10 +170,16 @@ export async function createUpdateTask( req, res ) {
         }
         await taskQuestionService.insertMany( sectionList );
         let message = req.body?._id ? 'Task Updated Successfully' : 'Task Created Successfully';
+        if ( inputBody.submitType == 'save' ) {
+          message = 'Saved in draft successfully';
+        }
         return res.sendSuccess( { checklistId: checkListId, message: message } );
       } else {
         if ( inputBody.submitType == 'save' ) {
+          let message = 'Saved in draft successfully';
           return res.sendSuccess( { checklistId: checkListId, message: message } );
+        } else {
+          return res.sendSuccess( { message: 'Question is required' } );
         }
       }
     } else {
@@ -362,6 +370,13 @@ export async function validateUser( req, res ) {
         return res.sendSuccess( { validate: false, user: userEmail, store: storeId, domain: domainExists } );
       }
 
+      if ( req.body.hasOwnProperty( 'delete' ) ) {
+        let checkExists = await taskAssignService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName, checkListId: req.body.id } );
+        if ( checkExists ) {
+          return res.sendError( 'User already exists', 400 );
+        }
+      }
+
       let id = await uploadUser( req, res );
       if ( id ) {
         return res.sendSuccess( { validate: true, id } );
@@ -429,9 +444,9 @@ export async function validateUser( req, res ) {
       }
     } else {
       if ( req.body.hasOwnProperty( 'delete' ) ) {
-        let checkExists = await taskAssignService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName } );
+        let checkExists = await taskAssignService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName, checkListId: req.body.id } );
         if ( checkExists ) {
-          return res.sendSuccess( 'User already exists' );
+          return res.sendError( 'User already exists', 400 );
         }
       }
 
@@ -652,11 +667,14 @@ export async function taskConfig( req, res ) {
 
     let logInsertData = {
       action: inputBody.submitType == 'publish' ? 'taskPublishUsingConfigPage' : 'taskConfigDraft',
+      type: 'task',
       checklistId: inputBody._id,
       checkListName: inputBody?.checkListName,
       createdBy: req.user._id,
       createdByName: req.user.userName,
       client_id: inputBody.client_id,
+      createdByEmail: req.user.email,
+      approver: inputBody?.approver || [],
     };
     await checklistLogs.create( logInsertData );
 
@@ -688,6 +706,7 @@ export async function taskConfig( req, res ) {
             checkListId: inputBody._id,
             type: 'task',
             client_id: inputBody.client_id,
+            checkListName: inputBody?.checkListName,
           } );
         }
       } );
@@ -734,15 +753,15 @@ export async function taskConfig( req, res ) {
       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' ) },
-            { sourceCheckList_id: new ObjectId( req.params.checklistId ) },
-            { scheduleEndTime_iso: { $gt: currentDate } },
-          ],
-        };
-        deleteQuery.$and.push( { checklistStatus: { $ne: 'submit' } } );
-        await taskProcessedService.deleteMany( deleteQuery );
+        // let deleteQuery = {
+        //   $and: [
+        //     { date_string: dayjs().format( 'YYYY-MM-DD' ) },
+        //     { sourceCheckList_id: new ObjectId( req.params.checklistId ) },
+        //     { scheduleEndTime_iso: { $gt: currentDate } },
+        //   ],
+        // };
+        // deleteQuery.$and.push( { checklistStatus: { $ne: 'submit' } } );
+        // await taskProcessedService.deleteMany( deleteQuery );
         await insertSingleProcessData( inputBody._id );
       } else {
         logger.info( `Schudled End Time Breached Checklist publish true => Checklist Name: ${checklistDetails.checkListName}` );
@@ -751,12 +770,8 @@ export async function taskConfig( req, res ) {
       futureDaysDataRemove( currentDate, req.params.checklistId );
     }
     if ( response?.modifiedCount || response?.matchedCount || response?.upsertedCount ) {
-      return res.sendSuccess( { id: inputBody._id, message: 'Configuration Updated Successfully' } );
-    }
-    if ( inputBody.submitType == 'save' ) {
-      if ( response?.modifiedCount || response?.matchedCount || response?.upsertedCount ) {
-        return res.sendSuccess( { message: 'Configuration Updated Successfully' } );
-      }
+      let message = inputBody.submitType == 'publish' ? 'Configuration Updated Successfully' : 'Saved in draft successfully';
+      return res.sendSuccess( { id: inputBody._id, message: message } );
     }
   } catch ( e ) {
     logger.error( { functionName: 'taskConfig =>', error: e, message: req.body } );
@@ -806,6 +821,9 @@ export async function insertSingleProcessData( checklistId ) {
       insertdata.locationCount = getCLconfig.locationCount;
       insertdata.allowedMultiSubmit = false;
       insertdata.scheduleRepeatedType = 'daily';
+      insertdata.remainder = getCLconfig?.remainder || [];
+      insertdata.approver = getCLconfig?.approver || [];
+      insertdata.restrictAttendance = getCLconfig?.restrictAttendance;
       let collectSections = [];
       let sectionQuery = [];
       sectionQuery.push( {
@@ -827,21 +845,55 @@ export async function insertSingleProcessData( checklistId ) {
         }
         insertdata.questionAnswers = collectSections;
         insertdata.updatedAt = new Date();
-        let insertdataquery = {};
-        insertdataquery.date_string = insertdata.date_string;
-        insertdataquery.date_iso = insertdata.date_iso;
-        insertdataquery.client_id = insertdata.client_id;
-        insertdataquery.sourceCheckList_id = insertdata.sourceCheckList_id;
-        let updatedchecklist;
-        let checklistDetails = await taskProcessedConfigService.findOne( insertdataquery );
-        if ( !checklistDetails ) {
-          updatedchecklist = await taskProcessedConfigService.insert( insertdata );
-        } else {
-          await taskProcessedConfigService.updateOne( { _id: checklistDetails._id }, insertdata );
-          updatedchecklist = checklistDetails;
-        }
-        if ( updatedchecklist ) {
-          insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedchecklist, date, startTimeIso, endTimeIso, insertdata );
+        function getDaysBeforeEndDate( endDate ) {
+          const end = dayjs.utc( endDate );
+          const now = dayjs.utc();
+
+          if ( end.isBefore( now ) ) {
+            throw new Error( 'End date must be in the future.' );
+          }
+
+          const daysArray = [];
+          let currentDate = now.startOf( 'day' );
+
+          while ( currentDate.isBefore( end ) ) {
+            daysArray.push( currentDate.format( ) );
+            currentDate = currentDate.add( 1, 'day' );
+          }
+
+          return daysArray;
+        };
+
+        const dateArray = getDaysBeforeEndDate( endDate );
+
+        for ( const dateVal of dateArray ) {
+          const insertdataquery = {
+            date_string: dayjs( dateVal ).format( 'YYYY-MM-DD' ),
+            date_iso: dayjs( dateVal ).toDate(),
+            client_id: insertdata.client_id,
+            sourceCheckList_id: insertdata.sourceCheckList_id,
+          };
+
+          const insertDataPerDay = {
+            ...insertdata,
+            date_string: dayjs( dateVal ).format( 'YYYY-MM-DD' ),
+            date_iso: dayjs( dateVal ).toDate(),
+            approver: getCLconfig?.approver,
+          };
+
+          let updatedchecklist;
+          let checklistDetails = await taskProcessedConfigService.findOne( insertdataquery );
+
+          if ( !checklistDetails ) {
+            updatedchecklist = await taskProcessedConfigService.insert( insertDataPerDay );
+          } else {
+            await taskProcessedConfigService.updateOne( { _id: checklistDetails._id }, insertDataPerDay );
+            updatedchecklist = checklistDetails;
+          }
+
+          if ( updatedchecklist ) {
+            await insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, dateVal, startTimeIso, endTimeIso, insertdata );
+          }
         }
       }
     }
@@ -852,18 +904,18 @@ export async function insertSingleProcessData( checklistId ) {
   }
 };
 
-async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedchecklist, date, startTimeIso, endTimeIso, insertdata ) {
+async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata ) {
   let getquestionQuery = [];
   getquestionQuery.push( {
     $match: {
       checkListId: new ObjectId( checklistId ),
       checkFlag: true,
       isdeleted: false,
-      // ...( getCLconfig?.reinitiate ) ? { reinitiate: true } : {},
     },
   } );
   let allQuestion = await taskAssignService.aggregate( getquestionQuery );
 
+
   if ( allQuestion ) {
     let userIdList = [];
     for ( let element4 of allQuestion ) {
@@ -893,7 +945,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       element4.checkListName = getCLconfig.checkListName;
       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.date_string = dayjs( date ).format( 'YYYY-MM-DD' );
       element4.allowedOverTime = false;
       element4.allowedStoreLocation = getCLconfig.allowedStoreLocation;
       element4.scheduleStartTime = '12:00 AM';
@@ -911,19 +963,43 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       element4.scheduleRepeatedType = 'daily';
       element4.approvalEnable = getCLconfig.approver.length ? true : false;
       element4.priorityType = getCLconfig.priorityType;
+      element4.remainder = getCLconfig?.remainder || [];
+      element4.restrictAttendance = getCLconfig?.restrictAttendance;
     }
     if ( userIdList.length ) {
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
     }
+
     if ( allQuestion ) {
-      let assigndeletequery = {};
-      assigndeletequery.date_string = insertdata.date_string;
-      assigndeletequery.date_iso = insertdata.date_iso;
-      assigndeletequery.client_id = insertdata.client_id;
-      assigndeletequery.checkListId = updatedchecklist._id;
-      assigndeletequery.checklistStatus = { $nin: [ 'submit' ] };
-      await taskProcessedService.deleteMany( assigndeletequery );
-      await taskProcessedService.insertMany( allQuestion );
+      let assigndeletequery = {
+        date_iso: date,
+        client_id: insertdata.client_id,
+        checkListId: updatedchecklist._id,
+        redoStatus: false,
+        checklistStatus: { $nin: [ 'submit' ] },
+      };
+
+      if ( assigndeletequery.checkListId && assigndeletequery.date_iso ) {
+        await taskProcessedService.deleteMany( assigndeletequery );
+      }
+
+      const retainTaskQuery = {
+        date_iso: date,
+        client_id: insertdata.client_id,
+        checkListId: updatedchecklist._id,
+        redoStatus: true,
+        checklistStatus: { $nin: [ 'submit' ] },
+      };
+
+      const taskToRetain = await taskProcessedService.find( retainTaskQuery );
+
+      const insertList = allQuestion.filter( ( item2 ) =>
+        !taskToRetain.some( ( item1 ) =>
+          item1.store_id === item2.store_id && item1.userEmail === item2.userEmail,
+        ),
+      );
+
+      await taskProcessedService.insertMany( insertList );
       logger.info( { function: 'insertPCBulk_v3', query: assigndeletequery } );
     }
   }
@@ -1007,22 +1083,14 @@ export async function reinitiateTask( req, res ) {
     if ( !taskDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-    let data = {};
-    data.scheduleDate = req.body.scheduleDate;
-    data.scheduleEndTime = req.body.scheduleEndTime;
-    data.scheduleEndTimeISO = dayjs.utc( req.body.scheduleEndTime, 'hh:mm A' ).format();
-    data.allowedStoreLocation = req.body.allowedStoreLocation;
-    data.approver = req.body.approver;
-    data.priorityType = req.body.priorityType;
-    data.restrictAttendance = req.body.restrictAttendance;
-    data.reinitiate = true;
+    let endDate = dayjs( req.body.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + req.body.scheduleEndTime;
+    endDate = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
 
     if ( req.body?.approver.length ) {
       let data = [];
       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 );
       req.body?.approver.forEach( ( ele ) => {
         if ( !existEmail.includes( ele.value ) ) {
           data.push( {
@@ -1033,16 +1101,59 @@ export async function reinitiateTask( req, res ) {
           } );
         }
       } );
-
-      await traxApprover.updateMany( { checkListId: req.body.taskId, userEmail: { $nin: userMailList } }, { isdeleted: true } );
       if ( data.length ) {
         await traxApprover.insertMany( data );
       }
     }
 
-    await taskService.updateOne( { _id: req.body.taskId }, data );
-    await taskAssignService.updateOne( { userEmail: req.body.userEmail, storeName: req.body.storeName, checkListId: req.body.taskId }, { reinitiate: true } );
-    await insertSingleProcessData( req.body.taskId );
+    function getDaysBeforeEndDate( endDate ) {
+      const end = dayjs.utc( endDate );
+      const now = dayjs.utc( req.body.previousEndDate ).add( 1, 'day' );
+
+      const daysArray = [];
+      if ( !end.isBefore( now ) ) {
+        let currentDate = now.startOf( 'day' );
+
+        while ( currentDate.isBefore( end ) ) {
+          daysArray.push( currentDate.format( ) );
+          currentDate = currentDate.add( 1, 'day' );
+        }
+      }
+      return daysArray;
+    };
+
+    const dateArray = getDaysBeforeEndDate( endDate );
+    await taskProcessedService.updateMany( { userEmail: req.body.userEmail, store_id: req.body.store_id, date_iso: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, sourceCheckList_id: req.body.taskId }, { scheduleEndTime_iso: endDate, priorityType: req.body.priorityType, allowedStoreLocation: req.body.allowedStoreLocation } );
+    await taskProcessedConfigService.updateMany( { date_iso: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, sourceCheckList_id: req.body.taskId }, { scheduleEndTime_iso: endDate, priorityType: req.body.priorityType, allowedStoreLocation: req.body.allowedStoreLocation } );
+
+    if ( dateArray.length ) {
+      let getPreviousUserTaskDate = await taskProcessedService.findOne( { userEmail: req.body.userEmail, store_id: req.body.store_id, sourceCheckList_id: req.body.taskId } );
+      if ( !getPreviousUserTaskDate ) {
+        return res.sendError( 'No data found', 204 );
+      }
+      let getPreviousConfigDate = await taskProcessedConfigService.findOne( { sourceCheckList_id: req.body.taskId } );
+
+      for ( let date of dateArray ) {
+        let configData = {
+          ...getPreviousConfigDate._doc,
+          date_string: dayjs( date ).format( 'YYYY-MM-DD' ),
+          date_iso: new Date( dayjs( date ).format( 'YYYY-MM-DD' ) ),
+        };
+
+        let userTaskData = {
+          ...getPreviousUserTaskDate._doc,
+          date_string: dayjs( date ).format( 'YYYY-MM-DD' ),
+          date_iso: new Date( dayjs( date ).format( 'YYYY-MM-DD' ) ),
+        };
+
+        delete configData._id;
+        delete userTaskData._id;
+
+        await taskProcessedConfigService.insert( configData );
+        await taskProcessedService.insert( userTaskData );
+      }
+    }
+
     return res.sendSuccess( 'Task reinitaite SUccessfully' );
   } catch ( e ) {
     logger.error( { functionName: 'reinitiateTask', error: e } );
@@ -1096,14 +1207,6 @@ export async function createChecklistTask( req, res ) {
       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 = [];
@@ -1124,7 +1227,9 @@ export async function createChecklistTask( req, res ) {
         inputBody.question[0].questionReferenceImage.forEach( ( ele ) => {
           let imgUrl = decodeURIComponent( ele.split( '?' )[0] );
           let url = imgUrl.split( '/' );
-          url.splice( 0, 3 );
+          if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+            url.splice( 0, 3 );
+          }
           images.push( url.join( '/' ) );
         } );
         inputBody.question[0].questionReferenceImage = images;
@@ -1134,7 +1239,7 @@ export async function createChecklistTask( req, res ) {
         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' ) ) {
+          if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
             url.splice( 0, 3 );
           }
           images.push( url.join( '/' ) );
@@ -1224,43 +1329,48 @@ export async function approveTask( req, res ) {
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
-    let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, checklistStatus: 'submit', approvalEnable: true };
+    let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
     if ( req.body?.storeId?.length ) {
       query['store_id'] = { $in: req.body.storeId };
     }
-    let taskDetails = await taskProcessedService.find( query, { _id: 1 } );
+    let taskDetails = await taskProcessedService.find( query, { _id: 1, checklistStatus: 1, storeName: 1 } );
     if ( !taskDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
-    let idList = taskDetails.map( ( item ) => item._id );
-    let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
-    if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
-      let params = {
-        'payload': {
-          sourceCheckList_id: req.body.sourceCheckList_id,
-          fromDate: req.body.fromDate,
-          toDate: req.body.toDate,
-          store_id: req.body.storeId,
-        },
-        'upsert': {
-          approvalStatus: true,
-        },
-      };
-      const requestOptions = {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify( params ),
-      };
-      let url = JSON.parse( process.env.LAMBDAURL );
+    let idList = taskDetails.filter( ( ele ) => ele.checklistStatus == 'submit' ).map( ( item ) => item._id );
+    if ( idList.length ) {
+      let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
+      if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
+        let params = {
+          'payload': {
+            sourceCheckList_id: req.body.sourceCheckList_id,
+            fromDate: req.body.fromDate,
+            toDate: req.body.toDate,
+            store_id: req.body.storeId,
+          },
+          'upsert': {
+            approvalStatus: true,
+          },
+        };
+        const requestOptions = {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify( params ),
+        };
+        let url = JSON.parse( process.env.LAMBDAURL );
 
-      let searchResponse = await fetch( url.approveTask, requestOptions );
-      if ( searchResponse.ok ) {
-        return res.sendSuccess( 'Task Approved successfully' );
-      } else {
-        return res.sendError( 'Something went wrong', 500 );
+        let searchResponse = await fetch( url.approveTask, requestOptions );
+        if ( searchResponse.ok ) {
+          return res.sendSuccess( 'Task has been approved the submitted stores' );
+        } else {
+          return res.sendError( 'Something went wrong', 500 );
+        }
       }
+    } else {
+      let redoList = taskDetails.filter( ( ele ) => ele.checklistStatus == 'open' );
+      return res.sendError( `${redoList.length} stores has not been approved since those stores are not submitted`, 400 );
     }
   } catch ( e ) {
     logger.error( { function: 'approveTask', error: e, message: req.body } );
@@ -1289,15 +1399,18 @@ export async function redoTask( req, res ) {
     if ( sectionIndex == -1 ) {
       return res.sendError( 'section is not found', 400 );
     }
-    let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true };
+    let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
     let userAnswer = data.userAnswer;
+    console.log( userAnswer );
     question[sectionIndex].questions[req.body.payload.qno - 1] = data;
+    question[sectionIndex].questions[req.body.payload.qno - 1].remarks = '';
     question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
     taskDetails.questionAnswers = question;
     let updateData = {
       checklistStatus: 'open',
       redoStatus: true,
       questionAnswers: question,
+      ...( dayjs.utc( taskDetails.scheduleEndTime_iso ).format( 'YYYY-MM-DD' ) == dayjs().format( 'YYYY-MM-DD' ) ) ? { scheduleEndTime_iso: dayjs.utc().endOf( 'day' ) } :{},
     };
 
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
@@ -1322,6 +1435,7 @@ export async function redoTask( req, res ) {
         submitedBy: taskDetails.userName,
         submitTime: taskDetails.submitTime,
       };
+      console.log( data );
       await checklistLogs.create( data );
       const requestOptions = {
         method: 'POST',
@@ -1341,7 +1455,7 @@ export async function redoTask( req, res ) {
       return res.sendError( 'Something went wrong', 500 );
     }
   } catch ( e ) {
-    logger.error( { function: 'redoChecklist', error: e, message: req.body } );
+    logger.error( { function: 'redoTask', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -1512,12 +1626,23 @@ export async function approvalstatus( req, res ) {
     }
     let filterApprover = Approver.filter( ( data ) => data.userEmail=== req.user.email );
     if ( filterApprover.length === 0 ) {
+      if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+        let url = JSON.parse( process.env.LAMBDAURL );
+        let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
+        if ( resultData ) {
+          console.log( resultData.status_code );
+          if ( resultData.status_code == '200' ) {
+            return res.sendSuccess( resultData );
+          }
+        }
+        return res.sendError( 'No Content', 204 );
+      }
       return res.sendSuccess( 'suceess' );
     }
 
 
     let url = JSON.parse( process.env.LAMBDAURL );
-    let resultData = await LamdaServiceCall( url.approvalstatus, req.body );
+    let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
     console.log( resultData );
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
@@ -1743,6 +1868,7 @@ export const updatePublish = async ( req, res ) => {
       createdBy: req.user._id,
       createdByName: req.user.userName,
       client_id: req.body.clientId,
+      createdByEmail: req.user.email,
     };
     await checklistLogs.create( logInsertData );
     return res.sendSuccess( { checklistName: getCheckDetails.checkListName, message: 'Updated Successfully' } );
@@ -1766,7 +1892,7 @@ export const duplicateChecklist = async ( req, res ) => {
 
     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 } );
+    let checkListNameDetails = await taskService.find( { checkListName: { $regex: name }, client_id: req.query.clientId } );
     if ( checkListNameDetails.length ) {
       let nameLength = checkListNameDetails.length + 1;
       dupDetails.checkListName = dupDetails.checkListName.split( '(' )[0] + '(' + nameLength +')';
@@ -1786,6 +1912,7 @@ export const duplicateChecklist = async ( req, res ) => {
       createdBy: req.user._id,
       createdByName: req.user.userName,
       client_id: req.query.clientId,
+      createdByEmail: req.user.email,
     };
     await checklistLogs.create( logInsertData );
     taskService.create( dupDetails ).then( async ( data ) => {

package/src/controllers/taskDashboard.controllers.js

@@ -107,11 +107,16 @@ export const taskTableV1 = async ( req, res ) => {
     let offset = parseInt( req.body.offset - 1 ) || 0;
     let page = offset * limit;
     let query = [];
+    let fromDate = new Date( req.body.fromDate );
+    let toDate = new Date( req.body.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
 
     query.push(
         {
           $match: {
-            // checkListType: 'task',
+            date_iso: { $gte: fromDate, $lte: toDate },
             client_id: req.body.clientId,
             isdeleted: false,
           },
@@ -218,28 +223,22 @@ 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 result = {};
 
     let findQuery = [];
     let findAndQuery = [];
 
     findAndQuery.push(
-        // { date_iso: { $gte: fromDate, $lte: toDate } },
+        { date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } },
         { 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' ) {
       if ( requestData.checklistStatus == 'redo' ) {
         findAndQuery.push(
             { redoStatus: true },
-            { checklistStatus: { $ne: 'submit' } } );
+        );
       } else {
         findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
       }
@@ -259,8 +258,40 @@ export const taskInfoTableV1 = async ( req, res ) => {
       findQuery.push( { $match: { $or: [ query ] } } );
     }
 
+    findQuery.push( { $sort: { date_iso: -1, userName: 1 } } );
+
+    findQuery.push(
+        {
+          $group: {
+            _id: { userEmail: '$userEmail', storeId: '$store_id', checklistStatus: '$checklistStatus' },
+            checkListName: { $first: '$checkListName' },
+            createdByName: { $first: '$createdByName' },
+            userName: { $first: '$userName' },
+            userEmail: { $first: '$userEmail' },
+            checklistStatus: { $first: '$checklistStatus' },
+            submitTime_string: { $first: '$submitTime_string' },
+            storeName: { $first: '$storeName' },
+            checkListType: { $first: '$checkListType' },
+            scheduleRepeatedType: { $first: '$scheduleRepeatedType' },
+            date_iso: { $first: '$date_iso' },
+            store_id: { $first: '$store_id' },
+            timeFlag: { $first: '$timeFlag' },
+            date_string: { $first: '$date_string' },
+            sourceCheckList_id: { $first: '$sourceCheckList_id' },
+            reinitiateStatus: { $first: '$reinitiateStatus' },
+            scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
+            processedchecklistId: { $first: '$_id' },
+            redoStatus: { $first: '$redoStatus' },
+            priorityType: { $first: '$priorityType' },
+            allowedStoreLocation: { $first: '$allowedStoreLocation' },
+            restrictAttendance: { $first: '$restrictAttendance' },
+          },
+        },
+    );
+
     findQuery.push( {
       $project: {
+        _id: 0,
         checkListName: 1,
         createdByName: 1,
         userName: 1,
@@ -277,12 +308,17 @@ export const taskInfoTableV1 = async ( req, res ) => {
         sourceCheckList_id: 1,
         reinitiateStatus: 1,
         scheduleEndTime_iso: 1,
-
+        processedchecklistId: 1,
+        redoStatus: 1,
+        priorityType: 1,
+        allowedStoreLocation: 1,
+        restrictAttendance: 1,
       },
     } );
 
     findQuery.push( {
       $project: {
+        _id: 0,
         checkListName: 1,
         checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
         createdByName: 1,
@@ -316,13 +352,18 @@ export const taskInfoTableV1 = async ( req, res ) => {
         checklistDate: '$date_string',
         sourceCheckList_id: 1,
         scheduleEndTime_iso: 1,
+        processedchecklistId: 1,
+        redoStatus: 1,
+        priorityType: 1,
+        allowedStoreLocation: 1,
+        restrictAttendance: 1,
       },
     } );
 
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
       findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
     } else {
-      findQuery.push( { $sort: { ['date_iso']: -1 } } );
+      findQuery.push( { $sort: { userEmail: 1 } } );
     }
 
     let limit = parseInt( requestData?.limit ) || 10;
@@ -348,7 +389,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
 
     result.totalCount = taskInfoData[0].count[0].total;
     for ( let i = 0; i < taskInfoData[0].data.length; i++ ) {
-      taskInfoData[0].data[i].scheduleEndTime_iso = dayjs( taskInfoData[0].data[i].scheduleEndTime_iso ).format( 'DD MMM YYYY' );
+      taskInfoData[0].data[i].date = dayjs.utc( taskInfoData[0].data[i].scheduleEndTime_iso ).format();
+      taskInfoData[0].data[i].scheduleEndTime_iso = dayjs.utc( taskInfoData[0].data[i].scheduleEndTime_iso ).format( 'DD MMM YYYY' );
     }
     result.taskInfo = taskInfoData[0].data;
     return res.sendSuccess( result );
@@ -689,13 +731,13 @@ export const taskDropdownListV1 = async ( req, res ) => {
     findQuery.push(
         {
           $group: {
-            _id: '$sourceCheckList_id',
+            _id: '$_id',
             checkListName: { $first: '$checkListName' },
             checkListType: { $first: '$checkListType' },
             createdByName: { $first: '$createdByName' },
             storeCount: { $first: '$storeCount' },
-            scheduleEndTimeISO: { $first: '$scheduleEndTime_iso' },
-            submitTime_string: { $first: '$submitTime_string' },
+            scheduleEndTimeISO: { $first: '$scheduleEndTimeISO' },
+            // submitTime_string: { $first: '$submitTime_string' },
           },
         },
     );
@@ -709,7 +751,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
         createdByName: 1,
         storeCount: 1,
         scheduleEndTimeISO: 1,
-        submitTime_string: 1,
+        // submitTime_string: 1,
       },
     } );
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
@@ -717,7 +759,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     } else {
       findQuery.push( { $sort: { ['checkListNameLowercase']: 1 } } );
     }
-    let getChecklistData = await processedTaskService.aggregate( findQuery );
+    let getChecklistData = await taskService.aggregate( findQuery );
     if ( !getChecklistData.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }
@@ -1000,14 +1042,14 @@ export async function taskDetails( req, res ) {
       const exportResult = [];
       for ( let task of taskDetails[0].data ) {
         exportResult.push( {
-          'Task Name': task?.checkListName ||'',
+          'Task Name': task?.checkListName ||'--',
           'Created by': task?.createdByName ||'--',
-          'Created On': dayjs.utc( task?.publishDate ).format( 'DD MMM, YYYY' ) || '',
+          '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' ) || '',
+          'Due on': dayjs.utc( task?.scheduleEndTime_iso ).format( 'DD MMM, YYYY' ) || '--',
         } );
       }
       await download( exportResult, res );

package/src/routes/task.routes.js

@@ -13,7 +13,7 @@ taskRouter
     .post( '/upload', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.validateUser )
     .post( '/uploadImage', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.uploadImage )
     .post( '/config', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.taskConfig )
-    .post( '/reinitiate', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.reinitiateTask )
+    .post( '/reinitiate', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.reinitiateTask )
     .post( '/checklistTask', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.createChecklistTask )
     .post( '/updateApprove', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.approveTask )
     .post( '/redo', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.redoTask )

package/src/service/processedTaskConfig.service.js

@@ -5,7 +5,7 @@ export const find = async ( query = {}, field={} ) => {
 };
 
 export const findOne = async ( query = {}, field={} ) => {
-  return model.taskProcessedConfigModel.findOne( query, field );
+  return model.taskProcessedConfigModel.findOne( query, field ).sort( { date_iso: -1 } );
 };
 
 export const updateMany = async ( query = {}, record={} ) => {

package/src/service/processedTaskList.service.js

@@ -5,7 +5,7 @@ export const find = async ( query = {}, field={} ) => {
 };
 
 export const findOne = async ( query = {}, field={} ) => {
-  return model.taskProcessedModel.findOne( query, field );
+  return model.taskProcessedModel.findOne( query, field ).sort( { date_iso: -1 } );
 };
 
 export const updateMany = async ( query = {}, record={} ) => {
@@ -28,3 +28,7 @@ export const aggregate = async ( query = [] ) => {
   return model.taskProcessedModel.aggregate( query );
 };
 
+export const insert = async ( query = [] ) => {
+  return model.taskProcessedModel.create( query );
+};
+