From 354c8c3d4ad8b0dd2c7455edf82f1b3fcb7b4e89 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 6 Feb 2024 22:42:40 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=BD=98=ED=85=90=EC=B8=A0=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=A1=9C=EC=A7=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/CreatorAdminContentController.kt | 7 +++---- .../content/CreatorAdminContentRepository.kt | 19 ++----------------- .../content/CreatorAdminContentService.kt | 7 +++---- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentController.kt index 12a6074..f19e973 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentController.kt +++ b/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") diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt index c2598e6..e856992 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt +++ b/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, 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 @@ -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 { 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) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt index 615b5e2..9d1438d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt +++ b/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