fix: 월별 집안일 완료 랭킹 api - houseworkComplete.member 기준으로 로직 수정

fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepository.java

@@ -15,4 +15,6 @@ public interface HouseWorkCompleteCustomRepository {
     List<HouseWorkCompleteStatisticsVo> findMonthlyHouseWorkRanking(Long teamId, YearMonth month);
 
     List<HouseworkComplete> findMonthlyHouseWorkStatisticByTeamIdAndHouseWorkNameV2(Long memberId, YearMonth from, String houseWorkName);
+
+    Long findMonthlyHouseWorkByMember(Long memberId, YearMonth month);
 }

fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepositoryImpl.java

@@ -89,6 +89,19 @@ public List<HouseworkComplete> findMonthlyHouseWorkStatisticByTeamIdAndHouseWork
                 .fetch();
     }
 
+    @Override
+    public Long findMonthlyHouseWorkByMember(Long memberId, YearMonth month) {
+
+        LocalDateTime startTimeOfMonth = month.atDay(1) .atStartOfDay();
+        LocalDateTime endTimeOfMonth = month.atEndOfMonth().atTime(LocalTime.MAX);
+
+        return (long) jpaQueryFactory.selectFrom(houseworkComplete)
+                .where(houseworkComplete.member.memberId.eq(memberId),
+                        houseworkComplete.successDateTime.between(startTimeOfMonth, endTimeOfMonth))
+                .fetch()
+                .size();
+    }
+
     private BooleanExpression houseworkNameEq(String houseworkName) {
         return houseworkName != null? houseWork.houseWorkName.eq(houseworkName) : null;
     }

fairer-api/src/main/java/com/depromeet/fairer/service/houseworkComplete/HouseWorkCompleteService.java

@@ -88,16 +88,23 @@ public MonthlyHouseWorkStatisticResponseDto getMonthlyHouseWorkRanking(Long memb
                 () -> new NoSuchMemberException("memberId에 해당하는 회원을 찾지 못했습니다.")
         );
 
-        List<HouseWorkCompleteStatisticsVo> teamHouseWorkStatistics = houseWorkCompleteRepository.findMonthlyHouseWorkRanking(
-                currentMember.getTeam().getTeamId(),
-                YearMonth.from(month));
-
-        List<MemberHouseWorkStatisticDto> houseWorkStatics = teamHouseWorkStatistics.stream()
-                .map(statistic -> MemberHouseWorkStatisticDto.of(statistic.getMember(), statistic.getCompleteCount()))
-                .sorted(Comparator.comparing(MemberHouseWorkStatisticDto::getHouseWorkCount).reversed())
-                .collect(Collectors.toList());
+        List<MemberHouseWorkStatisticDto> memberHouseWorkStatisticDtos = new ArrayList<>();
+        for(Member member : currentMember.getTeam().getMembers()){
+            memberHouseWorkStatisticDtos.add(
+                    MemberHouseWorkStatisticDto.of(member, houseWorkCompleteRepository.findMonthlyHouseWorkByMember(member.getMemberId(), YearMonth.from(month))));
+        }
 
-        return MonthlyHouseWorkStatisticResponseDto.of(houseWorkStatics);
+//        List<HouseWorkCompleteStatisticsVo> teamHouseWorkStatistics = houseWorkCompleteRepository.findMonthlyHouseWorkRanking(
+//                currentMember.getTeam().getTeamId(),
+//                YearMonth.from(month));
+//
+//        List<MemberHouseWorkStatisticDto> houseWorkStatics = teamHouseWorkStatistics.stream()
+//                .map(statistic -> MemberHouseWorkStatisticDto.of(statistic.getMember(), statistic.getCompleteCount()))
+//                .sorted(Comparator.comparing(MemberHouseWorkStatisticDto::getHouseWorkCount).reversed())
+//                .collect(Collectors.toList());
+
+        memberHouseWorkStatisticDtos.sort(Comparator.comparing(MemberHouseWorkStatisticDto::getHouseWorkCount).reversed());
+        return MonthlyHouseWorkStatisticResponseDto.of(memberHouseWorkStatisticDtos);
     }
 
 }

fairer-api/src/main/java/com/depromeet/fairer/vo/houseWorkComplete/HouseWorkCompleteStatisticsVo.java

@@ -2,7 +2,10 @@
 
 import com.depromeet.fairer.domain.member.Member;
 import lombok.Getter;
+import lombok.Setter;
+
 @Getter
+@Setter
 public class HouseWorkCompleteStatisticsVo {
 
     private Member member;