tango-app-api-report 3.0.12-dev → 3.0.14-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.0.12-dev",
+    "version": "3.0.14-dev",
     "description": "report",
     "main": "index.js",
     "type": "module",

package/src/controllers/report.controllers.js

@@ -1,4 +1,4 @@
-import { findOneReport, findReport, reportCreate, reportGet, reportGetSingle, reportUpdate } from '../service/report.service.js';
+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 { findOneUser, getUserNameEmailById } from '../service/user.service.js';
 import { updateOneBasePriceModel } from '../service/basePrice.service.js';
@@ -107,6 +107,16 @@ export async function updateReport( req, res ) {
   }
 }
 
+export async function deleteReport( req, res ) {
+  try {
+    const inputData = req.params;
+    await deleteOneReport( { _id: inputData.id } );
+    return res.sendSuccess( { result: 'Report has been deleted successfully' } );
+  } catch ( error ) {
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function clientReportList( req, res ) {
   try {
     const inputData = req.body;
@@ -118,6 +128,7 @@ export async function clientReportList( req, res ) {
         $match: {
           $and: [
             { 'reportConfigs.report': { $eq: true } },
+            { status: { $eq: 'active' } },
             { clientId: { $in: inputData.clientId } },
           ],
 
@@ -214,7 +225,7 @@ export async function generateReport( req, res ) {
       QueueUrl: `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.generateReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
-        client_name: inputData.getReportName?.reportName,
+        client_name: req.report?.reportConfigs?.reportName,
         client_id: Number( inputData.clientId ),
         message: 'good to trigger',
       } ),
@@ -228,9 +239,9 @@ export async function generateReport( req, res ) {
         logType: 'report',
         logSubType: 'generateReport',
         logData: {
-          clientName: inputData.getReportName?.clientName,
+          clientName: req.report?.clientName,
           fileDate: inputData.fileDate,
-          reportName: inputData.getReportName?.reportName,
+          reportName: req.report?.reportConfigs?.reportName,
           clientId: inputData.ClientId,
           sqsMessageId: sqsQueue.MessageId,
         },
@@ -271,7 +282,7 @@ export async function uploadManualReport( req, res ) {
       logger.info( { files: req.files } );
       const uploadDataParams = {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `reports/${inputData.fileDate}/${data.reportName}/`,
+        Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/`,
         fileName: inputData.fileName,
         body: req.files.files.data,
       };
@@ -292,7 +303,7 @@ export async function uploadManualReport( req, res ) {
         logSubType: 'uploadReport',
         logData: {
           fileDate: inputData.fileDate,
-          reportName: data.reportName,
+          reportName: req.report?.reportConfigs?.reportName,
           clientId: data.clientId,
         },
       };
@@ -374,7 +385,7 @@ export async function sendReport( req, res ) {
     for ( const data of getReportList ) {
       const fetchData = {
         Bucket: appConfig.cloud.aws.bucket.reportBucket,
-        Key: `reports/${inputData.fileDate}/${data.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
+        Key: `reports/${inputData.fileDate}/${req.report?.reportConfigs?.reportName}/${inputData.fileDate}_${data.fileName}.${data.fileType}`,
       };
       reportName.push( `${inputData.fileDate}_${data.fileName}` );
       name.push( `${data.fileName}` );
@@ -423,7 +434,7 @@ export async function sendReport( req, res ) {
       QueueUrl: `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.sendReport}`,
       MessageBody: JSON.stringify( {
         file_date: inputData.fileDate,
-        client_name: getReportList[0].reportName,
+        client_name: req.report?.reportConfigs?.reportName,
         client_id: Number( inputData.clientId ),
         file_name: regionalKey,
         report_name: name,
@@ -440,7 +451,7 @@ export async function sendReport( req, res ) {
         logSubType: 'sendReport',
         logData: {
           fileDate: inputData.fileDate,
-          reportName: getReportList[0].reportName,
+          reportName: req.report?.reportConfigs?.reportName,
           clientId: getReportList[0].clientId,
         },
       };

package/src/docs/report.docs.js

@@ -1,6 +1,6 @@
 import j2s from 'joi-to-swagger';
 
-import { clientListTableSchema, downloadReportSchema, generateReportSchema, getReportListSchema, getReportLogSchema, sendReportSchema, uploadManualReportSchema, uploadManualReportSchema2 } from '../dtos/report.dtos.js';
+import { clientListTableSchema, deleteReportSchemaParam, downloadReportSchema, generateReportSchema, getReportListSchema, getReportLogSchema, sendReportSchema, uploadManualReportSchema, uploadManualReportSchema2 } from '../dtos/report.dtos.js';
 
 export const reportDocs = {
 
@@ -175,5 +175,29 @@ export const reportDocs = {
     },
   },
 
+  '/v3/report/delete-report/{id}': {
+    get: {
+      tags: [ 'Report' ],
+      description: 'delete report by _id',
+      operationId: 'delete-report/{id}',
+      parameters: [
+        {
+          in: 'path',
+          name: 'id',
+          required: true,
+          description: 'The _id of the report.',
+          scema: j2s( deleteReportSchemaParam ).swagger,
+        },
+      ],
+      responses: {
+        200: { description: 'Success' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
 };
 

package/src/dtos/report.dtos.js

@@ -56,6 +56,15 @@ export const updateReportValid = {
 
 };
 
+export const deleteReportSchemaParam = joi.object( {
+  id: joi.string().required(),
+} );
+
+export const deleteReportValid = {
+  params: deleteReportSchemaParam,
+
+};
+
 
 export const clientListTableSchema = joi.object( {
   fromDate: joi.string().required(),

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, 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 { 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';
 
 export const reportRouter = express.Router();
@@ -21,6 +21,10 @@ reportRouter.put( '/update-report/:id', isAllowedSessionHandler, authorize( { us
   { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
 ] } ), validate( updateReportValid ), updateReport );
 
+reportRouter.get( '/delete-report/:id', isAllowedSessionHandler, authorize( { userType: [ 'tango' ], access: [
+  { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] },
+] } ), validate( deleteReportValid ), deleteReport );
+
 
 // admin report's overview
 reportRouter.post( '/client-list-table', isAllowedSessionHandler,

package/src/service/report.service.js

@@ -45,3 +45,7 @@ export function findOneReport( query ) {
 export function findReport( query, fields ) {
   return reportModel.find( query, fields );
 }
+
+export function deleteOneReport( query ) {
+  return reportModel.deleteOne( query );
+}

package/src/validations/report.validations.js

@@ -5,7 +5,7 @@ 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 }, { '_id': 0, 'reportConfigs.reportName': 1, 'clientName': 1 } );
+    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 );
     }