tango-app-api-trax 3.7.65 → 3.7.67

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.65",
+    "version": "3.7.67",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -229,6 +229,7 @@ export async function startChecklist( req, res ) {
           },
           questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
           redoStatus: { $ifNull: [ '$redoStatus', '' ] },
+          export: { $ifNull: [ '$export', '' ] },
         },
       } );
       let getupdatedchecklist = await processedchecklist.aggregate( findQuery );
@@ -2014,32 +2015,33 @@ export async function submitChecklist( req, res ) {
           };
           console.log( 'inserttraxlogs =>', inserttraxlogs );
           insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-          let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
-          if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
-            let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.flatMap( ( ele ) => ele?.value ): [];
-            emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.notifyType?.users.flatMap( ( ele ) => ele?.value ) ];
-            let data = {
-              storeName: getchecklist[0].storeName,
-              flagCount: updateData.questionFlag,
-              checklistName: getchecklist[0].checkListName,
-              submittedBy: getchecklist[0].userName,
-              time: updateData.submitMobileTime,
-              domain: JSON.parse( process.env.URL ).domain,
-            };
-            emailList = [ 'hs9628sh@gmail.com' ];
-            const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-            const htmlContent = handlebars.compile( fileContent );
-            const html = htmlContent( { data: data } );
-            emailList.forEach( ( email ) => {
-              let params = {
-                toEmail: email,
-                mailSubject: 'TangoEye | Checklist Flag',
-                htmlBody: html,
-                attachment: '',
-                sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+          if ( updateData.questionFlag ) {
+            let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
+            if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
+              let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
+              emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
+              let data = {
+                storeName: getchecklist[0].storeName,
+                flagCount: updateData.questionFlag,
+                checklistName: getchecklist[0].checkListName,
+                submittedBy: getchecklist[0].userName,
+                time: updateData.submitMobileTime,
+                domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags`,
               };
-              sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-            } );
+              const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+              const htmlContent = handlebars.compile( fileContent );
+              const html = htmlContent( { data: data } );
+              emailList.forEach( ( email ) => {
+                let params = {
+                  toEmail: email,
+                  mailSubject: 'TangoEye | Checklist Flag',
+                  htmlBody: html,
+                  attachment: '',
+                  sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+                };
+                sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+              } );
+            }
           }
         }
 
@@ -3295,6 +3297,7 @@ export async function questionList( req, res ) {
         videoUploadTimeLimit: { $ifNull: [ '$videoUploadTimeLimit', 0 ] },
         taskType: { $ifNull: [ '$planoType', '' ] },
         streamId: { $ifNull: [ '$streamId', '' ] },
+        export: { $ifNull: [ '$export', '' ] },
       },
     } );
 

package/src/controllers/traxDashboard.controllers.js

@@ -293,9 +293,9 @@ export const checklistPerformance = async ( req, res ) => {
 
     let complianceURL = 'https://h5gwudrwylz65s4vb6h2evwxeq0kkjog.lambda-url.ap-south-1.on.aws/';
     const complianceData = await LamdaServiceCall( complianceURL, detectionPayload );
-    if ( complianceData ) {
+    if ( complianceData?.data?.length && requestData?.sortColumnName == 'questionCompliance' ) {
       const end = skip + requestData?.limit;
-      checklistIdList = complianceData.slice( start, end )?.map( ( ele ) => ele?.checklistId );
+      checklistIdList = complianceData.data.slice( skip, end )?.map( ( ele ) => ele?.sourceCheckList_id );
     }
 
 
@@ -450,12 +450,12 @@ export const checklistPerformance = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
-    getChecklistPerformanceData.forEach( ( ele ) => {
+    getChecklistPerformanceData?.[0]?.data.forEach( ( ele ) => {
       let findCompliance;
-      if ( complianceData ) {
-        findCompliance = complianceData?.find( ( data ) => data.checklistId == ele?.sourceCheckList_id );
+      if ( complianceData?.data?.length ) {
+        findCompliance = complianceData?.data?.find( ( data ) => data.sourceCheckList_id == ele?.sourceCheckList_id );
       }
-      ele['questionComplianceRate'] = findCompliance?.compliance ?? 0;
+      ele['questionComplianceRate'] = findCompliance?.compliancePercentage ?? 0;
     } );
 
     if ( requestData.export ) {