From 435010d5238202a4a8b99012deb6696ba7b6608a Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 12 Jan 2026 11:03:48 +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=EC=BD=98=ED=85=90=EC=B8=A0=20-=20=EB=B3=B8=EC=9D=B8(?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0)=EB=A7=8C=20?= =?UTF-8?q?=EC=98=A4=ED=94=88=EC=98=88=EC=A0=95=20=EC=BD=98=ED=85=90?= =?UTF-8?q?=EC=B8=A0=EA=B0=80=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/AudioContentRepository.kt | 26 ++++++++++++++++--- .../sodalive/content/AudioContentService.kt | 3 +++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index 242779e9..d30632e9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -44,6 +44,7 @@ interface AudioContentQueryRepository { fun findByIdAndCreatorId(contentId: Long, creatorId: Long): AudioContent? fun findByCreatorId( creatorId: Long, + isCreator: Boolean = false, coverImageHost: String, isAdult: Boolean = false, contentType: ContentType = ContentType.ALL, @@ -55,6 +56,7 @@ interface AudioContentQueryRepository { fun findTotalCountByCreatorId( creatorId: Long, + isCreator: Boolean = false, isAdult: Boolean = false, categoryId: Long = 0, contentType: ContentType = ContentType.ALL @@ -230,6 +232,7 @@ class AudioContentQueryRepositoryImpl( override fun findByCreatorId( creatorId: Long, + isCreator: Boolean, coverImageHost: String, isAdult: Boolean, contentType: ContentType, @@ -246,11 +249,18 @@ class AudioContentQueryRepositoryImpl( } var where = audioContent.member.id.eq(creatorId) - .and( + + where = if (isCreator) { + where.and( + audioContent.releaseDate.isNotNull + .and(audioContent.duration.isNotNull) + ) + } else { + where.and( audioContent.isActive.isTrue .and(audioContent.duration.isNotNull) - .or(audioContent.releaseDate.isNotNull.and(audioContent.duration.isNotNull)) ) + } if (!isAdult) { where = where.and(audioContent.isAdult.isFalse) @@ -332,16 +342,24 @@ class AudioContentQueryRepositoryImpl( override fun findTotalCountByCreatorId( creatorId: Long, + isCreator: Boolean, isAdult: Boolean, categoryId: Long, contentType: ContentType ): Int { var where = audioContent.member.id.eq(creatorId) - .and( + + where = if (isCreator) { + where.and( + audioContent.releaseDate.isNotNull + .and(audioContent.duration.isNotNull) + ) + } else { + where.and( audioContent.isActive.isTrue .and(audioContent.duration.isNotNull) - .or(audioContent.releaseDate.isNotNull.and(audioContent.duration.isNotNull)) ) + } if (!isAdult) { where = where.and(audioContent.isAdult.isFalse) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt index a61a2af6..fdd2fcd9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt @@ -979,9 +979,11 @@ class AudioContentService( limit: Long ): GetAudioContentListResponse { val isAdult = member.auth != null && isAdultContentVisible + val isCreator = member.id == creatorId val totalCount = repository.findTotalCountByCreatorId( creatorId = creatorId, + isCreator = isCreator, isAdult = isAdult, categoryId = categoryId, contentType = contentType @@ -989,6 +991,7 @@ class AudioContentService( val audioContentList = repository.findByCreatorId( creatorId = creatorId, + isCreator = isCreator, coverImageHost = coverImageHost, isAdult = isAdult, contentType = contentType,