tango-app-api-task 3.6.2-bulktask-8 → 3.7.2-multireff-1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.6.2-bulktask-8",
+    "version": "3.7.2-multireff-1",
     "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.201",
+        "tango-api-schema": "^2.2.193",
         "tango-app-api-middleware": "^3.1.77",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/task.controller.js

@@ -117,26 +117,26 @@ export async function createUpdateTask( req, res ) {
         for ( let i = 0; i < inputBody?.sections?.length; i++ ) {
           let section = inputBody.sections[i];
           section.questions.forEach( ( section ) => {
-            if ( section.questionReferenceImage && section.questionReferenceImage.length ) {
-              let image = [];
-              for ( let img of section.questionReferenceImage ) {
-                let imgUrl = decodeURIComponent( img.split( '?' )[0] );
-                let url = imgUrl.split( '/' );
-                url.splice( 0, 3 );
-                image.push( url.join( '/' ) );
-              }
-              section.questionReferenceImage = image;
-            }
-            section.answers.forEach( ( answer ) => {
-              if ( answer.referenceImage.length ) {
-                answer.referenceImage = answer.referenceImage.map( ( value ) => {
-                  let imgUrl = decodeURIComponent( value?.split( '?' )[0] );
-                  let url = imgUrl.split( '/' );
-                  url.splice( 0, 3 );
-                  return url.join( '/' );
-                } );
-              }
-            } );
+            // if ( section.questionReferenceImage && section.questionReferenceImage.length ) {
+            //   let image = [];
+            //   for ( let img of section.questionReferenceImage ) {
+            //     let imgUrl = decodeURIComponent( img.split( '?' )[0] );
+            //     let url = imgUrl.split( '/' );
+            //     url.splice( 0, 3 );
+            //     image.push( url.join( '/' ) );
+            //   }
+            //   section.questionReferenceImage = image;
+            // }
+            // section.answers.forEach( ( answer ) => {
+            //   if ( answer.referenceImage.length ) {
+            //     answer.referenceImage = answer.referenceImage.map( ( value ) => {
+            //       let imgUrl = decodeURIComponent( value?.split( '?' )[0] );
+            //       let url = imgUrl.split( '/' );
+            //       url.splice( 0, 3 );
+            //       return url.join( '/' );
+            //     } );
+            //   }
+            // } );
           } );
 
           sectionList.push( {
@@ -256,7 +256,8 @@ export async function createUpdateTask( req, res ) {
             },
             userType: req?.user?.userType || '',
           };
-          await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertLogData );
+          // await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertLogData );
+          insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertLogData );
         }
       } else {
         let logObj = {
@@ -275,7 +276,8 @@ export async function createUpdateTask( req, res ) {
           logDetails: {},
           userType: req?.user?.userType || '',
         };
-        await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
+        // await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
+        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       }
 
       if ( inputBody?.submitType == 'save' ) {
@@ -295,7 +297,8 @@ export async function createUpdateTask( req, res ) {
           logDetails: {},
           userType: req?.user?.userType || '',
         };
-        await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
+        // await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
+        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       }
       return res.sendSuccess( { checklistId: checkListId, message: message } );
     } else {
@@ -360,42 +363,42 @@ export async function taskDetails( req, res ) {
     let questionDetails = await taskQuestionService.find( query );
     if ( questionDetails.length ) {
       let sections = [];
-      let bucket = JSON.parse( process.env.BUCKET );
+      // let bucket = JSON.parse( process.env.BUCKET );
       questionDetails.forEach( ( item ) => {
-        item.question.forEach( async ( question ) => {
-          if ( question.questionReferenceImage && question.questionReferenceImage != '' && typeof question.questionReferenceImage == 'string' ) {
-            let inputData = {
-              Bucket: bucket.sop,
-              file_path: decodeURIComponent( question.questionReferenceImage ),
-            };
-            question.questionReferenceImage = await signedUrl( inputData );
-          } else {
-            if ( question.questionReferenceImage.length ) {
-              let image = [];
-              for ( let img of question.questionReferenceImage ) {
-                let inputData = {
-                  Bucket: bucket.sop,
-                  file_path: decodeURIComponent( img ),
-                };
-                image.push( await signedUrl( inputData ) );
-              }
-              question.questionReferenceImage = image;
-            }
-          }
-          question.answers.forEach( async ( answer ) => {
-            if ( answer.referenceImage.length > 0 ) {
-              let updatedImages = [];
-              for ( let refImage of answer.referenceImage ) {
-                let inputData = {
-                  Bucket: bucket.sop,
-                  file_path: decodeURIComponent( refImage ),
-                };
-                updatedImages.push( await signedUrl( inputData ) );
-              }
-              answer.referenceImage = updatedImages;
-            }
-          } );
-        } );
+        // item.question.forEach( async ( question ) => {
+        //   if ( question.questionReferenceImage && question.questionReferenceImage != '' && typeof question.questionReferenceImage == 'string' ) {
+        //     let inputData = {
+        //       Bucket: bucket.sop,
+        //       file_path: decodeURIComponent( question.questionReferenceImage ),
+        //     };
+        //     question.questionReferenceImage = await signedUrl( inputData );
+        //   } else {
+        //     if ( question.questionReferenceImage.length ) {
+        //       let image = [];
+        //       for ( let img of question.questionReferenceImage ) {
+        //         let inputData = {
+        //           Bucket: bucket.sop,
+        //           file_path: decodeURIComponent( img ),
+        //         };
+        //         image.push( await signedUrl( inputData ) );
+        //       }
+        //       question.questionReferenceImage = image;
+        //     }
+        //   }
+        //   question.answers.forEach( async ( answer ) => {
+        //     if ( answer.referenceImage.length > 0 ) {
+        //       let updatedImages = [];
+        //       for ( let refImage of answer.referenceImage ) {
+        //         let inputData = {
+        //           Bucket: bucket.sop,
+        //           file_path: decodeURIComponent( refImage ),
+        //         };
+        //         updatedImages.push( await signedUrl( inputData ) );
+        //       }
+        //       answer.referenceImage = updatedImages;
+        //     }
+        //   } );
+        // } );
         sections.push( {
           id: item._id,
           name: item.section,
@@ -1229,7 +1232,7 @@ function findObjectDifference( oldObj, newObj ) {
 }
 
 
-export async function insertSingleProcessData( checklistId, answerTypechange, inputBody, insertfrom ) {
+export async function insertSingleProcessData( checklistId, answerTypechange, inputBody ) {
   try {
     let currentdate = new Date();
     let date = dayjs( currentdate ).format();
@@ -1343,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, insertfrom );
+            await insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, dateVal, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody );
           }
         }
       }
@@ -1355,7 +1358,7 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
   }
 };
 
-async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody, insertfrom ) {
+async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody ) {
   let getquestionQuery = [];
 
   if ( dayjs( getCLconfig.publishDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
@@ -1528,20 +1531,10 @@ 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 );
       }
@@ -1578,8 +1571,6 @@ 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 } );
     }
