src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt

@@ -6,7 +6,6 @@ import kr.co.vividnext.sodalive.member.block.MemberBlockRequest
 import kr.co.vividnext.sodalive.member.following.CreatorFollowRequest
 import kr.co.vividnext.sodalive.member.login.LoginRequest
 import kr.co.vividnext.sodalive.member.notification.UpdateNotificationSettingRequest
-import org.springframework.data.domain.Pageable
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.security.core.userdetails.User
 import org.springframework.web.bind.annotation.GetMapping
@@ -156,18 +155,11 @@ class MemberController(private val service: MemberService) {
 
     @GetMapping("/block")
     fun getBlockedMemberList(
-        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
-        pageable: Pageable
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(
+        ApiResponse.ok(service.getBlockedMemberList(member.id!!))
-            service.getBlockedMemberList(
-                member.id!!,
-                offset = pageable.offset,
-                limit = pageable.pageSize.toLong()
-            )
-        )
     }
 
     @PostMapping("/block")

src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt

@@ -135,7 +135,7 @@ class MemberQueryRepositoryImpl(
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
             .and(
                 creatorFollowing.member.id.notIn(
-                    blockMemberRepository.getBlockedMemberIdList(creatorId)
+                    blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
@@ -179,7 +179,7 @@ class MemberQueryRepositoryImpl(
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
             .and(
                 creatorFollowing.member.id.notIn(
-                    blockMemberRepository.getBlockedMemberIdList(creatorId)
+                    blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
@@ -211,7 +211,7 @@ class MemberQueryRepositoryImpl(
             .and(liveReservation.room.id.eq(roomId))
             .and(
                 liveReservation.member.id.notIn(
-                    blockMemberRepository.getBlockedMemberIdList(creatorId)
+                    blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
 
@@ -248,7 +248,7 @@ class MemberQueryRepositoryImpl(
             .and(creatorFollowing.member.notification.uploadContent.isTrue)
             .and(
                 creatorFollowing.member.id.notIn(
-                    blockMemberRepository.getBlockedMemberIdList(creatorId)
+                    blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
@@ -361,7 +361,7 @@ class MemberQueryRepositoryImpl(
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
             .and(
                 creatorFollowing.member.id.notIn(
-                    blockMemberRepository.getBlockedMemberIdList(creatorId)
+                    blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)

src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt

@@ -14,7 +14,6 @@ import kr.co.vividnext.sodalive.live.reservation.LiveReservationRepository
 import kr.co.vividnext.sodalive.live.room.detail.GetRoomDetailUser
 import kr.co.vividnext.sodalive.member.block.BlockMember
 import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
-import kr.co.vividnext.sodalive.member.block.GetBlockedMemberListResponse
 import kr.co.vividnext.sodalive.member.block.MemberBlockRequest
 import kr.co.vividnext.sodalive.member.following.CreatorFollowing
 import kr.co.vividnext.sodalive.member.following.CreatorFollowingRepository
@@ -358,11 +357,8 @@ class MemberService(
         }
     }
 
-    fun getBlockedMemberList(memberId: Long, offset: Long, limit: Long): GetBlockedMemberListResponse {
+    fun getBlockedMemberList(memberId: Long): List<Long> {
-        val totalCount = blockMemberRepository.getBlockedMemberTotalCount(memberId)
+        return blockMemberRepository.getBlockedMemberList(memberId = memberId)
-        val items = blockMemberRepository.getBlockedMemberList(offset = offset, limit = limit, memberId = memberId)
-
-        return GetBlockedMemberListResponse(totalCount = totalCount, items = items)
     }
 
     @Transactional
@@ -373,15 +369,10 @@ class MemberService(
         )
 
         if (blockMember == null) {
-            val blockedMember = repository.findByIdOrNull(id = request.blockMemberId)
+            blockMember = BlockMember(
-                ?: throw SodaException("잘못된 요청입니다.")
+                blockedMemberId = request.blockMemberId,
-
+                memberId = memberId
-            val member = repository.findByIdOrNull(id = memberId)
+            )
-                ?: throw SodaException("잘못된 요청입니다.")
-
-            blockMember = BlockMember()
-            blockMember.member = member
-            blockMember.blockedMember = blockedMember
 
             blockMemberRepository.save(blockMember)
         } else {

src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMember.kt

@@ -1,21 +1,12 @@
 package kr.co.vividnext.sodalive.member.block
 
 import kr.co.vividnext.sodalive.common.BaseEntity
-import kr.co.vividnext.sodalive.member.Member
 import javax.persistence.Entity
-import javax.persistence.FetchType
-import javax.persistence.JoinColumn
-import javax.persistence.ManyToOne
 
 @Entity
 data class BlockMember(
-    var isActive: Boolean = true
+    val blockedMemberId: Long,
+    val memberId: Long
 ) : BaseEntity() {
-    @ManyToOne(fetch = FetchType.LAZY)
+    var isActive: Boolean = true
-    @JoinColumn(name = "blocked_member_id", nullable = false)
-    var blockedMember: Member? = null
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id", nullable = false)
-    var member: Member? = null
 }

src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMemberRepository.kt

@@ -1,9 +1,7 @@
 package kr.co.vividnext.sodalive.member.block
 
 import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.member.QMember.member
 import kr.co.vividnext.sodalive.member.block.QBlockMember.blockMember
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 
@@ -13,24 +11,17 @@ interface BlockMemberRepository : JpaRepository<BlockMember, Long>, BlockMemberQ
 interface BlockMemberQueryRepository {
     fun getBlockAccount(blockedMemberId: Long, memberId: Long): BlockMember?
     fun isBlocked(blockedMemberId: Long, memberId: Long): Boolean
-    fun getBlockedMemberIdList(memberId: Long): List<Long>
+    fun getBlockedMemberList(memberId: Long): List<Long>
-    fun getBlockedMemberList(offset: Long, limit: Long, memberId: Long): List<GetBlockedMemberListItem>
-    fun getBlockedMemberTotalCount(memberId: Long): Int
 }
 
 @Repository
-class BlockMemberQueryRepositoryImpl(
+class BlockMemberQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : BlockMemberQueryRepository {
-    private val queryFactory: JPAQueryFactory,
-
-    @Value("\${cloud.aws.cloud-front.host}")
-    private val cloudFrontHost: String
-) : BlockMemberQueryRepository {
     override fun getBlockAccount(blockedMemberId: Long, memberId: Long): BlockMember? {
         return queryFactory
             .selectFrom(blockMember)
             .where(
-                blockMember.blockedMember.id.eq(blockedMemberId)
+                blockMember.blockedMemberId.eq(blockedMemberId)
-                    .and(blockMember.member.id.eq(memberId))
+                    .and(blockMember.memberId.eq(memberId))
             )
             .orderBy(blockMember.id.desc())
             .fetchFirst()
@@ -41,8 +32,8 @@ class BlockMemberQueryRepositoryImpl(
             .select(blockMember.id)
             .from(blockMember)
             .where(
-                blockMember.member.id.eq(memberId)
+                blockMember.memberId.eq(memberId)
-                    .and(blockMember.blockedMember.id.eq(blockedMemberId))
+                    .and(blockMember.blockedMemberId.eq(blockedMemberId))
                     .and(blockMember.isActive.isTrue)
             )
             .fetchOne()
@@ -50,47 +41,14 @@ class BlockMemberQueryRepositoryImpl(
         return blockedAccount != null
     }
 
-    override fun getBlockedMemberIdList(memberId: Long): List<Long> {
+    override fun getBlockedMemberList(memberId: Long): List<Long> {
         return queryFactory
-            .select(blockMember.blockedMember.id)
+            .select(blockMember.blockedMemberId)
             .from(blockMember)
             .where(
-                blockMember.member.id.eq(memberId)
+                blockMember.memberId.eq(memberId)
                     .and(blockMember.isActive.isTrue)
             )
             .fetch()
     }
-
-    override fun getBlockedMemberList(offset: Long, limit: Long, memberId: Long): List<GetBlockedMemberListItem> {
-        return queryFactory
-            .select(
-                QGetBlockedMemberListItem(
-                    blockMember.blockedMember.id,
-                    blockMember.blockedMember.nickname,
-                    blockMember.blockedMember.profileImage.prepend("").prepend(cloudFrontHost),
-                    blockMember.blockedMember.isActive
-                )
-            )
-            .from(blockMember)
-            .innerJoin(blockMember.blockedMember, member)
-            .where(
-                blockMember.member.id.eq(memberId)
-                    .and(blockMember.isActive.isTrue)
-            )
-            .offset(offset)
-            .limit(limit)
-            .fetch()
-    }
-
-    override fun getBlockedMemberTotalCount(memberId: Long): Int {
-        return queryFactory
-            .select(blockMember.id)
-            .from(blockMember)
-            .where(
-                blockMember.member.id.eq(memberId)
-                    .and(blockMember.isActive.isTrue)
-            )
-            .fetch()
-            .size
-    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/member/block/GetBlockedMemberListResponse.kt

@@ -1,15 +0,0 @@
-package kr.co.vividnext.sodalive.member.block
-
-import com.querydsl.core.annotations.QueryProjection
-
-data class GetBlockedMemberListResponse(
-    val totalCount: Int,
-    val items: List<GetBlockedMemberListItem>
-)
-
-data class GetBlockedMemberListItem @QueryProjection constructor(
-    val memberId: Long,
-    val nickname: String,
-    val profileImageUrl: String,
-    val isBlocked: Boolean
-)