tango-app-api-task 3.7.2-multireff-1 → 3.7.2-multireff-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.7.2-multireff-1",
+    "version": "3.7.2-multireff-2",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
-        "tango-api-schema": "^2.2.193",
+        "tango-api-schema": "^2.2.201",
         "tango-app-api-middleware": "^3.1.77",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/task.controller.js

@@ -1232,7 +1232,7 @@ function findObjectDifference( oldObj, newObj ) {
 }
 
 
-export async function insertSingleProcessData( checklistId, answerTypechange, inputBody ) {
+export async function insertSingleProcessData( checklistId, answerTypechange, inputBody, insertfrom ) {
   try {
     let currentdate = new Date();
     let date = dayjs( currentdate ).format();
@@ -1346,7 +1346,7 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
             updatedchecklist = checklistDetails;
           }
           if ( updatedchecklist ) {
-            await insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, dateVal, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody );
+            await insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, dateVal, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody, insertfrom );
           }
         }
       }
@@ -1358,7 +1358,7 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
   }
 };
 
-async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody ) {
+async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody, insertfrom ) {
   let getquestionQuery = [];
 
   if ( dayjs( getCLconfig.publishDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
@@ -1531,10 +1531,20 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
         if ( inputBody && inputBody?.streamId ) {
           element4.streamId = inputBody?.streamId;
         }
+        console.log( insertdata.questionAnswers, element4.comments );
         if ( answerTypechange ) {
           element4.questionAnswers = insertdata.questionAnswers;
           element4.planoType = 'qrScan';
         }
+
+        if ( insertfrom === 'gallery' ) {
+          // Clone the data to prevent shared reference
+          const clonedQuestionAnswers = JSON.parse( JSON.stringify( insertdata.questionAnswers ) );
+          clonedQuestionAnswers[0].questions[0].qcomment = element4.comments;
+
+          element4.questionAnswers = clonedQuestionAnswers;
+        }
+
         element4.coverage = getCLconfig?.coverage;
         assignUserList.push( element4 );
       }
@@ -1571,6 +1581,8 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
           item1.store_id === item2.store_id && item1.userEmail === item2.userEmail,
         ),
       );
+
+
       await taskProcessedService.insertMany( insertList );
       logger.info( { function: 'insertPCBulk_v3', query: assigndeletequery } );
     }
@@ -1623,7 +1635,7 @@ export async function uploadImage( req, res ) {
       return res.sendError( { message: 'Something went wrong' }, 500 );
     }
 
-    return res.sendSuccess( { message: 'Uploaded Successfully', imgUrl: imgUrl } );
+    return res.sendSuccess( { message: 'Uploaded Successfully', imgUrl: imgUrl, path: inputData.file_path } );
   } catch ( e ) {
     logger.error( 'uploadImage =>', e );
     return res.sendError( e, 500 );
@@ -2077,7 +2089,7 @@ export async function createChecklistTask( req, res ) {
         console.log( 'logData', logData );
         await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
       }
-      await insertSingleProcessData( response?._id );
+      await insertSingleProcessData( response?._id, false, inputBody, 'gallery' );
       return res.sendSuccess( 'Task created successfully' );
     }
   } catch ( e ) {
@@ -2122,39 +2134,73 @@ export async function createChecklistMultiTask( req, res ) {
 
     let time = inputBody?.scheduleEndTime || '11:59 PM';
     let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
-    for ( let originaldata of inputData ) {
-      let checklistDetails = await checklistService.findOne( { _id: originaldata?.checkListId }, { coverage: 1 } );
-      let data = {
-        checkListName: inputBody.checkListName,
-        checkListDescription: inputBody.checkListDescription,
-        createdBy: req.user._id,
-        createdByName: req.user.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: inputBody.checkListType,
-        publishDate: new Date(),
-        locationCount: 1,
-        ...( originaldata?.checkListId ) ? { referenceCheckListId: originaldata?.checkListId } : {},
-        coverage: checklistDetails?.coverage || 'store',
-        checkListFrom: 'gallery',
-      };
+    let checklistDetails = await checklistService.findOne( { _id: inputData[0]?.checkListId }, { coverage: 1 } );
+    let data = {
+      checkListName: inputBody.checkListName,
+      checkListDescription: inputBody.checkListDescription,
+      createdBy: req.user._id,
+      createdByName: req.user.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: inputBody.checkListType,
+      publishDate: new Date(),
+      locationCount: 1,
+      ...( inputData[0]?.checkListId ) ? { referenceCheckListId: inputData[0]?.checkListId } : {},
+      coverage: checklistDetails?.coverage || 'store',
+      checkListFrom: 'gallery',
+      restrictAttendance: req.body.restrictAttendance,
+      allowedStoreLocation: req.body.allowedStoreLocation,
+    };
+    console.log( data );
+    if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.user.role ) ) ) {
+      let userList = await userService.findOne( { clientId: inputBody.clientId, role: 'superadmin' }, { userName: 1, email: 1 } );
+      if ( userList ) {
+        data['approver'] = { name: userList.userName, value: userList.email };
+      }
+    } else {
+      data['approver'] = { name: req.user.userName, value: req.user.email };
+    }
 
