Skip to content

[TB-29] 영수증 상세 조회 API 응답 DTO 구조 변경 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baekjaehyuk merged 1 commit into from
May 15, 2025
Merged

[TB-29] 영수증 상세 조회 API 응답 DTO 구조 변경 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/FindReceiptController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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.ReceiptDetailResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
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;
Expand Down Expand Up @@ -40,11 +40,11 @@ public PagingResponse<ReceiptResponse> getReceiptList(
}

@GetMapping("/{link}/receipts/{receiptId}")
public ReceiptDetailResponse getReceipt(
public List<ReceiptItemResponse> getReceiptItem(
@PathVariable(value = "link") UUID link,
@PathVariable("receiptId") Long receiptId
) {
return findReceiptUseCase.getReceipt(link, receiptId);
return findReceiptUseCase.getReceiptItem(link, receiptId);
}

@GetMapping("/{link}/receipts/category")
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/api/FindReceiptApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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.ReceiptDetailResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
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;
Expand Down Expand Up @@ -32,8 +32,8 @@ PagingResponse<ReceiptResponse> getReceiptList(
@PageableDefault(page = 1, sort = "createdAt", direction = Sort.Direction.ASC) Pageable pageable
);

@Operation(summary = "영수증 상세 목록 조회", description = "파싱된 영수증 정보를 조회한다.")
ReceiptDetailResponse getReceipt(
@Operation(summary = "영수증 상세 목록 조회", description = "파싱된 영수증 상세 아이템을 조회한다.")
List<ReceiptItemResponse> getReceiptItem(
@PathVariable(value = "link") UUID link,
@PathVariable("receiptId") Long receiptId
);
Expand Down
36 changes: 0 additions & 36 deletions ...in/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptDetailResponse.java
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions ...main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptItemResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
package com.ClubAccount_BE.receipt.adapter.in.web.dto.response;

import com.ClubAccount_BE.receipt.domain.ReceiptItem;
import java.util.List;
import java.math.BigDecimal;
import lombok.Builder;

@Builder
public record ReceiptItemResponse(
Long id,
String name,
String price,
String totalPrice,
int quantity
int quantity,
BigDecimal price,
BigDecimal totalPrice
) {

public static ReceiptItemResponse of(ReceiptItem receiptItem) {
return ReceiptItemResponse.builder()
.id(receiptItem.getId())
.name(receiptItem.getName())
.price(receiptItem.getPrice().toString())
.totalPrice(receiptItem.getTotalPrice().toString())
.quantity(receiptItem.getQuantity())
.price(receiptItem.getPrice())
.totalPrice(receiptItem.getTotalPrice())

Check warning on line 22 in src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptItemResponse.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/in/web/dto/response/ReceiptItemResponse.java#L21-L22 

Added lines #L21 - L22 were not covered by tests
.build();
}

public static List<ReceiptItemResponse> of(List<ReceiptItem> items) {
return items.stream()
.map(ReceiptItemResponse::of)
.toList();
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/ClubAccount_BE/receipt/application/port/in/FindReceiptUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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.ReceiptDetailResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptResponse;
import java.time.LocalDate;
import java.util.List;
Expand All @@ -21,7 +21,7 @@ PagingResponse<ReceiptResponse> getReceiptList(
Pageable pageable
);

ReceiptDetailResponse getReceipt(UUID link, Long receiptId);
List<ReceiptItemResponse> getReceiptItem(UUID link, Long receiptId);

List<ReceiptExpenseResponse> getReceiptExpenseList(UUID link, int year);
}
9 changes: 6 additions & 3 deletions src/main/java/com/ClubAccount_BE/receipt/application/service/FindReceiptService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
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.ReceiptDetailResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptExpenseResponse;
import com.ClubAccount_BE.receipt.adapter.in.web.dto.response.ReceiptItemResponse;
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;
Expand Down Expand Up @@ -35,11 +35,14 @@
private final ReceiptEditor receiptEditor;

@Override
public ReceiptDetailResponse getReceipt(UUID link, Long receiptId) {
public List<ReceiptItemResponse> getReceiptItem(UUID link, Long receiptId) {

User user = findUserPort.getUserByLink(link);
Receipt receipt = findReceiptPort.getReceipt(user, receiptId);
return ReceiptDetailResponse.of(receipt);
return receipt.getReceiptItems()
.stream()
.map(ReceiptItemResponse::of)
.toList();

Check warning on line 45 in src/main/java/com/ClubAccount_BE/receipt/application/service/FindReceiptService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/application/service/FindReceiptService.java#L42-L45 

Added lines #L42 - L45 were not covered by tests
}

@Override
Expand Down