크리에이터 관리자 카테고리 콘텐츠 리스트 API 추가

- 불필요한 로직 제거

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

@@ -194,7 +194,13 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .where(where)
             .offset(offset)
             .limit(limit)
-            .orderBy(pinContent.isActive.desc(), pinContent.updatedAt.desc(), orderBy, audioContent.id.desc())
+            .orderBy(
+                pinContent.isActive.desc(),
+                pinContent.updatedAt.desc(),
+                orderBy,
+                audioContent.updatedAt.desc(),
+                audioContent.id.desc()
+            )
             .fetch()
     }
 

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentController.kt

@@ -20,13 +20,12 @@ import org.springframework.web.multipart.MultipartFile
 class CreatorAdminContentController(private val service: CreatorAdminContentService) {
     @GetMapping("/list")
     fun getAudioContentList(
-        @RequestParam("category-id", required = false) categoryId: Long? = 0,
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
-        pageable: Pageable
+        pageable: Pageable,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(service.getAudioContentList(pageable, member, categoryId ?: 0))
+        ApiResponse.ok(service.getAudioContentList(pageable, member))
     }
 
     @GetMapping("/search")

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt

@@ -6,7 +6,6 @@ import com.querydsl.core.types.dsl.StringTemplate
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.content.AudioContent
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
-import kr.co.vividnext.sodalive.content.category.QCategoryContent.categoryContent
 import kr.co.vividnext.sodalive.content.hashtag.QAudioContentHashTag.audioContentHashTag
 import kr.co.vividnext.sodalive.content.hashtag.QHashTag.hashTag
 import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentTheme
@@ -17,12 +16,11 @@ import java.time.LocalDateTime
 interface CreatorAdminContentRepository : JpaRepository<AudioContent, Long>, CreatorAdminAudioContentQueryRepository
 
 interface CreatorAdminAudioContentQueryRepository {
-    fun getAudioContentTotalCount(memberId: Long, searchWord: String = "", categoryId: Long = 0): Int
+    fun getAudioContentTotalCount(memberId: Long, searchWord: String = ""): Int
     fun getAudioContentList(
         memberId: Long,
         offset: Long,
         limit: Long,
-        categoryId: Long = 0,
         searchWord: String = ""
     ): List<GetCreatorAdminContentListItem>
 
@@ -34,7 +32,7 @@ interface CreatorAdminAudioContentQueryRepository {
 class CreatorAdminAudioContentQueryRepositoryImpl(
     private val queryFactory: JPAQueryFactory
 ) : CreatorAdminAudioContentQueryRepository {
-    override fun getAudioContentTotalCount(memberId: Long, searchWord: String, categoryId: Long): Int {
+    override fun getAudioContentTotalCount(memberId: Long, searchWord: String): Int {
         var where = audioContent.duration.isNotNull
             .and(audioContent.member.isNotNull)
             .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull))
@@ -47,15 +45,9 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
             )
         }
 
-        if (categoryId > 0) {
-            where = where.and(categoryContent.category.id.eq(categoryId))
-        }
-
         return queryFactory
             .select(audioContent.id)
             .from(audioContent)
-            .leftJoin(categoryContent)
-            .on(audioContent.id.eq(categoryContent.content.id).and(categoryContent.isActive.ne(false)))
             .where(where)
             .fetch()
             .size
@@ -65,7 +57,6 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
         memberId: Long,
         offset: Long,
         limit: Long,
-        categoryId: Long,
         searchWord: String
     ): List<GetCreatorAdminContentListItem> {
         var where = audioContent.duration.isNotNull
@@ -73,10 +64,6 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
             .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull))
             .and(audioContent.member.id.eq(memberId))
 
