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

@@ -111,8 +111,6 @@ interface AudioContentQueryRepository {
     fun getAudioContentCurationList(isAdult: Boolean, offset: Long, limit: Long): List<AudioContentCuration>
 
     fun getNotReleaseContentId(): List<Long>
-
-    fun isContentCreator(contentId: Long, memberId: Long): Boolean
 }
 
 @Repository
@@ -723,19 +721,4 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .where(where)
             .fetch()
     }
-
-    override fun isContentCreator(contentId: Long, memberId: Long): Boolean {
-        val foundedContentId = queryFactory
-            .select(audioContent.id)
-            .from(audioContent)
-            .innerJoin(audioContent.member, member)
-            .where(
-                audioContent.isActive.isTrue
-                    .and(audioContent.id.eq(contentId))
-                    .and(audioContent.member.id.eq(memberId))
-            )
-            .fetchOne()
-
-        return foundedContentId != null && foundedContentId == contentId
-    }
 }

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

@@ -492,8 +492,6 @@ class AudioContentService(
             commentRepository.findByContentId(
                 cloudFrontHost = coverImageHost,
                 contentId = audioContent.id!!,
-                memberId = member.id!!,
-                isContentCreator = creatorId == member.id!!,
                 timezone = timezone,
                 offset = 0,
                 limit = 1
@@ -504,11 +502,7 @@ class AudioContentService(
 
         // 댓글 수
         val commentCount = if (audioContent.isCommentAvailable) {
-            commentRepository.totalCountCommentByContentId(
+            commentRepository.totalCountCommentByContentId(contentId = audioContent.id!!)
-                contentId = audioContent.id!!,
-                memberId = member.id!!,
-                isContentCreator = creatorId == member.id!!
-            )
         } else {
             0
         }
@@ -672,11 +666,7 @@ class AudioContentService(
         val items = audioContentList
             .map {
                 val commentCount = commentRepository
-                    .totalCountCommentByContentId(
+                    .totalCountCommentByContentId(it.contentId)
-                        it.contentId,
-                        memberId = member.id!!,
-                        isContentCreator = creatorId == member.id!!
-                    )
                 it.commentCount = commentCount
 
                 val likeCount = audioContentLikeRepository

src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentComment.kt

@@ -18,7 +18,6 @@ data class AudioContentComment(
     var comment: String,
     @Column(nullable = true)
     var donationCan: Int? = null,
-    val isSecret: Boolean = false,
     var isActive: Boolean = true
 ) : BaseEntity() {
     @ManyToOne(fetch = FetchType.LAZY)

src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt

@@ -27,7 +27,6 @@ class AudioContentCommentController(private val service: AudioContentCommentServ
                 comment = request.comment,
                 audioContentId = request.contentId,
                 parentId = request.parentId,
-                isSecret = request.isSecret,
                 member = member
             )
         )
@@ -55,7 +54,6 @@ class AudioContentCommentController(private val service: AudioContentCommentServ
         ApiResponse.ok(
             service.getCommentList(
                 audioContentId = audioContentId,
-                memberId = member.id!!,
                 timezone = timezone,
                 pageable = pageable
             )

src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt

@@ -16,14 +16,12 @@ interface AudioContentCommentQueryRepository {
     fun findByContentId(
         cloudFrontHost: String,
         contentId: Long,
-        memberId: Long,
-        isContentCreator: Boolean,
         timezone: String,
         offset: Long,
         limit: Int
     ): List<GetAudioContentCommentListItem>
 
-    fun totalCountCommentByContentId(contentId: Long, memberId: Long, isContentCreator: Boolean): Int
+    fun totalCountCommentByContentId(contentId: Long): Int
     fun commentReplyCountByAudioContentCommentId(commentId: Long): Int
     fun getAudioContentCommentReplyList(
         cloudFrontHost: String,
@@ -47,32 +45,21 @@ class AudioContentCommentQueryRepositoryImpl(
     override fun findByContentId(
         cloudFrontHost: String,
         contentId: Long,
-        memberId: Long,
-        isContentCreator: Boolean,
         timezone: String,
         offset: Long,
         limit: Int
     ): List<GetAudioContentCommentListItem> {
-        var where = audioContentComment.audioContent.id.eq(contentId)
+        return queryFactory.selectFrom(audioContentComment)
+            .where(
+                audioContentComment.audioContent.id.eq(contentId)
                     .and(audioContentComment.isActive.isTrue)
                     .and(audioContentComment.parent.isNull)
-
-        if (!isContentCreator) {
-            where = where.and(
-                audioContentComment.isSecret.isFalse
-                    .or(audioContentComment.member.id.eq(memberId))
             )
-        }
-
-        return queryFactory
-            .selectFrom(audioContentComment)
-            .innerJoin(audioContentComment.audioContent, audioContent)
-            .innerJoin(audioContentComment.member, member)
-            .where(where)
             .offset(offset)
             .limit(limit.toLong())
             .orderBy(audioContentComment.createdAt.desc())
             .fetch()
+            .asSequence()
             .map {
                 val date = it.createdAt!!
                     .atZone(ZoneId.of("UTC"))
@@ -88,32 +75,22 @@ class AudioContentCommentQueryRepositoryImpl(
                         "$cloudFrontHost/profile/default-profile.png"
                     },
                     comment = it.comment,
-                    isSecret = it.isSecret,
                     donationCan = it.donationCan ?: 0,
                     date = date.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")),
                     replyCount = commentReplyCountByAudioContentCommentId(it.id!!)
                 )
             }
+            .toList()
     }
 
-    override fun totalCountCommentByContentId(contentId: Long, memberId: Long, isContentCreator: Boolean): Int {
+    override fun totalCountCommentByContentId(contentId: Long): Int {
-        var where = audioContentComment.audioContent.id.eq(contentId)
+        return queryFactory.select(audioContentComment.id)
-            .and(audioContentComment.isActive.isTrue)
-            .and(audioContentComment.parent.isNull)
-
-        if (!isContentCreator) {
-            where = where.and(
-                audioContentComment.isSecret.isFalse
-                    .or(audioContentComment.member.id.eq(memberId))
-            )
-        }
-
-        return queryFactory
-            .select(audioContentComment.id)
             .from(audioContentComment)
-            .innerJoin(audioContentComment.audioContent, audioContent)
+            .where(
-            .innerJoin(audioContentComment.member, member)
+                audioContentComment.audioContent.id.eq(contentId)
-            .where(where)
+                    .and(audioContentComment.parent.isNull)
+                    .and(audioContentComment.isActive.isTrue)
+            )
             .fetch()
             .size
     }
@@ -163,7 +140,6 @@ class AudioContentCommentQueryRepositoryImpl(
                         "$cloudFrontHost/profile/default-profile.png"
                     },
                     comment = it.comment,
-                    isSecret = it.isSecret,
                     donationCan = it.donationCan ?: 0,
                     date = date.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")),
                     replyCount = 0

src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt

@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.comment
 
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.content.AudioContentRepository
-import kr.co.vividnext.sodalive.content.order.OrderRepository
 import kr.co.vividnext.sodalive.fcm.FcmEvent
 import kr.co.vividnext.sodalive.fcm.FcmEventType
 import kr.co.vividnext.sodalive.member.Member
@@ -21,19 +20,12 @@ class AudioContentCommentService(
     private val blockMemberRepository: BlockMemberRepository,
     private val audioContentRepository: AudioContentRepository,
     private val applicationEventPublisher: ApplicationEventPublisher,
-    private val orderRepository: OrderRepository,
 
     @Value("\${cloud.aws.cloud-front.host}")
     private val cloudFrontHost: String
 ) {
     @Transactional
-    fun registerComment(
+    fun registerComment(member: Member, comment: String, audioContentId: Long, parentId: Long? = null) {
-        member: Member,
-        comment: String,
-        audioContentId: Long,
-        parentId: Long? = null,
-        isSecret: Boolean = false
-    ) {
         val audioContent = audioContentRepository.findByIdOrNull(id = audioContentId)
             ?: throw SodaException("잘못된 콘텐츠 입니다.\n다시 시도해 주세요.")
 
@@ -41,16 +33,7 @@ class AudioContentCommentService(
         val isBlocked = blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = creator.id!!)
         if (isBlocked) throw SodaException("${creator.nickname}님의 요청으로 댓글쓰기가 제한됩니다.")
 
-        val (isExistsAudioContent, _) = orderRepository.isExistOrderedAndOrderType(
+        val audioContentComment = AudioContentComment(comment = comment)
-            memberId = member.id!!,
-            contentId = audioContent.id!!
-        )
-
-        if (isSecret && !isExistsAudioContent) {
-            throw SodaException("콘텐츠 구매 후 비밀댓글을 등록할 수 있습니다.")
-        }
-
-        val audioContentComment = AudioContentComment(comment = comment, isSecret = isSecret)
         audioContentComment.audioContent = audioContent
         audioContentComment.member = member
 
@@ -107,27 +90,16 @@ class AudioContentCommentService(
         }
     }
 
-    fun getCommentList(
+    fun getCommentList(audioContentId: Long, timezone: String, pageable: Pageable): GetAudioContentCommentListResponse {
-        audioContentId: Long,
+        val commentList =
-        memberId: Long,
+            repository.findByContentId(
-        timezone: String,
-        pageable: Pageable
-    ): GetAudioContentCommentListResponse {
-        val isContentCreator = audioContentRepository.isContentCreator(audioContentId, memberId)
-        val commentList = repository.findByContentId(
                 cloudFrontHost = cloudFrontHost,
                 contentId = audioContentId,
-            memberId = memberId,
-            isContentCreator = isContentCreator,
                 timezone = timezone,
                 offset = pageable.offset,
                 limit = pageable.pageSize
             )
-        val totalCount = repository.totalCountCommentByContentId(
+        val totalCount = repository.totalCountCommentByContentId(audioContentId)
-            contentId = audioContentId,
-            memberId = memberId,
-            isContentCreator = isContentCreator
-        )
 
         return GetAudioContentCommentListResponse(totalCount, commentList)
     }

src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt

@@ -1,19 +1,16 @@
 package kr.co.vividnext.sodalive.content.comment
 
-import com.querydsl.core.annotations.QueryProjection
-
 data class GetAudioContentCommentListResponse(
     val totalCount: Int,
     val items: List<GetAudioContentCommentListItem>
 )
 
-data class GetAudioContentCommentListItem @QueryProjection constructor(
+data class GetAudioContentCommentListItem(
     val id: Long,
     val writerId: Long,
     val nickname: String,
     val profileUrl: String,
     val comment: String,
-    val isSecret: Boolean,
     val donationCan: Int,
     val date: String,
     val replyCount: Int

src/main/kotlin/kr/co/vividnext/sodalive/content/comment/RegisterCommentRequest.kt

@@ -1,8 +1,3 @@
 package kr.co.vividnext.sodalive.content.comment
 
-data class RegisterCommentRequest(
+data class RegisterCommentRequest(val comment: String, val contentId: Long, val parentId: Long?)
-    val comment: String,
-    val contentId: Long,
-    val parentId: Long?,
-    val isSecret: Boolean = false
-)

src/main/kotlin/kr/co/vividnext/sodalive/content/order/GetAudioContentOrderListResponse.kt

@@ -10,7 +10,6 @@ data class GetAudioContentOrderListResponse(
 data class GetAudioContentOrderListItem @QueryProjection constructor(
     val contentId: Long,
     val coverImageUrl: String,
-    val creatorId: Long,
     val creatorNickname: String,
     val title: String,
     val themeStr: String,

src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt

@@ -126,7 +126,6 @@ class OrderQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Orde
                 QGetAudioContentOrderListItem(
                     audioContent.id,
                     audioContent.coverImage.prepend("/").prepend(coverImageHost),
-                    audioContent.member.id,
                     audioContent.member.nickname,
                     audioContent.title,
                     audioContent.theme.theme,

src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt

@@ -98,13 +98,10 @@ class OrderService(
             offset = offset,
             limit = limit
         )
+            .asSequence()
             .map {
                 val commentCount = audioContentCommentQueryRepository
-                    .totalCountCommentByContentId(
+                    .totalCountCommentByContentId(it.contentId)
-                        it.contentId,
-                        memberId = member.id!!,
-                        isContentCreator = it.creatorId == member.id!!
-                    )
 
                 val likeCount = audioContentLikeQueryRepository
                     .totalCountAudioContentLike(it.contentId)
@@ -113,6 +110,7 @@ class OrderService(
                 it.likeCount = likeCount
                 it
             }
+            .toList()
 
         return GetAudioContentOrderListResponse(
             totalCount = totalCount,