Skip to content

[TMO-59] UserBlock 이력 찾는 부분 수정 #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DoyoubK merged 1 commit into from
Apr 17, 2025
Merged

[TMO-59] UserBlock 이력 찾는 부분 수정 #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/main/java/swyp/swyp6_team7/member/service/MemberBlockService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,17 +218,28 @@ public UserBlockDetailResponse getBlockDetail(String token) {
}
Integer userNumber = Integer.parseInt(userNumberStr);

log.info("UserNumber={}", userNumber);

Users user = userRepository.findById(userNumber)
.orElseThrow(() -> new IllegalArgumentException("일반 회원 정보를 찾을 수 없습니다."));

if (!user.isBlocked()) {
return new UserBlockDetailResponse(userNumber, user.getUserEmail(), user.getUserName(), false, null, null);
}

UserBlock userBlock = userBlockRepository.findAllByUserNumberOrderByRegTs(userNumber)
.stream().filter(UserBlock::isValidBlock)
List<UserBlock> 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(
Expand Down
Loading