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

package/package.json

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

package/src/controllers/task.controller.js

@@ -1420,9 +1420,9 @@ export async function createChecklistTask( req, res ) {
           body: JSON.stringify( params ),
         };
         let url = JSON.parse( process.env.LAMBDAURL );
-        console.log( url.redoChecklist );
+
         let searchResponse = await fetch( url.redoChecklist, requestOptions );
-        console.log( searchResponse.ok );
+
 
         if ( !searchResponse.ok ) {
           return res.sendError( 'Something went wrong', 500 );
@@ -1456,7 +1456,7 @@ export async function approveTask( req, res ) {
       let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
         let inputstores = taskDetails.filter( ( data ) => data.checklistStatus == 'submit' );
-        console.log( inputstores );
+
         let params = {
           'payload': {
             sourceCheckList_id: req.body.sourceCheckList_id,
@@ -1468,7 +1468,7 @@ export async function approveTask( req, res ) {
             approvalStatus: true,
           },
         };
-        console.log( params );
+
 
         const requestOptions = {
           method: 'POST',
@@ -1478,9 +1478,9 @@ export async function approveTask( req, res ) {
           body: JSON.stringify( params ),
         };
         let url = JSON.parse( process.env.LAMBDAURL );
-        console.log( url.approveTask );
+
         let searchResponse = await fetch( url.approveTask, requestOptions );
-        console.log( searchResponse.ok );
+
         if ( searchResponse.ok ) {
           let pendingstores = taskDetails.filter( ( data ) => data.checklistStatus != 'submit' );
           if ( pendingstores && pendingstores.length > 0 ) {
@@ -1526,7 +1526,7 @@ export async function redoTask( req, res ) {
     }
     let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
     let userAnswer = data.userAnswer;
-    console.log( userAnswer );
+
     question[sectionIndex].questions[req.body.payload.qno - 1] = data;
     question[sectionIndex].questions[req.body.payload.qno - 1].remarks = '';
     question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
@@ -1567,7 +1567,7 @@ export async function redoTask( req, res ) {
         submitedBy: taskDetails.userName,
         submitTime: taskDetails.submitTime,
       };
-      console.log( data );
+
       await checklistLogs.create( data );
       const requestOptions = {
         method: 'POST',
@@ -1762,7 +1762,6 @@ export async function approvalstatus( req, res ) {
         let url = JSON.parse( process.env.LAMBDAURL );
         let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
         if ( resultData ) {
-          console.log( resultData.status_code );
           if ( resultData.status_code == '200' ) {
             return res.sendSuccess( resultData );
           }
@@ -1775,7 +1774,7 @@ export async function approvalstatus( req, res ) {
 
     let url = JSON.parse( process.env.LAMBDAURL );
     let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
-    console.log( resultData );
+
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         return res.sendSuccess( resultData );
@@ -2101,11 +2100,9 @@ export async function teamMigrations( req, res ) {
               store: findStore._id,
             },
           ];
-          console.log( user.userEmail );
-          console.log( '***********' );
-          console.log( updateStore );
           let updateUser = await userService.updateOne( { email: user.userEmail }, { assignedStores: updateStore } );
           console.log( updateUser );
+
           let leamexits = await userService.findOne( { email: user.AomMailId } );
           if ( leamexits ) {
             let teamsExist = await findOneTeams( { 'teamName': user.AomUserName } );
@@ -2232,7 +2229,7 @@ export async function createAiChecklist( req, res ) {
     }
 
     let userAdmin = await userService.findOne( { clientId: inputBody.clientId, role: 'superadmin', isActive: true } );
-    console.log( userAdmin );
+
 
     let data = {
       checkListName: `${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`,
@@ -2356,10 +2353,10 @@ export async function createAiChecklist( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-export async function createAiTaskNew( req, res ) {
+export async function StoreHygienetask( req, res ) {
   try {
     let inputBody = req.body;
-    console.log( inputBody );
+
     inputBody.clientId = 11;
     inputBody.taskDescription = '';
     let userId;
@@ -2375,7 +2372,7 @@ export async function createAiTaskNew( req, res ) {
     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;
@@ -2420,14 +2417,11 @@ export async function createAiTaskNew( req, res ) {
       return res.sendError( 'Invalid Creator Details', 500 );
     }
 
-    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' )}`,
+      checkListName: `${inputBody.taskName}(${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}-${inputBody.count})`,
       checkListDescription: inputBody.taskDescription,
       createdBy: creator[0]._id,
       createdByName: creator[0].userName,
@@ -2523,9 +2517,8 @@ export async function createAiTaskNew( req, res ) {
           Key: imgpath,
         };
 
-        console.log( inputData );
+
         let output = await getObject( inputData );
-        console.log( output );
 
 
         let image = {
@@ -2534,7 +2527,7 @@ export async function createAiTaskNew( req, res ) {
           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:' ) ) {
@@ -2575,7 +2568,224 @@ export async function createAiTaskNew( req, res ) {
       return res.sendSuccess( 'Task created successfully' );
     }
   } catch ( e ) {
-    logger.error( { function: 'createAiTaskNew', error: e } );
+    logger.error( { function: 'StoreHygienetask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+export async function eyeTesttask( req, res ) {
+  try {
+    let inputBody = req.body;
+    inputBody.clientId = 11;
+    inputBody.taskDescription = '';
+    let userId;
+    let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, clientId: inputBody.clientId, status: 'active' }, { storeId: 1, storeName: 1, storeProfile: 1 } );
+    if ( !storeDetails ) {
+      return res.sendError( 'Store Not Found', 500 );
+    }
+
+    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 } );
+
+    if ( !finduser ) {
+      return res.sendError( 'No user Found For this store', 500 );
+    }
+
+    userId = finduser.userId;
+    inputBody.userName = finduser.userName;
+    inputBody.userEmail = finduser.userEmail;
+
+
+    let teamList = await findteams( { users: { $elemMatch: { email: finduser.userEmail } } } );
+
+    inputBody.approver = '';
+    for ( let team of teamList ) {
+      for ( let user of team.Teamlead ) {
+        inputBody.approver = user.email + ',' + inputBody.approver;
+      }
+    }
+    inputBody.approver = inputBody.approver.replace( /,$/, '' );
+
+
+    // let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
+    let time = inputBody?.scheduleEndTime || '11:59 PM';
+    let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
+    // let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
+    // if ( userDetails&&userDetails.fcmToken ) {
+    //   const fcmToken = userDetails.fcmToken;
+    //   await sendPushNotification( title, description, fcmToken );
+    // }
+    const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
+    const currentTime = dayjs.utc();
+    if ( inputDateTime.isBefore( currentTime ) ) {
+      return res.sendError( 'The input date-time is before the current time.', 500 );
+    }
+
+    let approverList = inputBody?.approver.split( ',' );
+
+
+    let userAdmin = await userService.find( { clientId: inputBody.clientId, email: { $in: approverList }, userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
+
+    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 } );
+    }
+
+    let creator = await userService.find( { clientId: inputBody.clientId, email: 'rohit.chawla@lenskart.com', userType: 'client', isActive: true } );
+    if ( creator && creator.length === 0 ) {
+      return res.sendError( 'Invalid Creator Details', 500 );
+    }
+
+
+    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' )}-${inputBody.count})`,
+      checkListDescription: inputBody.taskDescription,
+      createdBy: creator[0]._id,
+      createdByName: creator[0].userName,
+      publish: true,
+      questionCount: 1,
+      storeCount: 1,
+      scheduleDate: date,
+      scheduleEndTime: time,
+      scheduleEndTimeISO: dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format(),
+      priorityType: 'high',
+      client_id: inputBody.clientId,
+      checkListType: 'task',
+      publishDate: new Date(),
+      locationCount: 1,
+      ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
+    };
+
+
+    data['approver'] = userAdmin;
+
+
+    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' ) {
+      if ( inputBody?.options && inputBody?.options.length > 0 ) {
+        let optionsResult = [];
+        let optionList = inputBody?.options.split( ',' );
+        for ( let option of optionList ) {
+          let optiondata = {
+            'answer': '',
+            'sopFlag': false,
+            'validation': false,
+            'validationType': '',
+            'referenceImage': [],
+            'runAI': false,
+            'allowUploadfromGallery': false,
+            'descriptivetype': '',
+            'showLinked': false,
+            'linkedQuestion': 0,
+            'nestedQuestion': [],
+          };
+          optiondata.answer = option;
+          optionsResult.push( optiondata );
+        }
+        answer = optionsResult;
+      } else {
+        return res.sendError( 'please enter Valid Options', 500 );
+      }
+    }
+
+
+    let response = await taskService.create( data );
+    if ( response?.approver.length ) {
+      let inputData = [];
+      response?.approver.forEach( ( ele ) => {
+        inputData.push( {
+          userEmail: ele.email,
+          checkListId: response._id,
+          type: 'task',
+          client_id: inputBody.clientId,
+          checkListName: data?.checkListName || '',
+        } );
+      } );
+
+      await traxApprover.insertMany( inputData );
+    }
+
+    if ( response?._id ) {
+      let question = [
+        {
+          'qno': 1,
+          'qname': inputBody.question,
+          'answerType': inputBody?.answerType || 'yes/no',
+          'runAI': false,
+          'runAIDescription': '',
+          'allowUploadfromGallery': false,
+          'linkType': false,
+          'questionReferenceImage': [],
+          'answers': answer,
+          'descriptivetype': 'text',
+        },
+      ];
+
+
+      if ( req.files && req.files.referenceImage && req.files.referenceImage.length ) {
+        let images = [];
+
+
+        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( '/' ) );
+        }
+        question[0].questionReferenceImage = images;
+      } else {
+        let images = [];
+        let uplaodedImage = await uploadmultiImage( req.files.referenceImage );
+        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( '/' ) );
+
+        question[0].questionReferenceImage = images;
+      }
+
+      if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
+        answer[0].referenceImage = question[0].questionReferenceImage;
+      }
+
+
+      question = {
+        checkListId: response?._id,
+        question: question,
+        section: 'Section 1',
+        checkList: data.checkListName,
+        client_id: inputBody.clientId,
+      };
+      await taskQuestionService.create( question );
+
+      let userDetails = {
+        userName: inputBody.userName,
+        userEmail: inputBody.userEmail,
+        store_id: storeDetails.storeId,
+        storeName: storeDetails.storeName,
+        city: storeDetails?.storeProfile?.city,
+        checkFlag: true,
+        checkListId: response?._id,
+        checkListName: data.checkListName,
+        client_id: inputBody.clientId,
+        userId: userId,
+      };
+      await taskAssignService.create( userDetails );
+      await insertSingleProcessData( response?._id );
+      return res.sendSuccess( 'Task created successfully' );
+    }
+  } catch ( e ) {
+    logger.error( { function: 'eyeTesttask', error: e } );
     return res.sendError( e, 500 );
   }
 }
@@ -2589,11 +2799,11 @@ export async function createAiTask( 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 );
     }
@@ -2617,10 +2827,10 @@ export async function createAiTask( 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 ) {
       return res.sendError( 'Invalid Approver Details', 500 );
     }
@@ -2654,14 +2864,13 @@ export async function createAiTask( 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( ',' );
@@ -2693,7 +2902,6 @@ export async function createAiTask( req, res ) {
     if ( response?.approver.length ) {
       let inputData = [];
       response?.approver.forEach( ( ele ) => {
-        console.log( data );
         inputData.push( {
           userEmail: ele.email,
           checkListId: response._id,
@@ -2702,7 +2910,7 @@ export async function createAiTask( req, res ) {
           checkListName: data?.checkListName || '',
         } );
       } );
-      console.log( inputData );
+
       await traxApprover.insertMany( inputData );
     }
 
@@ -2725,7 +2933,6 @@ 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 ) {
@@ -2765,7 +2972,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' );
@@ -3066,7 +3273,7 @@ export async function customertrial( params ) {
       Key: 'hygiene/16-01-2025/11-2212/11-2212_13d76f2dd3ea3123aa476a885893c9fd_labelled.jpeg',
     };
 
-    console.log( inputData );
+
     let url = await getObject( inputData );
     console.log( url );
   } catch ( e ) {

package/src/dtos/task.dto.js

@@ -12,7 +12,7 @@ export const aitaskvalidationSchema = Joi.object().keys( {
   scheduleDate: Joi.string().optional(),
   scheduleEndTime: Joi.string().optional(),
 } );
-export const aitaskvalidationSchemanew = Joi.object().keys( {
+export const StoreHygienetaskSchema = Joi.object().keys( {
   storeName: Joi.string().required(),
   taskName: Joi.string().required(),
   question: Joi.string().required(),
@@ -20,12 +20,27 @@ export const aitaskvalidationSchemanew = Joi.object().keys( {
   options: Joi.string().optional(),
   scheduleDate: Joi.string().optional(),
   scheduleEndTime: Joi.string().optional(),
-  referenceImage: Joi.string().required(),
+  referenceImage: Joi.array().required(),
+  count: Joi.number().required(),
+} );
+
+
+export const eyeTesttaskSchema = Joi.object().keys( {
+  storeName: Joi.string().required(),
+  taskName: Joi.string().required(),
+  question: Joi.string().required(),
+  answerType: Joi.string().required(),
+  scheduleDate: Joi.string().required(),
+  scheduleEndTime: Joi.string().required(),
+  referenceImage: Joi.any().optional(),
 } );
 
 export const aitaskvalidation = {
   body: aitaskvalidationSchema,
 };
-export const aitaskvalidationNew = {
-  body: aitaskvalidationSchemanew,
+export const StoreHygienetaskvalidation = {
+  body: StoreHygienetaskSchema,
+};
+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, aitaskvalidationNew } from '../dtos/task.dto.js';
+import { aitaskvalidation, StoreHygienetaskvalidation, eyeTesttaskvalidation } from '../dtos/task.dto.js';
 export const taskRouter = express.Router();
 
 taskRouter
@@ -29,7 +29,8 @@ taskRouter
     .get( '/clusterMigrations', taskController.clusterMigrations )
     .post( '/createaiChecklist', isAllowedInternalAPIHandler, taskController.createAiChecklist )
     .post( '/createaiTask', isAllowedInternalAPIHandler, validate( aitaskvalidation ), taskController.createAiTask )
-    .post( '/createAiTaskNew', isAllowedInternalAPIHandler, validate( aitaskvalidationNew ), taskController.createAiTaskNew )
+    .post( '/StoreHygienetask', isAllowedInternalAPIHandler, validate( StoreHygienetaskvalidation ), taskController.StoreHygienetask )
+    .post( '/eyeTesttask', isAllowedInternalAPIHandler, validate( eyeTesttaskvalidation ), taskController.eyeTesttask )
     .get( '/getcoustemer', taskController.customertrial );