tango-app-api-report 3.1.3 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.1.3",
+    "version": "3.3.1",
     "description": "report",
     "main": "index.js",
     "type": "module",
@@ -25,8 +25,8 @@
         "nodemailer": "^6.9.13",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.111",
-        "tango-app-api-middleware": "^3.1.19",
+        "tango-api-schema": "^2.1.32",
+        "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';
@@ -130,7 +130,6 @@ export async function clientReportList( req, res ) {
         $match: {
           $and: [
             { 'reportConfigs.report': { $eq: true } },
-            { status: { $eq: 'active' } },
             { clientId: { $in: inputData.clientId } },
           ],
 
@@ -141,6 +140,7 @@ export async function clientReportList( req, res ) {
           clientId: 1,
           tangoId: 1,
           clientName: 1,
+          status: 1,
           daysDifference: 1,
           datesArray: {
             $map: {
@@ -166,6 +166,21 @@ export async function clientReportList( req, res ) {
           clientName: 1,
           tangoId: 1,
           fileDate: '$datesArray',
+          status: 1,
+          isSendEnable: {
+            $cond: [
+              { $eq: [ '$status', 'active' ] },
+              true,
+              false,
+            ],
+          },
+          isGenerateEnable: {
+            $cond: [
+              { $in: [ '$status', [ 'active', 'hold' ] ] },
+              true,
+              false,
+            ],
+          },
         },
       },
     ];
@@ -196,6 +211,10 @@ export async function clientReportList( req, res ) {
                   clientId: { $regex: inputData.searchValue, $options: 'i' },
 
                 },
+                {
+                  status: { $regex: inputData.searchValue, $options: 'i' },
+
+                },
               ],
             },
           },
@@ -223,6 +242,7 @@ export async function clientReportList( req, res ) {
 export async function generateReport( req, res ) {
   try {
     const sqs = JSON.parse( process.env.SQS );
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const sqsProduceQueue = {
       QueueUrl: `${sqs.url}${sqs.generateReport}`,
@@ -237,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( 'tango-retail-activity-logs', log );
+      logger.info( { auditLog: openSearch.auditLog, openSearch: openSearch } );
+      await insertOpenSearchData( openSearch.auditLog, log );
 
       return res.sendSuccess( { result: 'Report has been Initiated Sucessfully' } );
     }
@@ -263,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]+)$/;
@@ -301,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',
@@ -310,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 );
@@ -378,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;
@@ -388,7 +411,7 @@ export async function sendReport( req, res ) {
     let result = [];
     let file = {};
     let sendMailCount = 0;
-    let subject = 'Fwd: Tango Eye\'s Customer Intelligence Report - ' + inputData.fileDate;
+    let subject = 'Tango Eye\'s Customer Intelligence Report - ' + inputData.fileDate;
     let messageBody = `<br>Hi Team,<br><br>&nbsp;Please find attached Tango RetailEye report on customer footfall and shopping patterns for ${inputData.fileDate}.<br><br>&nbsp;Thanks <br>&nbsp;Team Tango`;
     let UserattachmentDetails = [];
     for ( const data of getReportList ) {
@@ -443,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,
@@ -454,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',
@@ -462,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 );
@@ -480,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': {
@@ -496,6 +523,11 @@ export async function getReportLog( req, res ) {
                     'logData.fileDate.keyword': inputData.fileDate,
                   },
                 },
+                {
+                  'term': {
+                    'logData.clientId.keyword': inputData.clientId,
+                  },
+                },
 
               ],
 
@@ -503,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 ) {

package/src/routes/report.routes.js

@@ -3,10 +3,10 @@ import express from 'express';
 import { authorize, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { addReportValid, clientListTableValid, deleteReportValid, downloadReportValid, generateReportValid, getReportListValid, getReportLogValid, getReportValid, getSingleReportValid, sendReportValid, updateReportValid } from '../dtos/report.dtos.js';
 import { clientReportList, createReport, deleteReport, dowloadReport, generateReport, getReport, getReportList, getReportLog, getSingleReport, sendReport, updateBasePrice, updateReport, uploadManualReport } from '../controllers/report.controllers.js';
-import { isFileExist, isFolderExist, isReportEnable } from '../validations/report.validations.js';
+import { isFileExist, isFolderExist, isReportEnable, isSendReportEnable } from '../validations/report.validations.js';
 
 export const reportRouter = express.Router();
-
+// report setting configurations
 reportRouter.post( '/create-report/:id', isAllowedSessionHandler, authorize( { userType: [ 'tango' ], access: [
   { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
 ] } ), validate( addReportValid ), createReport );
@@ -29,43 +29,43 @@ reportRouter.get( '/delete-report/:id', isAllowedSessionHandler, authorize( { us
 // admin report's overview
 reportRouter.post( '/client-list-table', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isView' ] },
     ] } ),
     validate( clientListTableValid ), clientReportList );
 
 reportRouter.post( '/generate-report', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isEdit' ] },
     ] } ),
     validate( generateReportValid ), isReportEnable, generateReport );
 
 reportRouter.post( '/upload-manual-report', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isEdit' ] },
     ] } ),
     isReportEnable, uploadManualReport );
 
 reportRouter.get( '/get-report-list', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isView' ] },
     ] } ),
     validate( getReportListValid ), isReportEnable, isFolderExist, getReportList );
 
 reportRouter.get( '/download-report', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isEdit' ] },
     ] } ),
-    validate( downloadReportValid ), isFileExist, dowloadReport );
+    validate( downloadReportValid ), isReportEnable, isFileExist, dowloadReport );
 
 reportRouter.post( '/send-report', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isEdit' ] },
     ] } ),
-    validate( sendReportValid ), isReportEnable, sendReport );
+    validate( sendReportValid ), isSendReportEnable, sendReport );
 
 reportRouter.post( '/get-report-log', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] },
+      { featureName: 'manage', name: 'reports', permissions: [ 'isView' ] },
     ] } ),
     validate( getReportLogValid ), getReportLog );
 

package/src/validations/report.validations.js

@@ -3,11 +3,26 @@ import { findOneClient } from '../service/client.service.js';
 
 
 export async function isReportEnable( req, res, next ) {
+  try {
+    const inputData = req.method !== 'GET'? req.body: req.query;
+    const getReportName = await findOneClient( { 'clientId': inputData.clientId, 'status': { $in: [ 'active', 'hold' ] }, 'reportConfigs.report': true }, { '_id': 0, 'reportConfigs.reportName': 1, 'clientName': 1 } );
+    if ( !getReportName ) {
+      return res.sendError( 'This action was forbidden', 403 );
+    }
+    req.report = getReportName;
+    return next();
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'isReportEnable' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+export async function isSendReportEnable( req, res, next ) {
   try {
     const inputData = req.method !== 'GET'? req.body: req.query;
     const getReportName = await findOneClient( { 'clientId': inputData.clientId, 'status': 'active', 'reportConfigs.report': true }, { '_id': 0, 'reportConfigs.reportName': 1, 'clientName': 1 } );
     if ( !getReportName ) {
-      return res.sendError( 'reportName is not there in the client', 204 );
+      return res.sendError( 'This action was forbidden', 403 );
     }
     req.report = getReportName;
     return next();