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/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} 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),