tango-app-api-task 1.0.0-alpha.22 → 1.0.0-alpha.23

package/package.json

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

package/src/controllers/task.controller.js

@@ -1522,3 +1522,222 @@ export async function approvalstatus( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+export const taskList = async ( req, res ) => {
+  try {
+    let limit = parseInt( req.query.limit ) || 10;
+    let offset = parseInt( req.query.offset - 1 ) || 0;
+    let page = offset * limit;
+    let query = [];
+    query.push(
+        {
+          $match: {
+            checkListType: 'task',
+            client_id: req.query.clientId,
+            isdeleted: false,
+            ...( req.user.userType == 'client' && req.user.role != 'superadmin' ) ? { 'owner.value': { $in: [ req.user.email ] } } : {},
+          },
+        },
+    );
+
+    if ( req.query.search && req.query.search != '' ) {
+      req.query.search = req.query.search.replace( /([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1' );
+      query.push( {
+        $match: {
+          checkListName: { $regex: new RegExp( req.query.search, 'i' ) },
+        },
+      } );
+    }
+
+    query.push(
+        {
+          $project: {
+            checkList: { $toLower: '$checkListName' },
+            checkListName: 1,
+            createdBy: 1,
+            userName: { $toLower: '$createdByName' },
+            createdByName: 1,
+            storeCount: 1,
+            createdAt: 1,
+            publish: 1,
+            checkListType: 1,
+            questionCount: 1,
+            checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
+            priorityType: 1,
+            scheduleEndTimeISO: 1,
+          },
+        },
+    );
+
+    if ( req.query.sortColumnName && req.query.sortColumnName != '' && req.query.sortBy != '' ) {
+      if ( req.query.sortColumnName == 'status' ) {
+        req.query.sortColumnName = 'publish';
+      }
+      if ( req.query.sortColumnName != 'publish' ) {
+        query.push( {
+          $addFields: { lowerName: { $toLower: `$${req.query.sortColumnName}` } },
+        } );
+        query.push( {
+          $sort: { lowerName: parseInt( req.query.sortBy ) },
+        } );
+      } else {
+        query.push( {
+          $sort: { publish: parseInt( req.query.sortBy ) },
+        } );
+      }
+    } else {
+      query.push(
+          { $sort: { createdAt: -1 } },
+      );
+    }
+
+    query.push( {
+      $facet: {
+        data: [
+          { $skip: page },
+          { $limit: limit },
+        ],
+        count: [
+          { $count: 'totalCount' },
+        ],
+      },
+    } );
+
+    let checkList = await taskService.aggregate( query );
+    if ( !checkList[0].data.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+
+    checkList[0].data.forEach( ( item ) => {
+      if ( item.storeCount > 0 && item.storeCount <= 9 ) {
+        item.storeCount = '0' + item.storeCount;
+      }
+      if ( item.questionCount > 0 && item.questionCount <= 9 ) {
+        item.questionCount = '0' + item.questionCount;
+      }
+      item.createdAt = dayjs( item.createdAt ).format( 'DD MMM, YYYY' );
+    } );
+
+    return res.sendSuccess( { result: checkList[0].data, count: checkList[0].count[0].totalCount } );
+  } catch ( e ) {
+    logger.error( 'taskList', e );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updatePublish = async ( req, res ) => {
+  try {
+    if ( typeof req?.body?.checklistId == 'undefined' && typeof req.body.type == 'undefined' ) {
+      return res.sendError( { message: 'checklistId or type is required' }, 400 );
+    }
+
+    if ( typeof req?.body?.publish == 'undefined' ) {
+      return res.sendError( { message: 'publish is required' }, 400 );
+    }
+    let getCheckDetails;
+    let query;
+
+    if ( req.body.checklistId ) {
+      query = { _id: req.body.checklistId };
+      getCheckDetails = await taskService.findOne( { _id: req.body.checklistId, client_id: req.body.clientId, checkListType: 'task' } );
+    }
+
+    if ( !getCheckDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    if ( getCheckDetails?.publishDate ) {
+      let date = dayjs();
+      let diff = date.diff( dayjs.utc( getCheckDetails?.publishDate ), 'minutes' );
+      if ( diff < 5 ) {
+        let mins = ( 5 - diff ) > 1 ? 'minutes' : 'minute';
+        return res.sendError( `Please try after ${5 - diff} ${mins}`, 400 );
+      }
+    }
+
+    getCheckDetails.publish = req.body.publish;
+    getCheckDetails.publishDate = req.body.publish ? new Date() : getCheckDetails?.publishDate;
+    let currentDate = dayjs();
+    if ( !req.body.publish ) {
+      await taskProcessedConfigService.deleteMany( { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId } );
+      await taskProcessedService.deleteMany( { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId, checklistStatus: { $ne: 'submit' } } );
+      logger.info( { function: 'updatePublish', query: { date_string: { $gt: currentDate.format( 'YYYY-MM-DD' ) }, date_iso: { $gt: currentDate.format( '' ) }, sourceCheckList_id: req.body.checklistId, checklistStatus: { $ne: 'submit' } } } );
+    }
+
+
+    await taskService.updateOne( query, getCheckDetails );
+    if ( getCheckDetails.checkListType == 'task' ) {
+      let currentDate = dayjs.utc().format();
+      let updatedscheduleEndTimeISO = dayjs.utc( getCheckDetails.scheduleEndTimeISO ).format( 'HH:mm:ss' );
+      let newUpdatedDate = dayjs.utc( updatedscheduleEndTimeISO, 'HH:mm:ss' ).format();
+
+      if ( req.body.publish && req.body.publish == true ) {
+        if ( newUpdatedDate > currentDate ) {
+          let deleteQuery = {
+            $and: [
+              { date_string: dayjs().format( 'YYYY-MM-DD' ) },
+              { sourceCheckList_id: new ObjectId( req.body.checklistId ) },
+              { scheduleEndTime_iso: { $gt: currentDate } },
+            ],
+          };
+          deleteQuery.$and.push( { checklistStatus: { $ne: 'submit' } } );
+          let PClicklist = await taskProcessedService.deleteMany( deleteQuery );
+          logger.info( { function: 'updatePublish', query: deleteQuery } );
+          logger.info( `Deleted Checklist Before Insert => Checklist Name: ${getCheckDetails.checkListName}, PChecklist Count: ${PClicklist.deletedCount}` );
+          if ( PClicklist.acknowledged ) {
+            await insertSingleProcessData( req.body.checklistId );
+          } else {
+            res.sendError( 'something went wrong, please try again', 500 );
+          }
+        } else {
+          logger.info( `Schudled End Time Breached Checklist publish true => Checklist Name: ${getCheckDetails.checkListName}` );
+        }
+
+        futureDaysDataRemove( currentDate, req.body.checklistId, getCheckDetails.checkListName, '111' );
+      } else {
+        if ( newUpdatedDate > currentDate ) {
+          let deleteQuery = {
+            $and: [
+              { date_string: dayjs().format( 'YYYY-MM-DD' ) },
+              { sourceCheckList_id: new ObjectId( req.body.checklistId ) },
+              { scheduleEndTime_iso: { $gt: currentDate } },
+            ],
+          };
+          await taskProcessedConfigService.deleteMany( deleteQuery );
+          deleteQuery.$and.push( { checklistStatus: { $ne: 'submit' } } );
+          await taskProcessedService.deleteMany( deleteQuery );
+          logger.info( { function: 'updatePublish', query: deleteQuery } );
+
+          let checklistLogQuery = {};
+          checklistLogQuery.checkListName = getCheckDetails.checkListName;
+          checklistLogQuery.createdAt = { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) };
+          await checklistLogs.deleteMany( checklistLogQuery );
+
+          let checklistDetectionsQuery = {};
+          checklistDetectionsQuery.sourceChecklist_id = new ObjectId( req.body.checklistId );
+          checklistDetectionsQuery.date_iso = { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) };
+          // await processeddetections.deleteMany( checklistDetectionsQuery );
+          logger.info( { function: 'updatePublish', query: checklistDetectionsQuery } );
+        } else {
+          logger.info( `Schudled End Time Breached Checklist Unpublish false => Checklist Name: ${getCheckDetails.checkListName}` );
+        }
+
+        // //Delete Future Data////
+        futureDaysDataRemove( currentDate, req.body.checklistId, getCheckDetails.checkListName, '222' );
+      }
+    }
+    let logInsertData = {
+      action: req.body.publish ? 'publishTask' : 'unPublishTask',
+      checklistId: req.body?.checklistId,
+      checkListName: getCheckDetails.checkListName,
+      createdBy: req.user._id,
+      createdByName: req.user.userName,
+      client_id: req.body.clientId,
+    };
+    await checklistLogs.create( logInsertData );
+    return res.sendSuccess( { checklistName: getCheckDetails.checkListName, message: 'Updated Successfully' } );
+  } catch ( e ) {
+    logger.error( 'updatePublish task erroe =>', e );
+    return res.sendError( e, 500 );
+  }
+};

package/src/controllers/taskDashboard.controllers.js

@@ -218,25 +218,31 @@ 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 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: { $gte: fromDate, $lte: toDate } },
         { 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' ) {
-      findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
+      if ( requestData.checklistStatus == 'redo' ) {
+        findAndQuery.push(
+            { redoStatus: true },
+            { checklistStatus: { $ne: 'submit' } } );
+      } else {
+        findAndQuery.push( { checklistStatus: requestData.checklistStatus } );
+      }
     }
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -677,11 +683,25 @@ export const taskDropdownListV1 = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         // { checkListType: 'task' },
-        { isdeleted: false },
+        // { isdeleted: false },
+    );
+    findQuery.push( { $match: { $and: findAndQuery } }, { $sort: { date_iso: -1 } } );
+    findQuery.push(
+        {
+          $group: {
+            _id: '$sourceCheckList_id',
+            checkListName: { $first: '$checkListName' },
+            checkListType: { $first: '$checkListType' },
+            createdByName: { $first: '$createdByName' },
+            storeCount: { $first: '$storeCount' },
+            scheduleEndTimeISO: { $first: '$scheduleEndTime_iso' },
+            submitTime_string: { $first: '$submitTime_string' },
+          },
+        },
     );
-    findQuery.push( { $match: { $and: findAndQuery } } );
     findQuery.push( {
       $project: {
+        _id: 1,
         sourceCheckList_id: '$_id',
         checkListName: 1,
         checkListNameLowercase: { $toLower: '$checkListName' },
@@ -697,7 +717,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     } else {
       findQuery.push( { $sort: { ['checkListNameLowercase']: 1 } } );
     }
-    let getChecklistData = await taskService.aggregate( findQuery );
+    let getChecklistData = await processedTaskService.aggregate( findQuery );
     if ( !getChecklistData.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }
@@ -929,8 +949,9 @@ export async function taskDetails( req, res ) {
           priorityType: { $first: '$priorityType' },
           storeCount: { $first: '$storeCount' },
           submitCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },
-          redoCount: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
+          redoCount: { $sum: { $cond: [ { $and: [ { $eq: [ '$redoStatus', true ] }, { $ne: [ '$checklistStatus', 'submit' ] } ] }, 1, 0 ] } },
           scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
+          checkListChar: { $first: { $toUpper: { $substr: [ '$createdByName', 0, 2 ] } } },
         },
       },
     ];
@@ -949,6 +970,10 @@ export async function taskDetails( req, res ) {
       query.push( {
         $sort: { [req.body.sortColumnName]: req.body.sortBy },
       } );
+    } else {
+      query.push( {
+        $sort: { checkListName: 1 },
+      } );
     }
 
     if ( req.body.filter.length ) {
@@ -976,13 +1001,13 @@ export async function taskDetails( req, res ) {
       for ( let task of taskDetails[0].data ) {
         exportResult.push( {
           'Checklist Name': task?.checkListName ||'',
-          'Created by': task?.createdByName||'',
-          'Created On': task?.publishDate||'',
-          'Priority': task?.priorityType || '',
-          'Assigned To': task?.storeCount||'',
-          'Submitted': task?.submitCount||'',
-          'Redo': task?.redoCount||'',
-          'Due on': task?.scheduleEndTime_iso||'',
+          'Created by': task?.createdByName ||'--',
+          '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' ) || '',
         } );
       }
       await download( exportResult, res );

package/src/routes/task.routes.js

@@ -21,6 +21,8 @@ taskRouter
     .post( '/getQuestions', isAllowedSessionHandler, taskController.getQuestions )
     .post( '/getAnswers', isAllowedSessionHandler, taskController.getAnswers )
     .post( '/getAnswerCount', isAllowedSessionHandler, taskController.getAnswerCount )
-    .post( '/approvalstatus', isAllowedSessionHandler, taskController.approvalstatus );
+    .post( '/approvalstatus', isAllowedSessionHandler, taskController.approvalstatus )
+    .get( '/task-list', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ ] } ] } ), taskController.taskList )
+    .put( '/publish', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.updatePublish );