Skip to content

Commit

Permalink
refactor: 변수명 직관적으로 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
hjk0761 committed Oct 22, 2024
1 parent db36cea commit e596f55
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ public UserFeedbackResponse getReceivedFeedback(long feedbackReceiverId) {
return getUserFeedbackResponse(developFeedbackOutput, socialFeedbackOutput, Room::isClosed);
}

private UserFeedbackResponse getUserFeedbackResponse(Map<Long, List<FeedbackOutput>> developFeedbackOutput, Map<Long, List<FeedbackOutput>> socialFeedbackOutput, Predicate<Room> predicate) {
private UserFeedbackResponse getUserFeedbackResponse(Map<Long, List<FeedbackOutput>> developFeedbackOutput, Map<Long, List<FeedbackOutput>> socialFeedbackOutput, Predicate<Room> roomStatusPredicate) {
Map<Long, List<FeedbackResponse>> developFeedbacks = FeedbackMapper.toFeedbackResponseMap(developFeedbackOutput);
Map<Long, List<FeedbackResponse>> socialFeedbacks = FeedbackMapper.toFeedbackResponseMap(socialFeedbackOutput);

List<FeedbacksResponse> feedbacksResponses = getFeedbacksResponses(developFeedbacks, socialFeedbacks, predicate);
List<FeedbacksResponse> feedbacksResponses = getFeedbacksResponses(developFeedbacks, socialFeedbacks, roomStatusPredicate);
return new UserFeedbackResponse(feedbacksResponses);
}

Expand All @@ -60,29 +60,29 @@ private void maskingIfNoFeedbackDeliver(long receiverId, Map<Long, List<Feedback
socialFeedbackOutput.forEach((key, value) -> socialFeedbackOutput.put(key, maskingFeedback(receiverId, value, false)));
}

private List<FeedbackOutput> maskingFeedback(long receiverId, List<FeedbackOutput> feedbackOutputs, boolean isDevelopFeedback) {
BiPredicate<Long, Long> biPredicate = isDevelopFeedback ? socialFeedbackReader::existsByDeliverAndReceiver : developFeedbackReader::existsByDeliverAndReceiver;
private List<FeedbackOutput> maskingFeedback(long receiverId, List<FeedbackOutput> feedbackOutputs, boolean needToCheckSocialFeedback) {
BiPredicate<Long, Long> feedbackExistencePredicate = needToCheckSocialFeedback ? socialFeedbackReader::existsByDeliverAndReceiver : developFeedbackReader::existsByDeliverAndReceiver;
return feedbackOutputs.stream()
.map(feedbackOutput -> {
if (needToMasking(receiverId, feedbackOutput, biPredicate)) {
if (needToMasking(receiverId, feedbackOutput, feedbackExistencePredicate)) {
return FeedbackOutput.masking(feedbackOutput);
}
return feedbackOutput;
})
.toList();
}

private boolean needToMasking(long receiverId, FeedbackOutput feedbackResponse, BiPredicate<Long, Long> biConsumer) {
private boolean needToMasking(long receiverId, FeedbackOutput feedbackResponse, BiPredicate<Long, Long> feedbackExistencePredicate) {
long deliverId = feedbackResponse.receiverId();
return !biConsumer.test(receiverId, deliverId);
return !feedbackExistencePredicate.test(receiverId, deliverId);
}

private List<FeedbacksResponse> getFeedbacksResponses(Map<Long, List<FeedbackResponse>> developFeedbacks, Map<Long, List<FeedbackResponse>> socialFeedbacks, Predicate<Room> predicate) {
private List<FeedbacksResponse> getFeedbacksResponses(Map<Long, List<FeedbackResponse>> developFeedbacks, Map<Long, List<FeedbackResponse>> socialFeedbacks, Predicate<Room> roomStatusPredicate) {
List<Long> roomIds = extractDistinctKeyStreams(developFeedbacks, socialFeedbacks).toList();
List<Room> rooms = roomRepository.findAllById(roomIds);

return rooms.stream()
.filter(predicate)
.filter(roomStatusPredicate)
.map(room -> FeedbacksResponse.of(room, emptyListIfNull(developFeedbacks.get(room.getId())), emptyListIfNull(socialFeedbacks.get(room.getId()))))
.toList();
}
Expand Down

0 comments on commit e596f55

Please sign in to comment.