Skip to content

Commit

Permalink
feat: 최신 커밋 반영
Browse files Browse the repository at this point in the history
- festival 엔티티 변경 반영
  • Loading branch information
seokjin8678 committed Apr 20, 2024
1 parent 1a43cfd commit 4626551
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public List<SchoolFestivalV1Response> findFestivalsBySchoolId(
new QSchoolFestivalV1Response(
festival.id,
festival.name,
festival.startDate,
festival.endDate,
festival.thumbnail,
festival.festivalDuration.startDate,
festival.festivalDuration.endDate,
festival.posterImageUrl,
festivalQueryInfo.artistInfo
)
)
.from(festival)
.leftJoin(festivalQueryInfo).on(festivalQueryInfo.festivalId.eq(festival.id))
.where(festival.school.id.eq(schoolId).and(festival.endDate.goe(today)))
.where(festival.school.id.eq(schoolId).and(festival.festivalDuration.endDate.goe(today)))
.stream()
.sorted(Comparator.comparing(SchoolFestivalV1Response::startDate))
.toList();
Expand All @@ -48,15 +48,15 @@ public List<SchoolFestivalV1Response> findPastFestivalsBySchoolId(
new QSchoolFestivalV1Response(
festival.id,
festival.name,
festival.startDate,
festival.endDate,
festival.thumbnail,
festival.festivalDuration.startDate,
festival.festivalDuration.endDate,
festival.posterImageUrl,
festivalQueryInfo.artistInfo
)
)
.from(festival)
.leftJoin(festivalQueryInfo).on(festivalQueryInfo.festivalId.eq(festival.id))
.where(festival.school.id.eq(schoolId).and(festival.endDate.lt(today)))
.where(festival.school.id.eq(schoolId).and(festival.festivalDuration.endDate.lt(today)))
.stream()
.sorted(Comparator.comparing(SchoolFestivalV1Response::endDate).reversed())
.toList();
Expand Down

0 comments on commit 4626551

Please sign in to comment.