parent
b8299bc139
commit
116aea3431
|
@ -4,6 +4,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory
|
||||||
import kr.co.vividnext.sodalive.event.QEvent.event
|
import kr.co.vividnext.sodalive.event.QEvent.event
|
||||||
import org.springframework.data.jpa.repository.JpaRepository
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
import org.springframework.stereotype.Repository
|
import org.springframework.stereotype.Repository
|
||||||
|
import java.time.LocalDateTime
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
interface EventRepository : JpaRepository<Event, Long>, EventQueryRepository
|
interface EventRepository : JpaRepository<Event, Long>, EventQueryRepository
|
||||||
|
@ -16,7 +17,10 @@ interface EventQueryRepository {
|
||||||
@Repository
|
@Repository
|
||||||
class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : EventQueryRepository {
|
class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : EventQueryRepository {
|
||||||
override fun getEventList(isAdult: Boolean?): List<EventItem> {
|
override fun getEventList(isAdult: Boolean?): List<EventItem> {
|
||||||
|
val now = LocalDateTime.now()
|
||||||
var where = event.isActive.isTrue
|
var where = event.isActive.isTrue
|
||||||
|
.and(event.startDate.loe(now))
|
||||||
|
.and(event.endDate.goe(now))
|
||||||
|
|
||||||
if (isAdult != null) {
|
if (isAdult != null) {
|
||||||
where = if (isAdult) {
|
where = if (isAdult) {
|
||||||
|
@ -52,9 +56,12 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getMainEventPopup(isAdult: Boolean): EventItem? {
|
override fun getMainEventPopup(isAdult: Boolean): EventItem? {
|
||||||
|
val now = LocalDateTime.now()
|
||||||
var where = event.isActive.isTrue
|
var where = event.isActive.isTrue
|
||||||
.and(event.isPopup.isTrue)
|
.and(event.isPopup.isTrue)
|
||||||
.and(event.popupImage.isNotNull)
|
.and(event.popupImage.isNotNull)
|
||||||
|
.and(event.startDate.loe(now))
|
||||||
|
.and(event.endDate.goe(now))
|
||||||
|
|
||||||
where = if (isAdult) {
|
where = if (isAdult) {
|
||||||
where.and(
|
where.and(
|
||||||
|
|
Loading…
Reference in New Issue