From b1030df754ca9359e56f23cdd877951245840ae5 Mon Sep 17 00:00:00 2001 From: 13wjdgk <13wjdgk@naver.com> Date: Thu, 9 Nov 2023 21:54:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor=20:=20=ED=8F=AC=EC=9D=B8=ED=8A=B8?= =?UTF-8?q?=20=EC=83=81=ED=92=88=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EB=B6=88=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coniverse/dangjang/domain/point/service/PointService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/coniverse/dangjang/domain/point/service/PointService.java b/src/main/java/com/coniverse/dangjang/domain/point/service/PointService.java index 080b1c23..b43d3263 100644 --- a/src/main/java/com/coniverse/dangjang/domain/point/service/PointService.java +++ b/src/main/java/com/coniverse/dangjang/domain/point/service/PointService.java @@ -1,6 +1,7 @@ package com.coniverse.dangjang.domain.point.service; import java.time.LocalDate; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -181,13 +182,14 @@ private int getBalancePoint(int changePoint, int balancePoint) { * 구매 가능 상품 조회 *

* 유저의 현재 포인트와 구매 가능한 상품을 조회한다. + * 11월 10일 이후 포인트 서비스를 종료한다. * * @param oauthId 유저 아이디 * @since 1.0.0 */ public ProductListResponse getProducts(String oauthId) { int balancePoint = pointSearchService.findUserPointByOauthId(oauthId).getPoint(); - List productList = pointSearchService.findAllByType(PointType.USE); + List productList = new ArrayList<>(); List descriptionListToEarnPoint = pointSearchService.findAllByType(PointType.EARN).stream() .map(PointProduct::getDescription) .collect(Collectors.toList()); From f649394165f57c311b943d7e0549e48e94e9d6cf Mon Sep 17 00:00:00 2001 From: 13wjdgk <13wjdgk@naver.com> Date: Thu, 9 Nov 2023 21:59:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test=20:=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dangjang/domain/point/service/PointHistoryServiceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/coniverse/dangjang/domain/point/service/PointHistoryServiceTest.java b/src/test/java/com/coniverse/dangjang/domain/point/service/PointHistoryServiceTest.java index 095ab8d6..71ad945d 100644 --- a/src/test/java/com/coniverse/dangjang/domain/point/service/PointHistoryServiceTest.java +++ b/src/test/java/com/coniverse/dangjang/domain/point/service/PointHistoryServiceTest.java @@ -281,7 +281,6 @@ void tearDown() { ProductListResponse response = pointService.getProducts(유저.getOauthId()); //then assertThat(response.balancedPoint()).isEqualTo(유저_포인트.getPoint()); - assertThat(response.productList()).hasSize(useTypeProductSize); assertThat(response.descriptionListToEarnPoint()).hasSize(earnTypeProductSize); }