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

package/package.json

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

package/src/controllers/internalAPI.controller.js

@@ -133,21 +133,22 @@ async function insertData( requestData ) {
           for ( let [ index2, element2 ] of resultchecklist.entries() ) {
             let getCLconfig = await taskService.findOne( { _id: element2 } );
             if ( getCLconfig ) {
-              if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
-                getCLconfig.scheduleEndTime = '11:59 PM';
-              }
-              console.log( getCLconfig.scheduleEndTime );
-
+              // if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
+              //   getCLconfig.scheduleEndTime = '11:59 PM';
+              // }
+              // console.log( getCLconfig.scheduleEndTime );
+              let sTime = dayjs.utc( getCLconfig.publishDate ).format( 'hh:mm A' );
               let startTimeIso; let endTimeIso;
-              startTimeIso = dayjs.utc( `${currentdate} 12:00 AM`, 'YYYY-MM-DD hh:mm A' );
-              endTimeIso = dayjs.utc( `${currentdate} ${getCLconfig.scheduleEndTime}`, 'YYYY-MM-DD hh:mm A' );
+              startTimeIso = dayjs.utc( `${currentdate} ${sTime}`, 'YYYY-MM-DD hh:mm A' );
+              endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
               console.log( endTimeIso );
 
               let insertdata = {};
-              insertdata.date_iso = startTimeIso.format();
+              insertdata.date_iso = new Date( dayjs( currentdate, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
               insertdata.date_string = currentdate;
               insertdata.sourceCheckList_id = getCLconfig._id;
               insertdata.checkListName = getCLconfig.checkListName;
+              insertdata.checkListDescription = getCLconfig.checkListName;
               insertdata.publish = getCLconfig.publish;
               insertdata.scheduleStartTime = startTimeIso.format();
               insertdata.scheduleStartTime_iso = startTimeIso.format();
@@ -244,6 +245,7 @@ async function insertData( requestData ) {
                         delete element4.updatedAt;
                         element4.checkListId = updatedchecklist._id;
                         element4.checkListName = getCLconfig.checkListName;
+                        element4.checkListDescription = getCLconfig.checkListDescription;
                         element4.date_iso = new Date( currentdate );
                         element4.date_string = currentdate;
                         element4.allowedOverTime = false;

package/src/controllers/task.controller.js

@@ -108,11 +108,13 @@ export async function createUpdateTask( req, res ) {
               section.questionReferenceImage = image;
             }
             section.answers.forEach( ( answer ) => {
-              if ( answer.referenceImage != '' ) {
-                let imgUrl = decodeURIComponent( answer.referenceImage?.split( '?' )[0] );
-                let url = imgUrl.split( '/' );
-                url.splice( 0, 3 );
-                answer.referenceImage = url.join( '/' );
+              if ( answer.referenceImage.length ) {
+                answer.referenceImage = answer.referenceImage.map( ( value ) => {
+                  let imgUrl = decodeURIComponent( value?.split( '?' )[0] );
+                  let url = imgUrl.split( '/' );
+                  url.splice( 0, 3 );
+                  return url.join( '/' );
+                } );
               }
             } );
           } );
@@ -256,12 +258,16 @@ export async function taskDetails( req, res ) {
             }
           }
           question.answers.forEach( async ( answer ) => {
-            if ( answer.referenceImage != '' ) {
-              let inputData = {
-                Bucket: bucket.sop,
-                file_path: decodeURIComponent( answer.referenceImage ),
-              };
-              answer.referenceImage = await signedUrl( inputData );
+            if ( answer.referenceImage.length > 0 ) {
+              let updatedImages = [];
+              for ( let refImage of answer.referenceImage ) {
+                let inputData = {
+                  Bucket: bucket.sop,
+                  file_path: decodeURIComponent( refImage ),
+                };
+                updatedImages.push( await signedUrl( inputData ) );
+              }
+              answer.referenceImage = updatedImages;
             }
           } );
         } );
@@ -665,7 +671,7 @@ export async function taskConfig( req, res ) {
     } ) : [];
     let endDate = dayjs.utc( configDetails?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + configDetails.scheduleEndTime;
     configDetails.scheduleEndTimeISO = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
-    configDetails.publishDate = dayjs().format();
+    configDetails.publishDate = dayjs.utc( dayjs().format( 'hh:mm A' ), 'hh:mm A' ).format();
 
     let response = await taskService.updateOne( { _id: inputBody._id }, configDetails );
     if ( inputBody?.approver.length ) {
@@ -752,7 +758,7 @@ export async function taskConfig( req, res ) {
       }
     }
   } catch ( e ) {
-    logger.error( { functionName: 'updateConfigure =>', error: e, message: req.body } );
+    logger.error( { functionName: 'taskConfig =>', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -767,20 +773,21 @@ export async function insertSingleProcessData( checklistId ) {
       let endDate = dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) + ' ' + getCLconfig.scheduleEndTime;
       endDate = dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format();
       if ( endDate >= date ) {
-        if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( currentdate ).format( 'YYYY-MM-DD' ) ) {
-          getCLconfig.scheduleEndTime = '11:59 PM';
-        }
+        // if ( dayjs( getCLconfig?.scheduleDate ).format( 'YYYY-MM-DD' ) != dayjs( currentdate ).format( 'YYYY-MM-DD' ) ) {
+        //   getCLconfig.scheduleEndTime = '11:59 PM';
+        // }
       } else {
         return false;
       }
-
-      startTimeIso = dayjs.utc( '12:00 AM', 'hh:mm A' );
-      endTimeIso = dayjs.utc( getCLconfig.scheduleEndTime, 'hh:mm A' );
+      let sTime = dayjs.utc( getCLconfig.publishDate ).format( 'hh:mm A' );
+      startTimeIso = dayjs.utc( sTime, 'hh:mm A' );
+      endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
       let insertdata = {};
-      insertdata.date_iso = startTimeIso.format();
+      insertdata.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
       insertdata.date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
       insertdata.sourceCheckList_id = getCLconfig._id;
       insertdata.checkListName = getCLconfig.checkListName;
+      insertdata.checkListDescription = getCLconfig.checkListDescription;
       insertdata.publish = getCLconfig.publish;
       insertdata.scheduleStartTime = '12:00 AM';
       insertdata.scheduleStartTime_iso = startTimeIso.format();
@@ -882,7 +889,8 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       delete element4.updatedAt;
       element4.checkListId = updatedchecklist._id;
       element4.checkListName = getCLconfig.checkListName;
-      element4.date_iso = startTimeIso.format();
+      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.allowedOverTime = false;
       element4.allowedStoreLocation = getCLconfig.allowedStoreLocation;
@@ -910,7 +918,6 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       assigndeletequery.date_string = insertdata.date_string;
       assigndeletequery.date_iso = insertdata.date_iso;
       assigndeletequery.client_id = insertdata.client_id;
-      assigndeletequery.brandId = insertdata.brandId;
       assigndeletequery.checkListId = updatedchecklist._id;
       assigndeletequery.checklistStatus = { $nin: [ 'submit' ] };
       await taskProcessedService.deleteMany( assigndeletequery );
@@ -1078,7 +1085,7 @@ export async function createChecklistTask( req, res ) {
       ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
     };
 
-    if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.uer.role ) ) ) {
+    if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.user.role ) ) ) {
       let userList = await userService.findOne( { clientId: inputBody.clientId, role: 'superadmin' }, { userName: 1, email: 1 } );
       if ( userList ) {
         data['approver'] = { name: userList.userName, value: userList.email };
@@ -1113,6 +1120,16 @@ export async function createChecklistTask( req, res ) {
         } );
         inputBody.question[0].questionReferenceImage = images;
       }
