콘텐츠 댓글 조회 수정

- 콘텐츠 크리에이터 - 댓글 전체 조회 - 일반 유저 - 공개 댓글 + 내가 쓴 댓글
2024-08-29 23:40:44 +09:00 · 2024-08-29 23:40:44 +09:00 · 93410af224
parent 45e8b0d155
commit 93410af224
9 changed files with 101 additions and 31 deletions
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt
@ -111,6 +111,8 @@ interface AudioContentQueryRepository {
    fun getAudioContentCurationList(isAdult: Boolean, offset: Long, limit: Long): List<AudioContentCuration>

    fun getNotReleaseContentId(): List<Long>
+
+    fun isContentCreator(contentId: Long, memberId: Long): Boolean
 }

@Repository
@ -721,4 +723,19 @@ 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
+    }
 }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt
@ -492,6 +492,8 @@ class AudioContentService(
            commentRepository.findByContentId(
                cloudFrontHost = coverImageHost,
                contentId = audioContent.id!!,
+                memberId = member.id!!,
+                isContentCreator = creatorId == member.id!!,
                timezone = timezone,
                offset = 0,
                limit = 1
@ -502,7 +504,11 @@ class AudioContentService(

        // 댓글 수
        val commentCount = if (audioContent.isCommentAvailable) {
-            commentRepository.totalCountCommentByContentId(contentId = audioContent.id!!)
+            commentRepository.totalCountCommentByContentId(
+                contentId = audioContent.id!!,
+                memberId = member.id!!,
+                isContentCreator = creatorId == member.id!!
+            )
        } else {
            0
        }
@ -666,7 +672,11 @@ class AudioContentService(
        val items = audioContentList
            .map {
                val commentCount = commentRepository
-                    .totalCountCommentByContentId(it.contentId)
+                    .totalCountCommentByContentId(
+                        it.contentId,
+                        memberId = member.id!!,
+                        isContentCreator = creatorId == member.id!!
+                    )
                it.commentCount = commentCount

                val likeCount = audioContentLikeRepository
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
@ -55,6 +55,7 @@ class AudioContentCommentController(private val service: AudioContentCommentServ
        ApiResponse.ok(
            service.getCommentList(
                audioContentId = audioContentId,
+                memberId = member.id!!,
                timezone = timezone,
                pageable = pageable
            )
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
@ -16,12 +16,14 @@ interface AudioContentCommentQueryRepository {
    fun findByContentId(
        cloudFrontHost: String,
        contentId: Long,
+        memberId: Long,
+        isContentCreator: Boolean,
        timezone: String,
        offset: Long,
        limit: Int
    ): List<GetAudioContentCommentListItem>

-    fun totalCountCommentByContentId(contentId: Long): Int
+    fun totalCountCommentByContentId(contentId: Long, memberId: Long, isContentCreator: Boolean): Int
    fun commentReplyCountByAudioContentCommentId(commentId: Long): Int
    fun getAudioContentCommentReplyList(
        cloudFrontHost: String,
@ -45,21 +47,32 @@ class AudioContentCommentQueryRepositoryImpl(
    override fun findByContentId(
        cloudFrontHost: String,
        contentId: Long,
+        memberId: Long,
+        isContentCreator: Boolean,
        timezone: String,
        offset: Long,
        limit: Int
    ): List<GetAudioContentCommentListItem> {
-        return queryFactory.selectFrom(audioContentComment)
-            .where(
-                audioContentComment.audioContent.id.eq(contentId)
-                    .and(audioContentComment.isActive.isTrue)
-                    .and(audioContentComment.parent.isNull)
+        var 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"))
@ -75,22 +88,32 @@ 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): Int {
-        return queryFactory.select(audioContentComment.id)
-            .from(audioContentComment)
-            .where(
-                audioContentComment.audioContent.id.eq(contentId)
-                    .and(audioContentComment.parent.isNull)
-                    .and(audioContentComment.isActive.isTrue)
+    override fun totalCountCommentByContentId(contentId: Long, memberId: Long, isContentCreator: Boolean): Int {
+        var 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
+            .select(audioContentComment.id)
+            .from(audioContentComment)
+            .innerJoin(audioContentComment.audioContent, audioContent)
+            .innerJoin(audioContentComment.member, member)
+            .where(where)
            .fetch()
            .size
    }
@ -140,6 +163,7 @@ 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
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt
@ -107,16 +107,27 @@ class AudioContentCommentService(
        }
    }

-    fun getCommentList(audioContentId: Long, timezone: String, pageable: Pageable): GetAudioContentCommentListResponse {
-        val commentList =
-            repository.findByContentId(
-                cloudFrontHost = cloudFrontHost,
-                contentId = audioContentId,
-                timezone = timezone,
-                offset = pageable.offset,
-                limit = pageable.pageSize
-            )
-        val totalCount = repository.totalCountCommentByContentId(audioContentId)
+    fun getCommentList(
+        audioContentId: Long,
+        memberId: Long,
+        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(
+            contentId = audioContentId,
+            memberId = memberId,
+            isContentCreator = isContentCreator
+        )

        return GetAudioContentCommentListResponse(totalCount, commentList)
    }
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt
@ -1,16 +1,19 @@
 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(
+data class GetAudioContentCommentListItem @QueryProjection constructor(
    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
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/GetAudioContentOrderListResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/GetAudioContentOrderListResponse.kt
@ -10,6 +10,7 @@ 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,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt
@ -126,6 +126,7 @@ 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,
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt
@ -98,10 +98,13 @@ class OrderService(
            offset = offset,
            limit = limit
        )
-            .asSequence()
            .map {
                val commentCount = audioContentCommentQueryRepository
-                    .totalCountCommentByContentId(it.contentId)
+                    .totalCountCommentByContentId(
+                        it.contentId,
+                        memberId = member.id!!,
+                        isContentCreator = it.creatorId == member.id!!
+                    )

                val likeCount = audioContentLikeQueryRepository
                    .totalCountAudioContentLike(it.contentId)
@ -110,7 +113,6 @@ class OrderService(
                it.likeCount = likeCount
                it
            }
-            .toList()

        return GetAudioContentOrderListResponse(
            totalCount = totalCount,