tango-app-api-report 3.3.0 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "description": "report",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.1.32",
-        "tango-app-api-middleware": "^3.1.42",
+        "tango-app-api-middleware": "^3.1.43",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/report.controllers.js

@@ -1,5 +1,5 @@
 import { deleteOneReport, findOneReport, findReport, reportCreate, reportGet, reportGetSingle, reportUpdate } from '../service/report.service.js';
-import { fileUpload, getObject, getOpenSearchData, insertOpenSearchData, listFileByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { convertTimestampToDateTime, fileUpload, getObject, getOpenSearchData, insertOpenSearchData, listFileByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
 import { findOneUser, getUserNameEmailById } from '../service/user.service.js';
 import { updateOneBasePriceModel } from '../service/basePrice.service.js';
 import { aggregateClient } from '../service/client.service.js';
@@ -257,19 +257,20 @@ export async function generateReport( req, res ) {
     if ( sqsQueue.MessageId ) {
       const log = {
         userName: req.user.userName,
-        Date: new Date(),
         userId: req.user._id,
         logType: 'report',
         logSubType: 'generateReport',
         logData: {
-          clientName: req.report?.clientName,
+          // clientName: req.report?.clientName,
           fileDate: inputData.fileDate,
           reportName: req.report?.reportConfigs?.reportName,
-          clientId: inputData.ClientId,
+          clientId: inputData.clientId,
           sqsMessageId: sqsQueue.MessageId,
         },
+        createdAt: Date.now(),
       };
-      await insertOpenSearchData( openSearch.activityLog, log );
+      logger.info( { auditLog: openSearch.auditLog, openSearch: openSearch } );
+      await insertOpenSearchData( openSearch.auditLog, log );
 
       return res.sendSuccess( { result: 'Report has been Initiated Sucessfully' } );
     }
@@ -283,6 +284,7 @@ export async function generateReport( req, res ) {
 export async function uploadManualReport( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const name = inputData.fileName;
     const regex = /^(\d{2}-\d{2}-\d{4})_(.*?)\.([a-zA-Z0-9]+)$/;
@@ -321,7 +323,6 @@ export async function uploadManualReport( req, res ) {
       }
       const log = {
         userName: user.userName,
-        Date: new Date(),
         userId: req.user._id,
         logType: 'report',
         logSubType: 'uploadReport',
@@ -330,9 +331,10 @@ export async function uploadManualReport( req, res ) {
           reportName: req.report?.reportConfigs?.reportName,
           clientId: data.clientId,
         },
+        createdAt: Date.now(),
       };
       logger.info( { log: log } );
-      // await insertOpenSearchData( 'tango-retail-activity-logs', log );
+      await insertOpenSearchData( openSearch.auditLog, log );
       return res.sendSuccess( { result: 'uploaded Sucessfully' } );
     } else {
       return res.sendError( 'File Name is Incorrect', 400 );
@@ -398,6 +400,7 @@ export async function dowloadReport( req, res ) {
 export async function sendReport( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const sqs = JSON.parse( process.env.SQS );
     const sesConfig = JSON.parse( process.env.SES );
     const inputData = req.body;
@@ -463,6 +466,7 @@ export async function sendReport( req, res ) {
       QueueUrl: `${sqs.url}${sqs.sendReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
+        reportName: req.report?.reportConfigs?.reportName,
         client_name: req.report?.reportConfigs?.reportName,
         client_id: Number( inputData.clientId ),
         file_name: regionalKey,
@@ -474,7 +478,6 @@ export async function sendReport( req, res ) {
       logger.info( 'successfully Pushed to SQS ' + `${JSON.stringify( sqsQueue )}`, 'Send Report' );
       const log = {
         userName: user.userName,
-        Date: new Date(),
         userId: user._id,
         logType: 'report',
         logSubType: 'sendReport',
@@ -482,10 +485,12 @@ export async function sendReport( req, res ) {
           fileDate: inputData.fileDate,
           reportName: req.report?.reportConfigs?.reportName,
           clientId: getReportList[0].clientId,
+          sqsMessageId: sqsQueue.MessageId,
         },
+        createdAt: Date.now(),
       };
       logger.info( { log: log } );
-      // await insertOpenSearchData( 'tango-retail-activity-logs', log );
+      await insertOpenSearchData( openSearch.auditLog, log );
       return res.sendSuccess( { result: 'Report has been Sent Successfully' } );
     } else {
       return res.sendError( ' Message does not Sent & Report has been Sent Successfully', 500 );
@@ -500,7 +505,9 @@ export async function sendReport( req, res ) {
 export async function getReportLog( req, res ) {
   try {
     const inputData = req.body;
-    const log = await getOpenSearchData( 'tango-retail-activity-logs',
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const logData =[];
+    const reportLog = await getOpenSearchData( openSearch.auditLog,
         {
           'size': 100,
           'query': {
@@ -516,6 +523,11 @@ export async function getReportLog( req, res ) {
                     'logData.fileDate.keyword': inputData.fileDate,
                   },
                 },
+                {
+                  'term': {
+                    'logData.clientId.keyword': inputData.clientId,
+                  },
+                },
 
               ],
 
@@ -523,10 +535,24 @@ export async function getReportLog( req, res ) {
           },
 
         } );
-    return res.sendSuccess( { result: log } );
+    logger.info( { reportLog: reportLog } );
+    if ( reportLog.body.hits.hits.length > 0 ) {
+      const sourcesArray = reportLog.body.hits.hits.map( ( hit ) => hit._source );
+      for ( const i of sourcesArray ) { // Loop through sourcesArray, not result._doc.camera
+        const convertedTime = await convertTimestampToDateTime( i.createdAt );
+        logData.push( {
+          ...i, // Spread the individual log object
+          time: convertedTime, // Add the converted time
+        } );
+      }
+      return res.sendSuccess( { result: logData } );
+    } else {
+      return res.sendError( 'No data found', 204 );
+    }
   } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
     logger.info( { error: error } );
-    return res.sendError( error, 500 );
+    return res.sendError( err, 500 );
   }
 }
 export async function updateBasePrice( req, res ) {