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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-alpha.3",
+    "version": "1.0.0-alpha.4",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -145,6 +145,8 @@ export async function createUpdateTask( req, res ) {
           return res.sendSuccess( { checklistId: checkListId, message: message } );
         }
       }
+    } else {
+      return res.sendError( { message: 'something went wrong' }, 500 );
     }
   } catch ( e ) {
     logger.error( { functionName: 'createTask', error: e } );
@@ -588,6 +590,7 @@ export async function taskConfig( req, res ) {
     let storeCount = 0;
     let locationCount = 0;
     let checklistDetails;
+    inputBody.client_id = inputBody.clientId;
     if ( !inputBody._id ) {
       return res.sendError( { message: 'Task Id is Required' }, 400 );
     }
@@ -605,7 +608,7 @@ export async function taskConfig( req, res ) {
       checkListName: inputBody?.checkListName,
       createdBy: req.user._id,
       createdByName: req.user.userName,
-      client_id: req.body.client_id,
+      client_id: inputBody.client_id,
     };
     await checklistLogs.create( logInsertData );
 
@@ -631,7 +634,7 @@ export async function taskConfig( req, res ) {
             userEmail: ele.value,
             checkListId: inputBody._id,
             type: 'task',
-            client_id: req.body.client_id,
+            client_id: inputBody.client_id,
           } );
         }
       } );
@@ -653,7 +656,7 @@ export async function taskConfig( req, res ) {
       let query = [
         {
           $match: {
-            client_id: req.body.clientId,
+            client_id: inputBody.client_id,
             id: { $in: storeList },
             city: { $exists: true },
           },
@@ -850,6 +853,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       element4.publishDate = getCLconfig.publishDate;
       element4.locationCount = getCLconfig.locationCount;
       element4.scheduleRepeatedType = 'daily';
+      element4.approvalEnable = getCLconfig.approver.length ? true : false;
     }
     if ( userIdList.length ) {
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -1047,7 +1051,7 @@ export async function createChecklistTask( req, res ) {
         client_id: inputBody.clientId,
       };
       await taskQuestionService.create( question );
-      let storeDetails = await storeService.findOne( { storeName: inputBody.storeName }, { storeId: 1, storeProfile: 1 } );
+      let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, status: 'active' }, { storeId: 1, storeProfile: 1 } );
       if ( !storeDetails ) {
         return res.sendError( 'No data found', 204 );
       }

package/src/controllers/taskActionCenter.controllers.js

@@ -10,8 +10,8 @@ export const overallCardsV1 = async ( req, res ) => {
     let taskIdList = [];
     let checklistIdList = [];
     let resultData;
-    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) || req.body?.clientId ) {
-      let clientId = req.user?.clientId || req.body?.clientId;
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+      let clientId = req.user?.clientId;
       query = { client_id: clientId };
     } else {
       query = { userEmail: req.user.userEmail };
@@ -45,7 +45,7 @@ export const overallCardsV1 = async ( req, res ) => {
       },
     };
 
