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 @@ -22,11 +22,10 @@ class FestivalController(
) {

@GetMapping
@Operation(summary = "지역축제 목록 조회 API")
fun festivalList(
@RequestParam("sort", required = false) sort: FestivalSortType,
@RequestParam("status", required = false)status: FestivalStatus
):ApiResponse<FestivalListResponseDTO.ListDto>?{
):ApiResponse<FestivalListResponseDTO.ListDto>{

val festivalList = festivalQueryService.getFestivalList(sort, status)
return ApiResponse.onSuccess(festivalList);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ interface FestivalLikesRepository: JpaRepository<FestivalLike, String> {
fun findAllByFestivalIn(festivalList: List<Festival>): List<FestivalLike>
fun findAllByFestivalIn(festivalList: Set<Festival>): List<FestivalLike>

@Query("SELECT fl FROM FestivalLike fl WHERE fl.festival IN :festivals")
@Query(
"""
SELECT fl FROM FestivalLike fl
LEFT JOIN FETCH fl.user
WHERE fl.festival IN :festivals
"""
)
fun findLikeByFestival(@Param("festivals") festivalList: List<Festival>): List<FestivalLike>

}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class FestivalQueryService(
// val festivalIdList: List<Long> = festivalList.mapNotNull { it.id }

// 좋아요 리스트 조회
val festivalLikeList: List<FestivalLike> = festivalLikesRepository.findAllByFestivalIn(festivalList)
val festivalLikeList: List<FestivalLike> = festivalLikesRepository.findLikeByFestival(festivalList)

// 좋아요 수 계산
val likeCountMap: Map<Long, Int> = festivalLikeList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class HomeResponseDTO {
val latitude: Double?,
val longitude: Double?,
val address: String,
@get:JsonProperty("is_liked")
val isLiked: Boolean
@get:JsonProperty("is_like")
val isLike: Boolean
)

}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class HomeQueryService(
latitude = place.latitude?.toDouble(),
longitude = place.longitude?.toDouble(),
address = place.address,
isLiked = place.placeLikes.any { it.user == currentUser }
isLike = place.placeLikes.any { it.user == currentUser }
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class SearchResultDTO {
val longitude: Double? = null,
val address: String,
val congestionLevel: Int? = null,
@get:JsonProperty("is_liked")
val isLiked: Boolean,
@get:JsonProperty("is_like")
val isLike: Boolean,
val startDate: String? = null,
val endDate: String? = null,
@get:JsonProperty("is_end")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class SearchUtil(
id = festival.id,
name = festival.name,
address = festival.place,
isLiked = festival.festivalLikes.any { it.user == currentUser },
isLike = festival.festivalLikes.any { it.user == currentUser },
startDate = festival.startDate.toString(),
endDate = festival.endDate.toString(),
isEnd = festival.endDate.before(java.util.Date()),
Expand All @@ -54,7 +54,7 @@ class SearchUtil(
longitude = place.longitude?.toDouble(),
address = place.address,
congestionLevel = placeRedisUtil.getRedisCongestion(place.id),
isLiked = place.placeLikes.any { it.user == currentUser },
isLike = place.placeLikes.any { it.user == currentUser },
startDate = null,
endDate = null,
isEnd = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ class UserLikesDTO {
val id: Long? = null,
val name: String,
val address: String,
@get:JsonProperty("is_liked")
val isLiked: Boolean,
@get:JsonProperty("is_like")
val isLike: Boolean,
// val startDate: String? = null,
// val endDate: String? = null,
@get:JsonProperty("is_end")
val isEnd: Boolean?
val isEnd: Boolean?,
)

}