Skip to content

Commit a9defda

Browse files
authored
Merge pull request #79 from rhkr8521/fix/#like,comment-block-user-hidden
[FIX] 내가 누른 좋아요, 댓글 메모 차단된 사용자 필터링 추가
2 parents 520d79d + 07905e1 commit a9defda

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

src/main/java/com/rhkr8521/mapping/api/memo/service/MemoService.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,17 @@ public List<MemoListResponseDTO> getMemosWithMyComments(UserDetails userDetails)
518518
.orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()))
519519
.getId();
520520

521+
// 차단한 사용자 목록
522+
List<Long> blockedIds = memberService.getBlockedUserIds(userId);
523+
// 내가 댓글 단 메모 목록
521524
List<Memo> memos = commentRepository.findDistinctMemoByMemberId(userId);
522525

523-
return memos.stream()
526+
// 메모 필터링
527+
List<Memo> filtered = memos.stream()
528+
.filter(memo -> blockedIds.isEmpty() || !blockedIds.contains(memo.getMember().getId()))
529+
.toList();
530+
531+
return filtered.stream()
524532
.map(this::convertToDTO)
525533
.collect(Collectors.toList());
526534
}
@@ -532,9 +540,17 @@ public List<MemoListResponseDTO> getMemosILiked(UserDetails userDetails) {
532540
.orElseThrow(() -> new NotFoundException(ErrorStatus.USER_NOTFOUND_EXCEPTION.getMessage()))
533541
.getId();
534542

543+
// 차단한 사용자 목록
544+
List<Long> blockedIds = memberService.getBlockedUserIds(userId);
545+
// 좋아요한 메모 목록
535546
List<Memo> likedMemos = memoLikeRepository.findMemosByMemberId(userId);
536547

537-
return likedMemos.stream()
548+
// 메모 필터링
549+
List<Memo> filtered = likedMemos.stream()
550+
.filter(memo -> blockedIds.isEmpty() || !blockedIds.contains(memo.getMember().getId()))
551+
.toList();
552+
553+
return filtered.stream()
538554
.map(this::convertToDTO)
539555
.collect(Collectors.toList());
540556
}

src/main/java/com/rhkr8521/mapping/common/config/swagger/SwaggerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public OpenAPI openAPI() {
4040
SecurityRequirement refreshTokenRequirement = new SecurityRequirement().addList(refreshTokenHeader);
4141

4242
Server server = new Server();
43-
server.setUrl("https://api.mapping.kro.kr");
43+
server.setUrl("http://localhost:8080");
4444

4545
return new OpenAPI()
4646
.info(new Info()

0 commit comments

Comments
 (0)