From 8e5b43a14ec98fccfce9771ea6ea1d9ebb7fdb1c Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Sat, 7 Sep 2024 01:56:23 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?=
=?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../comment/AudioContentCommentController.kt | 1 -
.../comment/AudioContentCommentRepository.kt | 17 -----------------
.../comment/AudioContentCommentService.kt | 2 --
.../GetAudioContentCommentListResponse.kt | 1 -
4 files changed, 21 deletions(-)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
index bc0cfba..a68faa2 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt
@@ -74,7 +74,6 @@ class AudioContentCommentController(private val service: AudioContentCommentServ
return ApiResponse.ok(
service.getCommentReplyList(
commentId = commentId,
- memberId = member.id!!,
timezone = timezone,
pageable = pageable
)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
index ecf14f0..eecd945 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
@@ -5,7 +5,6 @@ import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment
import kr.co.vividnext.sodalive.member.QMember.member
-import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository
import java.time.LocalDateTime
@@ -29,7 +28,6 @@ interface AudioContentCommentQueryRepository {
fun getAudioContentCommentReplyList(
cloudFrontHost: String,
commentId: Long,
- memberId: Long,
timezone: String,
offset: Long,
limit: Int
@@ -87,7 +85,6 @@ class AudioContentCommentQueryRepositoryImpl(
audioContentComment.member.profileImage.prepend("/").prepend(cloudFrontHost),
audioContentComment.comment,
audioContentComment.isSecret,
- blockMember.id.isNotNull,
audioContentComment.donationCan.coalesce(0),
formattedDate,
Expressions.constant(0)
@@ -96,12 +93,6 @@ class AudioContentCommentQueryRepositoryImpl(
.from(audioContentComment)
.innerJoin(audioContentComment.audioContent, audioContent)
.innerJoin(audioContentComment.member, member)
- .leftJoin(blockMember)
- .on(
- member.id.eq(blockMember.blockedMember.id)
- .and(blockMember.isActive.isTrue)
- .and(blockMember.member.id.eq(memberId))
- )
.where(where)
.offset(offset)
.limit(limit.toLong())
@@ -150,7 +141,6 @@ class AudioContentCommentQueryRepositoryImpl(
override fun getAudioContentCommentReplyList(
cloudFrontHost: String,
commentId: Long,
- memberId: Long,
timezone: String,
offset: Long,
limit: Int
@@ -176,7 +166,6 @@ class AudioContentCommentQueryRepositoryImpl(
audioContentComment.member.profileImage.prepend("/").prepend(cloudFrontHost),
audioContentComment.comment,
audioContentComment.isSecret,
- blockMember.id.isNotNull,
audioContentComment.donationCan.coalesce(0),
formattedDate,
Expressions.constant(0)
@@ -184,12 +173,6 @@ class AudioContentCommentQueryRepositoryImpl(
)
.from(audioContentComment)
.innerJoin(audioContentComment.member, member)
- .leftJoin(blockMember)
- .on(
- member.id.eq(blockMember.blockedMember.id)
- .and(blockMember.isActive.isTrue)
- .and(blockMember.member.id.eq(memberId))
- )
.where(
audioContentComment.parent.isNotNull
.and(audioContentComment.parent.id.eq(commentId))
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt
index f6e8e8c..9d885c1 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentService.kt
@@ -134,14 +134,12 @@ class AudioContentCommentService(
fun getCommentReplyList(
commentId: Long,
- memberId: Long,
timezone: String,
pageable: Pageable
): GetAudioContentCommentListResponse {
val commentList = repository.getAudioContentCommentReplyList(
cloudFrontHost = cloudFrontHost,
commentId = commentId,
- memberId = memberId,
timezone = timezone,
offset = pageable.offset,
limit = pageable.pageSize
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt
index 80d6af9..37bd46a 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/GetAudioContentCommentListResponse.kt
@@ -14,7 +14,6 @@ data class GetAudioContentCommentListItem @QueryProjection constructor(
val profileUrl: String,
val comment: String,
val isSecret: Boolean,
- val isWriterBlock: Boolean,
val donationCan: Int,
val date: String,
var replyCount: Int = 0