Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class UserController(
@Operation(
summary = "사용자 피드 인증 개별 날짜 조회",
security = [SecurityRequirement(name = ACCESS_TOKEN_KEY)],
description = "챌린지 인증 시간 빠른순으로 정렬되어 조회됩니다."
description = "피드 인증 시간 빠른순으로 정렬되어 조회됩니다."
)
@ApiResponse(responseCode = "200")
@ApiErrorResponses([TOKEN_UNAUTHENTICATED, TOKEN_UNAUTHORIZED, DATE_FORMAT_INVALID])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data class FindUserFeedsByDateResponse(
@Schema(description = "챌린지 이름", example = "신나게 하는 러닝 챌린지")
val name: String,

@Schema(description = "챌린지 인증 시간", example = "13:00")
@Schema(description = "피드 인증 시간", example = "13:00")
@field:JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "kk:mm")
val proveTime: LocalTime,
) {
Expand All @@ -33,7 +33,7 @@ data class FindUserFeedsByDateResponse(
feed.challengeId,
feed.imageUrl,
feed.name,
feed.proveTime,
feed.proveTime.toLocalTime(),
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class UserCustomRepositoryImpl(
feed.challenge.id,
feed.imageUrl,
feed.challenge.name,
feed.challenge.proveTime
feed.createDateTime,
)
)
.from(feed)
Expand All @@ -137,7 +137,7 @@ class UserCustomRepositoryImpl(
feed.createDateTime.month().eq(date.monthValue),
feed.createDateTime.dayOfMonth().eq(date.dayOfMonth)
)
.orderBy(feed.challenge.proveTime.asc())
.orderBy(feed.createDateTime.asc())
.fetch()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.photi.server.service.user.dto

import com.querydsl.core.annotations.QueryProjection
import java.time.LocalTime
import java.time.LocalDateTime

data class FindUserFeedsByDateDto @QueryProjection constructor(
val feedId: Long,
val challengeId: Long,
val imageUrl: String,
val name: String,
val proveTime: LocalTime,
val proveTime: LocalDateTime,
)
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ class UserServiceTest {
1L,
"https://url.kr/5MhHhD",
"챌린지 이름",
LocalTime.of(13, 0)
LocalDateTime.of(2025, 6, 3, 13, 0)
)
}

Expand Down