diff --git a/account-query/src/main/java/cz/muni/pa165/banking/domain/report/StatisticalReport.java b/account-query/src/main/java/cz/muni/pa165/banking/domain/report/StatisticalReport.java index ad06ee984adec9c4f43f2ae2e5d0034b5f65fee0..815a98879dc6cb91399cff31ff0c259fc814141c 100644 --- a/account-query/src/main/java/cz/muni/pa165/banking/domain/report/StatisticalReport.java +++ b/account-query/src/main/java/cz/muni/pa165/banking/domain/report/StatisticalReport.java @@ -19,7 +19,7 @@ public class StatisticalReport { private final TransactionStatistics withdrawalAmount = new TransactionStatistics(TransactionType.WITHDRAW); - private final TransactionStatistics crossAccountAmount = new TransactionStatistics(TransactionType.CROSS_ACCOUNT_PAYMENT); + private final TransactionStatistics crossAccountAmount = new TransactionStatistics(TransactionType.TRANSFER); private final TransactionStatistics creditAmount = new TransactionStatistics(TransactionType.CREDIT); @@ -49,7 +49,7 @@ public class StatisticalReport { case REFUND -> refundAmount.AddAmount(transaction.getAmount()); case DEPOSIT -> depositAmount.AddAmount(transaction.getAmount()); case WITHDRAW -> withdrawalAmount.AddAmount(transaction.getAmount()); - case CROSS_ACCOUNT_PAYMENT -> crossAccountAmount.AddAmount(transaction.getAmount()); + case TRANSFER -> crossAccountAmount.AddAmount(transaction.getAmount()); } } diff --git a/account-query/src/main/java/cz/muni/pa165/banking/domain/transaction/TransactionType.java b/account-query/src/main/java/cz/muni/pa165/banking/domain/transaction/TransactionType.java index 2a1fb15b87e63a153fb22f837940e0b2bf5b7e6d..5d0988c86783f5f2da92ae27e580ff3c7b5ba064 100644 --- a/account-query/src/main/java/cz/muni/pa165/banking/domain/transaction/TransactionType.java +++ b/account-query/src/main/java/cz/muni/pa165/banking/domain/transaction/TransactionType.java @@ -11,7 +11,7 @@ public enum TransactionType { CREDIT, - CROSS_ACCOUNT_PAYMENT, + TRANSFER, REFUND diff --git a/account-query/src/test/java/cz/muni/pa165/banking/domain/report/StatisticalReportTest.java b/account-query/src/test/java/cz/muni/pa165/banking/domain/report/StatisticalReportTest.java index 1a56a8f4b0b34e30a3de7c6de4a2bb432a9d48cb..1b0418837ed7bac0a9a8baa4bdf49017c4320e9b 100644 --- a/account-query/src/test/java/cz/muni/pa165/banking/domain/report/StatisticalReportTest.java +++ b/account-query/src/test/java/cz/muni/pa165/banking/domain/report/StatisticalReportTest.java @@ -21,7 +21,7 @@ class StatisticalReportTest { Transaction tr3 = new Transaction(TransactionType.WITHDRAW, BigDecimal.ONE, OffsetDateTime.now(), new UUID(2, 2)); Transaction tr5 = new Transaction(TransactionType.REFUND, BigDecimal.ONE, OffsetDateTime.now(), new UUID(2, 2)); Transaction tr6 = new Transaction(TransactionType.DEPOSIT, BigDecimal.ONE, OffsetDateTime.now(), new UUID(2, 2)); - Transaction tr7 = new Transaction(TransactionType.CROSS_ACCOUNT_PAYMENT, BigDecimal.ONE, OffsetDateTime.now(), new UUID(2, 2)); + Transaction tr7 = new Transaction(TransactionType.TRANSFER, BigDecimal.ONE, OffsetDateTime.now(), new UUID(2, 2)); report = new StatisticalReport(List.of(tr1, tr2, tr3, tr5, tr6, tr7)); } @Test @@ -59,7 +59,7 @@ class StatisticalReportTest { //Act TransactionStatistics statistics = report.getCrossAccountAmount(); //Assert - assertThat(statistics.getType()).isEqualTo(TransactionType.CROSS_ACCOUNT_PAYMENT); + assertThat(statistics.getType()).isEqualTo(TransactionType.TRANSFER); } @Test public void whenGetAllStatsThenStatsOfAllTypesReturned(){ diff --git a/m2m-banking-api/account-query-api/openapi.yaml b/m2m-banking-api/account-query-api/openapi.yaml index 344ed566183609927723e57bc97646414b7b7065..1560488aea29fa5759c3b2ffc8fde8d219eef69a 100644 --- a/m2m-banking-api/account-query-api/openapi.yaml +++ b/m2m-banking-api/account-query-api/openapi.yaml @@ -17,7 +17,7 @@ components: schemas: TransactionType: type: string - enum: [ WITHDRAW, DEPOSIT, CREDIT, CROSS_ACCOUNT_PAYMENT, REFUND ] + enum: [ WITHDRAW, DEPOSIT, CREDIT, TRANSFER, REFUND ] description: type of transaction Transaction: title: A transaction