tango-app-api-report 3.0.12-dev → 3.0.13-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.0.12-dev",
+    "version": "3.0.13-dev",
     "description": "report",
     "main": "index.js",
     "type": "module",

package/src/controllers/report.controllers.js

@@ -214,7 +214,7 @@ export async function generateReport( req, res ) {
       QueueUrl: `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.generateReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
-        client_name: inputData.getReportName?.reportName,
+        client_name: req.report?.reportConfigs?.reportName,
         client_id: Number( inputData.clientId ),
         message: 'good to trigger',
       } ),
@@ -228,9 +228,9 @@ export async function generateReport( req, res ) {
         logType: 'report',
         logSubType: 'generateReport',
         logData: {
-          clientName: inputData.getReportName?.clientName,
+          clientName: req.report?.clientName,
           fileDate: inputData.fileDate,
-          reportName: inputData.getReportName?.reportName,
+          reportName: req.report?.reportConfigs?.reportName,
           clientId: inputData.ClientId,
           sqsMessageId: sqsQueue.MessageId,
         },
@@ -271,7 +271,7 @@ export async function uploadManualReport( req, res ) {
       logger.info( { files: req.files } );
       const uploadDataParams = {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `reports/${inputData.fileDate}/${data.reportName}/`,
+        Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
         fileName: inputData.fileName,
         body: req.files.files.data,
       };
@@ -292,7 +292,7 @@ export async function uploadManualReport( req, res ) {
         logSubType: 'uploadReport',
         logData: {
           fileDate: inputData.fileDate,
-          reportName: data.reportName,
+          reportName: req.report?.reportConfigs?.reportName,
           clientId: data.clientId,
         },
       };
@@ -374,7 +374,7 @@ export async function sendReport( req, res ) {
     for ( const data of getReportList ) {
       const fetchData = {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `reports/${inputData.fileDate}/${data.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
+        Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
       };
       reportName.push( `${inputData.fileDate}_${data.fileName}` );
       name.push( `${data.fileName}` );
@@ -423,7 +423,7 @@ export async function sendReport( req, res ) {
       QueueUrl: `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.sendReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
-        client_name: getReportList[0].reportName,
+        client_name: req.report?.reportConfigs?.reportName,
         client_id: Number( inputData.clientId ),
         file_name: regionalKey,
         report_name: name,
@@ -440,7 +440,7 @@ export async function sendReport( req, res ) {
         logSubType: 'sendReport',
         logData: {
           fileDate: inputData.fileDate,
-          reportName: getReportList[0].reportName,
+          reportName: req.report?.reportConfigs?.reportName,
           clientId: getReportList[0].clientId,
         },
       };