[TB-30] 영수증 카테고리별 지출 조회 API 변경

src/main/java/com/ClubAccount_BE/core/config/SecurityConfig.java

@@ -49,7 +49,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 API_V1_PREFIX + "/auth/reset-password",
                                 API_V1_PREFIX + "/{link}/receipts",
                                 API_V1_PREFIX + "/{link}/receipts/{receiptId}",
-                                API_V1_PREFIX + "/{link}/receipts/category",
+                                API_V1_PREFIX + "/{link}/receipts/category-expense",
+                                API_V1_PREFIX + "/{link}/receipts/monthly-expense",
                                 "/api-docs",
                                 "/swagger-custom-ui.html",
                                 "/v3/api-docs",

src/main/java/com/ClubAccount_BE/core/config/WebConfig.java

@@ -1,12 +1,12 @@
 package com.ClubAccount_BE.core.config;
 
 import com.ClubAccount_BE.core.config.auth.LoginUserArgumentResolver;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import java.util.List;
 
 @RequiredArgsConstructor
 @Configuration
@@ -22,7 +22,11 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers)
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:5173", "http://172.20.10.3:5173")
+                .allowedOrigins(
+                        "http://localhost:5173",
+                        "http://172.20.10.3:5173",
+                        "https://club-account-fe.vercel.app"
+                )
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
                 .allowedHeaders("*")
                 .exposedHeaders("Authorization", "Set-Cookie")

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/FindReceiptController.java

@@ -2,9 +2,9 @@
 
 import com.ClubAccount_BE.core.response.PagingResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.api.FindReceiptApi;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptMonthlyExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptResponse;
 import com.ClubAccount_BE.receipt.application.port.in.FindReceiptUseCase;
 import jakarta.validation.constraints.Positive;
@@ -47,18 +47,18 @@ public List<ReceiptItemResponse> getReceiptItem(
         return findReceiptUseCase.getReceiptItem(link, receiptId);
     }
 
