tango-app-api-report 3.0.6-dev → 3.0.8-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.0.6-dev",
+    "version": "3.0.8-dev",
     "description": "report",
     "main": "index.js",
     "type": "module",
@@ -21,6 +21,7 @@
         "handlebars": "^4.7.8",
         "joi-to-swagger": "^6.2.0",
         "mongodb": "^6.5.0",
+        "nodemailer": "^6.9.13",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.103",

package/src/controllers/report.controllers.js

@@ -1,8 +1,11 @@
 import { findOneReport, findReport, reportCreate, reportGet, reportGetSingle, reportUpdate } from '../service/report.service.js';
-import { appConfig, fileUpload, getObject, insertOpenSearchData, listFileByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { appConfig, 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';
+import aws from 'aws-sdk';
+import * as nodemailer from 'nodemailer';
+
 // import basePricingModel from 'tango-api-schema/schema/basePricing.model.js';
 
 
@@ -256,7 +259,7 @@ export async function uploadManualReport( req, res ) {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
         Key: `reports/${inputData.fileDate}/${data.reportName}/`,
         fileName: inputData.fileName,
-        Body: req.files,
+        Body: req.files.files.data,
       };
       const result = await fileUpload( uploadDataParams );
       logger.info( { result: result, value: 'file upload response' } );
@@ -353,7 +356,7 @@ export async function sendReport( req, res ) {
     for ( const data of getReportList ) {
       const fetchData = {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `${inputData.fileDate}/${data.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
+        Key: `reports/${inputData.fileDate}/${data.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
       };
       reportName.push( `${inputData.fileDate}_${data.fileName}` );
       name.push( `${data.fileName}` );
@@ -387,12 +390,12 @@ export async function sendReport( req, res ) {
       }
     }
     UserattachmentDetails.forEach( async ( userattach ) => {
-      await sendEmail( userattach.email, subject, messageBody, userattach.attachments, config.ses.reportEmail ).then( ( response ) => {
+      await sendEmail( userattach.email, subject, messageBody, userattach.attachments, appConfig.cloud.aws.ses.reportEmail ).then( ( response ) => {
         result.push( response );
       } );
     } );
     if ( sendMailCount == getReportList.length ) {
-      return res.sendError( 'File not available in bucket', 404 );
+      return res.sendError( 'File not available in bucket', 204 );
     }
     let user = await findOneUser( { _id: req.user._id, isActive: true } );
     if ( !user ) {
@@ -423,7 +426,8 @@ export async function sendReport( req, res ) {
           clientId: getReportList[0].clientId,
         },
       };
-      await insertOpenSearchData( 'tango-retail-activity-logs', log );
+      logger.info( { log: log } );
+      // await insertOpenSearchData( 'tango-retail-activity-logs', log );
       return res.sendSuccess( { result: 'Report has been Sent Successfully' } );
     } else {
       return res.sendError( ' Message does not Sent & Report has been Sent Successfully', 500 );
@@ -435,6 +439,38 @@ 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',
+        {
+          'size': 100,
+          'query': {
+            'bool': {
+              'must': [
+                {
+                  'term': {
+                    'logType.keyword': 'report',
+                  },
+                },
+                {
+                  'term': {
+                    'logData.fileDate.keyword': inputData.fileDate,
+                  },
+                },
+
+              ],
+
+            },
+          },
+
+        } );
+    return res.sendSuccess( { result: log } );
+  } catch ( error ) {
+    logger.info( { error: error } );
+    return res.sendError( error, 500 );
+  }
+}
 export async function updateBasePrice( req, res ) {
   try {
     const inputData = req.body;
@@ -486,4 +522,48 @@ export async function updateBasePrice( req, res ) {
   }
 }
 
+export async function sendEmail( toEmail, mailSubject, htmlBody, attachment, sourceEmail ) {
+  return new Promise( async ( resolve, reject ) => {
+    try {
+      const ses = new aws.SES( {
+        apiVersion: 'latest',
+        region: appConfig.cloud.aws.region,
+        // accessKeyId: process.env.AWS_ACCESS_KEY_ID_SES,
+        // secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY_SES,
+      } );
+
+      let Attachment = [];
+      if ( attachment ) {
+        Attachment = attachment;
+      }
+      try {
+        let transporter = nodemailer.createTransport( {
+          SES: { ses, aws },
+        } );
+        let mailOptions = {
+          from: sourceEmail,
+          to: toEmail,
+          subject: mailSubject,
+          html: htmlBody,
+          attachments: Attachment,
+        };
+        transporter.sendMail( mailOptions )
+            .then( ( data ) => {
+              resolve( data );
+            } )
+            .catch( ( err ) => {
+              logger.error( err, 'Node Mailer EXCEPTION' );
+              reject( err );
+            } );
+      } catch ( error ) {
+        console.error( 'Error sending email:', error );
+        throw error;
+      }
+    } catch ( error ) {
+      console.error( 'Error sending email:', error );
+      throw error;
+    }
+  } );
+}
+
 

package/src/docs/report.docs.js

@@ -1,6 +1,6 @@
 import j2s from 'joi-to-swagger';
 
-import { clientListTableSchema, downloadReportSchema, generateReportSchema, getReportListSchema, sendReportSchema, uploadManualReportSchema, uploadManualReportSchema2 } from '../dtos/report.dtos.js';
+import { clientListTableSchema, downloadReportSchema, generateReportSchema, getReportListSchema, getReportLogSchema, sendReportSchema, uploadManualReportSchema, uploadManualReportSchema2 } from '../dtos/report.dtos.js';
 
 export const reportDocs = {
 
@@ -152,5 +152,28 @@ export const reportDocs = {
     },
   },
 
+  '/v3/report/get-report-log': {
+    post: {
+      tags: [ 'Report' ],
+      description: `get report log`,
+      operationId: 'get-report-log',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( getReportLogSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
 };
 

package/src/dtos/report.dtos.js

@@ -128,3 +128,14 @@ export const sendReportValid = {
 
 };
 
+export const getReportLogSchema = joi.object( {
+  fileDate: joi.string().required(),
+  clientId: joi.string().required(),
+} );
+
+export const getReportLogValid = {
+  body: getReportLogSchema,
+
+};
+
+

package/src/routes/report.routes.js

@@ -1,8 +1,8 @@
 
 import express from 'express';
 import { authorize, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { addReportValid, clientListTableValid, downloadReportValid, generateReportValid, getReportListValid, getReportValid, getSingleReportValid, sendReportValid, updateReportValid } from '../dtos/report.dtos.js';
-import { clientReportList, createReport, dowloadReport, generateReport, getReport, getReportList, getSingleReport, sendReport, updateBasePrice, updateReport, uploadManualReport } from '../controllers/report.controllers.js';
+import { addReportValid, clientListTableValid, downloadReportValid, generateReportValid, getReportListValid, getReportLogValid, getReportValid, getSingleReportValid, sendReportValid, updateReportValid } from '../dtos/report.dtos.js';
+import { clientReportList, createReport, dowloadReport, generateReport, getReport, getReportList, getReportLog, getSingleReport, sendReport, updateBasePrice, updateReport, uploadManualReport } from '../controllers/report.controllers.js';
 import { isFileExist, isFolderExist, isReportEnable } from '../validations/report.validations.js';
 
 export const reportRouter = express.Router();
@@ -59,6 +59,12 @@ reportRouter.post( '/send-report', isAllowedSessionHandler,
     ] } ),
     validate( sendReportValid ), isReportEnable, sendReport );
 
+reportRouter.post( '/get-report-log', isAllowedSessionHandler,
+    authorize( { userType: [ 'tango' ], access: [
+      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] },
+    ] } ),
+    validate( getReportLogValid ), getReportLog );
+
 reportRouter.post( '/invoice', updateBasePrice );
 
 export default reportRouter;