tango-app-api-task 1.0.0-beta.9 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-beta.9",
+    "version": "1.1.1",
     "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.2.5",
-        "tango-app-api-middleware": "3.1.43-alpha.10",
+        "tango-api-schema": "^2.2.10",
+        "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

@@ -753,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}` );
@@ -823,6 +823,7 @@ export async function insertSingleProcessData( checklistId ) {
       insertdata.scheduleRepeatedType = 'daily';
       insertdata.remainder = getCLconfig?.remainder || [];
       insertdata.approver = getCLconfig?.approver || [];
+      insertdata.restrictAttendance = getCLconfig?.restrictAttendance;
       let collectSections = [];
       let sectionQuery = [];
       sectionQuery.push( {
@@ -914,6 +915,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
   } );
   let allQuestion = await taskAssignService.aggregate( getquestionQuery );
 
+
   if ( allQuestion ) {
     let userIdList = [];
     for ( let element4 of allQuestion ) {
@@ -962,20 +964,42 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
       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' ] };
-      assigndeletequery.redoStatus = false;
-      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 } );
     }
   }
@@ -1059,24 +1083,14 @@ export async function reinitiateTask( req, res ) {
     if ( !taskDetails ) {
       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 = endDate;
-    data.allowedStoreLocation = req.body.allowedStoreLocation;
-    data.approver = req.body.approver;
-    data.priorityType = req.body.priorityType;
-    data.restrictAttendance = req.body.restrictAttendance;
-    data.reinitiate = true;
 
     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( {
@@ -1087,14 +1101,11 @@ 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 );
     function getDaysBeforeEndDate( endDate ) {
       const end = dayjs.utc( endDate );
       const now = dayjs.utc( req.body.previousEndDate ).add( 1, 'day' );
@@ -1112,8 +1123,8 @@ export async function reinitiateTask( req, res ) {
     };
 
     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 } );
-    await taskProcessedConfigService.updateMany( { date_iso: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, sourceCheckList_id: req.body.taskId }, { scheduleEndTime_iso: 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, restrictAttendance: req.body.restrictAttendance } );
+    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 } );
@@ -1196,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 = [];
@@ -1213,6 +1216,7 @@ export async function createChecklistTask( req, res ) {
           checkListId: response._id,
           type: 'task',
           client_id: inputBody.clientId,
+          checkListName: inputBody?.checkListName || '',
         } );
       } );
       await traxApprover.insertMany( data );
@@ -1326,43 +1330,49 @@ 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, store_id: 1, userEmail: 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 inputstores = taskDetails.filter( ( data ) => data.checklistStatus == 'submit' );
+        let params = {
+          'payload': {
+            sourceCheckList_id: req.body.sourceCheckList_id,
+            fromDate: req.body.fromDate,
+            toDate: req.body.toDate,
+            store_id: inputstores,
+          },
+          '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 } );
@@ -1393,6 +1403,7 @@ export async function redoTask( req, res ) {
     }
     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 = [];
@@ -1401,6 +1412,7 @@ export async function redoTask( req, res ) {
       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 );
@@ -1425,6 +1437,7 @@ export async function redoTask( req, res ) {
         submitedBy: taskDetails.userName,
         submitTime: taskDetails.submitTime,
       };
+      console.log( data );
       await checklistLogs.create( data );
       const requestOptions = {
         method: 'POST',
@@ -1617,7 +1630,7 @@ export async function approvalstatus( req, res ) {
     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.approvalstatus, req.body );
+        let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
         if ( resultData ) {
           console.log( resultData.status_code );
           if ( resultData.status_code == '200' ) {
@@ -1631,7 +1644,7 @@ export async function approvalstatus( req, res ) {
 
 
     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' ) {
@@ -1881,7 +1894,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 +')';

package/src/controllers/taskDashboard.controllers.js

@@ -107,8 +107,8 @@ export const taskTableV1 = async ( req, res ) => {
     let offset = parseInt( req.body.offset - 1 ) || 0;
     let page = offset * limit;
     let query = [];
-    let fromDate = new Date( requestData.fromDate );
-    let toDate = new Date( requestData.toDate );
+    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 );
@@ -238,7 +238,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
       if ( requestData.checklistStatus == 'redo' ) {
         findAndQuery.push(
             { redoStatus: true },
-            { checklistStatus: { $ne: 'submit' } } );
+        );
       } else {
         findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
       }
@@ -282,6 +282,9 @@ export const taskInfoTableV1 = async ( req, res ) => {
             scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
             processedchecklistId: { $first: '$_id' },
             redoStatus: { $first: '$redoStatus' },
+            priorityType: { $first: '$priorityType' },
+            allowedStoreLocation: { $first: '$allowedStoreLocation' },
+            restrictAttendance: { $first: '$restrictAttendance' },
           },
         },
     );
@@ -307,6 +310,9 @@ export const taskInfoTableV1 = async ( req, res ) => {
         scheduleEndTime_iso: 1,
         processedchecklistId: 1,
         redoStatus: 1,
+        priorityType: 1,
+        allowedStoreLocation: 1,
+        restrictAttendance: 1,
       },
     } );
 
@@ -348,6 +354,9 @@ export const taskInfoTableV1 = async ( req, res ) => {
         scheduleEndTime_iso: 1,
         processedchecklistId: 1,
         redoStatus: 1,
+        priorityType: 1,
+        allowedStoreLocation: 1,
+        restrictAttendance: 1,
       },
     } );
 
@@ -722,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' },
           },
         },
     );
@@ -742,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 !='' ) {
@@ -750,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 );
     }
@@ -1033,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 );