-    @GetMapping("/{link}/receipts/category")
-    public ReceiptCategoryResponse getReceiptCategoryRatio(
+    @GetMapping("/{link}/receipts/category-expense")
+    public ReceiptCategoryExpenseResponse getReceiptCategoryExpense(
             @PathVariable(value = "link") UUID link
     ) {
-        return findReceiptUseCase.getReceiptCategoryRatio(link);
+        return findReceiptUseCase.getReceiptCategoryExpense(link);
     }
 
-    @GetMapping("/{link}/receipts/expense")
-    public List<ReceiptExpenseResponse> getReceiptExpenseList(
+    @GetMapping("/{link}/receipts/monthly-expense")
+    public List<ReceiptMonthlyExpenseResponse> getReceiptMonthlyExpenseList(
             @PathVariable(value = "link") UUID link,
             @Positive(message = "유효하지 않은 연도입니다.") @RequestParam int year
     ) {
-        return findReceiptUseCase.getReceiptExpenseList(link, year);
+        return findReceiptUseCase.getReceiptMonthlyExpenseList(link, year);
     }
 }

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/api/FindReceiptApi.java

@@ -1,9 +1,9 @@
 package com.ClubAccount_BE.receipt.adapter.in.web.api;
 
 import com.ClubAccount_BE.core.response.PagingResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptMonthlyExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,13 +38,13 @@ List<ReceiptItemResponse> getReceiptItem(
             @PathVariable("receiptId") Long receiptId
     );
 
-    @Operation(summary = "영수증 카테고리 비율 조회", description = "등록된 영수증의 카테고리 비율을 조회한다.")
-    ReceiptCategoryResponse getReceiptCategoryRatio(
+    @Operation(summary = "영수증 카테고리별 지출 조회", description = "등록된 영수증의 카테고리별 지출을 조회한다.")
+    ReceiptCategoryExpenseResponse getReceiptCategoryExpense(
             @PathVariable(value = "link") UUID link
     );
 
     @Operation(summary = "영수증 월별 지출 목록 조회", description = "등록된 영수증의 월별 지출을 조회한다.")
-    List<ReceiptExpenseResponse> getReceiptExpenseList(
+    List<ReceiptMonthlyExpenseResponse> getReceiptMonthlyExpenseList(
             @PathVariable(value = "link") UUID link,
             @Positive(message = "유효하지 않은 연도입니다.") @RequestParam int year
     );

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptCategoryExpenseResponse.java

@@ -0,0 +1,36 @@
+package com.ClubAccount_BE.receipt.adapter.in.web.dto.response;
+
+import com.ClubAccount_BE.receipt.domain.ReceiptCategoryExpenseResult;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
+import lombok.Builder;
+
+@Builder
+public record ReceiptCategoryExpenseResponse(
+        @Schema(description = "회식비 카테고리 총 지출")
+        BigDecimal groupDiningExpense,
+
+        @Schema(description = "물품 구매비 카테고리 총 지출")
+        BigDecimal supplyPurchaseExpense,
+
+        @Schema(description = "정기 구독비 카테고리 총 지출")
+        BigDecimal subscriptionExpense,
+
+        @Schema(description = "대관비 카테고리 총 지출")
+        BigDecimal venueRentalExpense,
+
+        @Schema(description = "기타 카테고리 총 지출")
+        BigDecimal otherExpense
+) {
+
+    public static ReceiptCategoryExpenseResponse of(ReceiptCategoryExpenseResult result) {
+        return ReceiptCategoryExpenseResponse.builder()
+                .groupDiningExpense(result.getGroupDiningExpense())
+                .supplyPurchaseExpense(result.getSupplyPurchaseExpense())
+                .subscriptionExpense(result.getSubscriptionExpense())
+                .venueRentalExpense(result.getVenueRentalExpense())
+                .otherExpense(result.getOtherExpense())
+                .build();
+    }
+
+}

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptExpenseResponse.java → src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptMonthlyExpenseResponse.java

@@ -1,20 +1,20 @@
 package com.ClubAccount_BE.receipt.adapter.in.web.dto.response;
 
-import com.ClubAccount_BE.receipt.domain.DetailExpenseResult;
+import com.ClubAccount_BE.receipt.domain.ReceiptMonthlyExpenseResult;
 import java.math.BigDecimal;
 import java.util.UUID;
 import lombok.Builder;
 
 @Builder
-public record ReceiptExpenseResponse(
+public record ReceiptMonthlyExpenseResponse(
         UUID id,
         int year,
         int month,
         BigDecimal totalExpense
 ) {
 
-    public static ReceiptExpenseResponse of(DetailExpenseResult result) {
-        return ReceiptExpenseResponse.builder()
+    public static ReceiptMonthlyExpenseResponse of(ReceiptMonthlyExpenseResult result) {
+        return ReceiptMonthlyExpenseResponse.builder()
                 .id(UUID.nameUUIDFromBytes((result.getYear() + "-" + result.getMonth()).getBytes()))
                 .year(result.getYear())
                 .month(result.getMonth())

src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java

@@ -59,7 +59,7 @@ public Receipt getReceipt(User user, Long receiptId) {
     }
 
     @Override
-    public List<Receipt> getReceiptExpenseList(User user, int year) {
+    public List<Receipt> getReceiptMonthlyExpenseList(User user, int year) {
         return receiptRepository
                 .findByUserIdAndYear(user.getId(), year)
                 .stream()

src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/entity/ReceiptEntity.java

@@ -72,6 +72,7 @@
         this.amount = receipt.getAmount();
         this.date = receipt.getDate();
         this.etc = receipt.getEtc();
+        this.amountMatched = receipt.isAmountMatched();
         this.receiptItems.clear();
     }
 

src/main/java/com/ClubAccount_BE/receipt/adapter/out/persistence/repository/ReceiptCustomRepositoryImpl.java

@@ -36,7 +36,7 @@
         List<ReceiptEntity> content = queryFactory
                 .selectFrom(receiptEntity)
                 .where(where)
-                .orderBy(receiptEntity.date.desc())
+                .orderBy(receiptEntity.date.desc(), receiptEntity.id.desc())
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();

src/main/java/com/ClubAccount_BE/receipt/application/port/in/FindReceiptUseCase.java

@@ -1,9 +1,9 @@
 package com.ClubAccount_BE.receipt.application.port.in;
 
 import com.ClubAccount_BE.core.response.PagingResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptMonthlyExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptResponse;
 import java.time.LocalDate;
 import java.util.List;
@@ -12,7 +12,7 @@
 
 public interface FindReceiptUseCase {
 
-    ReceiptCategoryResponse getReceiptCategoryRatio(UUID link);
+    ReceiptCategoryExpenseResponse getReceiptCategoryExpense(UUID link);
 
     PagingResponse<ReceiptResponse> getReceiptList(
             UUID link,
@@ -23,5 +23,5 @@ PagingResponse<ReceiptResponse> getReceiptList(
 
     List<ReceiptItemResponse> getReceiptItem(UUID link, Long receiptId);
 
-    List<ReceiptExpenseResponse> getReceiptExpenseList(UUID link, int year);
+    List<ReceiptMonthlyExpenseResponse> getReceiptMonthlyExpenseList(UUID link, int year);
 }

src/main/java/com/ClubAccount_BE/receipt/application/port/out/FindReceiptPort.java

@@ -20,5 +20,5 @@ Page<Receipt> getReceiptList(
 
     Receipt getReceipt(User user, Long receiptId);
 
-    List<Receipt> getReceiptExpenseList(User user, int year);
+    List<Receipt> getReceiptMonthlyExpenseList(User user, int year);
 }

src/main/java/com/ClubAccount_BE/receipt/application/service/FindReceiptService.java

@@ -4,15 +4,15 @@
 
 import com.ClubAccount_BE.core.exception.ApiException;
 import com.ClubAccount_BE.core.response.PagingResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryResponse;
-import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptCategoryExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
+import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptMonthlyExpenseResponse;
 import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptResponse;
 import com.ClubAccount_BE.receipt.application.port.in.FindReceiptUseCase;
 import com.ClubAccount_BE.receipt.application.port.out.FindReceiptPort;
-import com.ClubAccount_BE.receipt.domain.DetailCategoryResult;
-import com.ClubAccount_BE.receipt.domain.DetailExpenseResult;
 import com.ClubAccount_BE.receipt.domain.Receipt;
+import com.ClubAccount_BE.receipt.domain.ReceiptCategoryExpenseResult;
+import com.ClubAccount_BE.receipt.domain.ReceiptMonthlyExpenseResult;
 import com.ClubAccount_BE.receipt.domain.service.ReceiptEditor;
 import com.ClubAccount_BE.user.application.port.out.FindUserPort;
 import com.ClubAccount_BE.user.domain.User;
@@ -46,13 +46,17 @@
     }
 
     @Override
-    public List<ReceiptExpenseResponse> getReceiptExpenseList(UUID link, int year) {
+    public List<ReceiptMonthlyExpenseResponse> getReceiptMonthlyExpenseList(UUID link, int year) {
 
         User user = findUserPort.getUserByLink(link);
-        List<Receipt> receiptList = findReceiptPort.getReceiptExpenseList(user, year);
-        List<DetailExpenseResult> results = receiptEditor.calculateExpense(receiptList, year);
+        List<Receipt> receiptList = findReceiptPort.getReceiptMonthlyExpenseList(user, year);
+        List<ReceiptMonthlyExpenseResult> results = receiptEditor.calculateMonthlyExpense(
+                receiptList,
+                year
+        );
+
         return results.stream()
-                .map(ReceiptExpenseResponse::of)
+                .map(ReceiptMonthlyExpenseResponse::of)
                 .toList();
     }
 
@@ -77,11 +81,11 @@
     }
 
     @Override
-    public ReceiptCategoryResponse getReceiptCategoryRatio(UUID link) {
+    public ReceiptCategoryExpenseResponse getReceiptCategoryExpense(UUID link) {
 
         User user = findUserPort.getUserByLink(link);
         List<Receipt> receiptList = findReceiptPort.getReceiptCategoryList(user);
-        DetailCategoryResult result = receiptEditor.calculateCategoryRatio(receiptList);
-        return ReceiptCategoryResponse.of(result);
+        ReceiptCategoryExpenseResult result = receiptEditor.calculateCategoryExpense(receiptList);
+        return ReceiptCategoryExpenseResponse.of(result);
     }
 }