diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt index e65e2e9..a003f6b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt @@ -153,6 +153,15 @@ class MemberController(private val service: MemberService) { ApiResponse.ok(service.creatorUnFollow(creatorId = request.creatorId, memberId = member.id!!)) } + @GetMapping("/block") + fun getBlockedMemberList( + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.getBlockedMemberList(member.id!!)) + } + @PostMapping("/block") fun memberBlock( @RequestBody request: MemberBlockRequest, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index de05f33..1c18448 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -357,6 +357,10 @@ class MemberService( } } + fun getBlockedMemberList(memberId: Long): List { + return blockMemberRepository.getBlockedMemberList(memberId = memberId) + } + @Transactional fun memberBlock(request: MemberBlockRequest, memberId: Long) { var blockMember = blockMemberRepository.getBlockAccount( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMemberRepository.kt index f81572d..0a4c0d4 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMemberRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/block/BlockMemberRepository.kt @@ -11,7 +11,7 @@ interface BlockMemberRepository : JpaRepository, BlockMemberQ interface BlockMemberQueryRepository { fun getBlockAccount(blockedMemberId: Long, memberId: Long): BlockMember? fun isBlocked(blockedMemberId: Long, memberId: Long): Boolean - fun getBlockedMemberList(creatorId: Long): List + fun getBlockedMemberList(memberId: Long): List } @Repository @@ -41,12 +41,12 @@ class BlockMemberQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) return blockedAccount != null } - override fun getBlockedMemberList(creatorId: Long): List { + override fun getBlockedMemberList(memberId: Long): List { return queryFactory .select(blockMember.blockedMemberId) .from(blockMember) .where( - blockMember.memberId.eq(creatorId) + blockMember.memberId.eq(memberId) .and(blockMember.isActive.isTrue) ) .fetch()