tango-app-api-report 3.1.2 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.1.2",
+    "version": "3.3.0",
     "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.13",
+        "tango-api-schema": "^2.1.32",
+        "tango-app-api-middleware": "^3.1.42",
         "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 { appConfig, fileUpload, getObject, getOpenSearchData, insertOpenSearchData, listFileByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { 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';
@@ -15,6 +15,7 @@ dayjs.extend( timezone );
 
 export async function createReport( req, res ) {
   try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const createReport = await reportCreate( {
       clientId: req.params?.id, fileName: req.body?.fileName, fileType: req.body?.fileType, email: req.body?.email,
     } );
@@ -33,7 +34,7 @@ export async function createReport( req, res ) {
       showTo: [ 'tango' ],
     };
 
-    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    await insertOpenSearchData( openSearch.activityLog, logObj );
     if ( createReport ) {
       res.sendSuccess( { result: 'Created Successfully' } );
     }
@@ -73,6 +74,7 @@ export async function getSingleReport( req, res ) {
 
 export async function updateReport( req, res ) {
   try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const previousReport = await reportGetSingle( {
       _id: req.params?.id,
     } );
@@ -97,7 +99,7 @@ export async function updateReport( req, res ) {
 
     };
 
-    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    await insertOpenSearchData( openSearch.activityLog, logObj );
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
     }
@@ -128,7 +130,6 @@ export async function clientReportList( req, res ) {
         $match: {
           $and: [
             { 'reportConfigs.report': { $eq: true } },
-            { status: { $eq: 'active' } },
             { clientId: { $in: inputData.clientId } },
           ],
 
@@ -139,6 +140,7 @@ export async function clientReportList( req, res ) {
           clientId: 1,
           tangoId: 1,
           clientName: 1,
+          status: 1,
           daysDifference: 1,
           datesArray: {
             $map: {
@@ -164,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,
+            ],
+          },
         },
       },
     ];
@@ -194,6 +211,10 @@ export async function clientReportList( req, res ) {
                   clientId: { $regex: inputData.searchValue, $options: 'i' },
 
                 },
+                {
+                  status: { $regex: inputData.searchValue, $options: 'i' },
+
+                },
               ],
             },
           },
