tango-app-api-task 3.2.1-beta-41 → 3.2.1-hotfix-1

package/src/controllers/taskActionCenter.controllers.js

@@ -1,6 +1,6 @@
 import * as traxApprover from '../service/approver.service.js';
 import * as processedTask from '../service/processedTaskList.service.js';
-import { logger, getChecklistUsers } from 'tango-app-api-middleware';
+import { logger } from 'tango-app-api-middleware';
 import * as processedChecklist from '../service/processedChecklist.service.js';
 import * as checklistLog from '../service/checklistLog.service.js';
 import mongoose from 'mongoose';
@@ -46,21 +46,14 @@ export const overallCardsV1 = async ( req, res ) => {
       },
     };
 
-    let requestData = req.body;
-    // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
-    // End: Get User Based Checklist////
-
     let taskQuery = [
       {
         $match: {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: taskIdList },
           checklistStatus: 'submit',
+          ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
-          // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
         },
       },
       { ...groupQuery },
@@ -72,9 +65,8 @@ export const overallCardsV1 = async ( req, res ) => {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           sourceCheckList_id: { $in: checklistIdList },
           checklistStatus: 'submit',
+          ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           approvalStatus: false,
-          // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
         },
       },
       { ...groupQuery },
@@ -159,7 +151,6 @@ export const approvalTableV1 = async ( req, res ) => {
             ],
           },
         },
-        coverage: { $first: '$coverage' },
       },
     },
     {
@@ -178,7 +169,6 @@ export const approvalTableV1 = async ( req, res ) => {
         unApproveCount: 1,
         storeName: 1,
         redo: '$_id.redoType',
-        coverage: 1,
       },
     },
     {
@@ -190,20 +180,13 @@ export const approvalTableV1 = async ( req, res ) => {
 
     const promises = [];
 
-    let requestData = req.body;
-    // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
-    // End: Get User Based Checklist////
-
     if ( [ 'task', 'all' ].includes( req.body.type ) ) {
       query = [
         {
           $match: {
             date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: taskIdList },
-            // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+            ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
           },
         },
         ...groupQuery,
@@ -234,8 +217,7 @@ export const approvalTableV1 = async ( req, res ) => {
           $match: {
             date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
             sourceCheckList_id: { $in: checklistIdList },
-            // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
-            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+            ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } : {},
           },
         },
         ...groupQuery,
@@ -299,16 +281,11 @@ export const activityLogV1 = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
 
-    // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
-    // End: Get User Based Checklist////
 
     findAndQuery.push(
         { client_id: requestData.clientId },
+        { store_id: { $in: requestData.storeId } },
         { action: { $in: [ 'submitted', 'started' ] } },
-        // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
     );
 
 
@@ -317,9 +294,6 @@ export const activityLogV1 = async ( req, res ) => {
       $project: {
         checkListName: 1,
         storeName: 1,
-        userEmail: 1,
-        userName: 1,
-        coverage: 1,
         action: 1,
         createdAt: 1,
         type: 1,

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, download, getChecklistUsers } 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;
@@ -57,16 +57,10 @@ export const overallCardsV1 = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
 
-    // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
-    // End: Get User Based Checklist////
-
     findAndQuery.push(
         { date_iso: { $gte: fromDate, $lte: toDate } },
         { client_id: requestData.clientId },
-        // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+        { store_id: { $in: requestData.storeId } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -234,17 +228,11 @@ export const taskInfoTableV1 = async ( req, res ) => {
     let findQuery = [];
     let findAndQuery = [];
 
-    // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
-    // End: Get User Based Checklist////
-
     findAndQuery.push(
         { date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } },
         { client_id: requestData.clientId },
+        { store_id: { $in: requestData.storeId } },
         { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.taskId ) },
-        // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
     );
     if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
       if ( requestData.checklistStatus == 'redo' ) {
@@ -265,7 +253,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         findQuery.push( { $addFields: { store: { $toLower: '$storeName' } } } );
         query = { store: { $in: storeList } };
       } else {
-        query = { $or: [ { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } }, { userName: { $regex: requestData.searchValue.trim(), $options: 'i' } }, { userEmail: { $regex: requestData.searchValue.trim(), $options: 'i' } } ] };
+        query = { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } };
       }
       findQuery.push( { $match: { $or: [ query ] } } );
     }
@@ -405,21 +393,6 @@ export const taskInfoTableV1 = async ( req, res ) => {
       taskInfoData[0].data[i].scheduleEndTime_iso = dayjs.utc( taskInfoData[0].data[i].scheduleEndTime_iso ).format( 'DD MMM YYYY' );
     }
     result.taskInfo = taskInfoData[0].data;