-      if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.user.role ) ) ) {
-        let userList = await userService.findOne( { clientId: inputBody.clientId, role: 'superadmin' }, { userName: 1, email: 1 } );
-        if ( userList ) {
-          data['approver'] = { name: userList.userName, value: userList.email };
+    let response = await taskService.create( data );
+    let newquestion = {
+      'qno': 1,
+      'qname': inputBody.question[0].qname,
+      'answerType': inputBody.question[0].answerType,
+      'runAI': false,
+      'runAIDescription': '',
+      'allowUploadfromGallery': inputBody.question[0].allowUploadfromGallery,
+      'linkType': false,
+      'questionReferenceImage': inputBody.question[0].questionReferenceImage,
+      'descriptivetype': inputBody.question[0].descriptivetype,
+      'answers': inputBody.question[0].answers,
+    };
+    let question = {
+      checkListId: response?._id,
+      question: inputBody.showcomment ? inputBody.question : newquestion,
+      section: 'Section 1',
+      checkList: inputBody?.checkListName,
+      client_id: inputBody.clientId,
+    };
+    console.log( question );
+    await taskQuestionService.create( question );
+    for ( let originaldata of inputData ) {
+      let findcomment = {};
+      if ( !inputBody.showcomment ) {
+        if ( inputBody?.coverage === 'store' ) {
+          findcomment = inputBody.excelData.find( ( ele ) => ele['Store Name'] === originaldata.storeName );
+        } else if ( inputBody?.coverage === 'users' ) {
+          findcomment = inputBody.excelData.find( ( ele ) => ele['User Email'] === originaldata.userEmail );
         }
-      } else {
-        data['approver'] = { name: req.user.userName, value: req.user.email };
       }
+      console.log( '****************', findcomment );
+
 
-      let response = await taskService.create( data );
       if ( response?.approver.length ) {
         let data = [];
         response?.approver.forEach( ( ele ) => {
@@ -2194,19 +2240,12 @@ export async function createChecklistMultiTask( req, res ) {
           } );
           inputBody.question[0].answers[0].referenceImage = images;
         }
-        let question = {
-          checkListId: response?._id,
-          question: inputBody.question,
-          section: 'Section 1',
-          checkList: data.checkListName,
-          client_id: inputBody.clientId,
-        };
-        await taskQuestionService.create( question );
+
         let storeDetails;
         if ( originaldata?.storeName ) {
           storeDetails = await storeService.findOne( { storeName: originaldata.storeName, status: 'active' }, { storeId: 1, storeProfile: 1 } );
         }
-
+        let findUser = await userService.findOne( { email: originaldata.userEmail } );
         let userDetails = {
           userName: originaldata.userName ? originaldata.userName : '',
           userEmail: originaldata.userEmail ? originaldata.userEmail : '',
@@ -2217,15 +2256,16 @@ export async function createChecklistMultiTask( req, res ) {
           checkListId: response?._id,
           checkListName: data.checkListName,
           client_id: inputBody.clientId,
-          userId: userDetailList && userDetailList._id ? userDetailList._id : '',
-          assignId: response?.coverage == 'store' ? storeDetails?._id : userDetailList._id,
+          userId: findUser._id ? findUser._id : '',
+          assignId: response?.coverage == 'store' ? storeDetails?._id : findUser._id,
           coverage: response?.coverage || 'store',
+          comments: inputBody?.showcomment ? inputBody.checkListDescription : findcomment?.Comments,
         };
         await taskAssignService.create( userDetails );
         // console.log( originaldata?.checklistId );
         if ( inputBody.checkListType == 'checklistTask' ) {
           let taskDetails = await processedChecklist.findOne( { _id: originaldata?.checklistId }, { questionAnswers: 1, taskStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1 } );
-          // console.log( taskDetails );
+          console.log( taskDetails );
           if ( !taskDetails ) {
             return res.sendError( 'No data found', 204 );
           }
@@ -2235,7 +2275,7 @@ export async function createChecklistMultiTask( req, res ) {
             return res.sendError( 'section is not found', 400 );
           }
           let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.qno );
-
+          console.log( findQuestion );
           let data = { ...question[sectionIndex].questions[findQuestion], taskId: response?._id, task: true };
           question[sectionIndex].questions[req.body.qno - 1] = data;
           taskDetails.questionAnswers = question;
@@ -2243,6 +2283,7 @@ export async function createChecklistMultiTask( req, res ) {
             taskStatus: true,
             questionAnswers: question,
           };
+          console.log( updateData );
           await processedChecklist.updateOne( { _id: originaldata.checklistId }, updateData );
           let params = {
             'payload': {
@@ -2298,7 +2339,7 @@ export async function createChecklistMultiTask( req, res ) {
           console.log( 'logData', logData );
           await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
         }
-        await insertSingleProcessData( response?._id );
+        await insertSingleProcessData( response?._id, false, inputBody, 'gallery' );
       }
     }
     return res.sendSuccess( 'Task created successfully' );
@@ -2318,7 +2359,7 @@ export async function approveTask( req, res ) {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
-    if ( !( req.body.assignedStores && req.body.assignedStores.length >0 ) ) {
+    if ( !( req.body.assignedStores && req.body.assignedStores.length > 0 ) ) {
       req.body.assignedStores = req.body.storeId;
     }
     if ( req.body?.storeId?.length ) {
@@ -2346,13 +2387,13 @@ export async function approveTask( req, res ) {
 
       let teamsMsg;
       let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
-      teamsMsg = 'ClientId: '+ taskDetails[0].client_id + ', Type: Task, Process: started, Action: Approval, ChecklistId: '+ taskDetails[0].sourceCheckList_id + ', Task Name: '+ taskDetails[0].checkListName +', UpDatedBy: '+ req.user.email;
+      teamsMsg = 'ClientId: ' + taskDetails[0].client_id + ', Type: Task, Process: started, Action: Approval, ChecklistId: ' + taskDetails[0].sourceCheckList_id + ', Task Name: ' + taskDetails[0].checkListName + ', UpDatedBy: ' + req.user.email;
       if ( teamsAlertUrls && teamsAlertUrls.approvalAlert ) {
         sendTeamsNotification( teamsAlertUrls.approvalAlert, teamsMsg );
       }
 
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
-        teamsMsg = 'ClientId: '+ taskDetails[0].client_id + ', Type: Task, Process: Completed, Updated Count: '+updateResponse.modifiedCount+' Action: Approval, ChecklistId: '+ taskDetails[0].sourceCheckList_id + ', Task Name: '+ taskDetails[0].checkListName +', UpDatedBy: '+ req.user.email;
+        teamsMsg = 'ClientId: ' + taskDetails[0].client_id + ', Type: Task, Process: Completed, Updated Count: ' + updateResponse.modifiedCount + ' Action: Approval, ChecklistId: ' + taskDetails[0].sourceCheckList_id + ', Task Name: ' + taskDetails[0].checkListName + ', UpDatedBy: ' + req.user.email;
         if ( teamsAlertUrls && teamsAlertUrls.approvalAlert ) {
           sendTeamsNotification( teamsAlertUrls.approvalAlert, teamsMsg );
         }
@@ -2470,13 +2511,13 @@ export async function redoTask( req, res ) {
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
     // console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
-      let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
-      let currentDateTime;
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-      } else {
-        currentDateTime = dayjs();
-      }
+      // let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+      // let currentDateTime;
+      // if ( storeTimeZone?.storeProfile?.timeZone ) {
+      //   currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      // } else {
+      //   currentDateTime = dayjs();
+      // }
       data = {
         checklistId: taskDetails.sourceCheckList_id,
         checkListName: taskDetails.checkListName,
@@ -2492,10 +2533,10 @@ export async function redoTask( req, res ) {
         type: taskDetails.checkListType,
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
-        initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+        initiatedTime: dayjs.utc( ).format(),
         answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
         submitedBy: taskDetails.userName,
-        submitTime: taskDetails.submitTime,
+        submitTime: dayjs.utc( taskDetails.submitTime ).format(),
       };
 
       await checklistLogs.create( data );
@@ -2585,13 +2626,13 @@ export async function redomultiTask( req, res ) {
       let response = await taskProcessedService.updateOne( { _id: originalData.checklistId }, updateData );
       // console.log( response );
       if ( response.modifiedCount || response.matchedCount ) {
-        let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
-        let currentDateTime;
-        if ( storeTimeZone?.storeProfile?.timeZone ) {
-          currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-        } else {
-          currentDateTime = dayjs();
-        }
+        // let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+        // let currentDateTime;
+        // if ( storeTimeZone?.storeProfile?.timeZone ) {
+        //   currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+        // } else {
+        //   currentDateTime = dayjs();
+        // }
         data = {
           checklistId: taskDetails.sourceCheckList_id,
           checkListName: taskDetails.checkListName,
@@ -2607,15 +2648,16 @@ export async function redomultiTask( req, res ) {
           type: taskDetails.checkListType,
           userAnswer: userAnswer,
           initiatedBy: req.user.userName,
-          initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+          initiatedTime: dayjs.utc().format(),
           answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
           submitedBy: taskDetails.userName,
-          submitTime: taskDetails.submitTime,
+          submitTime: dayjs.utc( taskDetails.submitTime ).format(),
         };
         req.body.payload._id = originalData.checklistId;
         req.body.payload.section_id = originalData.section_id;
         req.body.payload.uniqueNo = originalData.uniqueNo;
         await checklistLogs.create( data );
+
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -2835,6 +2877,7 @@ export async function approvalstatus( req, res ) {
       if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
         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 );
@@ -2848,6 +2891,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' ) {
@@ -2863,6 +2907,39 @@ export async function approvalstatus( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+export async function allapprovalstatus( req, res ) {
+  try {
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+      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 );
+        }
+      }
+      return res.sendError( 'No Content', 204 );
+    }
+
+
+    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 );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( error, 'allapprovalstatus' );
+    return res.sendError( error, 500 );
+  }
+}
 
 export const taskList = async ( req, res ) => {
   try {
@@ -3264,7 +3341,7 @@ export async function teamMigrations( req, res ) {
 }
 export async function clusterMigrations( req, res ) {
   try {
-    let input =[];
+    let input = [];
     for ( let user of input ) {
       let userexits = await userService.findOne( { 'email': user.clusterEmail, 'clientId': '11' } );
       if ( userexits ) {

package/src/routes/task.routes.js

@@ -24,6 +24,7 @@ taskRouter
     .post( '/getAnswers', isAllowedSessionHandler, taskController.getAnswers )
     .post( '/getAnswerCount', isAllowedSessionHandler, taskController.getAnswerCount )
     .post( '/approvalstatus', isAllowedSessionHandler, taskController.approvalstatus )
+    .post( '/allapprovalstatus', isAllowedSessionHandler, taskController.allapprovalstatus )
     .get( '/task-list', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ ] } ] } ), taskController.taskList )
     .put( '/publish', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.updatePublish )
     .get( '/duplicateTask/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.duplicateChecklist )