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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.0.5-dev",
+    "version": "3.0.6-dev",
     "description": "report",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^1.0.77-dev",
+        "tango-app-api-middleware": "^1.0.81-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/report.controllers.js

@@ -1,5 +1,5 @@
 import { findOneReport, findReport, reportCreate, reportGet, reportGetSingle, reportUpdate } from '../service/report.service.js';
-import { appConfig, fileUpload, getObject, insertOpenSearchData, listFoldersByPath, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { appConfig, fileUpload, getObject, 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';
@@ -97,9 +97,7 @@ export async function clientReportList( req, res ) {
     const inputData = req.body;
     const limit = inputData.limit || 10;
     const offset = inputData.offset? ( inputData.offset - 1 ) * inputData.limit : 0;
-    logger.info( { inputData: inputData } );
     const daysDifference = Math.ceil( ( new Date( inputData.toDate ) - new Date( inputData.fromDate ) ) / ( 24 * 60 * 60 * 1000 ) );
-    logger.info( { daysDifference: daysDifference, value: ( new Date( inputData.toDate ) - new Date( inputData.fromDate ) ) / ( 24 * 60 * 60 * 1000 ), fromdate: inputData.fromDate, toDate: inputData.toDate } );
     const query = [
       {
         $match: {
@@ -143,6 +141,19 @@ export async function clientReportList( req, res ) {
         },
       },
     ];
+
+    if ( inputData.sortColumnName ) {
+      const sortBy = inputData.sortBy || -1;
+      const sortColumnName =inputData.sortColumnName == 'clientId'? 'tangoId': inputData.sortColumnName;
+      query.push( {
+        $sort: { [sortColumnName]: sortBy },
+      },
+      {
+        $sort: { fileDate: -1 },
+      } );
+    }
+
+
     if ( inputData.searchValue ) {
       query.push(
           {
@@ -160,13 +171,8 @@ export async function clientReportList( req, res ) {
           },
       );
     }
-    if ( inputData.sortColumnName ) {
-      const sortBy = inputData.sortBy || -1;
-      const sortColumnName =inputData.sortColumnName == 'clientId'? 'tangoId': inputData.sortColumnName;
-      query.push( {
-        $sort: { [sortColumnName]: sortBy },
-      } );
-    }
+
+
     const count = await aggregateClient( query );
     if ( count?.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -245,11 +251,12 @@ export async function uploadManualReport( req, res ) {
       if ( !data ) {
         return res.sendError( 'Report does not configured', 400 );
       }
+      logger.info( { files: req.files } );
       const uploadDataParams = {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `${inputData.fileDate}/${data.reportName}/`,
-        fileName: inputData.filename,
-        Body: req.files.fileuplaod_data.data,
+        Key: `reports/${inputData.fileDate}/${data.reportName}/`,
+        fileName: inputData.fileName,
+        Body: req.files,
       };
       const result = await fileUpload( uploadDataParams );
       logger.info( { result: result, value: 'file upload response' } );
@@ -272,14 +279,14 @@ export async function uploadManualReport( req, res ) {
           clientId: data.clientId,
         },
       };
-
-      await insertOpenSearchData( 'tango-retail-activity-logs', log );
+      logger.info( { log: log } );
+      // await insertOpenSearchData( 'tango-retail-activity-logs', log );
       return res.sendSuccess( { result: 'uploaded Sucessfully' } );
     } else {
       return res.sendError( 'File Name is Incorrect', 400 );
     }
   } catch ( error ) {
-    logger.error( { error: error, message: req.body, function: 'generateReport' } );
+    logger.error( { error: error, message: req.body, function: 'uploadManualReport' } );
     return res.sendError( error, 500 );
   }
 }
@@ -289,9 +296,10 @@ export async function getReportList( req, res ) {
     const inputData = req.query;
     const fetchData = {
       Bucket: appConfig.cloud.aws.bucket.reportBucket,
-      file_path: `${inputData.fileDate}/${inputData.getReportName?.reportName}/`,
+      file_path: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
     };
-    const folderPath = await listFoldersByPath( fetchData );
+    const folderPath = await listFileByPath( fetchData );
+
     logger.info( { folderPath: folderPath, value: 'report list from bucket' } );
     if ( folderPath.length == 0 ) {
       return res.sendError( 'No Reports Found', 204 );

package/src/docs/report.docs.js

@@ -1,6 +1,6 @@
 import j2s from 'joi-to-swagger';
 
-import { clientListTableSchema, downloadReportSchema, generateReportSchema, getReportListSchema, sendReportSchema, uploadManualReportSchema } from '../dtos/report.dtos.js';
+import { clientListTableSchema, downloadReportSchema, generateReportSchema, getReportListSchema, sendReportSchema, uploadManualReportSchema, uploadManualReportSchema2 } from '../dtos/report.dtos.js';
 
 export const reportDocs = {
 
@@ -59,6 +59,9 @@ export const reportDocs = {
       parameters: {},
       requestBody: {
         content: {
+          'multipart/form-data': {
+            schema: j2s( uploadManualReportSchema2 ).swagger,
+          },
           'application/json': {
             schema: j2s( uploadManualReportSchema ).swagger,
           },

package/src/dtos/report.dtos.js

@@ -88,6 +88,11 @@ export const uploadManualReportSchema = joi.object( {
   fileDate: joi.string().required(),
   clientId: joi.string().required(),
   fileName: joi.string().required(),
+  file: joi.string().required(),
+} );
+
+export const uploadManualReportSchema2 = joi.object( {
+  file: joi.binary().required(),
 } );
 
 export const uploadManualReportValid = {

package/src/routes/report.routes.js

@@ -1,7 +1,7 @@
 
 import express from 'express';
 import { authorize, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { addReportValid, clientListTableValid, downloadReportValid, generateReportValid, getReportListValid, getReportValid, getSingleReportValid, sendReportValid, updateReportValid, uploadManualReportValid } from '../dtos/report.dtos.js';
+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 { isFileExist, isFolderExist, isReportEnable } from '../validations/report.validations.js';
 
@@ -39,7 +39,7 @@ reportRouter.post( '/upload-manual-report', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [
       { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
     ] } ),
-    validate( uploadManualReportValid ), isReportEnable, uploadManualReport );
+    isReportEnable, uploadManualReport );
 
 reportRouter.get( '/get-report-list', isAllowedSessionHandler,
     authorize( { userType: [ 'tango' ], access: [

package/src/service/client.service.js

@@ -5,6 +5,6 @@ export function aggregateClient( query ) {
   return clientModel.aggregate( query );
 }
 
-export function findOneClient( query ) {
-  return clientModel.findOne( query );
+export function findOneClient( query, fields ) {
+  return clientModel.findOne( query, fields );
 }

package/src/validations/report.validations.js

@@ -1,15 +1,15 @@
-import { checkFileExist, logger } from 'tango-app-api-middleware';
+import { appConfig, 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, 'reportConfigs.report': true }, { reportName: '$reportConfigs.reportName', clientName: 1 } );
+    const getReportName = await findOneClient( { 'clientId': inputData.clientId, 'reportConfigs.report': true }, { '_id': 0, 'reportConfigs.reportName': 1, 'clientName': 1 } );
     if ( !getReportName ) {
       return res.sendError( 'reportName is not there in the client', 204 );
     }
-    req.body.reportName = getReportName;
+    req.report = getReportName;
     return next();
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'isReportEnable' } );
@@ -22,8 +22,9 @@ export async function isFolderExist( req, res, next ) {
     const inputData = req.query;
     const fetchData = {
       Bucket: appConfig.cloud.aws.bucket.reportBucket,
-      Key: `${inputData.fileDate}/${inputData.getReportName?.reportName}/`,
+      Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
     };
+    logger.info( { fetchData: fetchData, report: req.report?.reportConfigs?.reportName } );
     const isExist = await checkFileExist( fetchData );
     if ( isExist ) {
       return next();