From b0c7819b5a9ad19f36961bf11cc03a43c3e1c46f Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 3 Sep 2024 17:52:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=A8=EB=8B=A8=ED=95=9C=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/member/MemberController.kt | 9 +++++++++ .../kr/co/vividnext/sodalive/member/MemberService.kt | 4 ++++ .../sodalive/member/block/BlockMemberRepository.kt | 6 +++--- 3 files changed, 16 insertions(+), 3 deletions(-) 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()