From f1d84a38d8e1a2834d7eba84d1126009ca8189ad Mon Sep 17 00:00:00 2001 From: waterricecake Date: Thu, 27 Jul 2023 20:58:24 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20defaultcurrency=20=EC=A0=95?= =?UTF-8?q?=EC=A0=81=20=ED=8C=A9=ED=86=A0=EB=A6=AC=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/hanglog/expense/domain/Currency.java | 2 +- .../java/hanglog/expense/domain/type/CurrencyCodeType.java | 4 ++-- .../main/java/hanglog/expense/service/ExpenseService.java | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/hanglog/expense/domain/Currency.java b/backend/src/main/java/hanglog/expense/domain/Currency.java index 29845f005..eaff95ff8 100644 --- a/backend/src/main/java/hanglog/expense/domain/Currency.java +++ b/backend/src/main/java/hanglog/expense/domain/Currency.java @@ -55,7 +55,7 @@ public class Currency { private Double krw; // TODO : 추후 currency 데이터 입력 후 default 값 생성시 삭제 - public static Currency ofDefault() { + public static Currency getDefaultCurrency() { return new Currency(); } diff --git a/backend/src/main/java/hanglog/expense/domain/type/CurrencyCodeType.java b/backend/src/main/java/hanglog/expense/domain/type/CurrencyCodeType.java index 18ebdace4..25366c809 100644 --- a/backend/src/main/java/hanglog/expense/domain/type/CurrencyCodeType.java +++ b/backend/src/main/java/hanglog/expense/domain/type/CurrencyCodeType.java @@ -30,9 +30,9 @@ public enum CurrencyCodeType { this.getRate = getRate; } - public static double mappingCurrency(final String currency, final Currency currencies) { + public static double mappingCurrency(final String currencyCode, final Currency currencies) { return Arrays.stream(values()) - .filter(value -> value.code.equals(currency.toLowerCase())) + .filter(value -> value.code.equals(currencyCode.toLowerCase())) .findAny().orElseThrow(() -> new InvalidDomainException(INVALID_CURRENCY)) .getRate.apply(currencies); } diff --git a/backend/src/main/java/hanglog/expense/service/ExpenseService.java b/backend/src/main/java/hanglog/expense/service/ExpenseService.java index 712524197..41c258311 100644 --- a/backend/src/main/java/hanglog/expense/service/ExpenseService.java +++ b/backend/src/main/java/hanglog/expense/service/ExpenseService.java @@ -28,7 +28,7 @@ public class ExpenseService { // TODO: 추후 Currency 데이터 생길시 deafault 값 추가 - private static final Currency DEFAULT_CURRENCY = Currency.ofDefault(); + private static final Currency DEFAULT_CURRENCY = Currency.getDefaultCurrency(); private final TripRepository tripRepository; private final CurrencyRepository currencyRepository; private final TripCityRepository tripCityRepository; @@ -47,7 +47,9 @@ public ExpenseGetResponse getAllExpenses(final long tripId) { calculateAmounts(dayLog, currency, dayLogTotalAmounts, categoryTotalAmounts); } - final int totalAmount = dayLogTotalAmounts.values().stream().reduce(Integer::sum).orElse(0); + final int totalAmount = dayLogTotalAmounts.values().stream() + .reduce(Integer::sum) + .orElse(0); return ExpenseGetResponse.of( trip,