tango-app-api-task 3.3.1-beta-9 → 3.3.1-hotfix-2

package/package.json

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

package/src/controllers/internalAPI.controller.js

@@ -126,7 +126,7 @@ async function insertData( requestData ) {
           }
         }
 
-        // console.log( resultchecklist );
+        console.log( resultchecklist );
 
 
         if ( resultchecklist.length ) {
@@ -141,7 +141,7 @@ async function insertData( requestData ) {
               let startTimeIso; let endTimeIso;
               startTimeIso = dayjs.utc( `${currentdate} ${sTime}`, 'YYYY-MM-DD hh:mm A' );
               endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
-              // console.log( endTimeIso );
+              console.log( endTimeIso );
 
               let insertdata = {};
               insertdata.date_iso = new Date( dayjs( currentdate, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
@@ -269,7 +269,7 @@ async function insertData( requestData ) {
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
                       }
-                      // console.log( allQuestion );
+                      console.log( allQuestion );
 
                       if ( allQuestion ) {
                         let assigndeletequery = {};

package/src/controllers/task.controller.js

@@ -963,7 +963,7 @@ export async function taskConfig( req, res ) {
       return res.sendSuccess( { id: inputBody._id, message: message } );
     }
   } catch ( e ) {
-    // console.log( 'e', e );
+    console.log( 'e', e );
     logger.error( { functionName: 'taskConfig =>', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
@@ -1357,7 +1357,7 @@ export async function uploadImage( req, res ) {
 
 async function createUser( data ) {
   try {
-    // console.log( 'createUser ====>', data );
+    console.log( 'createUser ====>', data );
     let params = {
       userName: data.userName,
       email: data.email,
@@ -1825,7 +1825,7 @@ export async function redoTask( req, res ) {
     };
 
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
-    // console.log( response );
+    console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
       let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
@@ -1865,7 +1865,7 @@ export async function redoTask( req, res ) {
       };
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoTask, requestOptions );
-      // console.log( searchResponse.ok );
+      console.log( searchResponse.ok );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
       } else {
@@ -3714,7 +3714,7 @@ export async function updateAssign( req, res ) {
         let userData = {
           userName: assign.userName,
           email: assign.userEmail,
-          mobileNumber: assign?.userPhone || '',
+          mobileNumber: assign?.phone || '',
           clientId: req.body.clientId,
         };
         userDetails = await createUser( userData );
@@ -3979,7 +3979,7 @@ export async function taskcreation( req, res ) {
 
 
     let finduser = await userService.findOne( { clientId: inputBody.clientId, email: req.body.user, userType: 'client', isActive: true }, { userName: '$userName', email: 1, userId: '$_id' } );
-    // console.log( finduser );
+    console.log( finduser );
 
     if ( !finduser ) {
       return res.sendError( 'No user Found', 500 );
@@ -4039,35 +4039,7 @@ export async function taskcreation( req, res ) {
       ...( 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 > 1 ) {
-        let optionsResult = [];
-        for ( let option of inputBody?.options ) {
-          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 = [];
@@ -4083,11 +4055,41 @@ export async function taskcreation( req, res ) {
       await traxApprover.insertMany( inputData );
     }
     if ( response?._id ) {
-      let question = [
-        {
-          'qno': 1,
-          'qname': inputBody.question,
-          'answerType': inputBody?.answerType || 'yes/no',
+      let question = [];
+      for ( let [ index, ques ] of inputBody.questions.entries() ) {
+        let answer = await findAnswer( ques?.answerType );
+        if ( answer.length == 0 ) {
+          return res.sendError( 'please enter Valid AnswerType', 500 );
+        }
+        if ( ques?.answerType === 'multiplechoicesingle' || ques?.answerType === 'multiplechoicemultiple' ) {
+          if ( ques?.options && ques?.options.length > 1 ) {
+            let optionsResult = [];
+            for ( let option of ques?.options ) {
+              let optiondata = {
+                'answer': '',
+                'sopFlag': false,
+                'validation': false,
+                'validationType': '',
+                'referenceImage': [],
+                'runAI': false,
+                'allowUploadfromGallery': false,
+                'descriptivetype': '',
+                'showLinked': false,
+                'linkedQuestion': 0,
+                'nestedQuestion': [],
+              };
+              optiondata.answer = String( option );
+              optionsResult.push( optiondata );
+            }
+            answer = optionsResult;
+          } else {
+            return res.sendError( 'please enter Valid Options', 500 );
+          }
+        }
+        question.push( {
+          'qno': index+1,
+          'qname': ques.question,
+          'answerType': ques?.answerType || 'yes/no',
           'runAI': false,
           'runAIDescription': '',
           'allowUploadfromGallery': false,
@@ -4095,9 +4097,9 @@ export async function taskcreation( req, res ) {
           'questionReferenceImage': [],
           'answers': answer,
           'descriptivetype': 'text',
-        },
-      ];
-      let images = [];
+        } );
+      }
+      // let images = [];
 
       // for ( let imgpath of req.body.referenceImage ) {
       //   let configURL = JSON.parse( process.env.BUCKET );
@@ -4122,12 +4124,11 @@ export async function taskcreation( req, res ) {
       //   }
       //   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[0].questionReferenceImage = images;
 
+      // if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
+      //   answer[0].referenceImage = question[0].questionReferenceImage;
+      // }
 
       question = {
         checkListId: response?._id,

package/src/controllers/taskActionCenter.controllers.js

@@ -88,7 +88,7 @@ export const overallCardsV1 = async ( req, res ) => {
     resultData = { taskApproval: { count: taskCount?.[0]?.count || 0 }, checklistApproval: { count: checklistCount?.[0]?.count || 0 } };
     return res.sendSuccess( { cardData: resultData } );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
     return res.sendError( error, 500 );
   }
@@ -160,7 +160,6 @@ export const approvalTableV1 = async ( req, res ) => {
           },
         },
         coverage: { $first: '$coverage' },
-        userName: { $first: '$userName' },
       },
     },
     {
@@ -180,7 +179,6 @@ export const approvalTableV1 = async ( req, res ) => {
         storeName: 1,
         redo: '$_id.redoType',
         coverage: 1,
-        userName: 1,
       },
     },
     {
@@ -366,7 +364,7 @@ export const overallCards = async ( req, res ) => {
     let resultData = await overallCardsData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
     return res.sendError( error, 500 );
   }
@@ -385,7 +383,7 @@ async function overallCardsData( requestData ) {
     // resultData.card = cardData;
     return { cardData: cardData };
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: data, function: 'overallCardsData' } );
   }
 }
@@ -396,7 +394,7 @@ export const approvalTable = async ( req, res ) => {
     let resultData = await approvalTableData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskTable' } );
     return res.sendError( error, 500 );
   }
@@ -463,7 +461,7 @@ async function approvalTableData( requestData ) {
     };
     return tableData;
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'approvalTableData' } );
     return res.sendError( error, 500 );
   }
@@ -475,7 +473,7 @@ export const activityLog = async ( req, res ) => {
     let resultData = await activityLogData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'activityLog' } );
     return res.sendError( error, 500 );
   }
@@ -538,7 +536,7 @@ async function activityLogData( requestData ) {
     };
     return activityLogData;
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'activityLogData' } );
     return res.sendError( error, 500 );
   }

package/src/controllers/taskDashboard.controllers.js

@@ -11,7 +11,7 @@ export const overallCards = async ( req, res ) => {
     let resultData = await overallCardsData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
     return res.sendError( error, 500 );
   }
@@ -42,7 +42,7 @@ async function overallCardsData( requestData ) {
     // resultData.card = cardData;
     return { cardData: cardData };
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: data, function: 'overallCardsData' } );
   }
 }
@@ -108,6 +108,7 @@ export const overallCardsV1 = async ( req, res ) => {
 };
 export const taskTableV1 = async ( req, res ) => {
   try {
+    console.log( 'req.body', req.body );
     let limit = parseInt( req.body.limit ) || 10;
     let offset = parseInt( req.body.offset - 1 ) || 0;
     let page = offset * limit;
@@ -189,7 +190,7 @@ export const taskTableV1 = async ( req, res ) => {
           { $sort: { createdAt: -1 } },
       );
     }
-    // console.log( 'page', page );
+    console.log( 'page', page );
     query.push( {
       $facet: {
         data: [
@@ -220,7 +221,7 @@ export const taskTableV1 = async ( req, res ) => {
 
     return res.sendSuccess( { taskTableData: checkList[0].data, totalCount: checkList[0].count[0].totalCount } );
   } catch ( e ) {
-    // console.log( 'e', e );
+    console.log( 'e', e );
     logger.error( 'checklist =>', e );
     return res.sendError( e, 500 );
   }
@@ -421,7 +422,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
     }
     return res.sendSuccess( result );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'taskInfo' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -433,7 +434,7 @@ export const taskTable = async ( req, res ) => {
     let resultData = await taskTableData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskTable' } );
     return res.sendError( error, 500 );
   }
@@ -527,7 +528,7 @@ async function taskTableData( requestData ) {
     };
     return tableData;
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'taskTableData' } );
     return res.sendError( error, 500 );
   }
@@ -539,7 +540,7 @@ export const taskInfoTable = async ( req, res ) => {
     let resultData = await taskInfoTableData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskInfoTable' } );
     return res.sendError( error, 500 );
   }
@@ -673,7 +674,7 @@ async function taskInfoTableData( requestData ) {
     };
     return tableInfoData;
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'tableInfoData' } );
     return res.sendError( error, 500 );
   }
@@ -684,7 +685,7 @@ export const taskDropdownList = async ( req, res ) => {
     let resultData = await taskDropdownListData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskDropdownList' } );
     return res.sendError( error, 500 );
   }
@@ -737,7 +738,7 @@ async function taskDropdownListData( requestData ) {
     };
     return taskDropdownListData;
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'taskDropdownListData' } );
     return res.sendError( error, 500 );
   }
