diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesRepository.kt index 14fd766..22b8cf9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesRepository.kt @@ -14,9 +14,8 @@ interface CreatorAdminContentSeriesQueryRepository { fun getSeriesList( offset: Long, limit: Long, - creatorId: Long, - imageHost: String - ): List + creatorId: Long + ): List fun getSeriesContentCount(creatorId: Long): Int fun getSeriesContentList( @@ -55,18 +54,10 @@ class CreatorAdminContentSeriesQueryRepositoryImpl( override fun getSeriesList( offset: Long, limit: Long, - creatorId: Long, - imageHost: String - ): List { + creatorId: Long + ): List { return queryFactory - .select( - QGetCreatorAdminContentSeriesListItem( - series.id, - series.title, - series.coverImage.prepend("/").prepend(imageHost) - ) - ) - .from(series) + .selectFrom(series) .where( series.member.id.eq(creatorId) .and(series.isActive.isTrue) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesService.kt index fd9f0ae..a9f0f10 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/CreatorAdminContentSeriesService.kt @@ -170,9 +170,23 @@ class CreatorAdminContentSeriesService( val seriesList = repository.getSeriesList( offset = offset, limit = limit, - creatorId = creatorId, - imageHost = coverImageHost + creatorId = creatorId ) + .map { + GetCreatorAdminContentSeriesListItem( + seriesId = it.id!!, + title = it.title, + introduction = it.introduction, + coverImageUrl = "$coverImageHost/${it.coverImage!!}", + publishedDaysOfWeek = it.publishedDaysOfWeek.toList(), + genreId = it.genre!!.id!!, + isAdult = it.isAdult, + state = it.state, + isActive = it.isActive, + writer = it.writer, + studio = it.studio + ) + } return GetCreatorAdminContentSeriesListResponse(totalCount, seriesList) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/GetCreatorAdminContentSeriesListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/GetCreatorAdminContentSeriesListResponse.kt index da32444..f7c6484 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/GetCreatorAdminContentSeriesListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/GetCreatorAdminContentSeriesListResponse.kt @@ -1,14 +1,20 @@ package kr.co.vividnext.sodalive.creator.admin.content.series -import com.querydsl.core.annotations.QueryProjection - data class GetCreatorAdminContentSeriesListResponse( val totalCount: Int, val items: List ) -data class GetCreatorAdminContentSeriesListItem @QueryProjection constructor( +data class GetCreatorAdminContentSeriesListItem( val seriesId: Long, val title: String, - val coverImageUrl: String + val introduction: String, + val coverImageUrl: String, + val publishedDaysOfWeek: List, + val genreId: Long, + val isAdult: Boolean, + val state: SeriesState, + val isActive: Boolean, + val writer: String?, + val studio: String? ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/ModifySeriesRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/ModifySeriesRequest.kt index 4057c55..f51b4cb 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/ModifySeriesRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/series/ModifySeriesRequest.kt @@ -7,6 +7,7 @@ data class ModifySeriesRequest( val publishedDaysOfWeek: Set?, val genreId: Long?, val isAdult: Boolean?, + val state: SeriesState?, val isActive: Boolean?, val writer: String?, val studio: String?