-    if ( req.body.export ) {
-      const exportResult = [];
-      for ( let task of result.taskInfo ) {
-        exportResult.push( {
-          'Store': task?.storeName ||'--',
-          'Store SPOC': task?.userEmail ||'--',
-          'Due On': dayjs.utc( task?.scheduleEndTime_iso ).format( 'DD MMM, YYYY' ) || '--',
-          'Submitted On': task?.submitTime_string || '--',
-          'Assigned To': task?.storeCount ||'--',
-          'status': task?.checklistStatus ||'--',
-        } );
-      }
-      await download( exportResult, res );
-      return;
-    }
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -762,9 +735,8 @@ export const taskDropdownListV1 = async ( req, res ) => {
             checkListName: { $first: '$checkListName' },
             checkListType: { $first: '$checkListType' },
             createdByName: { $first: '$createdByName' },
-            storeCount: { $sum: 1 },
+            storeCount: { $first: '$storeCount' },
             scheduleEndTimeISO: { $first: '$scheduleEndTimeISO' },
-            coverage: { $first: '$coverage' },
             // submitTime_string: { $first: '$submitTime_string' },
           },
         },
@@ -779,7 +751,6 @@ export const taskDropdownListV1 = async ( req, res ) => {
         createdByName: 1,
         storeCount: 1,
         scheduleEndTimeISO: 1,
-        coverage: 1,
         // submitTime_string: 1,
       },
     } );
@@ -995,12 +966,6 @@ export async function taskDetails( req, res ) {
       return res.sendError( 'clientId is required', 400 );
     }
 
-    let requestData = req.body;
-    // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
-    let getUserEmails = await getChecklistUsers( loginUser );
-    // End: Get User Based Checklist////
-
     let toDate = new Date( req.body.toDate );
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
@@ -1025,34 +990,23 @@ export async function taskDetails( req, res ) {
         $match: {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
           client_id: req.body.clientId,
+          store_id: { $in: req.body.storeId },
           ...( idList.length ) ? { sourceCheckList_id: { $in: idList } } : {},
-          // store_id: { $in: req.body.storeId },
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
         },
       },
       { $sort: { date_iso: -1 } },
       {
         $group: {
-          '_id': '$sourceCheckList_id',
-          'checkListName': { $first: '$checkListName' },
-          'coverage': {
-            '$first': {
-              '$cond': {
-                'if': { '$gt': [ { '$ifNull': [ '$referenceCheckListId', '' ] }, '' ] },
-                'then': 'checklist',
-                'else': '$coverage',
-              },
-            },
-          },
-          'publishDate': { $first: '$publishDate' },
-          'priorityType': { $first: '$priorityType' },
-          'createdByName': { $first: '$createdByName' },
-          // storeCount: { $first: '$storeCount' },
-          'storeCount': { $sum: 1 },
-          'submitCount': { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 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 ] } } },
+          _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: [ { $and: [ { $eq: [ '$redoStatus', true ] }, { $ne: [ '$checklistStatus', 'submit' ] } ] }, 1, 0 ] } },
+          scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
+          checkListChar: { $first: { $toUpper: { $substr: [ '$createdByName', 0, 2 ] } } },
         },
       },
     ];

package/src/dtos/task.dto.js

@@ -23,16 +23,6 @@ export const StoreHygienetaskSchema = Joi.object().keys( {
   referenceImage: Joi.array().required(),
   count: Joi.number().required(),
 } );