-    query = [
+    let taskQuery = [
       {
         $match: {
           date_iso: { $gte: new Date( req.body.date ), $lte: toDate },
@@ -55,9 +55,8 @@ export const overallCardsV1 = async ( req, res ) => {
       },
       { ...groupQuery },
     ];
-    let taskCount = await processedTask.aggregate( query );
 
-    query = [
+    let checklistQuery = [
       {
         $match: {
           date_iso: { $gte: new Date( req.body.date ), $lte: toDate },
@@ -67,7 +66,12 @@ export const overallCardsV1 = async ( req, res ) => {
       },
       { ...groupQuery },
     ];
-    let checklistCount = await processedChecklist.aggregate( query );
+
+    let [ taskCount, checklistCount ] = await Promise.all( [
+      processedTask.aggregate( taskQuery ),
+      processedChecklist.aggregate( checklistQuery ),
+    ] );
+
     resultData = { taskCount: taskCount?.[0]?.count || 0, checklistCount: checklistCount?.[0]?.count || 0 };
     return res.sendSuccess( resultData );
   } catch ( error ) {
@@ -83,10 +87,8 @@ export const approvalTableV1 = async ( req, res ) => {
     let taskIdList = [];
     let checklistIdList = [];
     let resultData;
-    let taskResult = [];
-    let checklistResult = [];
-    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) || req.body?.clientId ) {
-      let clientId = req.user?.clientId || req.body?.clientId;
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+      let clientId = req.user?.clientId;
       query = { client_id: clientId };
     } else {
       query = { userEmail: req.user.userEmail };
@@ -100,6 +102,7 @@ export const approvalTableV1 = async ( req, res ) => {
                 .map( ( ele ) => ele.checkListId.toString() ),
         ),
       ].map( ( item ) => new ObjectId( item ) );
+
       checklistIdList = [
         ...new Set(
             details
@@ -158,6 +161,7 @@ export const approvalTableV1 = async ( req, res ) => {
       },
     } ];
 
+    const promises = [];
 
     if ( [ 'task', 'all' ].includes( req.body.type ) ) {
       query = [
@@ -169,8 +173,12 @@ export const approvalTableV1 = async ( req, res ) => {
         },
         ...groupQuery,
       ];
-      taskResult = await processedTask.aggregate( query );
+      promises.push( processedTask.aggregate( query ) );
+    } else {
+      promises.push( Promise.resolve( null ) );
     }
+
+
     if ( [ 'checklist', 'all' ].includes( req.body.type ) ) {
       query = [
         {
@@ -181,9 +189,13 @@ export const approvalTableV1 = async ( req, res ) => {
         },
         ...groupQuery,
       ];
-
-      checklistResult = await processedChecklist.aggregate( query );
+      promises.push( processedChecklist.aggregate( query ) );
+    } else {
+      promises.push( Promise.resolve( null ) );
     }
+
+    const [ taskResult, checklistResult ] = await Promise.all( promises );
+
     const taskSummary = taskResult.reduce(
         ( acc, ele ) => {
           if ( ele.unApproveCount === ele.storeCount ) {
@@ -234,6 +246,7 @@ export const overallCards = async ( req, res ) => {
     return res.sendError( error, 500 );
   }
 };
+
 async function overallCardsData( requestData ) {
   try {
     let cardData = {
@@ -251,6 +264,7 @@ async function overallCardsData( requestData ) {
     logger.error( { error: error, message: data, function: 'overallCardsData' } );
   }
 }
+
 export const approvalTable = async ( req, res ) => {
   try {
     let requestData = req.body;
@@ -262,6 +276,7 @@ export const approvalTable = async ( req, res ) => {
     return res.sendError( error, 500 );
   }
 };
+
 async function approvalTableData( requestData ) {
   try {
     let tableData = {
@@ -329,7 +344,6 @@ async function approvalTableData( requestData ) {
   }
 }
 
-
 export const activityLog = async ( req, res ) => {
   try {
     let requestData = req.body;
@@ -341,6 +355,7 @@ export const activityLog = async ( req, res ) => {
     return res.sendError( error, 500 );
   }
 };
+
 async function activityLogData( requestData ) {
   try {
     let activityLogData = {

package/src/controllers/taskDashboard.controllers.js

@@ -58,7 +58,6 @@ export const overallCardsV1 = async ( req, res ) => {
     let findAndQuery = [];
 
     findAndQuery.push(
-        { checkListType: { $eq: 'task' } },
         { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
@@ -67,7 +66,7 @@ export const overallCardsV1 = async ( req, res ) => {
     findQuery.push( { $match: { $and: findAndQuery } } );
     findQuery.push( {
       $group: {
-        _id: '$checklistStatus',
+        _id: { status: '$checklistStatus', redoType: '$redoStatus', approvalStatus: '$approvalStatus' },
         count: { $sum: 1 },
       },
     },
@@ -75,11 +74,11 @@ export const overallCardsV1 = async ( req, res ) => {
       $group: {
         _id: null,
         TotalTasks: { $sum: '$count' },
-        open: { $sum: { $cond: [ { $eq: [ '$_id', 'open' ] }, '$count', 0 ] } },
-        inprogress: { $sum: { $cond: [ { $eq: [ '$_id', 'inprogress' ] }, '$count', 0 ] } },
-        reopen: { $sum: { $cond: [ { $eq: [ '$_id', 'reopen' ] }, '$count', 0 ] } },
-        submitted: { $sum: { $cond: [ { $eq: [ '$_id', 'submit' ] }, '$count', 0 ] } },
-        closed: { $sum: { $cond: [ { $eq: [ '$_id', 'closed' ] }, '$count', 0 ] } },
+        open: { $sum: { $cond: [ { $and: [ { $eq: [ '$_id.status', 'open' ] }, { $eq: [ '$_id.redoType', false ] } ] }, '$count', 0 ] } },
+        inprogress: { $sum: { $cond: [ { $eq: [ '$_id.status', 'inprogress' ] }, '$count', 0 ] } },
+        reopen: { $sum: { $cond: [ { $and: [ { $eq: [ '$_id.status', 'open' ] }, { $eq: [ '$_id.redoType', true ] } ] }, '$count', 0 ] } },
+        submitted: { $sum: { $cond: [ { $and: [ { $eq: [ '$_id.status', 'submit' ] }, { $eq: [ '$_id.approvalStatus', false ] } ] }, '$count', 0 ] } },
+        closed: { $sum: { $cond: [ { $and: [ { $eq: [ '$_id.status', 'submit' ] }, { $eq: [ '$_id.approvalStatus', true ] } ] }, '$count', 0 ] } },
       },
     },
     {
@@ -112,7 +111,7 @@ export const taskTableV1 = async ( req, res ) => {
     query.push(
         {
           $match: {
-            checkListType: 'task',
+            // checkListType: 'task',
             client_id: req.body.clientId,
             isdeleted: false,
           },
@@ -230,11 +229,10 @@ export const taskInfoTableV1 = async ( req, res ) => {
     let findAndQuery = [];
 
     findAndQuery.push(
+        { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
         { store_id: { $in: requestData.storeId } },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
-        { checkListType: { $eq: 'task' } },
+        // { checkListType: { $eq: 'task' } },
         { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.taskId ) },
     );
     if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
@@ -315,12 +313,6 @@ export const taskInfoTableV1 = async ( req, res ) => {
       },
     } );
 
-    let getTotalCount = await processedTaskService.aggregate( findQuery );
-    console.log( 'getTotalCount', getTotalCount );
-    if ( !getTotalCount.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
-    }
-
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
       findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
     } else {
@@ -329,14 +321,30 @@ export const taskInfoTableV1 = async ( req, res ) => {
 
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset -1 ) || 0;
-    findQuery.push( { $skip: skip }, { $limit: limit } );
+
+    findQuery.push( {
+      $facet: {
+        data: [
+          { $skip: skip },
+          { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    } );
+
     let taskInfoData = await processedTaskService.aggregate( findQuery );
 
-    result.totalCount = getTotalCount.length;
-    for ( let i = 0; i < taskInfoData.length; i++ ) {
-      taskInfoData[i].scheduleEndTime_iso = dayjs( taskInfoData[i].scheduleEndTime_iso ).format( 'DD MMM YYYY' );
+    if ( !taskInfoData[0].data.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+
+    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' );
     }
-    result.taskInfo = taskInfoData;
+    result.taskInfo = taskInfoData[0].data;
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -668,7 +676,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     let findAndQuery = [];
     findAndQuery.push(
         { client_id: requestData.clientId },
-        { checkListType: 'task' },
+        // { checkListType: 'task' },
         { isdeleted: false },
     );
     findQuery.push( { $match: { $and: findAndQuery } } );