chore: remove redundant logic for exported report feat

cardano-foundation · Apr 25, 2024 · e291b66 · e291b66
1 parent 5496576
commit e291b66
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 74 deletions.
diff --git a/src/main/java/org/cardanofoundation/job/listener/ReportsListener.java b/src/main/java/org/cardanofoundation/job/listener/ReportsListener.java
@@ -50,8 +50,7 @@ public void consume(
               stakeKeyReportHistory,
               reportMessage.getZoneOffset(),
               reportMessage.getTimePattern(),
-              reportMessage.getDateFormat(),
-              reportMessage.getStakeAddress());
+              reportMessage.getDateFormat());
           break;
         case POOL_ID:
           PoolReportHistory poolReportHistory =
@@ -60,8 +59,7 @@ public void consume(
               poolReportHistory,
               reportMessage.getZoneOffset(),
               reportMessage.getTimePattern(),
-              reportMessage.getDateFormat(),
-              reportMessage.getPoolId());
+              reportMessage.getDateFormat());
           break;
         default:
           break;

diff --git a/src/main/java/org/cardanofoundation/job/service/PoolReportService.java b/src/main/java/org/cardanofoundation/job/service/PoolReportService.java
@@ -5,10 +5,6 @@
 public interface PoolReportService {
 
   void exportPoolReport(
-      PoolReportHistory poolReportHistory,
-      Long zoneOffset,
-      String timePattern,
-      String dateFormat,
-      String poolId)
+      PoolReportHistory poolReportHistory, Long zoneOffset, String timePattern, String dateFormat)
       throws Exception;
 }
