tango-app-api-task 3.2.1-beta-9 → 3.2.1-beta-11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-9",
+    "version": "3.2.1-beta-11",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -2337,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 }, userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
+    console.log( userAdmin );
+    if ( userAdmin&&userAdmin.length===0 ) {
+      return res.sendError( 'Invalid Approver Details', 500 );
+    }
+
+    let creator = await userService.find( { clientId: inputBody.clientId, email: { $in: inputBody.creator }, userType: 'client', isActive: true } );
+    if ( creator&&creator.length===0 ) {
+      return res.sendError( 'Invalid Creator Details', 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,
@@ -2360,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 ) {
@@ -2397,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 ) {
@@ -2429,6 +2447,8 @@ export async function createAiTask( req, res ) {
 
       if ( req.files&& req.files.referenceImage&&req.files.referenceImage.length ) {
         let images = [];
+        console.log( req.files.referenceImage.length );
+
 
         for ( let image of req.files.referenceImage ) {
           let uplaodedImage =await uploadmultiImage( image );

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 );