Skip to content

[Test] loki 로그 수집을 위한 로그 파일 이름 수정 #298

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
haeyonghahn merged 3 commits into from
Mar 2, 2025
Merged

[Test] loki 로그 수집을 위한 로그 파일 이름 수정 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb0c99d
[Feat] 작성가능한 리뷰 상태 조회 로직 수정
sirin0762 Mar 2, 2025
a028f38
Merge pull request #297 from FC-InnerCircle-ICD2/feature/fix-writable…
sirin0762 Mar 2, 2025
151f09a
[Test] loki 로그 수집을 위한 로그 파일 이름 수정
haeyonghahn Mar 2, 2025
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
12 changes: 8 additions & 4 deletions ...n-client/src/main/kotlin/org/fastcampus/applicationclient/review/service/ReviewService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<WritableReviewResponse>()
val responses = mutableListOf<WritableReviewResponse>()
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,
Expand All @@ -68,7 +72,7 @@ class ReviewService(
)
}

return response
return responses
}

@Transactional(readOnly = true)
Expand Down
2 changes: 1 addition & 1 deletion application-client/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<springProfile name="!local &amp; !default">
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/${LOG_FILE_NAME}_${TODAY}.log</file>
<file>${LOG_PATH}/${LOG_FILE_NAME}.log</file>

<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_FILE_PATTERN}</pattern>
Expand Down
2 changes: 1 addition & 1 deletion ...ient/src/test/kotlin/org/fastcampus/applicationclient/review/service/ReviewServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Order> = listOf(
createOrderFixture(id = "order_1", storeId = store.id),
createOrderFixture(id = "order_2", storeId = store.id),
Expand Down