-export const commonAiTaskSchema = Joi.object().keys( {
-  storeName: Joi.string().required(),
-  taskName: Joi.string().required(),
-  question: Joi.string().required(),
-  answerType: Joi.string().required(),
-  options: Joi.string().optional(),
-  scheduleDate: Joi.string().optional(),
-  scheduleEndTime: Joi.string().optional(),
-  referenceImage: Joi.array().required(),
-} );
 
 
 export const eyeTesttaskSchema = Joi.object().keys( {
@@ -51,9 +41,6 @@ export const aitaskvalidation = {
 export const StoreHygienetaskvalidation = {
   body: StoreHygienetaskSchema,
 };
-export const commonAiTaskvalidation = {
-  body: commonAiTaskSchema,
-};
 export const eyeTesttaskvalidation = {
   body: eyeTesttaskSchema,
 };

package/src/routes/task.routes.js

@@ -2,7 +2,7 @@
 import * as taskController from '../controllers/task.controller.js';
 import { isAllowedSessionHandler, validate, accessVerification, isAllowedClient, isAllowedInternalAPIHandler } from 'tango-app-api-middleware';
 import express from 'express';
-import { aitaskvalidation, StoreHygienetaskvalidation, eyeTesttaskvalidation, commonAiTaskvalidation } from '../dtos/task.dto.js';
+import { aitaskvalidation, StoreHygienetaskvalidation, eyeTesttaskvalidation } from '../dtos/task.dto.js';
 export const taskRouter = express.Router();
 
 taskRouter
@@ -10,7 +10,7 @@ taskRouter
     .post( '/delete/:taskIds', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.deleteTask )
     .get( '/details', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskController.taskDetails )
     .get( '/userDetails', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskController.userDetails )
-    .post( '/upload', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.validateUserv1 )
+    .post( '/upload', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.validateUser )
     .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, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.reinitiateTask )
@@ -28,14 +28,9 @@ taskRouter
     .get( '/teamMigrations', taskController.teamMigrations )
     .get( '/clusterMigrations', taskController.clusterMigrations )
     .post( '/createaiChecklist', isAllowedInternalAPIHandler, taskController.createAiChecklist )
-    .post( '/createaiTask', isAllowedInternalAPIHandler, taskController.createAiTask )
-    .post( '/assign', isAllowedSessionHandler, taskController.taskAssign )
-    // .post( '/assignUpload', isAllowedSessionHandler, taskController.assignTaskUser )
     .post( '/createaiTask', isAllowedInternalAPIHandler, validate( aitaskvalidation ), taskController.createAiTask )
     .post( '/StoreHygienetask', isAllowedInternalAPIHandler, validate( StoreHygienetaskvalidation ), taskController.StoreHygienetask )
     .post( '/eyeTesttask', isAllowedInternalAPIHandler, validate( eyeTesttaskvalidation ), taskController.eyeTesttask )
-    .post( '/commonAiTask', isAllowedInternalAPIHandler, validate( commonAiTaskvalidation ), taskController.commonAiTask )
-    .get( '/getcoustemer', taskController.customertrial )
-    .post( '/updateAssign', isAllowedSessionHandler, taskController.updateAssign );
+    .get( '/getcoustemer', taskController.customertrial );
 
 

package/src/routes/taskDashboard.routes.js

@@ -8,14 +8,14 @@ import {
 
 taskDashboardRouter
     .post( '/overallcards', isAllowedSessionHandler, overallCards )
+    .post( '/overallcardsV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), overallCardsV1 )
     .post( '/taskTable', isAllowedSessionHandler, taskTable )
     .post( '/taskTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskTableV1 )
     .post( '/taskInfoTable', isAllowedSessionHandler, taskInfoTable )
+    .post( '/taskInfoTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskInfoTableV1 )
     .post( '/taskDropdownList', isAllowedSessionHandler, taskDropdownList )
-    .post( '/taskDeleteV1', isAllowedSessionHandler, taskDeleteV1 )
     .post( '/taskDropdownListV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskDropdownListV1 )
-    .post( '/overallcardsV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), overallCardsV1 )
-    .post( '/taskDetails', isAllowedSessionHandler, taskDetails )
-    .post( '/taskInfoTableV1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [] } ] } ), taskInfoTableV1 );
+    .post( '/taskDeleteV1', isAllowedSessionHandler, taskDeleteV1 )
+    .post( '/taskDetails', isAllowedSessionHandler, taskDetails );
 
 export default taskDashboardRouter;

package/src/service/cluster.service.js

@@ -26,7 +26,6 @@ export async function createclusterModel( data ) {
 export async function findcluster( query, project ) {
   return await clusterModel.find( query, project );
 };
-
 export function countDocumentsClusters( query ) {
   return clusterModel.countDocuments( query );
 }

package/src/service/taskAssign.service.js

@@ -13,7 +13,7 @@ export const updateMany = async ( query = {}, record={} ) => {
 };
 
 export const updateOne = async ( query = {}, record={} ) => {
-  return model.taskAssignModel.updateOne( query, { $set: record }, { upsert: true } );
+  return model.taskAssignModel.updateOne( query, { $set: record } );
 };
 
 export const insertMany = async ( data = [] ) => {

package/src/service/user.service.js

@@ -20,10 +20,6 @@ export const updateOne = async ( query = {}, record={} ) => {
   return model.userModel.updateOne( query, { $set: record } );
 };
 
-export const upsert = async ( query = {}, record={} ) => {
-  return model.userModel.updateOne( query, { $set: record }, { upsert: true } );
-};
-
 export const aggregate = async ( query = {} ) => {
   return model.userModel.aggregate( query );
 };

package/src/service/teams.service copy.js

@@ -1,30 +0,0 @@
-import teamsModel from 'tango-api-schema/schema/teams.model.js';
-
-
-export async function createTeamsModel( data ) {
-  return await teamsModel.create( data );
-};
-export async function updateOneTeams( query, record ) {
-  return await teamsModel.updateOne( query, { $set: record }, { upsert: true } );
-};
-
-export async function aggregateTeams( query ) {
-  return await teamsModel.aggregate( query );
-};
-export async function deleteTeams( query ={} ) {
-  return await teamsModel.deleteOne( query );
-};
-
-export async function findOneTeams( query ={}, field={} ) {
-  return await teamsModel.findOne( query, field );
-};
-export async function findteams( query ={}, field={} ) {
-  return await teamsModel.find( query, field );
-};
-
-export async function updateOneTeamModel( query, record ) {
-  return await teamsModel.updateOne( query, record );
-}
-export function countDocumentsTeams( query ) {
-  return teamsModel.countDocuments( query );
-}