Merge pull request #10 from cardano-foundation/fix/batch_statistic

fix: transaction statistic calculation

Author: M4rc0Russ0

accounting_reporting_core/src/main/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/model/AccountingCorePresentationViewService.java

@@ -77,11 +77,11 @@ private BatchStatisticsView getStatisticts(Optional<BatchStatistics> batchStatis
         Optional<BatchStatistics> statistics = batchStatistics.stream().findFirst();
 
         return new BatchStatisticsView(
-                statistics.flatMap(BatchStatistics::getProcessedTransactionsCount).orElse(0),
-                Math.abs(statistics.flatMap(BatchStatistics::getFailedTransactionsCount).orElse(0) - statistics.flatMap(BatchStatistics::getApprovedTransactionsCount).orElse(0)),
-                statistics.flatMap(BatchStatistics::getFailedTransactionsCount).orElse(0),
                 statistics.flatMap(BatchStatistics::getApprovedTransactionsCount).orElse(0),
-                statistics.flatMap(BatchStatistics::getFinalizedTransactionsCount).orElse(0),
+                Math.abs(statistics.flatMap(BatchStatistics::getTotalTransactionsCount).orElse(0) - statistics.flatMap(BatchStatistics::getDispatchedTransactionsCount).orElse(0)),
+                statistics.flatMap(BatchStatistics::getFailedTransactionsCount).orElse(0),
+                statistics.flatMap(BatchStatistics::getDispatchedTransactionsCount).orElse(0),
+                statistics.flatMap(BatchStatistics::getCompletedTransactionsCount).orElse(0),
                 statistics.flatMap(BatchStatistics::getTotalTransactionsCount).orElse(0)
         );
 

accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/resource/model/AccountingCorePresentationConverterTest.java

@@ -189,10 +189,10 @@ void testBatchDetail() {
         assertEquals(batchId, result.get().getId());
         assertEquals(10, result.get().getBatchStatistics().getTotal());
         assertEquals(1, result.get().getBatchStatistics().getInvalid());
-        assertEquals(9, result.get().getBatchStatistics().getPublish());
-        assertEquals(8, result.get().getBatchStatistics().getPending());
-        assertEquals(6, result.get().getBatchStatistics().getPublished());
-        assertEquals(8, result.get().getBatchStatistics().getApprove());
+        assertEquals(0, result.get().getBatchStatistics().getPublish());
+        assertEquals(10, result.get().getBatchStatistics().getPending());
+        assertEquals(0, result.get().getBatchStatistics().getPublished());
+        assertEquals(9, result.get().getBatchStatistics().getApprove());
         assertEquals(2, result.get().getTransactions().stream().count());
 
         TransactionView resultTx1 = result.get().getTransactions().stream().filter(