diff --git a/src/main/java/org/cardanofoundation/job/service/ReportHistoryServiceAsync.java b/src/main/java/org/cardanofoundation/job/service/ReportHistoryServiceAsync.java
@@ -344,15 +344,10 @@ public CompletableFuture<ExportContent> exportPoolDeregistration(PoolReportHisto
 
   @Async
   public CompletableFuture<ExportContent> exportInformationOnTheReport(
-      ReportHistory reportHistory,
-      Long zoneOffset,
-      String timePattern,
-      String dateFormat,
-      String poolIdOrStakeAddress) {
+      ReportHistory reportHistory, Long zoneOffset, String timePattern, String dateFormat) {
     boolean isPoolReport = ReportType.POOL_ID.equals(reportHistory.getType());
     InformationReport informationReport =
-        buildInformationReport(
-            reportHistory, zoneOffset, timePattern, dateFormat, poolIdOrStakeAddress);
+        buildInformationReport(reportHistory, zoneOffset, timePattern, dateFormat);
 
     List<InformationReport> list = new ArrayList<>(List.of(informationReport));
     return CompletableFuture.completedFuture(
@@ -365,22 +360,16 @@ public CompletableFuture<ExportContent> exportInformationOnTheReport(
   }
 
   private InformationReport buildInformationReport(
-      ReportHistory reportHistory,
-      Long zoneOffset,
-      String timePattern,
-      String dateFormat,
-      String poolIdOrStakeAddress) {
+      ReportHistory reportHistory, Long zoneOffset, String timePattern, String dateFormat) {
     boolean isPoolReport = ReportType.POOL_ID.equals(reportHistory.getType());
     if (isPoolReport) {
-      return buildPoolReport(reportHistory, dateFormat, poolIdOrStakeAddress);
+      return buildPoolReport(reportHistory, dateFormat);
     } else {
-      return buildStakeReport(
-          reportHistory, zoneOffset, timePattern, dateFormat, poolIdOrStakeAddress);
+      return buildStakeReport(reportHistory, zoneOffset, timePattern, dateFormat);
     }
   }
 
-  private InformationReport buildPoolReport(
-      ReportHistory reportHistory, String dateFormat, String poolId) {
+  private InformationReport buildPoolReport(ReportHistory reportHistory, String dateFormat) {
     PoolReportHistory poolReportHistory =
         poolReportHistoryRepository.findByReportHistoryId(reportHistory.getId());
     Integer epochBegin = poolReportHistory.getBeginEpoch();
@@ -411,7 +400,7 @@ private InformationReport buildPoolReport(
     return InformationReport.builder()
         .createdAt(reportHistory.getCreatedAt())
         .reportType("Pool Report")
-        .poolId(poolId)
+        .poolId(poolReportHistory.getPoolView())
         .reportName(reportHistory.getReportName())
         .epochRange(epochRange)
         .dateTimeFormat(dateFormat)
@@ -421,11 +410,7 @@ private InformationReport buildPoolReport(
   }
 
   private InformationReport buildStakeReport(
-      ReportHistory reportHistory,
-      Long zoneOffset,
-      String timePattern,
-      String dateFormat,
-      String stakeAddress) {
+      ReportHistory reportHistory, Long zoneOffset, String timePattern, String dateFormat) {
     StakeKeyReportHistory stakeKeyReportHistory =
         stakeKeyReportHistoryRepository.findByReportHistoryId(reportHistory.getId());
 
@@ -463,7 +448,7 @@ private InformationReport buildStakeReport(
     return InformationReport.builder()
         .createdAt(reportHistory.getCreatedAt())
         .reportType("Stake Address Report")
-        .stakeAddress(stakeAddress)
+        .stakeAddress(stakeKeyReportHistory.getStakeKey())
         .reportName(reportHistory.getReportName())
         .dateRange(dateRange)
         .dateTimeFormat(dateFormat)

diff --git a/src/main/java/org/cardanofoundation/job/service/StakeKeyReportService.java b/src/main/java/org/cardanofoundation/job/service/StakeKeyReportService.java
@@ -13,7 +13,6 @@ void exportStakeKeyReport(
       StakeKeyReportHistory stakeKeyReportHistory,
       Long zoneOffset,
       String timePattern,
-      String dateFormat,
-      String stakeAddress)
+      String dateFormat)
       throws Exception;
 }
diff --git a/src/main/java/org/cardanofoundation/job/service/impl/PoolReportServiceImpl.java b/src/main/java/org/cardanofoundation/job/service/impl/PoolReportServiceImpl.java
@@ -41,16 +41,12 @@ public class PoolReportServiceImpl implements PoolReportService {
 
   @Override
   public void exportPoolReport(
-      PoolReportHistory poolReportHistory,
-      Long zoneOffset,
-      String timePattern,
-      String dateFormat,
-      String poolId)
+      PoolReportHistory poolReportHistory, Long zoneOffset, String timePattern, String dateFormat)
       throws Exception {
     var startTime = System.currentTimeMillis();
     try {
       List<ExportContent> exportContents =
-          getExportContents(poolReportHistory, zoneOffset, timePattern, dateFormat, poolId);
+          getExportContents(poolReportHistory, zoneOffset, timePattern, dateFormat);
       String storageKey = generateStorageKey(poolReportHistory);
       String excelFileName = storageKey + ExportType.EXCEL.getValue();
       InputStream excelInputStream =
@@ -76,11 +72,7 @@ public void exportPoolReport(
   }
 
   private List<ExportContent> getExportContents(
-      PoolReportHistory poolReportHistory,
-      Long zoneOffset,
-      String timePattern,
-      String dateFormat,
-      String poolId) {
+      PoolReportHistory poolReportHistory, Long zoneOffset, String timePattern, String dateFormat) {
     List<CompletableFuture<ExportContent>> exportContents = new ArrayList<>();
     var currentTime = System.currentTimeMillis();
     /* Check all events are enabled or not then get content correspondingly to each event
@@ -92,7 +84,7 @@ private List<ExportContent> getExportContents(
      */
     exportContents.add(
         reportHistoryServiceAsync.exportInformationOnTheReport(
-            poolReportHistory.getReportHistory(), zoneOffset, timePattern, dateFormat, poolId));
+            poolReportHistory.getReportHistory(), zoneOffset, timePattern, dateFormat));
 
     if (Boolean.TRUE.equals(poolReportHistory.getEventRegistration())) {
       exportContents.add(reportHistoryServiceAsync.exportPoolRegistration(poolReportHistory));

diff --git a/src/main/java/org/cardanofoundation/job/service/impl/StakeKeyReportServiceImpl.java b/src/main/java/org/cardanofoundation/job/service/impl/StakeKeyReportServiceImpl.java
@@ -56,14 +56,12 @@ public void exportStakeKeyReport(
       StakeKeyReportHistory stakeKeyReportHistory,
       Long zoneOffset,
       String timePattern,
-      String dateFormat,
-      String stakeAddress)
+      String dateFormat)
       throws Exception {
     var startTime = System.currentTimeMillis();
     try {
       List<ExportContent> exportContents =
-          getExportContents(
-              stakeKeyReportHistory, zoneOffset, timePattern, dateFormat, stakeAddress);
+          getExportContents(stakeKeyReportHistory, zoneOffset, timePattern, dateFormat);
       String storageKey = generateStorageKey(stakeKeyReportHistory);
       String excelFileName = storageKey + ExportType.EXCEL.getValue();
       InputStream excelInputStream =
@@ -98,8 +96,7 @@ private List<ExportContent> getExportContents(
       StakeKeyReportHistory stakeKeyReportHistory,
       Long zoneOffset,
       String timePattern,
-      String dateFormat,
-      String stakeAddress) {
+      String dateFormat) {
     StakeLifeCycleFilterRequest stakeLifeCycleFilterRequest =
         getStakeLifeCycleFilterRequest(stakeKeyReportHistory);
 
@@ -115,11 +112,7 @@ private List<ExportContent> getExportContents(
 
     exportContents.add(
         reportHistoryServiceAsync.exportInformationOnTheReport(
-            stakeKeyReportHistory.getReportHistory(),
-            zoneOffset,
-            timePattern,
-            dateFormat,
-            stakeAddress));
+            stakeKeyReportHistory.getReportHistory(), zoneOffset, timePattern, dateFormat));
 
     if (Boolean.TRUE.equals(stakeKeyReportHistory.getEventRegistration())) {
       exportContents.add(

diff --git a/src/test/java/org/cardanofoundation/job/service/impl/PoolReportServiceImplTest.java b/src/test/java/org/cardanofoundation/job/service/impl/PoolReportServiceImplTest.java
@@ -65,7 +65,7 @@ void exportPoolReport_shouldThrowExceptionWhenPersistFileToStorageFail() {
                 .build());
 
     when(reportHistoryServiceAsync.exportInformationOnTheReport(
-            any(), anyLong(), anyString(), anyString(), anyString()))
+            any(), anyLong(), anyString(), anyString()))
         .thenReturn(CompletableFuture.completedFuture(ExportContent.builder().build()));
     when(reportHistoryServiceAsync.exportPoolRegistration(poolReportHistory))
         .thenReturn(CompletableFuture.completedFuture(ExportContent.builder().build()));
@@ -85,7 +85,7 @@ void exportPoolReport_shouldThrowExceptionWhenPersistFileToStorageFail() {
         Exception.class,
         () ->
             poolReportService.exportPoolReport(
-                poolReportHistory, 0L, "MM/dd/yyyy HH:mm:ss", "MM/DD/YYYY (UTC)", "poolId"));
+                poolReportHistory, 0L, "MM/dd/yyyy HH:mm:ss", "MM/DD/YYYY (UTC)"));
     Assertions.assertEquals(ReportStatus.FAILED, poolReportHistory.getReportHistory().getStatus());
   }
 
@@ -111,7 +111,7 @@ void exportPoolReport_shouldSuccess() {
                 .isPoolSize(Boolean.TRUE)
                 .build());
     when(reportHistoryServiceAsync.exportInformationOnTheReport(
-            any(), anyLong(), anyString(), anyString(), anyString()))
+            any(), anyLong(), anyString(), anyString()))
         .thenReturn(CompletableFuture.completedFuture(ExportContent.builder().build()));
     when(reportHistoryServiceAsync.exportPoolRegistration(poolReportHistory))
         .thenReturn(CompletableFuture.completedFuture(ExportContent.builder().build()));
@@ -132,7 +132,7 @@ void exportPoolReport_shouldSuccess() {
     Assertions.assertDoesNotThrow(
         () ->
             poolReportService.exportPoolReport(
-                poolReportHistory, 0L, "MM/dd/yyyy HH:mm:ss", "MM/DD/YYYY (UTC)", "stakeAddress"));
+                poolReportHistory, 0L, "MM/dd/yyyy HH:mm:ss", "MM/DD/YYYY (UTC)"));
     Assertions.assertEquals(
         ReportStatus.GENERATED, poolReportHistory.getReportHistory().getStatus());
   }

diff --git a/src/test/java/org/cardanofoundation/job/service/impl/StakeKeyReportServiceImplTest.java b/src/test/java/org/cardanofoundation/job/service/impl/StakeKeyReportServiceImplTest.java
@@ -92,7 +92,7 @@ void exportStakeKeyReport_shouldThrowExceptionWhenPersistFileToStorageFail() {
                 .build());
 
     when(reportHistoryServiceAsync.exportInformationOnTheReport(
-            any(), anyLong(), anyString(), anyString(), anyString()))
+            any(), anyLong(), anyString(), anyString()))
         .thenReturn(CompletableFuture.completedFuture(ExportContent.builder().build()));
 
     when(reportHistoryServiceAsync.exportStakeRegistrations(stakeKey, condition))
