tango-app-api-task 3.2.1-beta-15 → 3.2.1-beta-16

package/package.json

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

package/src/controllers/task.controller.js

@@ -1,4 +1,4 @@
-import { logger, fileUpload, signedUrl } from 'tango-app-api-middleware';
+import { logger, fileUpload, signedUrl, getObject } from 'tango-app-api-middleware';
 import * as taskService from '../service/task.service.js';
 import * as checklistLogs from '../service/checklistLog.service.js';
 import * as taskQuestionService from '../service/taskQuestion.service.js';
@@ -2367,21 +2367,22 @@ export async function createAiTaskNew( req, res ) {
     if ( !storeDetails ) {
       return res.sendError( 'Store Not Found', 500 );
     }
-    console.log( storeDetails );
+
     let url = JSON.parse( process.env.LAMBDAURL );
     let checklistId = url.dailystoreChecklistId;
     let finduser = await checklistassignconfigModel.findOne( { checkListId: new mongoose.Types.ObjectId( checklistId ), store_id: storeDetails.storeId } );
-    console.log( finduser );
+
     if ( !finduser ) {
       return res.sendError( 'No user Found For this store', 500 );
     }
+    console.log( finduser );
     userId = finduser.userId;
     inputBody.userName = finduser.userName;
     inputBody.userEmail = finduser.userEmail;
 
 
     let teamList = await findteams( { users: { $elemMatch: { email: finduser.userEmail } } } );
-    console.log( teamList );
+
     inputBody.approver = '';
     for ( let team of teamList ) {
       for ( let user of team.Teamlead ) {
@@ -2389,8 +2390,6 @@ export async function createAiTaskNew( req, res ) {
       }
     }
     inputBody.approver = inputBody.approver.replace( /,$/, '' );
-    console.log( inputBody?.approver );
-    // return;
 
 
     // let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
@@ -2408,10 +2407,10 @@ export async function createAiTaskNew( req, res ) {
     }
 
     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 ) {
       userAdmin = await userService.find( { clientId: inputBody.clientId, email: 'rohit.chawla@lenskart.com', userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
     }
@@ -2420,10 +2419,13 @@ export async function createAiTaskNew( req, res ) {
     if ( creator && creator.length === 0 ) {
       return res.sendError( 'Invalid Creator Details', 500 );
     }
-    if ( req.files && req.files.referenceImage && req.files.referenceImage.length > 3 ) {
+
+    console.log( req.body.referenceImage );
+    req.body.referenceImage = req.body.referenceImage.split( ',' );
+    console.log( req.body.referenceImage );
+    if ( req.body && req.body.referenceImage && req.body.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,
@@ -2445,14 +2447,13 @@ export async function createAiTaskNew( req, res ) {
 
 
     data['approver'] = userAdmin;
-    console.log( data );
+
 
     let answer = await findAnswer( inputBody?.answerType );
     if ( answer.length == 0 ) {
       return res.sendError( 'please enter Valid AnswerType', 500 );
     }
     if ( inputBody?.answerType === 'multiplechoicesingle' || inputBody?.answerType === 'multiplechoicemultiple' ) {
-      console.log( inputBody?.options );
       if ( inputBody?.options && inputBody?.options.length > 0 ) {
         let optionsResult = [];
         let optionList = inputBody?.options.split( ',' );
@@ -2484,7 +2485,6 @@ export async function createAiTaskNew( req, res ) {
     if ( response?.approver.length ) {
       let inputData = [];
       response?.approver.forEach( ( ele ) => {
-        console.log( data );
         inputData.push( {
           userEmail: ele.email,
           checkListId: response._id,
@@ -2493,7 +2493,7 @@ export async function createAiTaskNew( req, res ) {
           checkListName: data?.checkListName || '',
         } );
       } );
-      console.log( inputData );
+
       await traxApprover.insertMany( inputData );
     }
 
@@ -2514,22 +2514,36 @@ export async function createAiTaskNew( req, res ) {
       ];
 
 
-      if ( req.files && req.files.referenceImage && req.files.referenceImage.length ) {
-        let images = [];
-        console.log( req.files.referenceImage.length );
+      let images = [];
 
+      for ( let imgpath of req.body.referenceImage ) {
+        let configURL = JSON.parse( process.env.BUCKET );
+        let inputData = {
+          Bucket: configURL.aiTraxoutput,
+          Key: imgpath,
+        };
 
-        for ( let image of req.files.referenceImage ) {
-          let uplaodedImage = await uploadmultiImage( image );
-          let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
-          let url = imgUrl.split( '/' );
-          if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
-            url.splice( 0, 3 );
-          }
-          images.push( url.join( '/' ) );
+        console.log( inputData );
+        let output = await getObject( inputData );
+        console.log( output );
+
+
+        let image = {
+          data: output.Body,
+          name: imgpath,
+          mimetype: output.ContentType,
+        };
+        let uplaodedImage = await uploadmultiImage( image );
+        console.log( uplaodedImage );
+        let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
+        let url = imgUrl.split( '/' );
+        if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+          url.splice( 0, 3 );
         }
-        question[0].questionReferenceImage = images;
+        images.push( url.join( '/' ) );
       }
+      question[0].questionReferenceImage = images;
+
       if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
         answer[0].referenceImage = question[0].questionReferenceImage;
       }
@@ -2556,7 +2570,6 @@ export async function createAiTaskNew( 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' );
@@ -3040,14 +3053,25 @@ export async function uploadmultiImage( images ) {
 
 export async function customertrial( params ) {
   try {
+    // let inputData = {
+    //   Bucket: 'tango-trax-audit',
+    //   file_path: 'trail/59-147/b1c5b15c0133dec0c45640d923fda221_10_09_59_000_24_01_2025_false.mp4',
+    // };
+    // let url = await signedUrl( inputData );
+    // console.log( url );
+
+
     let inputData = {
       Bucket: 'tango-trax-audit',
-      file_path: 'trail/59-147/b1c5b15c0133dec0c45640d923fda221_10_09_59_000_24_01_2025_false.mp4',
+      Key: 'hygiene/16-01-2025/11-2212/11-2212_13d76f2dd3ea3123aa476a885893c9fd_labelled.jpeg',
     };
-    let url = await signedUrl( inputData );
+
+    console.log( inputData );
+    let url = await getObject( inputData );
     console.log( url );
   } catch ( e ) {
     logger.error( 'uploadImage =>', e );
     return e;
   }
 };
+

package/src/dtos/task.dto.js

@@ -20,7 +20,7 @@ export const aitaskvalidationSchemanew = Joi.object().keys( {
   options: Joi.string().optional(),
   scheduleDate: Joi.string().optional(),
   scheduleEndTime: Joi.string().optional(),
-  referenceImage: Joi.string().optional(),
+  referenceImage: Joi.string().required(),
 } );
 
 export const aitaskvalidation = {