tango-app-api-task 1.0.0-alpha.4 → 1.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-alpha.4",
+    "version": "1.0.0-alpha.5",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "handlebars": "^4.7.8",
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
-        "tango-api-schema": "^2.1.90",
+        "tango-api-schema": "^2.1.91",
         "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

@@ -620,6 +620,7 @@ export async function taskConfig( req, res ) {
 
     let configDetails = { ...req.body };
     configDetails.scheduleEndTimeISO = dayjs.utc( configDetails.scheduleEndTime, 'hh:mm A' ).format();
+    configDetails.publishDate = dayjs().format();
 
     let response = await taskService.updateOne( { _id: inputBody._id }, configDetails );
     if ( inputBody?.approver.length ) {
@@ -1076,3 +1077,98 @@ export async function createChecklistTask( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function approveTask( req, res ) {
+  try {
+    if ( !req.body.id ) {
+      return res.sendError( 'id is required', 400 );
+    }
+    let taskDetails = await taskProcessedService.findOne( { _id: req.body.id }, { approvalEnable: 1, approvalStatus: 1 } );
+    if ( !taskDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    if ( !taskDetails.approvalEnable ) {
+      return res.sendError( 'task has no approver', 400 );
+    }
+    taskDetails.approvalStatus = true;
+    taskDetails.save().then( () => {
+      return res.sendSuccess( 'task Approved Successfully' );
+    } ).catch( ( e ) => {
+      return res.sendError( e, 500 );
+    } );
+  } catch ( e ) {
+    logger.error( { function: 'approveTask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function redoTask( req, res ) {
+  try {
+    if ( !req.body.payload._id ) {
+      return res.sendError( 'Id is Required', 400 );
+    }
+    if ( !req.body.payload.section_id ) {
+      return res.sendError( 'Section id is Required', 400 );
+    }
+    if ( !req.body.payload.qno ) {
+      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 } );
+    if ( !taskDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    let question = taskDetails.questionAnswers;
+    let sectionIndex = question.findIndex( ( sec ) => sec.section_id == req.body.payload.section_id );
+    if ( sectionIndex == -1 ) {
+      return res.sendError( 'section is not found', 400 );
+    }
+    let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true };
+    let userAnswer = data.userAnswer;
+    question[sectionIndex].questions[req.body.payload.qno - 1] = data;
+    question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
+    taskDetails.questionAnswers = question;
+    let updateData = {
+      checklistStatus: 'open',
+      redoStatus: true,
+      questionAnswers: question,
+    };
+
+    let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
+    if ( response.modifiedCount || response.matchedCount ) {
+      data = {
+        checklistId: taskDetails.sourceCheckList_id,
+        checkListName: taskDetails.checkListName,
+        sectionId: req.body.payload.section_id,
+        sectionName: question[sectionIndex].sectionName,
+        questionName: question[sectionIndex].questions[req.body.payload.qno - 1].qname,
+        action: 'redo',
+        store_id: taskDetails.store_id,
+        storeName: taskDetails.storeName,
+        client_id: taskDetails.client_id,
+        processedChecklistId: taskDetails._id,
+        type: taskDetails.checkListType,
+        userAnswer: userAnswer,
+      };
+      await checklistLogs.create( data );
+      const requestOptions = {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify( req.body ),
+      };
+      let searchResponse = await fetch( 'https://ottrgmadjmqptsxdmlckjxdjuy0qvpnt.lambda-url.ap-south-1.on.aws/', requestOptions );
+      if ( searchResponse.ok ) {
+        return res.sendSuccess( 'Question redo successfully' );
+      } else {
+        return res.sendError( 'Something went wrong', 500 );
+      }
+    } else {
+      return res.sendError( 'Something went wrong', 500 );
+    }
+  } catch ( e ) {
+    logger.error( { function: 'redoChecklist', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/taskActionCenter.controllers.js

@@ -14,7 +14,7 @@ export const overallCardsV1 = async ( req, res ) => {
       let clientId = req.user?.clientId;
       query = { client_id: clientId };
     } else {
-      query = { userEmail: req.user.userEmail };
+      query = { userEmail: req.user.email };
     }
     let details = await traxApprover.find( query );
     if ( details.length ) {
@@ -34,7 +34,7 @@ export const overallCardsV1 = async ( req, res ) => {
       ].map( ( item ) => new ObjectId( item ) );
     }
 
-    let toDate = new Date( req.body.date );
+    let toDate = new Date( req.body.toDate );
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
@@ -48,8 +48,9 @@ export const overallCardsV1 = async ( req, res ) => {
     let taskQuery = [
       {
         $match: {
-          date_iso: { $gte: new Date( req.body.date ), $lte: toDate },
+          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: taskIdList },
+          ...( req.body.storeId.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
         },
       },
@@ -59,8 +60,9 @@ export const overallCardsV1 = async ( req, res ) => {
     let checklistQuery = [
       {
         $match: {
-          date_iso: { $gte: new Date( req.body.date ), $lte: toDate },
+          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: checklistIdList },
+          ...( req.body.storeId.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
         },
       },
@@ -72,8 +74,8 @@ export const overallCardsV1 = async ( req, res ) => {
       processedChecklist.aggregate( checklistQuery ),
     ] );
 
-    resultData = { taskCount: taskCount?.[0]?.count || 0, checklistCount: checklistCount?.[0]?.count || 0 };
-    return res.sendSuccess( resultData );
+    resultData = { taskApproval: { count: taskCount?.[0]?.count || 0 }, checklistApproval: { count: checklistCount?.[0]?.count || 0 } };
+    return res.sendSuccess( { cardData: resultData } );
   } catch ( error ) {
     console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
@@ -91,7 +93,7 @@ export const approvalTableV1 = async ( req, res ) => {
       let clientId = req.user?.clientId;
       query = { client_id: clientId };
     } else {
-      query = { userEmail: req.user.userEmail };
+      query = { userEmail: req.user.email };
     }
     let details = await traxApprover.find( query );
     if ( details.length ) {
@@ -112,7 +114,7 @@ export const approvalTableV1 = async ( req, res ) => {
       ].map( ( item ) => new ObjectId( item ) );
     }
 
-    let toDate = new Date( req.body.date );
+    let toDate = new Date( req.body.toDate );
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
@@ -167,12 +169,27 @@ export const approvalTableV1 = async ( req, res ) => {
       query = [
         {
           $match: {
-            date_iso: { $gte: new Date( req.body.date ), $lte: toDate },
+            date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: taskIdList },
+            ...( req.body.storeId.length ) ? { store_id: { $in: req.body.storeId } } :{},
           },
         },
         ...groupQuery,
       ];
+      if ( req.body?.searchValue?.trim() && req.body?.searchValue?.trim().length ) {
+        query.push( {
+          $match: {
+            checkListName: { $regex: req.body?.searchValue, $options: 'i' },
+          },
+        } );
+      }
+      if ( req.body?.filter?.trim() && req.body?.filter?.trim().length ) {
+        query.push( {
+          $match: {
+            priorityType: req.body?.filter,
+          },
+        } );
+      }
       promises.push( processedTask.aggregate( query ) );
     } else {
       promises.push( Promise.resolve( null ) );
@@ -183,20 +200,28 @@ export const approvalTableV1 = async ( req, res ) => {
       query = [
         {
           $match: {
-            date_iso: { $gte: new Date( req.body.date ), $lte: toDate },
+            date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: checklistIdList },
+            ...( req.body.storeId.length ) ? { store_id: { $in: req.body.storeId } } : {},
           },
         },
         ...groupQuery,
       ];
       promises.push( processedChecklist.aggregate( query ) );
+      if ( req.body?.searchValue.trim() && req.body?.searchValue.trim().length ) {
+        query.push( {
+          $match: {
+            checkListName: { $regex: req.body?.searchValue, $options: 'i' },
+          },
+        } );
+      }
     } else {
       promises.push( Promise.resolve( null ) );
     }
 
     const [ taskResult, checklistResult ] = await Promise.all( promises );
 
-    const taskSummary = taskResult.reduce(
+    const taskSummary = taskResult?.reduce(
         ( acc, ele ) => {
           if ( ele.unApproveCount === ele.storeCount ) {
             acc.openTask.push( ele );
@@ -211,7 +236,7 @@ export const approvalTableV1 = async ( req, res ) => {
     );
     const { openTask, inprogressTask, doneTask } = taskSummary;
 
-    const checklistSummary = checklistResult.reduce(
+    const checklistSummary = checklistResult?.reduce(
         ( acc, ele ) => {
           if ( ele.unApproveCount === ele.storeCount ) {
             acc.openChecklist.push( ele );

package/src/routes/task.routes.js

@@ -14,6 +14,8 @@ taskRouter
     .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( '/checklistTask', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.createChecklistTask );
+    .post( '/checklistTask', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.createChecklistTask )
+    .post( '/updateApprove', isAllowedSessionHandler, taskController.approveTask )
+    .post( '/redo', isAllowedSessionHandler, taskController.redoTask );
 
 

package/src/service/processedTaskList.service.js

@@ -12,6 +12,10 @@ export const updateMany = async ( query = {}, record={} ) => {
   return model.taskProcessedModel.updateMany( query, { $set: record } );
 };
 
+export const updateOne = async ( query = {}, record={} ) => {
+  return model.taskProcessedModel.updateOne( query, { $set: record } );
+};
+
 export const insertMany = async ( data = [] ) => {
   return model.taskProcessedModel.insertMany( data );
 };