Compare commits
2 Commits
d36aada227
...
8285589b10
Author | SHA1 | Date |
---|---|---|
|
8285589b10 | |
|
00ce6d6a7a |
|
@ -42,6 +42,9 @@ class AdminContentController(private val service: AdminContentService) {
|
||||||
fun modifyAudioContent(
|
fun modifyAudioContent(
|
||||||
@RequestBody request: UpdateAdminContentRequest
|
@RequestBody request: UpdateAdminContentRequest
|
||||||
) = ApiResponse.ok(service.updateAudioContent(request))
|
) = ApiResponse.ok(service.updateAudioContent(request))
|
||||||
|
|
||||||
|
@GetMapping("/main/tab")
|
||||||
|
fun getContentMainTabList() = ApiResponse.ok(service.getContentMainTabList())
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class ContentReleaseStatus {
|
enum class ContentReleaseStatus {
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
package kr.co.vividnext.sodalive.admin.content
|
package kr.co.vividnext.sodalive.admin.content
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.admin.content.curation.AdminContentCurationRepository
|
import kr.co.vividnext.sodalive.admin.content.curation.AdminContentCurationRepository
|
||||||
|
import kr.co.vividnext.sodalive.admin.content.tab.AdminContentMainTabRepository
|
||||||
import kr.co.vividnext.sodalive.admin.content.theme.AdminContentThemeRepository
|
import kr.co.vividnext.sodalive.admin.content.theme.AdminContentThemeRepository
|
||||||
import kr.co.vividnext.sodalive.aws.cloudfront.AudioContentCloudFront
|
import kr.co.vividnext.sodalive.aws.cloudfront.AudioContentCloudFront
|
||||||
import kr.co.vividnext.sodalive.common.SodaException
|
import kr.co.vividnext.sodalive.common.SodaException
|
||||||
|
import kr.co.vividnext.sodalive.content.main.tab.GetContentMainTabItem
|
||||||
import org.springframework.data.domain.Pageable
|
import org.springframework.data.domain.Pageable
|
||||||
import org.springframework.data.repository.findByIdOrNull
|
import org.springframework.data.repository.findByIdOrNull
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
|
@ -14,7 +16,8 @@ class AdminContentService(
|
||||||
private val repository: AdminContentRepository,
|
private val repository: AdminContentRepository,
|
||||||
private val themeRepository: AdminContentThemeRepository,
|
private val themeRepository: AdminContentThemeRepository,
|
||||||
private val audioContentCloudFront: AudioContentCloudFront,
|
private val audioContentCloudFront: AudioContentCloudFront,
|
||||||
private val curationRepository: AdminContentCurationRepository
|
private val curationRepository: AdminContentCurationRepository,
|
||||||
|
private val contentMainTabRepository: AdminContentMainTabRepository
|
||||||
) {
|
) {
|
||||||
fun getAudioContentList(status: ContentReleaseStatus, pageable: Pageable): GetAdminContentListResponse {
|
fun getAudioContentList(status: ContentReleaseStatus, pageable: Pageable): GetAdminContentListResponse {
|
||||||
val totalCount = repository.getAudioContentTotalCount(status = status)
|
val totalCount = repository.getAudioContentTotalCount(status = status)
|
||||||
|
@ -118,4 +121,8 @@ class AdminContentService(
|
||||||
audioContent.theme = theme
|
audioContent.theme = theme
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getContentMainTabList(): List<GetContentMainTabItem> {
|
||||||
|
return contentMainTabRepository.findAllByActiveIsTrue()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping
|
||||||
import org.springframework.web.bind.annotation.PutMapping
|
import org.springframework.web.bind.annotation.PutMapping
|
||||||
import org.springframework.web.bind.annotation.RequestBody
|
import org.springframework.web.bind.annotation.RequestBody
|
||||||
import org.springframework.web.bind.annotation.RequestMapping
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam
|
||||||
import org.springframework.web.bind.annotation.RequestPart
|
import org.springframework.web.bind.annotation.RequestPart
|
||||||
import org.springframework.web.bind.annotation.RestController
|
import org.springframework.web.bind.annotation.RestController
|
||||||
import org.springframework.web.multipart.MultipartFile
|
import org.springframework.web.multipart.MultipartFile
|
||||||
|
@ -33,5 +34,7 @@ class AdminContentBannerController(private val service: AdminContentBannerServic
|
||||||
) = ApiResponse.ok(service.updateBannerOrders(request.ids), "수정되었습니다.")
|
) = ApiResponse.ok(service.updateBannerOrders(request.ids), "수정되었습니다.")
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
fun getAudioContentMainBannerList() = ApiResponse.ok(service.getAudioContentMainBannerList())
|
fun getAudioContentMainBannerList(
|
||||||
|
@RequestParam(value = "tabId", required = false) tabId: Long? = null
|
||||||
|
) = ApiResponse.ok(service.getAudioContentMainBannerList(tabId = tabId))
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.admin.content.banner
|
||||||
import com.querydsl.jpa.impl.JPAQueryFactory
|
import com.querydsl.jpa.impl.JPAQueryFactory
|
||||||
import kr.co.vividnext.sodalive.content.main.banner.AudioContentBanner
|
import kr.co.vividnext.sodalive.content.main.banner.AudioContentBanner
|
||||||
import kr.co.vividnext.sodalive.content.main.banner.QAudioContentBanner.audioContentBanner
|
import kr.co.vividnext.sodalive.content.main.banner.QAudioContentBanner.audioContentBanner
|
||||||
|
import kr.co.vividnext.sodalive.content.main.tab.QAudioContentMainTab.audioContentMainTab
|
||||||
import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
|
import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
|
||||||
import kr.co.vividnext.sodalive.event.QEvent.event
|
import kr.co.vividnext.sodalive.event.QEvent.event
|
||||||
import kr.co.vividnext.sodalive.member.QMember.member
|
import kr.co.vividnext.sodalive.member.QMember.member
|
||||||
|
@ -14,7 +15,7 @@ import org.springframework.stereotype.Repository
|
||||||
interface AdminContentBannerRepository : JpaRepository<AudioContentBanner, Long>, AdminContentBannerQueryRepository
|
interface AdminContentBannerRepository : JpaRepository<AudioContentBanner, Long>, AdminContentBannerQueryRepository
|
||||||
|
|
||||||
interface AdminContentBannerQueryRepository {
|
interface AdminContentBannerQueryRepository {
|
||||||
fun getAudioContentMainBannerList(): List<GetAdminContentBannerResponse>
|
fun getAudioContentMainBannerList(tabId: Long = 1): List<GetAdminContentBannerResponse>
|
||||||
}
|
}
|
||||||
|
|
||||||
class AdminContentBannerQueryRepositoryImpl(
|
class AdminContentBannerQueryRepositoryImpl(
|
||||||
|
@ -22,7 +23,15 @@ class AdminContentBannerQueryRepositoryImpl(
|
||||||
@Value("\${cloud.aws.cloud-front.host}")
|
@Value("\${cloud.aws.cloud-front.host}")
|
||||||
private val cloudFrontHost: String
|
private val cloudFrontHost: String
|
||||||
) : AdminContentBannerQueryRepository {
|
) : AdminContentBannerQueryRepository {
|
||||||
override fun getAudioContentMainBannerList(): List<GetAdminContentBannerResponse> {
|
override fun getAudioContentMainBannerList(tabId: Long): List<GetAdminContentBannerResponse> {
|
||||||
|
var where = audioContentBanner.isActive.isTrue
|
||||||
|
|
||||||
|
where = if (tabId <= 1L) {
|
||||||
|
where.and(audioContentMainTab.id.isNull)
|
||||||
|
} else {
|
||||||
|
where.and(audioContentMainTab.id.eq(tabId))
|
||||||
|
}
|
||||||
|
|
||||||
return queryFactory
|
return queryFactory
|
||||||
.select(
|
.select(
|
||||||
QGetAdminContentBannerResponse(
|
QGetAdminContentBannerResponse(
|
||||||
|
@ -43,7 +52,8 @@ class AdminContentBannerQueryRepositoryImpl(
|
||||||
.leftJoin(audioContentBanner.event, event)
|
.leftJoin(audioContentBanner.event, event)
|
||||||
.leftJoin(audioContentBanner.creator, member)
|
.leftJoin(audioContentBanner.creator, member)
|
||||||
.leftJoin(audioContentBanner.series, series)
|
.leftJoin(audioContentBanner.series, series)
|
||||||
.where(audioContentBanner.isActive.isTrue)
|
.leftJoin(audioContentBanner.tab, audioContentMainTab)
|
||||||
|
.where(where)
|
||||||
.orderBy(audioContentBanner.orders.asc())
|
.orderBy(audioContentBanner.orders.asc())
|
||||||
.fetch()
|
.fetch()
|
||||||
}
|
}
|
||||||
|
|
|
@ -169,7 +169,7 @@ class AdminContentBannerService(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getAudioContentMainBannerList(): List<GetAdminContentBannerResponse> {
|
fun getAudioContentMainBannerList(tabId: Long?): List<GetAdminContentBannerResponse> {
|
||||||
return repository.getAudioContentMainBannerList()
|
return repository.getAudioContentMainBannerList(tabId = tabId ?: 1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerType
|
||||||
|
|
||||||
data class CreateContentBannerRequest(
|
data class CreateContentBannerRequest(
|
||||||
val type: AudioContentBannerType,
|
val type: AudioContentBannerType,
|
||||||
|
val tabId: Long?,
|
||||||
val eventId: Long?,
|
val eventId: Long?,
|
||||||
val creatorId: Long?,
|
val creatorId: Long?,
|
||||||
val seriesId: Long?,
|
val seriesId: Long?,
|
||||||
|
|
|
@ -5,6 +5,7 @@ import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerType
|
||||||
data class UpdateContentBannerRequest(
|
data class UpdateContentBannerRequest(
|
||||||
val id: Long,
|
val id: Long,
|
||||||
val type: AudioContentBannerType?,
|
val type: AudioContentBannerType?,
|
||||||
|
val tabId: Long?,
|
||||||
val eventId: Long?,
|
val eventId: Long?,
|
||||||
val creatorId: Long?,
|
val creatorId: Long?,
|
||||||
val seriesId: Long?,
|
val seriesId: Long?,
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
package kr.co.vividnext.sodalive.admin.content.tab
|
||||||
|
|
||||||
|
import com.querydsl.jpa.impl.JPAQueryFactory
|
||||||
|
import kr.co.vividnext.sodalive.content.main.tab.AudioContentMainTab
|
||||||
|
import kr.co.vividnext.sodalive.content.main.tab.GetContentMainTabItem
|
||||||
|
import kr.co.vividnext.sodalive.content.main.tab.QAudioContentMainTab.audioContentMainTab
|
||||||
|
import kr.co.vividnext.sodalive.content.main.tab.QGetContentMainTabItem
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
|
|
||||||
|
interface AdminContentMainTabRepository : JpaRepository<AudioContentMainTab, Long>, AdminContentMainTabQueryRepository
|
||||||
|
|
||||||
|
interface AdminContentMainTabQueryRepository {
|
||||||
|
fun findAllByActiveIsTrue(): List<GetContentMainTabItem>
|
||||||
|
}
|
||||||
|
|
||||||
|
class AdminContentMainTabQueryRepositoryImpl(
|
||||||
|
private val queryFactory: JPAQueryFactory
|
||||||
|
) : AdminContentMainTabQueryRepository {
|
||||||
|
override fun findAllByActiveIsTrue(): List<GetContentMainTabItem> {
|
||||||
|
return queryFactory
|
||||||
|
.select(
|
||||||
|
QGetContentMainTabItem(
|
||||||
|
audioContentMainTab.id,
|
||||||
|
audioContentMainTab.title
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.from(audioContentMainTab)
|
||||||
|
.where(audioContentMainTab.isActive.isTrue)
|
||||||
|
.fetch()
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
package kr.co.vividnext.sodalive.content.main.tab
|
||||||
|
|
||||||
|
import com.querydsl.core.annotations.QueryProjection
|
||||||
|
|
||||||
|
data class GetContentMainTabItem @QueryProjection constructor(
|
||||||
|
val tabId: Long,
|
||||||
|
val title: String
|
||||||
|
)
|
Loading…
Reference in New Issue