불필요한 코드 제거
This commit is contained in:
parent
7f855bfc56
commit
8e5b43a14e
|
@ -74,7 +74,6 @@ class AudioContentCommentController(private val service: AudioContentCommentServ
|
||||||
return ApiResponse.ok(
|
return ApiResponse.ok(
|
||||||
service.getCommentReplyList(
|
service.getCommentReplyList(
|
||||||
commentId = commentId,
|
commentId = commentId,
|
||||||
memberId = member.id!!,
|
|
||||||
timezone = timezone,
|
timezone = timezone,
|
||||||
pageable = pageable
|
pageable = pageable
|
||||||
)
|
)
|
||||||
|
|
|
@ -5,7 +5,6 @@ import com.querydsl.jpa.impl.JPAQueryFactory
|
||||||
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
|
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
|
||||||
import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment
|
import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment
|
||||||
import kr.co.vividnext.sodalive.member.QMember.member
|
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.data.jpa.repository.JpaRepository
|
||||||
import org.springframework.stereotype.Repository
|
import org.springframework.stereotype.Repository
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
|
@ -29,7 +28,6 @@ interface AudioContentCommentQueryRepository {
|
||||||
fun getAudioContentCommentReplyList(
|
fun getAudioContentCommentReplyList(
|
||||||
cloudFrontHost: String,
|
cloudFrontHost: String,
|
||||||
commentId: Long,
|
commentId: Long,
|
||||||
memberId: Long,
|
|
||||||
timezone: String,
|
timezone: String,
|
||||||
offset: Long,
|
offset: Long,
|
||||||
limit: Int
|
limit: Int
|
||||||
|
@ -87,7 +85,6 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
audioContentComment.member.profileImage.prepend("/").prepend(cloudFrontHost),
|
audioContentComment.member.profileImage.prepend("/").prepend(cloudFrontHost),
|
||||||
audioContentComment.comment,
|
audioContentComment.comment,
|
||||||
audioContentComment.isSecret,
|
audioContentComment.isSecret,
|
||||||
blockMember.id.isNotNull,
|
|
||||||
audioContentComment.donationCan.coalesce(0),
|
audioContentComment.donationCan.coalesce(0),
|
||||||
formattedDate,
|
formattedDate,
|
||||||
Expressions.constant(0)
|
Expressions.constant(0)
|
||||||
|
@ -96,12 +93,6 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
.from(audioContentComment)
|
.from(audioContentComment)
|
||||||
.innerJoin(audioContentComment.audioContent, audioContent)
|
.innerJoin(audioContentComment.audioContent, audioContent)
|
||||||
.innerJoin(audioContentComment.member, member)
|
.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)
|
.where(where)
|
||||||
.offset(offset)
|
.offset(offset)
|
||||||
.limit(limit.toLong())
|
.limit(limit.toLong())
|
||||||
|
@ -150,7 +141,6 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
override fun getAudioContentCommentReplyList(
|
override fun getAudioContentCommentReplyList(
|
||||||
cloudFrontHost: String,
|
cloudFrontHost: String,
|
||||||
commentId: Long,
|
commentId: Long,
|
||||||
memberId: Long,
|
|
||||||
timezone: String,
|
timezone: String,
|
||||||
offset: Long,
|
offset: Long,
|
||||||
limit: Int
|
limit: Int
|
||||||
|
@ -176,7 +166,6 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
audioContentComment.member.profileImage.prepend("/").prepend(cloudFrontHost),
|
audioContentComment.member.profileImage.prepend("/").prepend(cloudFrontHost),
|
||||||
audioContentComment.comment,
|
audioContentComment.comment,
|
||||||
audioContentComment.isSecret,
|
audioContentComment.isSecret,
|
||||||
blockMember.id.isNotNull,
|
|
||||||
audioContentComment.donationCan.coalesce(0),
|
audioContentComment.donationCan.coalesce(0),
|
||||||
formattedDate,
|
formattedDate,
|
||||||
Expressions.constant(0)
|
Expressions.constant(0)
|
||||||
|
@ -184,12 +173,6 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
)
|
)
|
||||||
.from(audioContentComment)
|
.from(audioContentComment)
|
||||||
.innerJoin(audioContentComment.member, member)
|
.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(
|
||||||
audioContentComment.parent.isNotNull
|
audioContentComment.parent.isNotNull
|
||||||
.and(audioContentComment.parent.id.eq(commentId))
|
.and(audioContentComment.parent.id.eq(commentId))
|
||||||
|
|
|
@ -134,14 +134,12 @@ class AudioContentCommentService(
|
||||||
|
|
||||||
fun getCommentReplyList(
|
fun getCommentReplyList(
|
||||||
commentId: Long,
|
commentId: Long,
|
||||||
memberId: Long,
|
|
||||||
timezone: String,
|
timezone: String,
|
||||||
pageable: Pageable
|
pageable: Pageable
|
||||||
): GetAudioContentCommentListResponse {
|
): GetAudioContentCommentListResponse {
|
||||||
val commentList = repository.getAudioContentCommentReplyList(
|
val commentList = repository.getAudioContentCommentReplyList(
|
||||||
cloudFrontHost = cloudFrontHost,
|
cloudFrontHost = cloudFrontHost,
|
||||||
commentId = commentId,
|
commentId = commentId,
|
||||||
memberId = memberId,
|
|
||||||
timezone = timezone,
|
timezone = timezone,
|
||||||
offset = pageable.offset,
|
offset = pageable.offset,
|
||||||
limit = pageable.pageSize
|
limit = pageable.pageSize
|
||||||
|
|
|
@ -14,7 +14,6 @@ data class GetAudioContentCommentListItem @QueryProjection constructor(
|
||||||
val profileUrl: String,
|
val profileUrl: String,
|
||||||
val comment: String,
|
val comment: String,
|
||||||
val isSecret: Boolean,
|
val isSecret: Boolean,
|
||||||
val isWriterBlock: Boolean,
|
|
||||||
val donationCan: Int,
|
val donationCan: Int,
|
||||||
val date: String,
|
val date: String,
|
||||||
var replyCount: Int = 0
|
var replyCount: Int = 0
|
||||||
|
|
Loading…
Reference in New Issue