@@ -121,11 +121,7 @@ void exportStakeKeyReport_shouldThrowExceptionWhenPersistFileToStorageFail() {
         Exception.class,
         () ->
             stakeKeyReportService.exportStakeKeyReport(
-                stakeKeyReportHistory,
-                0L,
-                "MM/dd/yyyy HH:mm:ss",
-                "MM/DD/YYYY (UTC)",
-                "stakeAddress"));
+                stakeKeyReportHistory, 0L, "MM/dd/yyyy HH:mm:ss", "MM/DD/YYYY (UTC)"));
     Assertions.assertEquals(
         ReportStatus.FAILED, stakeKeyReportHistory.getReportHistory().getStatus());
   }
@@ -163,7 +159,7 @@ void exportStakeKeyReport_shouldSuccess() {
                 .build());
 
     when(reportHistoryServiceAsync.exportInformationOnTheReport(
-            any(), anyLong(), anyString(), anyString(), anyString()))
+            any(), anyLong(), anyString(), anyString()))
         .thenReturn(CompletableFuture.completedFuture(ExportContent.builder().build()));
 
     when(reportHistoryServiceAsync.exportStakeRegistrations(stakeKey, condition))
@@ -193,11 +189,7 @@ void exportStakeKeyReport_shouldSuccess() {
     Assertions.assertDoesNotThrow(
         () ->
             stakeKeyReportService.exportStakeKeyReport(
-                stakeKeyReportHistory,
-                0L,
-                "MM/dd/yyyy HH:mm:ss",
-                "MM/DD/YYYY (UTC)",
-                "stakeAddress"));
+                stakeKeyReportHistory, 0L, "MM/dd/yyyy HH:mm:ss", "MM/DD/YYYY (UTC)"));
     Assertions.assertEquals(
         ReportStatus.GENERATED, stakeKeyReportHistory.getReportHistory().getStatus());
   }