From b7e98d7d597d899b0bb01f434107188a1bd56090 Mon Sep 17 00:00:00 2001 From: doyoubkwon Date: Thu, 17 Apr 2025 17:59:58 +0900 Subject: [PATCH] =?UTF-8?q?[TMO-59]=20UserBlock=20=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=B0=BE=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/MemberBlockService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/swyp/swyp6_team7/member/service/MemberBlockService.java b/src/main/java/swyp/swyp6_team7/member/service/MemberBlockService.java index 633f1f91..81588809 100644 --- a/src/main/java/swyp/swyp6_team7/member/service/MemberBlockService.java +++ b/src/main/java/swyp/swyp6_team7/member/service/MemberBlockService.java @@ -218,6 +218,8 @@ public UserBlockDetailResponse getBlockDetail(String token) { } Integer userNumber = Integer.parseInt(userNumberStr); + log.info("UserNumber={}", userNumber); + Users user = userRepository.findById(userNumber) .orElseThrow(() -> new IllegalArgumentException("일반 회원 정보를 찾을 수 없습니다.")); @@ -225,10 +227,19 @@ public UserBlockDetailResponse getBlockDetail(String token) { return new UserBlockDetailResponse(userNumber, user.getUserEmail(), user.getUserName(), false, null, null); } - UserBlock userBlock = userBlockRepository.findAllByUserNumberOrderByRegTs(userNumber) - .stream().filter(UserBlock::isValidBlock) + List userBlocks = userBlockRepository.findAllByUserNumberOrderByRegTs(userNumber); + log.info("UserBlocks={}", userBlocks.size()); + + if (userBlocks.isEmpty()) { + log.warn("계정 정지 이력이 없습니다. 해당 유저에 대한 확인이 필요합니다."); + return new UserBlockDetailResponse(userNumber, user.getUserEmail(), user.getUserName(), false, null, null); + } + + UserBlock userBlock = userBlocks.stream().filter(UserBlock::isValidBlock) .toList().getLast(); + log.info("User Block={}", userBlock.getBlockType()); + if (userBlock != null && userBlock.getBlockType() == BlockType.BLOCK) { log.info("계정 정지 이력이 존재합니다."); return new UserBlockDetailResponse(