From bb0c99d72e32f38eaf41c159f94754bbb31abb4a Mon Sep 17 00:00:00 2001 From: Jin Date: Sun, 2 Mar 2025 13:10:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Feat]=20=EC=9E=91=EC=84=B1=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EB=A6=AC=EB=B7=B0=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/service/ReviewService.kt | 12 ++++++++---- .../review/service/ReviewServiceTest.kt | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt index 14352d54..92baed1c 100644 --- a/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt +++ b/application-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt @@ -6,6 +6,7 @@ import org.fastcampus.applicationclient.review.controller.dto.ReviewUpdateReques import org.fastcampus.applicationclient.review.controller.dto.WritableReviewResponse import org.fastcampus.applicationclient.review.controller.dto.WrittenReviewResponse import org.fastcampus.common.dto.CursorDTO +import org.fastcampus.order.entity.Order import org.fastcampus.order.exception.OrderException import org.fastcampus.order.repository.OrderRepository import org.fastcampus.review.exception.ReviewException @@ -50,13 +51,16 @@ class ReviewService( val reviewedOrderIds = reviewRepository.findByOrderIdIn(orderIds).map { it.orderId }.toSet() val reviewableOrders = orders .filter { it.id !in reviewedOrderIds } + .filter { it.status == Order.Status.COMPLETED } .sortedByDescending { it.orderTime } - val response = mutableListOf() + val responses = mutableListOf() for (reviewableOrder in reviewableOrders) { - val store = reviewableOrder.storeId?.let { storeRepository.findById(it) } + val store = reviewableOrder.storeId?.let { + storeRepository.findById(it) + } if (store == null) continue - response.add( + responses.add( WritableReviewResponse.of( store.id, store.name, @@ -68,7 +72,7 @@ class ReviewService( ) } - return response + return responses } @Transactional(readOnly = true) diff --git a/application-client/src/test/kotlin/org/fastcampus/applicationclient/review/service/ReviewServiceTest.kt b/application-client/src/test/kotlin/org/fastcampus/applicationclient/review/service/ReviewServiceTest.kt index 8fbee656..6d603d9b 100644 --- a/application-client/src/test/kotlin/org/fastcampus/applicationclient/review/service/ReviewServiceTest.kt +++ b/application-client/src/test/kotlin/org/fastcampus/applicationclient/review/service/ReviewServiceTest.kt @@ -36,7 +36,7 @@ class ReviewServiceTest { fun `should find writable reviews`() { val authMember = createAuthMember() val store = createStore(id = "store_001") - val reviewableOrder = createOrderFixture(id = "order_3", storeId = store.id) + val reviewableOrder = createOrderFixture(id = "order_3", storeId = store.id, status = Order.Status.COMPLETED) val orders: List = listOf( createOrderFixture(id = "order_1", storeId = store.id), createOrderFixture(id = "order_2", storeId = store.id), From 151f09a7c8367a4b04014f5dece573229dfa639e Mon Sep 17 00:00:00 2001 From: haeyonghahn Date: Sun, 2 Mar 2025 16:24:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Test]=20loki=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A7=91=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4=EB=A6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application-client/src/main/resources/logback-spring.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application-client/src/main/resources/logback-spring.xml b/application-client/src/main/resources/logback-spring.xml index 2e69bb17..ba45cb15 100644 --- a/application-client/src/main/resources/logback-spring.xml +++ b/application-client/src/main/resources/logback-spring.xml @@ -16,7 +16,7 @@ - ${LOG_PATH}/${LOG_FILE_NAME}_${TODAY}.log + ${LOG_PATH}/${LOG_FILE_NAME}.log ${LOG_FILE_PATTERN}