tango-app-api-report 3.3.7 → 3.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-report",
-    "version": "3.3.7",
+    "version": "3.4.0-beta.1",
     "description": "report",
     "main": "index.js",
     "type": "module",

package/src/controllers/report.controllers.js

@@ -81,12 +81,25 @@ export async function updateReport( req, res ) {
     const updateAck = await reportUpdate( {
       _id: req.params?.id, fileType: req.body?.fileType, email: req.body?.email, clientId: req.body?.clientId,
     } );
+    const postReport = await reportGetSingle( {
+      _id: req.params?.id,
+    } );
 
-    const user = await getUserNameEmailById( req.userId );
-
+    const user = req.user;
+    const oldData={
+      ReportName: previousReport?.fileName,
+      FileType: previousReport?.fileType,
+      ReceiversEmail: previousReport?.email.join( ', ' ),
+    };
+    const newData={
+      ReportName: postReport?.fileName,
+      FileType: postReport?.fileType,
+      ReceiversEmail: postReport?.email.join( ', ' ),
+    };
     const logObj = {
       clientId: req.body?.clientId,
       userName: user?.userName,
+      userId: user?._id,
       email: user?.email,
       date: new Date(),
       logType: 'configuration',
@@ -94,14 +107,14 @@ export async function updateReport( req, res ) {
       changes: [ `The Report ${previousReport.fileName}.${previousReport.fileType}` ],
       eventType: 'update',
       showTo: [ 'tango' ],
-      current: req.body,
+      current: postReport,
       previous: previousReport,
-
+      oldData: oldData,
+      newData: newData,
     };
-
     await insertOpenSearchData( openSearch.activityLog, logObj );
     if ( updateAck ) {
-      res.sendSuccess( { result: 'Updated Successfully' } );
+      return res.sendSuccess( { result: 'Updated Successfully' } );
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateReport' } );
@@ -112,30 +125,34 @@ export async function updateReport( req, res ) {
 export async function deleteReport( req, res ) {
   try {
     const inputData = req.params;
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const previousReport = await reportGetSingle( {
       _id: inputData?.id,
     } );
-    await deleteOneReport( { _id: inputData.id } );
+    const client = previousReport?.clientId;
+    const changes =[ `The Report ${previousReport?.fileName}.${previousReport?.fileType} has been deleted` ];
+
+    await deleteOneReport( { _id: inputData?.id } );
+
     const logObj = {
-      clientId: req.body?.clientId,
-      userName: user?.userName,
-      email: user?.email,
+      clientId: client,
+      userName: req?.user?.userName,
+      email: req?.user?.email,
       date: new Date(),
       logType: 'configuration',
       logSubType: 'reportConfig',
-      changes: [ `The Report ${previousReport.fileName}.${previousReport.fileType} has been deleted` ],
+      changes: changes,
       eventType: 'delete',
       showTo: [ 'tango' ],
-      current: req.body,
-      previous: previousReport,
-
     };
 
 
     await insertOpenSearchData( openSearch.activityLog, logObj );
     return res.sendSuccess( { result: 'Report has been deleted successfully' } );
   } catch ( error ) {
-    return res.sendError( error, 500 );
+    const err = error.message || 'Internal Server Error';
+    logger.error( { message: error, data: req.params, function: 'deleteReport' } );
+    return res.sendError( err, 500 );
   }
 }
 
@@ -281,7 +298,6 @@ export async function generateReport( req, res ) {
         logType: 'report',
         logSubType: 'generateReport',
         logData: {
-          // clientName: req.report?.clientName,
           fileDate: inputData.fileDate.split( '-' ).reverse().join( '-' ),
           reportName: req.report?.reportConfigs?.reportName,
           clientId: inputData.clientId,