diff --git a/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepository.java b/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepository.java index 05f5d3e..5abb0d4 100644 --- a/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepository.java +++ b/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepository.java @@ -16,5 +16,5 @@ public interface HouseWorkCompleteCustomRepository { List findMonthlyHouseWorkStatisticByTeamIdAndHouseWorkNameV2(Long memberId, YearMonth from, String houseWorkName); - Long findMonthlyHouseWorkByMember(Long memberId, YearMonth month); + Long getMonthlyCountByMember(Long memberId, YearMonth month); } diff --git a/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepositoryImpl.java b/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepositoryImpl.java index 495d12a..607769e 100644 --- a/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepositoryImpl.java +++ b/fairer-api/src/main/java/com/depromeet/fairer/repository/houseworkcomplete/HouseWorkCompleteCustomRepositoryImpl.java @@ -2,7 +2,6 @@ import com.depromeet.fairer.domain.houseworkComplete.HouseworkComplete; import com.depromeet.fairer.vo.houseWorkComplete.HouseWorkCompleteStatisticsVo; -import com.querydsl.core.Tuple; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -90,16 +89,16 @@ public List findMonthlyHouseWorkStatisticByTeamIdAndHouseWork } @Override - public Long findMonthlyHouseWorkByMember(Long memberId, YearMonth month) { + public Long getMonthlyCountByMember(Long memberId, YearMonth month) { LocalDateTime startTimeOfMonth = month.atDay(1) .atStartOfDay(); LocalDateTime endTimeOfMonth = month.atEndOfMonth().atTime(LocalTime.MAX); - return (long) jpaQueryFactory.selectFrom(houseworkComplete) + return (long) jpaQueryFactory.select(houseworkComplete.count()) + .from(houseWork) .where(houseworkComplete.member.memberId.eq(memberId), houseworkComplete.successDateTime.between(startTimeOfMonth, endTimeOfMonth)) - .fetch() - .size(); + .fetchOne(); } private BooleanExpression houseworkNameEq(String houseworkName) { diff --git a/fairer-api/src/main/java/com/depromeet/fairer/service/houseworkComplete/HouseWorkCompleteService.java b/fairer-api/src/main/java/com/depromeet/fairer/service/houseworkComplete/HouseWorkCompleteService.java index c9084ad..1ef7356 100644 --- a/fairer-api/src/main/java/com/depromeet/fairer/service/houseworkComplete/HouseWorkCompleteService.java +++ b/fairer-api/src/main/java/com/depromeet/fairer/service/houseworkComplete/HouseWorkCompleteService.java @@ -91,7 +91,7 @@ public MonthlyHouseWorkStatisticResponseDto getMonthlyHouseWorkRanking(Long memb List memberHouseWorkStatisticDtos = new ArrayList<>(); for(Member member : currentMember.getTeam().getMembers()){ memberHouseWorkStatisticDtos.add( - MemberHouseWorkStatisticDto.of(member, houseWorkCompleteRepository.findMonthlyHouseWorkByMember(member.getMemberId(), YearMonth.from(month)))); + MemberHouseWorkStatisticDto.of(member, houseWorkCompleteRepository.getMonthlyCountByMember(member.getMemberId(), YearMonth.from(month)))); } // List teamHouseWorkStatistics = houseWorkCompleteRepository.findMonthlyHouseWorkRanking( diff --git a/fairer-api/src/main/java/com/depromeet/fairer/service/member/oauth/OauthLoginService.java b/fairer-api/src/main/java/com/depromeet/fairer/service/member/oauth/OauthLoginService.java index 690ebe7..4a92f8e 100644 --- a/fairer-api/src/main/java/com/depromeet/fairer/service/member/oauth/OauthLoginService.java +++ b/fairer-api/src/main/java/com/depromeet/fairer/service/member/oauth/OauthLoginService.java @@ -54,7 +54,6 @@ import java.security.spec.RSAPublicKeySpec; import java.time.LocalDateTime; import java.util.*; - @Slf4j @Service @Transactional