@@ -1632,7 +1623,7 @@ export async function uploadImage( req, res ) {
       return res.sendError( { message: 'Something went wrong' }, 500 );
     }
 
-    return res.sendSuccess( { message: 'Uploaded Successfully', imgUrl: imgUrl, path: inputData.file_path } );
+    return res.sendSuccess( { message: 'Uploaded Successfully', imgUrl: imgUrl } );
   } catch ( e ) {
     logger.error( 'uploadImage =>', e );
     return res.sendError( e, 500 );
@@ -2086,7 +2077,7 @@ export async function createChecklistTask( req, res ) {
         console.log( 'logData', logData );
         await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
       }
-      await insertSingleProcessData( response?._id, false, inputBody, 'gallery' );
+      await insertSingleProcessData( response?._id );
       return res.sendSuccess( 'Task created successfully' );
     }
   } catch ( e ) {
@@ -2131,73 +2122,39 @@ export async function createChecklistMultiTask( req, res ) {
 
     let time = inputBody?.scheduleEndTime || '11:59 PM';
     let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
-    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 };
-    }
-
-    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 );
+      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',
+      };
+
+      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 };
       }
-      console.log( '****************', findcomment );
-
 
+      let response = await taskService.create( data );
       if ( response?.approver.length ) {
         let data = [];
         response?.approver.forEach( ( ele ) => {
@@ -2237,12 +2194,19 @@ 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 : '',
@@ -2253,16 +2217,15 @@ export async function createChecklistMultiTask( req, res ) {
           checkListId: response?._id,
           checkListName: data.checkListName,
           client_id: inputBody.clientId,
-          userId: findUser._id ? findUser._id : '',
-          assignId: response?.coverage == 'store' ? storeDetails?._id : findUser._id,
+          userId: userDetailList && userDetailList._id ? userDetailList._id : '',
+          assignId: response?.coverage == 'store' ? storeDetails?._id : userDetailList._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 );
           }
@@ -2272,7 +2235,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;
@@ -2280,7 +2243,6 @@ export async function createChecklistMultiTask( req, res ) {
             taskStatus: true,
             questionAnswers: question,
           };
-          console.log( updateData );
           await processedChecklist.updateOne( { _id: originaldata.checklistId }, updateData );
           let params = {
             'payload': {
@@ -2336,7 +2298,7 @@ export async function createChecklistMultiTask( req, res ) {
           console.log( 'logData', logData );
           await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
         }
-        await insertSingleProcessData( response?._id, false, inputBody, 'gallery' );
+        await insertSingleProcessData( response?._id );
       }
     }
     return res.sendSuccess( 'Task created successfully' );
@@ -2356,7 +2318,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 ) {
@@ -2384,13 +2346,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 );
         }
@@ -2530,10 +2492,10 @@ export async function redoTask( req, res ) {
         type: taskDetails.checkListType,
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
-        initiatedTime: dayjs.utc( ).format(),
+        initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
         answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
         submitedBy: taskDetails.userName,
-        submitTime: dayjs.utc( taskDetails.submitTime ).format(),
+        submitTime: taskDetails.submitTime,
       };
 
       await checklistLogs.create( data );
@@ -2645,10 +2607,10 @@ export async function redomultiTask( req, res ) {
           type: taskDetails.checkListType,
           userAnswer: userAnswer,
           initiatedBy: req.user.userName,
-          initiatedTime: dayjs.utc().format(),
+          initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
           answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
           submitedBy: taskDetails.userName,
-          submitTime: dayjs.utc( taskDetails.submitTime ).format(),
+          submitTime: taskDetails.submitTime,
         };
         req.body.payload._id = originalData.checklistId;
         req.body.payload.section_id = originalData.section_id;
@@ -3302,7 +3264,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 ) {