Skip to content

Commit 5f0a9eb

Browse files
authored
[Refactor]: 내 상품 목록 조회 기능 수정 (#218)
1 parent 2de46ab commit 5f0a9eb

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

src/main/java/com/backend/domain/product/controller/ApiV1ProductController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public RsData<Void> deleteProduct(
108108
public RsData<PageDto<MyProductListItemDto>> getMyProducts(
109109
@RequestParam(defaultValue = "1") int page,
110110
@RequestParam(defaultValue = "20") int size,
111-
@RequestParam(defaultValue = "SELLING") SaleStatus status,
111+
@RequestParam(required = false) SaleStatus status,
112112
@RequestParam(defaultValue = "LATEST") ProductSearchSortType sort,
113113
@AuthenticationPrincipal User user
114114
) {

src/main/java/com/backend/domain/product/enums/SaleStatus.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
@Getter
66
public enum SaleStatus {
7+
BEFORE_START("경매 시작 전"),
78
SELLING("판매 중"),
89
SOLD("판매 완료"),
910
FAILED("유찰");
@@ -18,6 +19,7 @@ public static AuctionStatus fromSaleStatus(SaleStatus saleStatus) {
1819
if (saleStatus == SELLING) return AuctionStatus.BIDDING;
1920
else if (saleStatus == SOLD) return AuctionStatus.SUCCESSFUL;
2021
else if (saleStatus == FAILED) return AuctionStatus.FAILED;
22+
else if (saleStatus == BEFORE_START) return AuctionStatus.BEFORE_START;
2123
else throw new IllegalArgumentException("Invalid SaleStatus: " + saleStatus);
2224
}
2325
}

src/main/java/com/backend/domain/product/service/StandardProductService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public Page<Product> findByMemberPaged(
8080
int page, int size, ProductSearchSortType sort, Member actor, SaleStatus status
8181
) {
8282
Pageable pageable = getPageable(page, size, sort);
83-
return productRepository.findByMemberPaged(pageable, actor.getId(), SaleStatus.fromSaleStatus(status));
83+
return productRepository.findByMemberPaged(pageable, actor.getId(), (status != null) ? SaleStatus.fromSaleStatus(status) : null);
8484
}
8585

8686
/**

src/test/java/com/backend/domain/product/controller/ApiV1ProductControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ void getMyProducts() throws Exception {
774774
).andDo(print());
775775

776776
Member actor = memberRepository.findByEmail("[email protected]").get();
777-
Page<Product> productPage = productService.findByMemberPaged(1, 20, ProductSearchSortType.LATEST, actor, SaleStatus.SELLING);
777+
Page<Product> productPage = productService.findByMemberPaged(1, 20, ProductSearchSortType.LATEST, actor, null);
778778

779779
// then
780780
resultActions
@@ -870,7 +870,7 @@ void getMyProductsSortedByPopularity() throws Exception {
870870
.andDo(print());
871871

872872
Member actor = memberRepository.findByEmail("[email protected]").get();
873-
Page<Product> productPage = productService.findByMemberPaged(1, 20, ProductSearchSortType.POPULAR, actor, SaleStatus.SELLING);
873+
Page<Product> productPage = productService.findByMemberPaged(1, 20, ProductSearchSortType.POPULAR, actor, null);
874874

875875
// then
876876
resultActions

0 commit comments

Comments
 (0)