+      if ( inputBody.question[0].answers[0].referenceImage.length ) {
+        let images = [];
+        inputBody.question[0].answers[0].referenceImage.forEach( ( ele ) => {
+          let imgUrl = decodeURIComponent( ele.split( '?' )[0] );
+          let url = imgUrl.split( '/' );
+          url.splice( 0, 3 );
+          images.push( url.join( '/' ) );
+        } );
+        inputBody.question[0].answers[0].referenceImage = images;
+      }
       let question = {
         checkListId: response?._id,
         question: inputBody.question,

package/src/controllers/taskDashboard.controllers.js

@@ -1,6 +1,6 @@
 import * as taskService from '../service/task.service.js';
 import * as processedTaskService from '../service/processedTaskList.service.js';
-import { logger } from 'tango-app-api-middleware';
+import { logger, download } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 import mongoose from 'mongoose';
 // const ObjectId = mongoose.Types.ObjectId;
@@ -893,3 +893,109 @@ export const taskDeleteV1 = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+
+
+export async function taskDetails( req, res ) {
+  try {
+    if ( !req.body.fromDate || !req.body.toDate ) {
+      return res.sendError( 'fromDate or toDate is missing', 400 );
+    }
+    if ( !req.body.clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+
+    let toDate = new Date( req.body.toDate );
+    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
+    let limit = req.body?.limit || 10;
+    let page = req.body?.offset ? ( req.body.offset * req.body.limit ) : 0;
+
+    let query = [
+      {
+        $match: {
+          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          client_id: req.body.clientId,
+          ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
+        },
+      },
+      { $sort: { date_iso: -1 } },
+      {
+        $group: {
+          _id: '$sourceCheckList_id',
+          checkListName: { $first: '$checkListName' },
+          createdByName: { $first: '$createdByName' },
+          publishDate: { $first: '$publishDate' },
+          priorityType: { $first: '$priorityType' },
+          storeCount: { $first: '$storeCount' },
+          submitCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },
+          redoCount: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
+          scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
+        },
+      },
+    ];
+
+    if ( req.body?.searchValue.trim().length ) {
+      query.push(
+          {
+            $match: {
+              checkListName: { $regex: req.body.searchValue, $options: 'i' },
+            },
+          },
+      );
+    }
+
+    if ( req.body.sortColumnName && req.body.sortBy ) {
+      query.push( {
+        $sort: { [req.body.sortColumnName]: req.body.sortBy },
+      } );
+    }
+
+    if ( req.body.filter.length ) {
+      query.push( {
+        $match: { priorityType: { $in: req.body.filter } },
+      } );
+    }
+
+    query.push( {
+      $facet: {
+        data: [
+          { $skip: page }, { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    } );
+
+
+    let taskDetails = await processedTaskService.aggregate( query );
+
+    if ( req.body.export ) {
+      const exportResult = [];
+      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||'',
+        } );
+      }
+      await download( exportResult, res );
+      return;
+    }
+
+    if ( !taskDetails[0].data.length ) {
+      return res.sendError( 'no date found', 204 );
+    }
+
+    return res.sendSuccess( { data: taskDetails?.[0]?.data || [], count: taskDetails?.[0]?.count?.[0]?.total || 0 } );
+  } catch ( e ) {
+    logger.error( { function: 'taskDetails', error: e, message: req.body } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/taskDashboard.routes.js

@@ -3,7 +3,7 @@ export const taskDashboardRouter = express.Router();
 import { isAllowedSessionHandler, accessVerification, isAllowedClient } from 'tango-app-api-middleware';
 
 import {
-  overallCards, taskTable, taskInfoTable, taskDropdownList, taskTableV1, overallCardsV1, taskInfoTableV1, taskDropdownListV1, taskDeleteV1,
+  overallCards, taskTable, taskInfoTable, taskDropdownList, taskTableV1, overallCardsV1, taskInfoTableV1, taskDropdownListV1, taskDeleteV1, taskDetails,
 } from '../controllers/taskDashboard.controllers.js';
 
 taskDashboardRouter
@@ -15,6 +15,7 @@ taskDashboardRouter
     .post( '/taskInfoTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskInfoTableV1 )
     .post( '/taskDropdownList', isAllowedSessionHandler, taskDropdownList )
     .post( '/taskDropdownListV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskDropdownListV1 )
-    .post( '/taskDeleteV1', isAllowedSessionHandler, taskDeleteV1 );
+    .post( '/taskDeleteV1', isAllowedSessionHandler, taskDeleteV1 )
+    .post( '/taskDetails', isAllowedSessionHandler, taskDetails );
 
 export default taskDashboardRouter;