tango-app-api-task 3.2.1-beta-8 → 3.2.1-beta-10

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-8",
+    "version": "3.2.1-beta-10",
     "description": "Task",
-    "main": "app.js",
+    "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/task.controller.js

@@ -2325,7 +2325,8 @@ export async function createAiTask( req, res ) {
       return res.sendError( 'No user Found For this store', 500 );
     }
     userId = finduser.userId;
-
+    inputBody.userName = finduser.userName;
+    inputBody.userEmail = finduser.userEmail;
 
     // let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
     let time = inputBody?.scheduleEndTime || '11:59 PM';
@@ -2336,14 +2337,29 @@ export async function createAiTask( req, res ) {
     //   await sendPushNotification( title, description, fcmToken );
     // }
 
-    let userAdmin = await userService.findOne( { clientId: inputBody.clientId, role: 'superadmin', isActive: true } );
 
+    let approverList = inputBody?.approver.split( ',' );
+    console.log( approverList );
+
+    let userAdmin = await userService.find( { clientId: inputBody.clientId, email: { $in: approverList }, isActive: true }, { name: '$userName', email: 1 } );
+    console.log( userAdmin );
+    if ( userAdmin&&userAdmin.length===0 ) {
+      return res.sendError( 'Atlease one active approver is required', 500 );
+    }
+
+    let creator = await userService.find( { clientId: inputBody.clientId, email: { $in: inputBody.creator }, isActive: true } );
+    if ( creator&&creator.length===0 ) {
+      return res.sendError( 'Atlease one active creator is required', 500 );
+    }
+    if ( req.files&&req.files.referenceImage&& req.files.referenceImage.length>3 ) {
+      return res.sendError( 'Maximum 3 referenceImage only allowed', 500 );
+    }
 
     let data = {
       checkListName: `${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`,
       checkListDescription: inputBody.taskDescription,
-      createdBy: userAdmin._id,
-      createdByName: userAdmin.userName,
+      createdBy: creator[0]._id,
+      createdByName: creator[0].userName,
       publish: true,
       questionCount: 1,
       storeCount: 1,
@@ -2359,7 +2375,8 @@ export async function createAiTask( req, res ) {
     };
 
 
-    data['approver'] = { name: userAdmin.userName, value: userAdmin.email };
+    data['approver'] = userAdmin;
+    console.log( data );
 
     let answer = await findAnswer( inputBody?.answerType );
     if ( answer.length==0 ) {
@@ -2396,17 +2413,19 @@ export async function createAiTask( req, res ) {
 
     let response = await taskService.create( data );
     if ( response?.approver.length ) {
-      let data = [];
+      let inputData = [];
       response?.approver.forEach( ( ele ) => {
-        data.push( {
-          userEmail: ele.value,
+        console.log( data );
+        inputData.push( {
+          userEmail: ele.email,
           checkListId: response._id,
           type: 'task',
           client_id: inputBody.clientId,
           checkListName: data?.checkListName || '',
         } );
       } );
-      await traxApprover.insertMany( data );
+      console.log( inputData );
+      await traxApprover.insertMany( inputData );
     }
 
     if ( response?._id ) {
@@ -2466,6 +2485,7 @@ export async function createAiTask( req, res ) {
         client_id: inputBody.clientId,
         userId: userId,
       };
+      console.log( userDetails );
       await taskAssignService.create( userDetails );
       await insertSingleProcessData( response?._id );
       return res.sendSuccess( 'Task created successfully' );

package/src/dtos/task.dto.js

@@ -0,0 +1,19 @@
+import Joi from 'joi';
+
+
+export const aitaskvalidationSchema = Joi.object().keys( {
+  storeName: Joi.string().required(),
+  taskName: Joi.string().required(),
+  question: Joi.string().required(),
+  answerType: Joi.string().required(),
+  approver: Joi.string().required(),
+  options: Joi.string().optional(),
+  scheduleDate: Joi.string().optional(),
+  time: Joi.string().optional(),
+  creator: Joi.string().optional(),
+
+} );
+
+export const aitaskvalidation = {
+  body: aitaskvalidationSchema,
+};

package/src/routes/task.routes.js

@@ -1,8 +1,8 @@
 
 import * as taskController from '../controllers/task.controller.js';
-import { isAllowedSessionHandler, accessVerification, isAllowedClient, isAllowedInternalAPIHandler } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, validate, accessVerification, isAllowedClient, isAllowedInternalAPIHandler } from 'tango-app-api-middleware';
 import express from 'express';
-
+import { aitaskvalidation } from '../dtos/task.dto.js';
 export const taskRouter = express.Router();
 
 taskRouter
@@ -27,7 +27,7 @@ taskRouter
     .get( '/duplicateTask/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.duplicateChecklist )
     .get( '/teamMigrations', taskController.teamMigrations )
     .post( '/createaiChecklist', isAllowedInternalAPIHandler, taskController.createAiChecklist )
-    .post( '/createaiTask', isAllowedInternalAPIHandler, taskController.createAiTask )
+    .post( '/createaiTask', isAllowedInternalAPIHandler, validate( aitaskvalidation ), taskController.createAiTask )
     .get( '/getcoustemer', taskController.customertrial );
 
 

package/app.js

@@ -1,46 +0,0 @@
-import express from 'express';
-import { taskRouter, taskDashboardRouter, taskActionCenterRouter } from './index.js';
-
-import dotenv from 'dotenv';
-import pkg from 'body-parser';
-const { json, urlencoded } = pkg;
-import fileupload from 'express-fileupload';
-import { logger } from 'tango-app-api-middleware';
-import { connectdb } from './config/database/database.js';
-import responseMiddleware from './config/response/response.js';
-import errorMiddleware from './config/response/error.js';
-import cors from 'cors';
-
-const env=dotenv.config();
-
-const app = express();
-const PORT = process.env.PORT || 3000;
-app.use( cors() );
-
-app.use( fileupload() );
-
-if ( env.error ) {
-  logger.error( '.env not found' );
-  process.exit( 1 );
-}
-
-app.use( json( { limit: '500mb' } ) );
-app.use(
-    urlencoded( {
-      extended: true,
-    } ),
-);
-
-app.use( responseMiddleware );
-app.use( errorMiddleware );
-
-
-app.use( '/task', taskRouter );
-app.use( '/task/dashboard', taskDashboardRouter );
-app.use( '/task/actionCenter', taskActionCenterRouter );
-
-
-app.listen( PORT, () => {
-  console.log( `server is running on port= ${PORT} ` );
-  connectdb();
-} );