tango-app-api-task 1.0.0-alpha.1 → 1.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-alpha.1",
+    "version": "1.0.0-alpha.2",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "tango-api-schema": "^2.1.88",
-        "tango-app-api-middleware": "^3.1.43-alpha.9",
+        "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

@@ -993,6 +993,20 @@ export async function reinitiateTask( req, res ) {
 export async function createChecklistTask( req, res ) {
   try {
     let inputBody = req.body;
+    let userId;
+    let userDetails = await userService.findOne( { email: inputBody.userEmail } );
+    if ( !userDetails ) {
+      let userData = {
+        userName: inputBody.userName,
+        email: inputBody.userEmail,
+        mobileNumber: '',
+        clientId: inputBody.clientId,
+      };
+      userId = await createUser( userData );
+    } else {
+      userId = userDetails._id;
+    }
+    let time = inputBody?.scheduleEndTime || '11:59 PM';
     let data = {
       checkListName: inputBody.checkListName,
       checkListDescription: inputBody.checkListDescription,
@@ -1002,8 +1016,8 @@ export async function createChecklistTask( req, res ) {
       questionCount: 1,
       storeCount: 1,
       scheduleDate: inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' ),
-      scheduleEndTime: inputBody?.scheduleEndTime || '11:59 PM',
-      scheduleEndTimeISO: dayjs.utc( inputBody.scheduleEndTime, 'hh:mm A' ).format(),
+      scheduleEndTime: time,
+      scheduleEndTimeISO: dayjs.utc( time, 'hh:mm A' ).format(),
       priorityType: 'high',
       client_id: inputBody.clientId,
       checkListType: inputBody.checkListType,
@@ -1047,6 +1061,7 @@ export async function createChecklistTask( req, res ) {
         checkListId: response?._id,
         checkListName: inputBody.checkListName,
         client_id: inputBody.clientId,
+        userId: userId,
       };
       await taskAssignService.create( userDetails );
       await insertSingleProcessData( response?._id );

package/src/controllers/taskActionCenter.controllers.js

@@ -4,13 +4,13 @@ import { logger } from 'tango-app-api-middleware';
 import * as processedChecklist from '../service/processedChecklist.service.js';
 import mongoose from 'mongoose';
 const ObjectId = mongoose.Types.ObjectId;
-export const overallCards = async ( req, res ) => {
+export const overallCardsV1 = async ( req, res ) => {
   try {
     let query;
     let taskIdList = [];
     let checklistIdList = [];
     let resultData;
-    if ( req?.user?.userType == 'client' && req.user.role == 'superadmin' || req.body?.clientId ) {
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) || req.body?.clientId ) {
       let clientId = req.user?.clientId || req.body?.clientId;
       query = { client_id: clientId };
     } else {
@@ -77,25 +77,7 @@ export const overallCards = async ( req, res ) => {
   }
 };
 
-// async function overallCardsData( requestData ) {
-//   try {
-//     let cardData = {
-//       'checklistApproval': {
-//         'count': 50, // Checklist Count
-//       },
-//       'taskApproval': {
-//         'count': 40, // Task Count
-//       },
-//     };
-//     // resultData.card = cardData;
-//     return { cardData: cardData };
-//   } catch ( error ) {
-//     console.log( 'error =>', error );
-//     logger.error( { error: error, message: data, function: 'overallCardsData' } );
-//   }
-// }
-
-export const approvalTable = async ( req, res ) => {
+export const approvalTableV1 = async ( req, res ) => {
   try {
     let query;
     let taskIdList = [];
@@ -103,7 +85,7 @@ export const approvalTable = async ( req, res ) => {
     let resultData;
     let taskResult = [];
     let checklistResult = [];
-    if ( req?.user?.userType == 'client' && req.user.role == 'superadmin' || req.body?.clientId ) {
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) || req.body?.clientId ) {
       let clientId = req.user?.clientId || req.body?.clientId;
       query = { client_id: clientId };
     } else {
@@ -241,72 +223,112 @@ export const approvalTable = async ( req, res ) => {
   }
 };
 
-// async function approvalTableData( requestData ) {
-//   try {
-//     let tableData = {
-//       'totalCount': 50,
-//       'approvalList': [
-//         {
-//           'taskName': 'Hustlr Tray',
-//           'createdBy': 'Olivia Rhye',
-//           'totalAssigned': 100,
-//           'totalSubmitted': 200,
-//           'scheduledRepeatedType': 'daily', // weekly or monthly,
-//           'dateString': '12 Jan,2024',
-//           'sorceTaskId': '4862896912909',
-//           'taskType': 'task', // checklist or redo
-//           'status': 'open', // inprogress or approved
-//           'priority': 'high',
-//           'approved': 90,
-//         },
-//         {
-//           'taskName': 'Hustlr Tray',
-//           'createdBy': 'Olivia Rhye',
-//           'totalAssigned': 100,
-//           'totalSubmitted': 200,
-//           'scheduledRepeatedType': 'daily', // weekly or monthly,
-//           'dateString': '12 Jan,2024',
-//           'sorceTaskId': '4862896912909',
-//           'taskType': 'redo', // checklist or redo
-//           'status': 'inprogress', // inprogress or approved
-//           'priority': 'low',
-//           'approved': 90,
-//         },
-//         {
-//           'taskName': 'Hustlr Tray',
-//           'createdBy': 'Olivia Rhye',
-//           'totalAssigned': 100,
-//           'totalSubmitted': 200,
-//           'scheduledRepeatedType': 'daily', // weekly or monthly,
-//           'dateString': '12 Jan,2024',
-//           'sorceTaskId': '4862896912909',
-//           'taskType': 'task', // checklist or redo
-//           'status': 'approved', // inprogress or approved
-//           'priority': 'low',
-//           'approved': 90,
-//         },
-//         {
-//           'taskName': 'Hustlr Tray',
-//           'createdBy': 'Olivia Rhye',
-//           'totalAssigned': 100,
-//           'totalSubmitted': 200,
-//           'scheduledRepeatedType': 'daily', // weekly or monthly,
-//           'dateString': '12 Jan,2024',
-//           'sorceTaskId': '4862896912909',
-//           'taskType': 'task', // checklist or redo
-//           'status': 'approved', // inprogress or approved
-//           'priority': 'low',
-//           'approved': 90,
-//         },
-//       ],
-//     };
-//     return tableData;
-//   } catch ( error ) {
-//     console.log( 'error =>', error );
-//     logger.error( { error: error, message: requestData, function: 'approvalTableData' } );
-//     return res.sendError( error, 500 );
-//   }
-// }
+export const overallCards = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let resultData = await overallCardsData( requestData );
+    return res.sendSuccess( resultData );
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, function: 'overallCards' } );
+    return res.sendError( error, 500 );
+  }
+};
+async function overallCardsData( requestData ) {
+  try {
+    let cardData = {
+      'checklistApproval': {
+        'count': 50, // Checklist Count
+      },
+      'taskApproval': {
+        'count': 40, // Task Count
+      },
+    };
+    // resultData.card = cardData;
+    return { cardData: cardData };
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, message: data, function: 'overallCardsData' } );
+  }
+}
+export const approvalTable = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let resultData = await approvalTableData( requestData );
+    return res.sendSuccess( resultData );
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, function: 'taskTable' } );
+    return res.sendError( error, 500 );
+  }
+};
+async function approvalTableData( requestData ) {
+  try {
+    let tableData = {
+      'totalCount': 50,
+      'approvalList': [
+        {
+          'taskName': 'Hustlr Tray',
+          'createdBy': 'Olivia Rhye',
+          'totalAssigned': 100,
+          'totalSubmitted': 200,
+          'scheduledRepeatedType': 'daily', // weekly or monthly,
+          'dateString': '12 Jan,2024',
+          'sorceTaskId': '4862896912909',
+          'taskType': 'task', // checklist or redo
+          'status': 'open', // inprogress or approved
+          'priority': 'high',
+          'approved': 90,
+        },
+        {
+          'taskName': 'Hustlr Tray',
+          'createdBy': 'Olivia Rhye',
+          'totalAssigned': 100,
+          'totalSubmitted': 200,
+          'scheduledRepeatedType': 'daily', // weekly or monthly,
+          'dateString': '12 Jan,2024',
+          'sorceTaskId': '4862896912909',
+          'taskType': 'redo', // checklist or redo
+          'status': 'inprogress', // inprogress or approved
+          'priority': 'low',
+          'approved': 90,
+        },
+        {
+          'taskName': 'Hustlr Tray',
+          'createdBy': 'Olivia Rhye',
+          'totalAssigned': 100,
+          'totalSubmitted': 200,
+          'scheduledRepeatedType': 'daily', // weekly or monthly,
+          'dateString': '12 Jan,2024',
+          'sorceTaskId': '4862896912909',
+          'taskType': 'task', // checklist or redo
+          'status': 'approved', // inprogress or approved
+          'priority': 'low',
+          'approved': 90,
+        },
+        {
+          'taskName': 'Hustlr Tray',
+          'createdBy': 'Olivia Rhye',
+          'totalAssigned': 100,
+          'totalSubmitted': 200,
+          'scheduledRepeatedType': 'daily', // weekly or monthly,
+          'dateString': '12 Jan,2024',
+          'sorceTaskId': '4862896912909',
+          'taskType': 'task', // checklist or redo
+          'status': 'approved', // inprogress or approved
+          'priority': 'low',
+          'approved': 90,
+        },
+      ],
+    };
+    return tableData;
+  } catch ( error ) {
+    console.log( 'error =>', error );
+    logger.error( { error: error, message: requestData, function: 'approvalTableData' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 
 export const activityLog = async ( req, res ) => {
   try {

package/src/controllers/taskDashboard.controllers.js

@@ -669,6 +669,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         { checkListType: 'task' },
+        { isdeleted: false },
     );
     findQuery.push( { $match: { $and: findAndQuery } } );
     findQuery.push( {
@@ -680,6 +681,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
         createdByName: 1,
         storeCount: 1,
         scheduleEndTimeISO: 1,
+        submitTime_string: 1,
       },
     } );
     if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
@@ -745,3 +747,35 @@ async function taskInfoViewData( requestData ) {
     return res.sendError( error, 500 );
   }
 }
+export const taskDeleteV1 = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+
+    if ( !requestData.taskId ) {
+      return res.sendError( 'Missing taskId in request body', 400 );
+    }
+
+    const taskConfig = await taskService.findOne( { _id: new mongoose.Types.ObjectId( requestData.taskId ) }, { _id: 1 } );
+    if ( !taskConfig ) {
+      console.log( 'Task found:', taskConfig );
+      return res.sendError( 'Task not found', 404 );
+    }
+
+    let resultData = await taskService.updateOne(
+        { _id: new mongoose.Types.ObjectId( requestData.taskId ) },
+        { isdeleted: true },
+    );
+
+    if ( resultData ) {
+      console.log( 'Update result:', resultData );
+      return res.sendSuccess( { message: 'Task deleted successfully' } );
+    } else {
+      return res.sendError( 'Something went wrong please try again', 500 );
+    }
+  } catch ( e ) {
+    logger.error( 'taskDeleteV1 =>', e );
+    return res.sendError( e, 500 );
+  }
+};
+
+

package/src/routes/taskActionCenter.routes.js

@@ -3,14 +3,14 @@ import { isAllowedSessionHandler } from 'tango-app-api-middleware';
 export const taskActionCenterRouter = express.Router();
 
 import {
-  overallCards, approvalTable, activityLog,
+  overallCards, approvalTable, activityLog, overallCardsV1, approvalTableV1,
 } from '../controllers/taskActionCenter.controllers.js';
 
 taskActionCenterRouter
-    .post( '/overallcards', isAllowedSessionHandler, overallCards )
-    // .post( '/overallcardsV1', overallCardsV1 )
-    .post( '/approvalTable', isAllowedSessionHandler, approvalTable )
-    // .post( '/approvalTableV1', approvalTableV1 )
+    .post( '/overallcardsV1', isAllowedSessionHandler, overallCardsV1 )
+    .post( '/overallcards', overallCards )
+    .post( '/approvalTableV1', isAllowedSessionHandler, approvalTableV1 )
+    .post( '/approvalTable', approvalTable )
     .post( '/activityLog', activityLog );
 
 export default taskActionCenterRouter;

package/src/routes/taskDashboard.routes.js

@@ -2,7 +2,7 @@ import express from 'express';
 export const taskDashboardRouter = express.Router();
 
 import {
-  overallCards, taskTable, taskInfoTable, taskDropdownList, taskTableV1, overallCardsV1, taskInfoTableV1, taskDropdownListV1,
+  overallCards, taskTable, taskInfoTable, taskDropdownList, taskTableV1, overallCardsV1, taskInfoTableV1, taskDropdownListV1, taskDeleteV1,
 } from '../controllers/taskDashboard.controllers.js';
 
 taskDashboardRouter
@@ -13,6 +13,7 @@ taskDashboardRouter
     .post( '/taskInfoTable', taskInfoTable )
     .post( '/taskInfoTableV1', taskInfoTableV1 )
     .post( '/taskDropdownList', taskDropdownList )
-    .post( '/taskDropdownListV1', taskDropdownListV1 );
+    .post( '/taskDropdownListV1', taskDropdownListV1 )
+    .post( '/taskDeleteV1', taskDeleteV1 );
 
 export default taskDashboardRouter;