diff --git a/src/main/java/com/moplus/moplus_server/client/homefeed/service/HomeFeedFacadeService.java b/src/main/java/com/moplus/moplus_server/client/homefeed/service/HomeFeedFacadeService.java index ef40413..73e5562 100644 --- a/src/main/java/com/moplus/moplus_server/client/homefeed/service/HomeFeedFacadeService.java +++ b/src/main/java/com/moplus/moplus_server/client/homefeed/service/HomeFeedFacadeService.java @@ -28,9 +28,6 @@ @RequiredArgsConstructor public class HomeFeedFacadeService { - private static final LocalDate today = LocalDate.now(); - private static final LocalDate monday = today.with(DayOfWeek.MONDAY); - private static final LocalDate friday = today.with(DayOfWeek.FRIDAY); private final ProblemSetStatisticRepository problemSetStatisticRepository; private final PublishGetService publishGetService; private final ProblemSetGetService problemSetGetService; @@ -38,18 +35,23 @@ public class HomeFeedFacadeService { @Transactional(readOnly = true) public HomeFeedResponse getHomeFeed(Member member) { + LocalDate today = LocalDate.now(); + LocalDate monday = today.with(DayOfWeek.MONDAY); + LocalDate friday = today.with(DayOfWeek.FRIDAY); + Long memberId = member.getId(); List publishes = publishGetService.getPublishesBetweenDates(monday, friday); - List dailyProgresses = getDailyProgresses(memberId, publishes); + List dailyProgresses = getDailyProgresses(memberId, publishes, monday, friday); - List problemSets = getWeekdayProblemSets(publishes); + List problemSets = getWeekdayProblemSets(publishes, monday, friday); return HomeFeedResponse.of(dailyProgresses, problemSets); } - private List getDailyProgresses(Long memberId, List publishes) { + private List getDailyProgresses(Long memberId, List publishes, + LocalDate monday, LocalDate friday) { Map progressStatuses = problemSubmitGetService.getProgressStatuses(memberId, publishes); @@ -66,7 +68,8 @@ private List getDailyProgresses(Long memberId, List getWeekdayProblemSets(List publishes) { + private List getWeekdayProblemSets(List publishes, + LocalDate monday, LocalDate friday) { Map publishByDate = publishes.stream() .collect(Collectors.toMap(Publish::getPublishedDate, publish -> publish));