From 6e20183b23a2f36a028b6b6743bac377f4a62aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Pit=C3=A1k?= <xpitak@fi.muni.cz>
Date: Tue, 23 Apr 2024 22:04:39 +0200
Subject: [PATCH] Rename transaction type
---
.../muni/pa165/banking/domain/report/StatisticalReport.java | 4 ++--
.../pa165/banking/domain/transaction/TransactionType.java | 2 +-
.../pa165/banking/domain/report/StatisticalReportTest.java | 4 ++--
m2m-banking-api/account-query-api/openapi.yaml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
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 ad06ee9..815a988 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 2a1fb15..5d0988c 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 1a56a8f..1b04188 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 344ed56..1560488 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
--
GitLab