-        if (categoryId > 0) {
-            where = where.and(categoryContent.category.id.eq(categoryId))
-        }
-
         if (searchWord.trim().length > 1) {
             where = where.and(
                 audioContent.title.contains(searchWord)
@@ -104,8 +91,6 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
             )
             .from(audioContent)
             .innerJoin(audioContent.theme, audioContentTheme)
-            .leftJoin(categoryContent)
-            .on(audioContent.id.eq(categoryContent.content.id).and(categoryContent.isActive.ne(false)))
             .where(where)
             .offset(offset)
             .limit(limit)

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt

@@ -26,13 +26,12 @@ class CreatorAdminContentService(
     @Value("\${cloud.aws.cloud-front.host}")
     private val coverImageHost: String
 ) {
-    fun getAudioContentList(pageable: Pageable, member: Member, categoryId: Long): GetCreatorAdminContentListResponse {
-        val totalCount = repository.getAudioContentTotalCount(memberId = member.id!!, categoryId = categoryId)
+    fun getAudioContentList(pageable: Pageable, member: Member): GetCreatorAdminContentListResponse {
+        val totalCount = repository.getAudioContentTotalCount(memberId = member.id!!)
         val audioContentAndThemeList = repository.getAudioContentList(
             memberId = member.id!!,
             offset = pageable.offset,
-            limit = pageable.pageSize.toLong(),
-            categoryId = categoryId
+            limit = pageable.pageSize.toLong()
         )
 
         val audioContentList = audioContentAndThemeList

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/category/CreatorAdminCategoryController.kt

@@ -0,0 +1,52 @@
+package kr.co.vividnext.sodalive.creator.admin.content.category
+
+import kr.co.vividnext.sodalive.common.ApiResponse
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.member.Member
+import org.springframework.data.domain.Pageable
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@PreAuthorize("hasRole('CREATOR')")
+@RequestMapping("/creator-admin/content-category")
+class CreatorAdminCategoryController(private val service: CreatorAdminCategoryService) {
+    @GetMapping("/search")
+    fun searchContentNotInCategory(
+        @RequestParam(value = "category_id") categoryId: Long,
+        @RequestParam(value = "search_word") searchWord: String,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            service.searchContentNotInCategory(
+                categoryId = categoryId,
+                searchWord = searchWord,
+                memberId = member.id!!
+            )
+        )
+    }
+
+    @GetMapping
+    fun getContentInCategory(
+        @RequestParam(value = "category_id") categoryId: Long,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
+        pageable: Pageable
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            service.getContentInCategory(
+                categoryId = categoryId,
+                memberId = member.id!!,
+                offset = pageable.offset,
+                limit = pageable.pageSize.toLong()
+            )
+        )
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/category/CreatorAdminCategoryRepository.kt

@@ -0,0 +1,49 @@
+package kr.co.vividnext.sodalive.creator.admin.content.category
+
+import com.querydsl.jpa.impl.JPAQueryFactory
+import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
+import kr.co.vividnext.sodalive.content.category.QCategoryContent.categoryContent
+import org.springframework.stereotype.Repository
+
+@Repository
+class CreatorAdminCategoryRepository(private val queryFactory: JPAQueryFactory) {
+    fun searchContentNotInCategory(
+        categoryId: Long,
+        searchWord: String,
+        memberId: Long
+    ): List<SearchContentNotInCategoryResponse> {
+        return queryFactory
+            .select(QSearchContentNotInCategoryResponse(audioContent.id, audioContent.title))
+            .from(audioContent)
+            .leftJoin(categoryContent)
+            .on(audioContent.id.eq(categoryContent.content.id).and(categoryContent.isActive.ne(true)))
+            .where(
+                audioContent.duration.isNotNull
+                    .and(audioContent.member.isNotNull)
+                    .and(audioContent.member.id.eq(memberId))
+                    .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull))
+                    .and(audioContent.title.contains(searchWord))
+            )
+            .fetch()
+    }
+
+    fun getContentInCategory(
+        categoryId: Long,
+        memberId: Long,
+        offset: Long,
+        limit: Long
+    ): List<GetContentInCategoryResponse> {
+        return queryFactory
+            .select(QGetContentInCategoryResponse(audioContent.id, audioContent.title, audioContent.isAdult))
+            .from(audioContent)
+            .leftJoin(categoryContent)
+            .on(audioContent.id.eq(categoryContent.content.id).and(categoryContent.isActive.isTrue))
+            .where(
+                audioContent.duration.isNotNull
+                    .and(audioContent.member.isNotNull)
+                    .and(audioContent.member.id.eq(memberId))
+                    .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull))
+            )
+            .fetch()
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/category/CreatorAdminCategoryService.kt

@@ -0,0 +1,32 @@
+package kr.co.vividnext.sodalive.creator.admin.content.category
+
+import org.springframework.stereotype.Service
+
+@Service
+class CreatorAdminCategoryService(private val repository: CreatorAdminCategoryRepository) {
+    fun searchContentNotInCategory(
+        categoryId: Long,
+        searchWord: String,
+        memberId: Long
+    ): List<SearchContentNotInCategoryResponse> {
+        return repository.searchContentNotInCategory(
+            categoryId,
+            searchWord,
+            memberId
+        )
+    }
+
+    fun getContentInCategory(
+        categoryId: Long,
+        memberId: Long,
+        offset: Long,
+        limit: Long
+    ): List<GetContentInCategoryResponse> {
+        return repository.getContentInCategory(
+            categoryId,
+            memberId,
+            offset,
+            limit
+        )
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/category/GetContentInCategoryResponse.kt

@@ -0,0 +1,9 @@
+package kr.co.vividnext.sodalive.creator.admin.content.category
+
+import com.querydsl.core.annotations.QueryProjection
+
+data class GetContentInCategoryResponse @QueryProjection constructor(
+    val contentId: Long,
+    val title: String,
+    val isAdult: Boolean
+)

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/category/SearchContentNotInCategoryResponse.kt

@@ -0,0 +1,8 @@
+package kr.co.vividnext.sodalive.creator.admin.content.category
+
+import com.querydsl.core.annotations.QueryProjection
+
+data class SearchContentNotInCategoryResponse @QueryProjection constructor(
+    val contentId: Long,
+    val title: String
+)