src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventController.kt

@@ -1,4 +1,4 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 import kr.co.vividnext.sodalive.common.ApiResponse
 import org.springframework.security.access.prepost.PreAuthorize
@@ -11,20 +11,22 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping("/event/charge")
-@PreAuthorize("hasRole('ADMIN')")
 class AdminChargeEventController(private val service: AdminChargeEventService) {
     @PostMapping
+    @PreAuthorize("hasRole('ADMIN')")
     fun createChargeEvent(@RequestBody request: CreateChargeEventRequest): ApiResponse<Any> {
         service.createChargeEvent(request)
         return ApiResponse.ok(null, "등록되었습니다.")
     }
 
     @PutMapping
+    @PreAuthorize("hasRole('ADMIN')")
     fun modifyChargeEvent(@RequestBody request: ModifyChargeEventRequest) = ApiResponse.ok(
         service.modifyChargeEvent(request),
         "수정되었습니다."
     )
 
     @GetMapping("/list")
+    @PreAuthorize("hasRole('ADMIN')")
     fun getChargeEventList() = ApiResponse.ok(service.getChargeEventList())
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventRepository.kt

@@ -1,7 +1,7 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.admin.event.charge.QChargeEvent.chargeEvent
+import kr.co.vividnext.sodalive.admin.event.QChargeEvent.chargeEvent
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/AdminChargeEventService.kt

@@ -1,4 +1,4 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 import kr.co.vividnext.sodalive.common.SodaException
 import org.springframework.data.repository.findByIdOrNull

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ChargeEvent.kt

@@ -1,4 +1,4 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 import kr.co.vividnext.sodalive.common.BaseEntity
 import java.time.LocalDateTime

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/CreateChargeEventRequest.kt

@@ -1,4 +1,4 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 data class CreateChargeEventRequest(
     val title: String,

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/GetChargeEventListResponse.kt

@@ -1,4 +1,4 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 data class GetChargeEventListResponse(
     val id: Long,

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/ModifyChargeEventRequest.kt

@@ -1,4 +1,4 @@
-package kr.co.vividnext.sodalive.admin.event.charge
+package kr.co.vividnext.sodalive.admin.event
 
 data class ModifyChargeEventRequest(
     val id: Long,

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerController.kt

@@ -1,57 +0,0 @@
-package kr.co.vividnext.sodalive.admin.event.banner
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import org.springframework.security.access.prepost.PreAuthorize
-import org.springframework.web.bind.annotation.DeleteMapping
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.multipart.MultipartFile
-
-@RestController
-@RequestMapping("/admin/event/banner")
-@PreAuthorize("hasRole('ADMIN')")
-class AdminEventBannerController(private val service: AdminEventBannerService) {
-    @PostMapping
-    fun createEventBanner(
-        @RequestParam("thumbnail") thumbnail: MultipartFile,
-        @RequestParam(value = "detail", required = false) detail: MultipartFile? = null,
-        @RequestParam(value = "popup", required = false) popup: MultipartFile? = null,
-        @RequestParam(value = "link", required = false) link: String? = null,
-        @RequestParam(value = "title", required = false) title: String? = null,
-        @RequestParam(value = "isAdult", required = false) isAdult: Boolean? = null,
-        @RequestParam(value = "isPopup") isPopup: Boolean,
-        @RequestParam(value = "startDate") startDate: String,
-        @RequestParam(value = "endDate") endDate: String
-    ) = ApiResponse.ok(
-        service.save(thumbnail, detail, popup, link, title, isAdult, isPopup, startDate, endDate),
-        "등록되었습니다."
-    )
-
-    @PutMapping
-    fun updateEvent(
-        @RequestParam(value = "id") id: Long,
-        @RequestParam(value = "thumbnail", required = false) thumbnail: MultipartFile? = null,
-        @RequestParam(value = "detail", required = false) detail: MultipartFile? = null,
-        @RequestParam(value = "popup", required = false) popup: MultipartFile? = null,
-        @RequestParam(value = "link", required = false) link: String? = null,
-        @RequestParam(value = "title", required = false) title: String? = null,
-        @RequestParam(value = "isAdult", required = false) isAdult: Boolean? = null,
-        @RequestParam(value = "isPopup", required = false) isPopup: Boolean? = null,
-        @RequestParam(value = "startDate", required = false) startDate: String? = null,
-        @RequestParam(value = "endDate", required = false) endDate: String? = null
-    ) = ApiResponse.ok(
-        service.update(id, thumbnail, detail, popup, link, title, isAdult, isPopup, startDate, endDate),
-        "수정되었습니다."
-    )
-
-    @DeleteMapping("/{id}")
-    fun deleteEvent(@PathVariable id: Long) = ApiResponse.ok(service.delete(id), "삭제되었습니다.")
-
-    @GetMapping
-    fun getEventList() = ApiResponse.ok(service.getEventList())
-}

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerRepository.kt

@@ -1,61 +0,0 @@
-package kr.co.vividnext.sodalive.admin.event.banner
-
-import com.querydsl.core.types.dsl.DateTimePath
-import com.querydsl.core.types.dsl.Expressions
-import com.querydsl.core.types.dsl.StringTemplate
-import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.event.Event
-import kr.co.vividnext.sodalive.event.QEvent.event
-import org.springframework.data.jpa.repository.JpaRepository
-import java.time.LocalDateTime
-
-interface AdminEventBannerRepository : JpaRepository<Event, Long>, AdminEventBannerQueryRepository
-
-interface AdminEventBannerQueryRepository {
-    fun getEventList(): List<GetAdminEventResponse>
-}
-
-class AdminEventBannerQueryRepositoryImpl(
-    private val queryFactory: JPAQueryFactory
-) : AdminEventBannerQueryRepository {
-    override fun getEventList(): List<GetAdminEventResponse> {
-        val now = LocalDateTime.now()
-        val where = event.isActive.isTrue
-            .and(event.startDate.loe(now))
-            .and(event.endDate.goe(now))
-
-        return queryFactory
-            .select(
-                QGetAdminEventResponse(
-                    event.id,
-                    event.title,
-                    event.thumbnailImage,
-                    event.detailImage,
-                    event.popupImage,
-                    getFormattedDate(event.startDate),
-                    getFormattedDate(event.endDate),
-                    event.link,
-                    event.isAdult,
-                    event.isPopup
-                )
-            )
-            .from(event)
-            .where(where)
-            .orderBy(event.id.desc())
-            .fetch()
-    }
-
-    private fun getFormattedDate(dateTimePath: DateTimePath<LocalDateTime>): StringTemplate {
-        return Expressions.stringTemplate(
-            "DATE_FORMAT({0}, {1})",
-            Expressions.dateTimeTemplate(
-                LocalDateTime::class.java,
-                "CONVERT_TZ({0},{1},{2})",
-                dateTimePath,
-                "UTC",
-                "Asia/Seoul"
-            ),
-            "%Y-%m-%d"
-        )
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/AdminEventBannerService.kt

@@ -1,222 +0,0 @@
-package kr.co.vividnext.sodalive.admin.event.banner
-
-import com.amazonaws.services.s3.model.ObjectMetadata
-import kr.co.vividnext.sodalive.aws.s3.S3Uploader
-import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.event.Event
-import kr.co.vividnext.sodalive.utils.generateFileName
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import org.springframework.web.multipart.MultipartFile
-import java.time.LocalDate
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
-
-@Service
-class AdminEventBannerService(
-    private val repository: AdminEventBannerRepository,
-    private val s3Uploader: S3Uploader,
-
-    @Value("\${cloud.aws.s3.bucket}")
-    private val bucket: String,
-    @Value("\${cloud.aws.cloud-front.host}")
-    private val cloudFrontHost: String
-) {
-    @Transactional
-    fun save(
-        thumbnail: MultipartFile,
-        detail: MultipartFile? = null,
-        popup: MultipartFile? = null,
-        link: String? = null,
-        title: String? = null,
-        isAdult: Boolean? = null,
-        isPopup: Boolean,
-        startDateString: String,
-        endDateString: String
-    ): Long {
-        if (detail == null && link.isNullOrBlank()) throw SodaException("상세이미지 혹은 링크를 등록하세요")
-
-        val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
-        val startDate = LocalDate.parse(startDateString, dateTimeFormatter).atTime(0, 0)
-            .atZone(ZoneId.of("Asia/Seoul"))
-            .withZoneSameInstant(ZoneId.of("UTC"))
-            .toLocalDateTime()
-
-        val endDate = LocalDate.parse(endDateString, dateTimeFormatter).atTime(23, 59, 59)
-            .atZone(ZoneId.of("Asia/Seoul"))
-            .withZoneSameInstant(ZoneId.of("UTC"))
-            .toLocalDateTime()
-
-        val event = repository.save(
-            Event(
-                thumbnailImage = "",
-                detailImage = null,
-                popupImage = null,
-                link = link,
-                title = title,
-                isAdult = isAdult,
-                isPopup = isPopup,
-                startDate = startDate,
-                endDate = endDate
-            )
-        )
-
-        var metadata = ObjectMetadata()
-        metadata.contentLength = thumbnail.size
-        val thumbnailImagePath = s3Uploader.upload(
-            inputStream = thumbnail.inputStream,
-            bucket = bucket,
-            filePath = "event/${event.id}/${generateFileName()}",
-            metadata = metadata
-        )
-
-        val detailImagePath = if (detail != null) {
-            metadata = ObjectMetadata()
-            metadata.contentLength = detail.size
-
-            s3Uploader.upload(
-                inputStream = detail.inputStream,
-                bucket = bucket,
-                filePath = "event/${event.id}/${generateFileName()}",
-                metadata = metadata
-            )
-        } else {
-            null
-        }
-
-        val popupImagePath = if (popup != null) {
-            metadata = ObjectMetadata()
-            metadata.contentLength = popup.size
-
-            s3Uploader.upload(
-                inputStream = popup.inputStream,
-                bucket = bucket,
-                filePath = "event/${event.id}/${generateFileName()}",
-                metadata = metadata
-            )
-        } else {
-            null
-        }
-
-        event.thumbnailImage = thumbnailImagePath
-        event.detailImage = detailImagePath
-        event.popupImage = popupImagePath
-
-        return event.id ?: throw SodaException("이벤트 등록을 하지 못했습니다.")
-    }
-
-    @Transactional
-    fun update(
-        id: Long,
-        thumbnail: MultipartFile? = null,
-        detail: MultipartFile? = null,
-        popup: MultipartFile? = null,
-        link: String? = null,
-        title: String? = null,
-        isAdult: Boolean? = null,
-        isPopup: Boolean? = null,
-        startDateString: String? = null,
-        endDateString: String? = null
-    ) {
-        if (id <= 0) throw SodaException("잘못된 요청입니다.")
-
-        val event = repository.findByIdOrNull(id)
-            ?: throw SodaException("잘못된 요청입니다.")
-
-        if (thumbnail != null) {
-            val metadata = ObjectMetadata()
-            metadata.contentLength = thumbnail.size
-
-            event.thumbnailImage = s3Uploader.upload(
-                inputStream = thumbnail.inputStream,
-                bucket = bucket,
-                filePath = "event/${event.id}/${generateFileName()}"
-            )
-        }
-
-        if (detail != null) {
-            val metadata = ObjectMetadata()
-            metadata.contentLength = detail.size
-
-            event.detailImage = s3Uploader.upload(
-                inputStream = detail.inputStream,
-                bucket = bucket,
-                filePath = "event/${event.id}/${generateFileName()}"
-            )
-        }
-
-        if (popup != null) {
-            val metadata = ObjectMetadata()
-            metadata.contentLength = popup.size
-
-            event.popupImage = s3Uploader.upload(
-                inputStream = popup.inputStream,
-                bucket = bucket,
-                filePath = "event/${event.id}/${generateFileName()}"
-            )
-        }
-
-        if (!link.isNullOrBlank() && event.link != link) {
-            event.link = link
-        }
-
-        if (!title.isNullOrBlank() && event.title != title) {
-            event.title = title
-        }
-
-        if (isPopup != null) {
-            event.isPopup = isPopup
-        }
-
-        if (isAdult != event.isAdult) {
-            event.isAdult = isAdult
-        }
-
-        val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
-        if (startDateString != null) {
-            event.startDate = LocalDate.parse(startDateString, dateTimeFormatter).atTime(0, 0)
-                .atZone(ZoneId.of("Asia/Seoul"))
-                .withZoneSameInstant(ZoneId.of("UTC"))
-                .toLocalDateTime()
-        }
-
-        if (endDateString != null) {
-            event.endDate = LocalDate.parse(endDateString, dateTimeFormatter).atTime(23, 59, 59)
-                .atZone(ZoneId.of("Asia/Seoul"))
-                .withZoneSameInstant(ZoneId.of("UTC"))
-                .toLocalDateTime()
-        }
-    }
-
-    @Transactional
-    fun delete(id: Long) {
-        if (id <= 0) throw SodaException("잘못된 요청입니다.")
-        val event = repository.findByIdOrNull(id)
-            ?: throw SodaException("잘못된 요청입니다.")
-
-        event.isActive = false
-    }
-
-    fun getEventList(): List<GetAdminEventResponse> {
-        return repository.getEventList()
-            .asSequence()
-            .map {
-                if (!it.thumbnailImageUrl.startsWith("https://")) {
-                    it.thumbnailImageUrl = "$cloudFrontHost/${it.thumbnailImageUrl}"
-                }
-
-                if (it.detailImageUrl != null && !it.detailImageUrl!!.startsWith("https://")) {
-                    it.detailImageUrl = "$cloudFrontHost/${it.detailImageUrl}"
-                }
-
-                if (it.popupImageUrl != null && !it.popupImageUrl!!.startsWith("https://")) {
-                    it.popupImageUrl = "$cloudFrontHost/${it.popupImageUrl}"
-                }
-
-                it
-            }
-            .toList()
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/admin/event/banner/GetAdminEventResponse.kt

@@ -1,16 +0,0 @@
-package kr.co.vividnext.sodalive.admin.event.banner
-
-import com.querydsl.core.annotations.QueryProjection
-
-data class GetAdminEventResponse @QueryProjection constructor(
-    val id: Long,
-    val title: String? = null,
-    var thumbnailImageUrl: String,
-    var detailImageUrl: String? = null,
-    var popupImageUrl: String? = null,
-    var startDate: String,
-    var endDate: String,
-    val link: String? = null,
-    val isAdult: Boolean? = null,
-    val isPopup: Boolean
-)

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventRepository.kt

@@ -1,8 +1,8 @@
 package kr.co.vividnext.sodalive.can.charge.event
 
 import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.admin.event.charge.ChargeEvent
+import kr.co.vividnext.sodalive.admin.event.ChargeEvent
-import kr.co.vividnext.sodalive.admin.event.charge.QChargeEvent.chargeEvent
+import kr.co.vividnext.sodalive.admin.event.QChargeEvent.chargeEvent
 import kr.co.vividnext.sodalive.can.charge.QCharge.charge
 import kr.co.vividnext.sodalive.can.payment.PaymentStatus
 import kr.co.vividnext.sodalive.can.payment.QPayment.payment

src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt

@@ -14,6 +14,8 @@ import org.springframework.cache.annotation.Cacheable
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 
 @Service
 class AudioContentMainService(
@@ -91,6 +93,7 @@ class AudioContentMainService(
     }
 
     @Transactional(readOnly = true)
+    @Cacheable(cacheNames = ["default"], key = "'contentMainBannerList:' + #memberId + ':' + #isAdult")
     fun getAudioContentMainBannerList(memberId: Long, isAdult: Boolean) =
         repository.getAudioContentMainBannerList(isAdult = isAdult)
             .asSequence()
@@ -106,6 +109,17 @@ class AudioContentMainService(
                     type = it.type,
                     thumbnailImageUrl = "$imageHost/${it.thumbnailImage}",
                     eventItem = if (it.type == AudioContentBannerType.EVENT && it.event != null) {
+                        val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+                        val startDate = it.event!!.startDate
+                            .atZone(ZoneId.of("UTC"))
+                            .withZoneSameInstant(ZoneId.of("Asia/Seoul"))
+                            .format(dateTimeFormatter)
+
+                        val endDate = it.event!!.endDate
+                            .atZone(ZoneId.of("UTC"))
+                            .withZoneSameInstant(ZoneId.of("Asia/Seoul"))
+                            .format(dateTimeFormatter)
+
                         EventItem(
                             id = it.event!!.id!!,
                             thumbnailImageUrl = if (!it.event!!.thumbnailImage.startsWith("https://")) {
@@ -122,7 +136,11 @@ class AudioContentMainService(
                                 it.event!!.detailImage
                             },
                             popupImageUrl = null,
-                            link = it.event!!.link
+                            startDate = startDate,
+                            endDate = endDate,
+                            link = it.event!!.link,
+                            title = it.event!!.title,
+                            isPopup = false
                         )
                     } else {
                         null

src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/AudioContentBanner.kt

@@ -1,8 +1,6 @@
 package kr.co.vividnext.sodalive.content.main.banner
 
 import kr.co.vividnext.sodalive.common.BaseEntity
-import kr.co.vividnext.sodalive.content.main.tab.AudioContentMainTab
-import kr.co.vividnext.sodalive.creator.admin.content.series.Series
 import kr.co.vividnext.sodalive.event.Event
 import kr.co.vividnext.sodalive.member.Member
 import javax.persistence.Column
@@ -36,18 +34,10 @@ data class AudioContentBanner(
     @JoinColumn(name = "creator_id", nullable = true)
     var creator: Member? = null
 
-    @OneToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "series_id", nullable = true)
-    var series: Series? = null
-
-    @OneToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "tab_id", nullable = true)
-    var tab: AudioContentMainTab? = null
-
     @Column(nullable = true)
     var link: String? = null
 }
 
 enum class AudioContentBannerType {
-    EVENT, CREATOR, LINK, SERIES
+    EVENT, CREATOR, LINK
 }

src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/AudioContentMainTab.kt

@@ -1,10 +0,0 @@
-package kr.co.vividnext.sodalive.content.main.tab
-
-import kr.co.vividnext.sodalive.common.BaseEntity
-import javax.persistence.Entity
-
-@Entity
-data class AudioContentMainTab(
-    val title: String,
-    val isActive: Boolean
-) : BaseEntity()

src/main/kotlin/kr/co/vividnext/sodalive/event/EventRepository.kt

@@ -1,5 +1,8 @@
 package kr.co.vividnext.sodalive.event
 
+import com.querydsl.core.types.dsl.DateTimePath
+import com.querydsl.core.types.dsl.Expressions
+import com.querydsl.core.types.dsl.StringTemplate
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.event.QEvent.event
 import org.springframework.data.jpa.repository.JpaRepository
@@ -40,10 +43,15 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
             .select(
                 QEventItem(
                     event.id,
+                    event.title,
                     event.thumbnailImage,
                     event.detailImage,
                     event.popupImage,
-                    event.link
+                    getFormattedDate(event.startDate),
+                    getFormattedDate(event.endDate),
+                    event.link,
+                    event.isAdult,
+                    event.isPopup
                 )
             )
             .from(event)
@@ -76,10 +84,15 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
             .select(
                 QEventItem(
                     event.id,
+                    event.title,
                     event.thumbnailImage,
                     event.detailImage,
                     event.popupImage,
-                    event.link
+                    getFormattedDate(event.startDate),
+                    getFormattedDate(event.endDate),
+                    event.link,
+                    event.isAdult,
+                    event.isPopup
                 )
             )
             .from(event)
@@ -87,4 +100,18 @@ class EventQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Even
             .orderBy(event.id.desc())
             .fetchFirst()
     }
+
+    private fun getFormattedDate(dateTimePath: DateTimePath<LocalDateTime>): StringTemplate {
+        return Expressions.stringTemplate(
+            "DATE_FORMAT({0}, {1})",
+            Expressions.dateTimeTemplate(
+                LocalDateTime::class.java,
+                "CONVERT_TZ({0},{1},{2})",
+                dateTimePath,
+                "UTC",
+                "Asia/Seoul"
+            ),
+            "%Y-%m-%d"
+        )
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/event/GetEventResponse.kt

@@ -12,8 +12,13 @@ data class GetEventResponse(
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class EventItem @QueryProjection constructor(
     @JsonProperty("id") val id: Long,
+    @JsonProperty("title") val title: String? = null,
     @JsonProperty("thumbnailImageUrl") var thumbnailImageUrl: String,
     @JsonProperty("detailImageUrl") var detailImageUrl: String? = null,
     @JsonProperty("popupImageUrl") var popupImageUrl: String? = null,
-    @JsonProperty("link") val link: String? = null
+    @JsonProperty("startDate") var startDate: String,
+    @JsonProperty("endDate") var endDate: String,
+    @JsonProperty("link") val link: String? = null,
+    @JsonProperty("isAdult") val isAdult: Boolean? = null,
+    @JsonProperty("isPopup") val isPopup: Boolean
 )