refactor: 클래스 명 및 패키지 위치 변경

backend/src/main/java/hanglog/expense/Currencies.java → backend/src/main/java/hanglog/expense/domain/Currency.java

@@ -1,4 +1,4 @@
-package hanglog.expense;
+package hanglog.expense.domain;
 
 import static jakarta.persistence.GenerationType.IDENTITY;
 import static lombok.AccessLevel.PROTECTED;
@@ -16,7 +16,7 @@
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor(access = PROTECTED)
-public class Currencies {
+public class Currency {
 
     @Id
     @GeneratedValue(strategy = IDENTITY)
@@ -54,8 +54,9 @@ public class Currencies {
     @Column(nullable = false)
     private Double krw;
 
-    public static Currencies ofDefault() {
-        return new Currencies();
+    // TODO : 추후 currency 데이터 입력 후 default 값 생성시 삭제
+    public static Currency ofDefault() {
+        return new Currency();
     }
 
     public double getUnitRateOfJpy() {

backend/src/main/java/hanglog/expense/Expense.java → backend/src/main/java/hanglog/expense/domain/Expense.java

@@ -1,4 +1,4 @@
-package hanglog.expense;
+package hanglog.expense.domain;
 
 import static jakarta.persistence.FetchType.LAZY;
 import static jakarta.persistence.GenerationType.IDENTITY;

backend/src/main/java/hanglog/expense/domain/repository/CurrencyRepository.java

@@ -0,0 +1,11 @@
+package hanglog.expense.domain.repository;
+
+import hanglog.expense.domain.Currency;
+import java.time.LocalDate;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CurrencyRepository extends JpaRepository<Currency, Long> {
+
+    Optional<Currency> findCurrenciesBySearchDate(final LocalDate searchDate);
+}

backend/src/main/java/hanglog/expense/repository/ExpenseRepository.java → backend/src/main/java/hanglog/expense/domain/repository/ExpenseRepository.java

@@ -1,6 +1,6 @@
-package hanglog.expense.repository;
+package hanglog.expense.domain.repository;
 
-import hanglog.expense.Expense;
+import hanglog.expense.domain.Expense;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ExpenseRepository extends JpaRepository<Expense, Long> {

backend/src/main/java/hanglog/expense/domain/type/CurrencyCodeType.java

@@ -0,0 +1,39 @@
+package hanglog.expense.domain.type;
+
+import static hanglog.global.exception.ExceptionCode.INVALID_CURRENCY;
+
+import hanglog.expense.domain.Currency;
+import hanglog.global.exception.InvalidDomainException;
+import java.util.Arrays;
+import java.util.function.Function;
+import lombok.Getter;
+
+@Getter
+public enum CurrencyCodeType {
+
+    USD("usd", Currency::getUsd),
+    EUR("eur", Currency::getEur),
+    GBP("gbp", Currency::getGbp),
+    JPY("jpy", Currency::getUnitRateOfJpy),
+    CNY("cny", Currency::getCny),
+    CHF("chf", Currency::getChf),
+    SGD("sgd", Currency::getSgd),
+    THB("thb", Currency::getThb),
+    HKD("hkd", Currency::getHkd),
+    KRW("krw", Currency::getKrw);
+
+    private final String code;
+    private final Function<Currency, Double> getRate;
+
+    CurrencyCodeType(final String code, final Function<Currency, Double> getRate) {
+        this.code = code;
+        this.getRate = getRate;
+    }
+
+    public static double mappingCurrency(final String currency, final Currency currencies) {
+        return Arrays.stream(values())
+                .filter(value -> value.code.equals(currency.toLowerCase()))
+                .findAny().orElseThrow(() -> new InvalidDomainException(INVALID_CURRENCY))
+                .getRate.apply(currencies);
+    }
+}

backend/src/main/java/hanglog/expense/dto/response/CategoriesInExpenseResponse.java

@@ -2,26 +2,27 @@
 
 
 import hanglog.category.domain.Category;
+import hanglog.category.dto.CategoryResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.ToString;
 
 @Getter
 @RequiredArgsConstructor
-@ToString
 public class CategoriesInExpenseResponse {
 
-    private final CategoryInExpenseResponse category;
+    private final CategoryResponse category;
     private final int amount;
     private final BigDecimal percentage;
 
     public static List<CategoriesInExpenseResponse> of(final Map<Category, Integer> categories) {
-        final int totalAmount = categories.values().stream().reduce(Integer::sum).orElse(0);
+        final int totalAmount = categories.values().stream()
+                .reduce(Integer::sum)
+                .orElse(0);
         if (totalAmount == 0) {
             return categories.entrySet().stream()
                     .map(entry -> getResponse(0, entry))
@@ -37,7 +38,7 @@ private static CategoriesInExpenseResponse getResponse(
             final Entry<Category, Integer> entry
     ) {
         return new CategoriesInExpenseResponse(
-                CategoryInExpenseResponse.of(entry.getKey()),
+                CategoryResponse.of(entry.getKey()),
                 entry.getValue(),
                 BigDecimal.valueOf(amount * 100).setScale(2, RoundingMode.CEILING)//.setScale(2)
         );

backend/src/main/java/hanglog/expense/dto/response/CitiesInExpenseResponse.java → backend/src/main/java/hanglog/expense/dto/response/CityInExpenseResponse.java

@@ -7,14 +7,14 @@
 
 @Getter
 @RequiredArgsConstructor
-public class CitiesInExpenseResponse {
+public class CityInExpenseResponse {
 
     private final long id;
     private final String name;
 
-    public static List<CitiesInExpenseResponse> of(final List<TripCity> cities) {
+    public static List<CityInExpenseResponse> of(final List<TripCity> cities) {
         return cities.stream().map(city ->
-                new CitiesInExpenseResponse(
+                new CityInExpenseResponse(
                         city.getCity().getId(),
                         city.getCity().getName()
                 )

backend/src/main/java/hanglog/expense/dto/response/CurrencyInExpenseResponse.java

@@ -1,7 +1,7 @@
 package hanglog.expense.dto.response;
 
-import hanglog.expense.Currencies;
-import hanglog.expense.Currency;
+import hanglog.expense.domain.Currency;
+import hanglog.expense.domain.type.CurrencyCodeType;
 import java.util.Arrays;
 import java.util.List;
 import lombok.Getter;
@@ -14,9 +14,9 @@ public class CurrencyInExpenseResponse {
     private final String currency;
     private final double rate;
 
-    public static List<CurrencyInExpenseResponse> of(final Currencies currencies) {
-        return Arrays.stream(Currency.values())
-                .map(value -> new CurrencyInExpenseResponse(value.getCurrency(), value.getGetRate().apply(currencies)))
+    public static List<CurrencyInExpenseResponse> of(final Currency currency) {
+        return Arrays.stream(CurrencyCodeType.values())
+                .map(value -> new CurrencyInExpenseResponse(value.getCode(), value.getGetRate().apply(currency)))
                 .toList();
     }
 }

backend/src/main/java/hanglog/expense/dto/response/ExpenseGetResponse.java

@@ -2,7 +2,7 @@
 
 
 import hanglog.category.domain.Category;
-import hanglog.expense.Currencies;
+import hanglog.expense.domain.Currency;
 import hanglog.trip.domain.DayLog;
 import hanglog.trip.domain.Trip;
 import hanglog.trip.domain.TripCity;
@@ -20,7 +20,7 @@ public class ExpenseGetResponse {
     private final String title;
     private final LocalDate startDate;
     private final LocalDate endDate;
-    private final List<CitiesInExpenseResponse> cities;
+    private final List<CityInExpenseResponse> cities;
     private final int totalAmount;
     private final List<CategoriesInExpenseResponse> categories;
     private final RatesInExpenseResponse rates;
@@ -31,18 +31,18 @@ public static ExpenseGetResponse of(
             final int totalAmount,
             final List<TripCity> cities,
             final Map<Category, Integer> categories,
-            final Currencies currencies,
+            final Currency currency,
             final Map<DayLog, Integer> dayLogs
     ) {
         return new ExpenseGetResponse(
                 trip.getId(),
                 trip.getTitle(),
                 trip.getStartDate(),
                 trip.getEndDate(),
-                CitiesInExpenseResponse.of(cities),
+                CityInExpenseResponse.of(cities),
                 totalAmount,
                 CategoriesInExpenseResponse.of(categories),
-                RatesInExpenseResponse.of(currencies),
+                RatesInExpenseResponse.of(currency),
                 DayLogInExpenseResponse.of(dayLogs)
         );
     }

backend/src/main/java/hanglog/expense/dto/response/ExpenseInItemResponse.java

@@ -1,6 +1,7 @@
 package hanglog.expense.dto.response;
 
-import hanglog.expense.Expense;
+import hanglog.category.dto.CategoryResponse;
+import hanglog.expense.domain.Expense;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -11,14 +12,14 @@ public class ExpenseInItemResponse {
     private final long id;
     private final String currency;
     private final double amount;
-    private final CategoryInExpenseResponse category;
+    private final CategoryResponse category;
 
     public static ExpenseInItemResponse of(final Expense expense) {
         return new ExpenseInItemResponse(
                 expense.getId(),
                 expense.getCurrency(),
                 expense.getAmount(),
-                CategoryInExpenseResponse.of(expense.getCategory())
+                CategoryResponse.of(expense.getCategory())
         );
     }
 }

backend/src/main/java/hanglog/expense/dto/response/RatesInExpenseResponse.java

@@ -1,6 +1,6 @@
 package hanglog.expense.dto.response;
 
-import hanglog.expense.Currencies;
+import hanglog.expense.domain.Currency;
 import java.time.LocalDate;
 import java.util.List;
 import lombok.Getter;
@@ -13,10 +13,10 @@ public class RatesInExpenseResponse {
     private final LocalDate date;
     private final List<CurrencyInExpenseResponse> values;
 
-    public static RatesInExpenseResponse of(final Currencies currencies) {
+    public static RatesInExpenseResponse of(final Currency currency) {
         return new RatesInExpenseResponse(
-                currencies.getSearchDate(),
-                CurrencyInExpenseResponse.of(currencies)
+                currency.getSearchDate(),
+                CurrencyInExpenseResponse.of(currency)
         );
     }
 }