chore: getBlockedUsers 기존 메서드 수정

sopt-makers · Nov 17, 2024 · 609225d · 609225d
1 parent 8dd90d7
commit 609225d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/main/src/main/java/org/sopt/makers/crew/main/comment/v2/service/CommentV2ServiceImpl.java b/main/src/main/java/org/sopt/makers/crew/main/comment/v2/service/CommentV2ServiceImpl.java
@@ -174,7 +174,11 @@ public CommentV2GetCommentsResponseDto getComments(Integer postId, Integer page,
 		User user = userRepository.findByIdOrThrow(userId);
 		Long orgId = user.getOrgId().longValue();
 
-		Map<Long, Boolean> blockedUsers = memberBlockService.getBlockedUsers(orgId);
+		List<Long> userOrgIds = comments.stream()
+			.map(comment -> comment.getUser().getOrgId().longValue())
+			.toList();
+
+		Map<Long, Boolean> blockedUsers = memberBlockService.getBlockedUsers(orgId, userOrgIds);
 
 		MyLikes myLikes = new MyLikes(likeRepository.findAllByUserIdAndCommentIdNotNull(userId));
 

diff --git a/...c/main/java/org/sopt/makers/crew/main/external/playground/service/MemberBlockService.java b/...c/main/java/org/sopt/makers/crew/main/external/playground/service/MemberBlockService.java
@@ -5,6 +5,4 @@
 
 public interface MemberBlockService {
 	Map<Long, Boolean> getBlockedUsers(Long blockerOrgId, List<Long> userOrgIds);
-
-	Map<Long, Boolean> getBlockedUsers(Long blockerOrgId);
 }
diff --git a/...in/java/org/sopt/makers/crew/main/external/playground/service/MemberBlockServiceImpl.java b/...in/java/org/sopt/makers/crew/main/external/playground/service/MemberBlockServiceImpl.java
@@ -24,12 +24,4 @@ public Map<Long, Boolean> getBlockedUsers(Long blockerOrgId, List<Long> userOrgI
 			.filter(memberBlock -> userOrgIds.contains(memberBlock.getBlockedMember()))
 			.collect(Collectors.toMap(MemberBlock::getBlockedMember, memberBlock -> true));
 	}
-
-	@Override
-	public Map<Long, Boolean> getBlockedUsers(Long blockerOrgId) {
-		List<MemberBlock> memberBlocks = memberBlockRepository.findAllByBlockerAndIsBlockedTrue(blockerOrgId);
-
-		return memberBlocks.stream()
-			.collect(Collectors.toMap(MemberBlock::getBlockedMember, memberBlock -> true));
-	}
 }
diff --git a/main/src/main/java/org/sopt/makers/crew/main/internal/service/InternalMeetingService.java b/main/src/main/java/org/sopt/makers/crew/main/internal/service/InternalMeetingService.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.sopt.makers.crew.main.entity.meeting.Meeting;
 import org.sopt.makers.crew.main.entity.meeting.MeetingRepository;
@@ -44,7 +45,13 @@ public InternalMeetingGetAllMeetingDto getMeetings(
 
 		Page<Meeting> meetings = meetingRepository.findAllByQuery(queryCommand,
 			new CustomPageable(queryCommand.getPage() - 1, queryCommand.getTake(), sort), time);
-		Map<Long, Boolean> blockedUsers = memberBlockService.getBlockedUsers(orgId.longValue());
+
+		List<Long> userOrgIds = meetings.getContent()
+			.stream()
+			.map(meeting -> meeting.getUser().getOrgId().longValue())
+			.toList();
+
+		Map<Long, Boolean> blockedUsers = memberBlockService.getBlockedUsers(orgId.longValue(), userOrgIds);
 
 		List<InternalMeetingResponseDto> meetingResponseDtos = meetings.getContent().stream()
 			.map(meeting -> InternalMeetingResponseDto.of(meeting, time.now(),