tango-app-api-report 3.0.15-dev → 3.0.17-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.0.15-dev",
+    "version": "3.0.17-dev",
     "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.104",
-        "tango-app-api-middleware": "^1.0.73-test",
+        "tango-api-schema": "^2.0.111",
+        "tango-app-api-middleware": "^3.1.15",
         "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' } );
     }
@@ -220,9 +222,10 @@ export async function clientReportList( req, res ) {
 
 export async function generateReport( req, res ) {
   try {
+    const sqs = JSON.parse( process.env.SQS );
     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,
@@ -259,6 +262,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,8 +285,8 @@ export async function uploadManualReport( req, res ) {
       }
       logger.info( { files: req.files } );
       const uploadDataParams = {
-        Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
+        Bucket: bucket.reportBucket,
+        Key: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
         fileName: inputData.fileName,
         body: req.files.files.data,
       };
@@ -321,10 +325,11 @@ 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,
-      file_path: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
+      Bucket: bucket.reportBucket,
+      file_path: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
     };
     const folderPath = await listFileByPath( fetchData );
 
@@ -345,9 +350,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 +377,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 = [];
@@ -384,8 +393,8 @@ export async function sendReport( req, res ) {
     let UserattachmentDetails = [];
     for ( const data of getReportList ) {
       const fetchData = {
-        Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
+        Bucket: bucket.reportBucket,
+        Key: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
       };
       reportName.push( `${inputData.fileDate}_${data.fileName}` );
       name.push( `${data.fileName}` );
@@ -419,7 +428,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 +440,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 +563,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/service/client.service.js

@@ -2,7 +2,7 @@ import clientModel from 'tango-api-schema/schema/client.model.js';
 
 
 export function aggregateClient( query ) {
-  return clientModel.aggregate( query );
+  return clientModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 
 export function findOneClient( query, fields ) {

package/src/validations/report.validations.js

@@ -1,4 +1,4 @@
-import { appConfig, checkFileExist, logger } from 'tango-app-api-middleware';
+import { checkFileExist, logger } from 'tango-app-api-middleware';
 import { findOneClient } from '../service/client.service.js';
 
 
@@ -19,10 +19,11 @@ 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,
-      Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
+      Bucket: bucket.reportBucket,
+      Key: `${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
     };
     logger.info( { fetchData: fetchData, report: req.report?.reportConfigs?.reportName } );
     const isExist = await checkFileExist( fetchData );
@@ -39,9 +40,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 );