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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.0.11-dev",
+    "version": "3.0.13-dev",
     "description": "report",
     "main": "index.js",
     "type": "module",
@@ -15,6 +15,7 @@
     "dependencies": {
         "aws-sdk": "^2.1578.0",
         "cors": "^2.8.5",
+        "dayjs": "^1.11.11",
         "dotenv": "^16.4.5",
         "express": "^4.18.3",
         "express-fileupload": "^1.5.0",
@@ -24,8 +25,8 @@
         "nodemailer": "^6.9.13",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^1.0.81-dev",
+        "tango-api-schema": "^2.0.104",
+        "tango-app-api-middleware": "^1.0.73-test",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/report.controllers.js

@@ -3,11 +3,15 @@ import { appConfig, fileUpload, getObject, getOpenSearchData, insertOpenSearchDa
 import { findOneUser, getUserNameEmailById } from '../service/user.service.js';
 import { updateOneBasePriceModel } from '../service/basePrice.service.js';
 import { aggregateClient } from '../service/client.service.js';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
 import aws from 'aws-sdk';
 import * as nodemailer from 'nodemailer';
+import dayjs from 'dayjs';
 
 // import basePricingModel from 'tango-api-schema/schema/basePricing.model.js';
-
+dayjs.extend( utc );
+dayjs.extend( timezone );
 
 export async function createReport( req, res ) {
   try {
@@ -26,9 +30,10 @@ export async function createReport( req, res ) {
       logSubType: 'reportConfig',
       changes: [ `${req.body?.fileName}` ],
       eventType: 'create',
+      showTo: [ 'tango' ],
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     if ( createReport ) {
       res.sendSuccess( { result: 'Created Successfully' } );
     }
@@ -68,6 +73,9 @@ export async function getSingleReport( req, res ) {
 
 export async function updateReport( req, res ) {
   try {
+    const previousReport = await reportGetSingle( {
+      _id: req.params?.id,
+    } );
     const updateAck = await reportUpdate( {
       _id: req.params?.id, fileType: req.body?.fileType, email: req.body?.email, clientId: req.body?.clientId,
     } );
@@ -83,9 +91,13 @@ export async function updateReport( req, res ) {
       logSubType: 'reportConfig',
       changes: [ `Report id ${req.params?.id}` ],
       eventType: 'update',
+      showTo: [ 'tango' ],
+      current: req.body,
+      previous: previousReport,
+
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
     }
@@ -202,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',
       } ),
@@ -216,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,
         },
@@ -259,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,
       };
@@ -280,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,
         },
       };
@@ -306,10 +318,14 @@ export async function getReportList( req, res ) {
     const folderPath = await listFileByPath( fetchData );
 
     logger.info( { folderPath: folderPath, value: 'report list from bucket' } );
-    if ( folderPath.length == 0 ) {
+    if ( folderPath?.data?.length == 0 ) {
       return res.sendError( 'No Reports Found', 204 );
     }
-    return res.sendSuccess( { result: folderPath } );
+    let temp =[];
+    for ( const item of folderPath.data ) {
+      temp.push( { Key: item.Key, LastModified: dayjs( item.LastModified ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm:ss' ) } );
+    }
+    return res.sendSuccess( { result: temp } );
   } catch ( error ) {
     logger.error( { error: error, message: req.query, function: 'getReportList' } );
     return res.sendError( error, 500 );
@@ -358,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}` );
@@ -407,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,
@@ -424,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,
         },
       };