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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-beta.2",
+    "version": "1.0.0-beta.4",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
-        "tango-api-schema": "^2.1.99",
-        "tango-app-api-middleware": "^3.1.43-alpha.10",
+        "tango-api-schema": "^2.2.3",
+        "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 = [];
@@ -652,11 +654,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 +693,7 @@ export async function taskConfig( req, res ) {
             checkListId: inputBody._id,
             type: 'task',
             client_id: inputBody.client_id,
+            checkListName: inputBody?.checkListName,
           } );
         }
       } );
@@ -827,21 +833,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,14 +892,13 @@ 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 );
@@ -893,7 +932,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';
@@ -1008,9 +1047,11 @@ export async function reinitiateTask( req, res ) {
       return res.sendError( 'no data found', 204 );
     }
     let data = {};
+    let endDate = dayjs( req.body.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + req.body.scheduleEndTime;
+    endDate = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
     data.scheduleDate = req.body.scheduleDate;
     data.scheduleEndTime = req.body.scheduleEndTime;
-    data.scheduleEndTimeISO = dayjs.utc( req.body.scheduleEndTime, 'hh:mm A' ).format();
+    data.scheduleEndTimeISO = endDate;
     data.allowedStoreLocation = req.body.allowedStoreLocation;
     data.approver = req.body.approver;
     data.priorityType = req.body.priorityType;
@@ -1041,8 +1082,55 @@ export async function reinitiateTask( req, res ) {
     }
 
     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' );
+
+      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 );
+    console.log( dateArray );
+    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 } );
+    await taskProcessedConfigService.updateMany( { date_iso: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, sourceCheckList_id: req.body.taskId }, { scheduleEndTime_iso: endDate } );
+
+    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 } );
@@ -1124,7 +1212,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;
@@ -1289,7 +1379,7 @@ 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;
     question[sectionIndex].questions[req.body.payload.qno - 1] = data;
     question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
@@ -1743,6 +1833,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' } );
@@ -1786,6 +1877,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

@@ -218,21 +218,15 @@ 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' ) {
@@ -259,8 +253,36 @@ 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' },
+            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' },
+          },
+        },
+    );
+
     findQuery.push( {
       $project: {
+        _id: 0,
         checkListName: 1,
         createdByName: 1,
         userName: 1,
@@ -277,12 +299,13 @@ export const taskInfoTableV1 = async ( req, res ) => {
         sourceCheckList_id: 1,
         reinitiateStatus: 1,
         scheduleEndTime_iso: 1,
-
+        processedchecklistId: 1,
       },
     } );
 
     findQuery.push( {
       $project: {
+        _id: 0,
         checkListName: 1,
         checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
         createdByName: 1,
@@ -316,13 +339,14 @@ export const taskInfoTableV1 = async ( req, res ) => {
         checklistDate: '$date_string',
         sourceCheckList_id: 1,
         scheduleEndTime_iso: 1,
+        processedchecklistId: 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 +372,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 );

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 );
+};
+