@@ -220,9 +241,11 @@ 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: `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.generateReport}`,
+      QueueUrl: `${sqs.url}${sqs.generateReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
         client_name: req.report?.reportConfigs?.reportName,
@@ -246,7 +269,7 @@ export async function generateReport( req, res ) {
           sqsMessageId: sqsQueue.MessageId,
         },
       };
-      await insertOpenSearchData( 'tango-retail-activity-logs', log );
+      await insertOpenSearchData( openSearch.activityLog, log );
 
       return res.sendSuccess( { result: 'Report has been Initiated Sucessfully' } );
     }
@@ -259,6 +282,7 @@ export async function generateReport( req, res ) {
 
 export async function uploadManualReport( req, res ) {
   try {
+    const bucket = JSON.parse( process.env.BUCKET );
     const inputData = req.body;
     const name = inputData.fileName;
     const regex = /^(\d{2}-\d{2}-\d{4})_(.*?)\.([a-zA-Z0-9]+)$/;
@@ -281,7 +305,7 @@ export async function uploadManualReport( req, res ) {
       }
       logger.info( { files: req.files } );
       const uploadDataParams = {
-        Bucket: appConfig.cloud.aws.bucket.reportBucket,
+        Bucket: bucket.reportBucket,
         Key: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
         fileName: inputData.fileName,
         body: req.files.files.data,
@@ -321,9 +345,10 @@ export async function uploadManualReport( req, res ) {
 
 export async function getReportList( req, res ) {
   try {
+    const bucket = JSON.parse( process.env.BUCKET );
     const inputData = req.query;
     const fetchData = {
-      Bucket: appConfig.cloud.aws.bucket.reportBucket,
+      Bucket: bucket.reportBucket,
       file_path: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
     };
     const folderPath = await listFileByPath( fetchData );
@@ -345,9 +370,10 @@ export async function getReportList( req, res ) {
 
 export async function dowloadReport( req, res ) {
   try {
+    const bucket = JSON.parse( process.env.BUCKET );
     const inputData = req.query;
     const params = {
-      Bucket: appConfig.cloud.aws.bucket.reportBucket,
+      Bucket: bucket.reportBucket,
       Key: inputData.filePath,
     };
     const fileName = inputData.filePath.split( '/' );
@@ -371,6 +397,9 @@ export async function dowloadReport( req, res ) {
 }
 export async function sendReport( req, res ) {
   try {
+    const bucket = JSON.parse( process.env.BUCKET );
+    const sqs = JSON.parse( process.env.SQS );
+    const sesConfig = JSON.parse( process.env.SES );
     const inputData = req.body;
     const getReportList = await findReport( { clientId: inputData.clientId } );
     let reportName = [];
@@ -379,12 +408,12 @@ 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 ) {
       const fetchData = {
-        Bucket: appConfig.cloud.aws.bucket.reportBucket,
+        Bucket: bucket.reportBucket,
         Key: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
       };
       reportName.push( `${inputData.fileDate}_${data.fileName}` );
@@ -419,7 +448,7 @@ export async function sendReport( req, res ) {
       }
     }
     UserattachmentDetails.forEach( async ( userattach ) => {
-      await sendEmail( userattach.email, subject, messageBody, userattach.attachments, appConfig.cloud.aws.ses.reportEmail ).then( ( response ) => {
+      await sendEmail( userattach.email, subject, messageBody, userattach.attachments, sesConfig.reportEmail ).then( ( response ) => {
         result.push( response );
       } );
     } );
@@ -431,7 +460,7 @@ export async function sendReport( req, res ) {
       return res.sendError( 'Forbiddon to Access', 403 );
     }
     const sqsProduceQueue = {
-      QueueUrl: `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.sendReport}`,
+      QueueUrl: `${sqs.url}${sqs.sendReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
         client_name: req.report?.reportConfigs?.reportName,
@@ -554,9 +583,10 @@ export async function updateBasePrice( req, res ) {
 export async function sendEmail( toEmail, mailSubject, htmlBody, attachment, sourceEmail ) {
   return new Promise( async ( resolve, reject ) => {
     try {
+      const awsConfig = JSON.parse( process.env.AWS_CONFIG );
       const ses = new aws.SES( {
         apiVersion: 'latest',
-        region: appConfig.cloud.aws.region,
+        region: awsConfig.region,
         // accessKeyId: process.env.AWS_ACCESS_KEY_ID_SES,
         // secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY_SES,
       } );

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

@@ -1,13 +1,28 @@
-import { appConfig, checkFileExist, logger } from 'tango-app-api-middleware';
+import { checkFileExist, logger } from 'tango-app-api-middleware';
 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();
@@ -19,9 +34,10 @@ export async function isReportEnable( req, res, next ) {
 
 export async function isFolderExist( req, res, next ) {
   try {
+    const bucket = JSON.parse( process.env.BUCKET );
     const inputData = req.query;
     const fetchData = {
-      Bucket: appConfig.cloud.aws.bucket.reportBucket,
+      Bucket: bucket.reportBucket,
       Key: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
     };
     logger.info( { fetchData: fetchData, report: req.report?.reportConfigs?.reportName } );
@@ -39,9 +55,10 @@ export async function isFolderExist( req, res, next ) {
 
 export async function isFileExist( req, res, next ) {
   try {
+    const bucket = JSON.parse( process.env.BUCKET );
     const inputData = req.query;
     const fetchData = {
-      Bucket: appConfig.cloud.aws.bucket.reportBucket,
+      Bucket: bucket.reportBucket,
       Key: inputData.Key,
     };
     const isExist = await checkFileExist( fetchData );