@@ -798,7 +799,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     result.taskDropdown = getChecklistData;
     return res.sendSuccess( result );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'checklistDropdown' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -906,7 +907,7 @@ export const taskDropdownListNew = async ( req, res ) => {
     result.taskDropdown = getChecklistData;
     return res.sendSuccess( result );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'checklistDropdownV1' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -917,7 +918,7 @@ export const taskInfoView = async ( req, res ) => {
     let resultData = await taskInfoViewData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskInfoView' } );
     return res.sendError( error, 500 );
   }
@@ -948,7 +949,7 @@ async function taskInfoViewData( requestData ) {
     };
     return taskInfoViewData;
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'taskInfoViewData' } );
     return res.sendError( error, 500 );
   }
@@ -963,7 +964,7 @@ export const taskDeleteV1 = async ( req, res ) => {
 
     const taskConfig = await taskService.findOne( { _id: new mongoose.Types.ObjectId( requestData.taskId ) }, { _id: 1 } );
     if ( !taskConfig ) {
-      // console.log( 'Task found:', taskConfig );
+      console.log( 'Task found:', taskConfig );
       return res.sendError( 'Task not found', 404 );
     }
 
@@ -973,7 +974,7 @@ export const taskDeleteV1 = async ( req, res ) => {
     );
 
     if ( resultData ) {
-      // console.log( 'Update result:', resultData );
+      console.log( 'Update result:', resultData );
       return res.sendSuccess( { message: 'Task deleted successfully' } );
     } else {
       return res.sendError( 'Something went wrong please try again', 500 );

package/src/dtos/task.dto.js

@@ -44,13 +44,16 @@ export const commonAiTaskSchema = Joi.object().keys( {
   scheduleEndTime: Joi.string().optional(),
   referenceImage: Joi.array().required(),
 } );
+const questionSchema = Joi.object( {
+  question: Joi.string().required(),
+  answerType: Joi.string().required(),
+  options: Joi.array().items().optional(),
+} );
 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(),
+  questions: Joi.array().items( questionSchema ).required(),
   scheduleDate: Joi.string().optional(),
   scheduleEndTime: Joi.string().optional(),
   approver: Joi.string().required(),