tango-app-api-task 3.3.1-beta-1 → 3.3.1-beta-3

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'; // getChecklistUsers
 import * as processedChecklist from '../service/processedChecklist.service.js';
 import * as checklistLog from '../service/checklistLog.service.js';
 import mongoose from 'mongoose';
@@ -48,8 +48,8 @@ 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 );
+    // 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 = [
@@ -60,7 +60,7 @@ export const overallCardsV1 = async ( req, res ) => {
           checklistStatus: 'submit',
           approvalStatus: false,
           // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
       { ...groupQuery },
@@ -74,7 +74,7 @@ export const overallCardsV1 = async ( req, res ) => {
           checklistStatus: 'submit',
           approvalStatus: false,
           // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
       { ...groupQuery },
@@ -159,6 +159,7 @@ export const approvalTableV1 = async ( req, res ) => {
             ],
           },
         },
+        coverage: { $first: '$coverage' },
       },
     },
     {
@@ -177,6 +178,7 @@ export const approvalTableV1 = async ( req, res ) => {
         unApproveCount: 1,
         storeName: 1,
         redo: '$_id.redoType',
+        coverage: 1,
       },
     },
     {
@@ -190,8 +192,8 @@ export const approvalTableV1 = 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 );
+    // 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 ) ) {
@@ -201,7 +203,7 @@ export const approvalTableV1 = async ( req, res ) => {
             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 } } ],
+            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
           },
         },
         ...groupQuery,
@@ -233,7 +235,7 @@ export const approvalTableV1 = async ( req, res ) => {
             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 } } ],
+            $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
           },
         },
         ...groupQuery,
@@ -298,15 +300,15 @@ export const activityLogV1 = async ( req, res ) => {
     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 );
+    // 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 },
         { action: { $in: [ 'submitted', 'started' ] } },
         // { store_id: { $in: requestData.storeId } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
     );
 
 
@@ -315,6 +317,9 @@ 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'; // getChecklistUsers
 import dayjs from 'dayjs';
 import mongoose from 'mongoose';
 // const ObjectId = mongoose.Types.ObjectId;
@@ -58,15 +58,15 @@ export const overallCardsV1 = async ( req, res ) => {
     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 );
+    // 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 } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -235,8 +235,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
     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 );
+    // 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(
@@ -244,7 +244,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         { client_id: requestData.clientId },
         { 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 } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
     );
     if ( requestData.checklistStatus && requestData.checklistStatus != 'All' ) {
       if ( requestData.checklistStatus == 'redo' ) {
@@ -265,7 +265,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         findQuery.push( { $addFields: { store: { $toLower: '$storeName' } } } );
         query = { store: { $in: storeList } };
       } else {
-        query = { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } };
+        query = { $or: [ { storeName: { $regex: requestData.searchValue.trim(), $options: 'i' } }, { userName: { $regex: requestData.searchValue.trim(), $options: 'i' } }, { userEmail: { $regex: requestData.searchValue.trim(), $options: 'i' } } ] };
       }
       findQuery.push( { $match: { $or: [ query ] } } );
     }
@@ -405,6 +405,21 @@ 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 );
@@ -747,8 +762,9 @@ export const taskDropdownListV1 = async ( req, res ) => {
             checkListName: { $first: '$checkListName' },
             checkListType: { $first: '$checkListType' },
             createdByName: { $first: '$createdByName' },
-            storeCount: { $first: '$storeCount' },
+            storeCount: { $sum: 1 },
             scheduleEndTimeISO: { $first: '$scheduleEndTimeISO' },
+            coverage: { $first: '$coverage' },
             // submitTime_string: { $first: '$submitTime_string' },
           },
         },
@@ -763,6 +779,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
         createdByName: 1,
         storeCount: 1,
         scheduleEndTimeISO: 1,
+        coverage: 1,
         // submitTime_string: 1,
       },
     } );
@@ -980,8 +997,8 @@ export async function taskDetails( 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 );
+    // 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 );
@@ -1010,7 +1027,7 @@ export async function taskDetails( req, res ) {
           client_id: req.body.clientId,
           ...( idList.length ) ? { sourceCheckList_id: { $in: idList } } : {},
           // store_id: { $in: req.body.storeId },
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
       { $sort: { date_iso: -1 } },
@@ -1029,6 +1046,7 @@ export async function taskDetails( req, res ) {
           },
           'publishDate': { $first: '$publishDate' },
           'priorityType': { $first: '$priorityType' },
+          'createdByName': { $first: '$createdByName' },
           // storeCount: { $first: '$storeCount' },
           'storeCount': { $sum: 1 },
           'submitCount': { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },

package/src/dtos/task.dto.js

@@ -34,7 +34,35 @@ export const eyeTesttaskSchema = Joi.object().keys( {
   scheduleEndTime: Joi.string().required(),
   referenceImage: Joi.any().optional(),
 } );
+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 taskcreationSchema = Joi.object().keys( {
+  storeName: Joi.string().required(),
+  taskName: Joi.string().required(),
+  user: Joi.string().required(),
+  question: Joi.string().required(),
+  answerType: Joi.string().required(),
+  options: Joi.array().optional(),
+  scheduleDate: Joi.string().optional(),
+  scheduleEndTime: Joi.string().optional(),
+  approver: Joi.string().required(),
+  creator: Joi.string().required(),
+} );
 
+export const commonAiTaskvalidation = {
+  body: commonAiTaskSchema,
+};
+export const taskcreationvalidation = {
+  body: taskcreationSchema,
+};
 export const aitaskvalidation = {
   body: aitaskvalidationSchema,
 };

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 } from '../dtos/task.dto.js';
+import { aitaskvalidation, StoreHygienetaskvalidation, eyeTesttaskvalidation, commonAiTaskvalidation, taskcreationvalidation } 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.validateUser )
+    .post( '/upload', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.validateUserv1 )
     .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,9 +28,14 @@ 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( '/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 )
+    .post( '/updateAssign', isAllowedSessionHandler, taskController.updateAssign )
+    .post( '/taskcreation', isAllowedInternalAPIHandler, validate( taskcreationvalidation ), taskController.taskcreation )
     .get( '/getcoustemer', taskController.customertrial );
 
 

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 } );
+  return model.taskAssignModel.updateOne( query, { $set: record }, { upsert: true } );
 };
 
 export const insertMany = async ( data = [] ) => {

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

@@ -0,0 +1,30 @@
+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 );
+}

package/src/service/user.service.js

@@ -20,6 +20,10 @@ 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 );
 };