From 51075f1f7f2ef8c9513650cbf94f8be7cacf62b0 Mon Sep 17 00:00:00 2001 From: sungHeeLee <70899677+hee9841@users.noreply.github.com> Date: Wed, 6 Nov 2024 21:52:37 +0900 Subject: [PATCH] =?UTF-8?q?Refactor:=20=EB=9F=AC=EB=8B=9D=20=EB=A0=88?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20Repository=20=EB=A6=AC=ED=8C=A9=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20(#297)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rename: findTotalDistanceMeterByMemberId 메소드명을 findTotalDistanceMeterByMemberIdWithRangeDate로 변경 * Fix: warning 제거(get(0) replace to getFirst()) * Style: 리파지 토리 함수 순서 변경 (find -> has -> save -> delete 순) * Rename: 메소드명 변경 (findAvgDistanceMeterByMemberIdAndDateRange -> findAvgDistanceMeterByMemberIdWithDateRange) * Rename: 메소드명 변경 ByDateRange 또는 AndDateRange 접미사를 WithDateRange로 변경하기 * Style: RepositoryImpl 순서 변경(조회 -> update -> save -> delete 순으로, 그 안에서는 jpa -> jooq순으로) * Feat: 사용자 id로 전체 러닝 거리 합을 구하는 리파지토리 함수 추가 * Refactor: 회원 id + 기간으로 전체 회원의 러닝 거리를 조회 -> 회원아이디에 따라 전체 러닝 거리를 구하는 함수로 변경 --- .../running/RunningRecordService.java | 12 ++-- .../runus/application/scale/ScaleService.java | 5 +- .../running/RunningRecordRepository.java | 26 ++++---- .../running/RunningRecordRepositoryImpl.java | 66 ++++++++++--------- .../running/JooqRunningRecordRepository.java | 48 +++++++++----- .../running/RunningRecordServiceTest.java | 10 +-- .../application/scale/ScaleServiceTest.java | 10 ++- .../RunningRecordRepositoryImplTest.java | 24 +++---- 8 files changed, 108 insertions(+), 93 deletions(-) diff --git a/src/main/java/com/dnd/runus/application/running/RunningRecordService.java b/src/main/java/com/dnd/runus/application/running/RunningRecordService.java index ad1aa673..4e8bdbce 100644 --- a/src/main/java/com/dnd/runus/application/running/RunningRecordService.java +++ b/src/main/java/com/dnd/runus/application/running/RunningRecordService.java @@ -138,15 +138,15 @@ public RunningRecordWeeklySummaryResponse getWeeklySummary( double conversionFactor; if (summaryType.equals(RunningRecordWeeklySummaryType.DISTANCE)) { - weekSummaries = runningRecordRepository.findDailyDistancesMeterByDateRange( + weekSummaries = runningRecordRepository.findDailyDistancesMeterWithDateRange( memberId, startWeekDate, nextOfEndWeekDate); - avgValue = runningRecordRepository.findAvgDistanceMeterByMemberIdAndDateRange( + avgValue = runningRecordRepository.findAvgDistanceMeterByMemberIdWithDateRange( memberId, startWeekDate.minusDays(7), nextOfEndWeekDate.minusDays(7)); conversionFactor = METERS_IN_A_KILOMETER; } else { - weekSummaries = runningRecordRepository.findDailyDurationsSecByDateRange( + weekSummaries = runningRecordRepository.findDailyDurationsSecWithDateRange( memberId, startWeekDate, nextOfEndWeekDate); - avgValue = runningRecordRepository.findAvgDurationSecByMemberIdAndDateRange( + avgValue = runningRecordRepository.findAvgDurationSecByMemberIdWithDateRange( memberId, startWeekDate.minusDays(7), nextOfEndWeekDate.minusDays(7)); conversionFactor = SECONDS_PER_HOUR; } @@ -198,7 +198,7 @@ public RunningRecordAddResultResponse addRunningRecord(long memberId, RunningRec .build()); OffsetDateTime now = OffsetDateTime.now(); - int totalDistance = runningRecordRepository.findTotalDistanceMeterByMemberId(memberId, BASE_TIME, now); + int totalDistance = runningRecordRepository.findTotalDistanceMeterByMemberId(memberId); Duration totalDuration = runningRecordRepository.findTotalDurationByMemberId(memberId, BASE_TIME, now); eventPublisher.publishEvent(new RunningRecordAddedEvent(member, record, totalDistance, totalDuration)); @@ -226,7 +226,7 @@ public RunningRecordMonthlySummaryResponse getMonthlyRunningSummery(long memberI int monthValue = startDateOfMonth.getMonthValue(); - int monthlyTotalDistance = runningRecordRepository.findTotalDistanceMeterByMemberId( + int monthlyTotalDistance = runningRecordRepository.findTotalDistanceMeterByMemberIdWithRangeDate( memberId, startDateOfMonth, startDateOfNextMonth); MemberLevel.Current currentMemberLevel = memberLevelRepository.findByMemberIdWithLevel(memberId); diff --git a/src/main/java/com/dnd/runus/application/scale/ScaleService.java b/src/main/java/com/dnd/runus/application/scale/ScaleService.java index 0da44c73..34fb8939 100644 --- a/src/main/java/com/dnd/runus/application/scale/ScaleService.java +++ b/src/main/java/com/dnd/runus/application/scale/ScaleService.java @@ -8,7 +8,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; import java.time.OffsetDateTime; import java.util.List; @@ -71,9 +70,7 @@ private List getAchievedCourses( private ScaleCoursesResponse.CurrentCourse calculateCurrentScaleLeftMeter( List scaleAchievementLogs, long memberId) { - OffsetDateTime now = OffsetDateTime.now(); - OffsetDateTime start = OffsetDateTime.of(LocalDate.of(1, 1, 1).atStartOfDay(), now.getOffset()); - int memberRunMeterSum = runningRecordRepository.findTotalDistanceMeterByMemberId(memberId, start, now); + int memberRunMeterSum = runningRecordRepository.findTotalDistanceMeterByMemberId(memberId); ScaleAchievementLog currentScale = scaleAchievementLogs.stream() .filter(log -> log.achievedDate() == null) diff --git a/src/main/java/com/dnd/runus/domain/running/RunningRecordRepository.java b/src/main/java/com/dnd/runus/domain/running/RunningRecordRepository.java index 1123fa1a..ba92ab6e 100644 --- a/src/main/java/com/dnd/runus/domain/running/RunningRecordRepository.java +++ b/src/main/java/com/dnd/runus/domain/running/RunningRecordRepository.java @@ -10,30 +10,32 @@ public interface RunningRecordRepository { Optional findById(long runningRecordId); - RunningRecord save(RunningRecord runningRecord); - - void deleteByMemberId(long memberId); - List findByMemberIdAndStartAtBetween( long memberId, OffsetDateTime startTime, OffsetDateTime endTime); - boolean hasByMemberIdAndStartAtBetween(long memberId, OffsetDateTime startTime, OffsetDateTime endTime); + List findByMember(Member member); - int findTotalDistanceMeterByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime endDate); + int findTotalDistanceMeterByMemberId(long memberId); - Duration findTotalDurationByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime endDate); + int findTotalDistanceMeterByMemberIdWithRangeDate(long memberId, OffsetDateTime startDate, OffsetDateTime endDate); - List findByMember(Member member); + Duration findTotalDurationByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime endDate); - List findDailyDistancesMeterByDateRange( + List findDailyDistancesMeterWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate); - List findDailyDurationsSecByDateRange( + List findDailyDurationsSecWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate); - int findAvgDistanceMeterByMemberIdAndDateRange( + int findAvgDistanceMeterByMemberIdWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate); - int findAvgDurationSecByMemberIdAndDateRange( + int findAvgDurationSecByMemberIdWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate); + + boolean hasByMemberIdAndStartAtBetween(long memberId, OffsetDateTime startTime, OffsetDateTime endTime); + + RunningRecord save(RunningRecord runningRecord); + + void deleteByMemberId(long memberId); } diff --git a/src/main/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImpl.java b/src/main/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImpl.java index 27f94587..3b35b76d 100644 --- a/src/main/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImpl.java +++ b/src/main/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImpl.java @@ -28,18 +28,6 @@ public Optional findById(long runningRecordId) { return jpaRunningRecordRepository.findById(runningRecordId).map(RunningRecordEntity::toDomain); } - @Override - public RunningRecord save(RunningRecord runningRecord) { - return jpaRunningRecordRepository - .save(RunningRecordEntity.from(runningRecord)) - .toDomain(); - } - - @Override - public void deleteByMemberId(long memberId) { - jpaRunningRecordRepository.deleteByMemberId(memberId); - } - @Override public List findByMemberIdAndStartAtBetween( long memberId, OffsetDateTime startTime, OffsetDateTime endTime) { @@ -49,13 +37,21 @@ public List findByMemberIdAndStartAtBetween( } @Override - public boolean hasByMemberIdAndStartAtBetween(long memberId, OffsetDateTime startTime, OffsetDateTime endTime) { - return jpaRunningRecordRepository.existsByMemberIdAndStartAtBetween(memberId, startTime, endTime); + public List findByMember(Member member) { + return jpaRunningRecordRepository.findByMemberId(member.memberId()).stream() + .map(RunningRecordEntity::toDomain) + .toList(); } @Override - public int findTotalDistanceMeterByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime endtDate) { - return jooqRunningRecordRepository.findTotalDistanceMeterByMemberId(memberId, startDate, endtDate); + public int findTotalDistanceMeterByMemberId(long memberId) { + return jooqRunningRecordRepository.findTotalDistanceMeterByMemberId(memberId); + } + + @Override + public int findTotalDistanceMeterByMemberIdWithRangeDate( + long memberId, OffsetDateTime startDate, OffsetDateTime endDate) { + return jooqRunningRecordRepository.findTotalDistanceMeterByMemberIdWithRangeDate(memberId, startDate, endDate); } @Override @@ -65,36 +61,46 @@ public Duration findTotalDurationByMemberId(long memberId, OffsetDateTime startD } @Override - public List findByMember(Member member) { - return jpaRunningRecordRepository.findByMemberId(member.memberId()).stream() - .map(RunningRecordEntity::toDomain) - .toList(); + public List findDailyDistancesMeterWithDateRange( + long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { + return jooqRunningRecordRepository.findDailyDistancesMeterWithDateRange(memberId, startDate, nextDateOfEndDate); } @Override - public List findDailyDistancesMeterByDateRange( + public List findDailyDurationsSecWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { - return jooqRunningRecordRepository.findDailyDistancesMeterByDateRange(memberId, startDate, nextDateOfEndDate); + return jooqRunningRecordRepository.findDailyDurationsSecMeterWithDateRange( + memberId, startDate, nextDateOfEndDate); } @Override - public List findDailyDurationsSecByDateRange( + public int findAvgDistanceMeterByMemberIdWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { - return jooqRunningRecordRepository.findDailyDurationsSecMeterByDateRange( + return jooqRunningRecordRepository.findAvgDistanceMeterByMemberIdWithDateRange( memberId, startDate, nextDateOfEndDate); } @Override - public int findAvgDistanceMeterByMemberIdAndDateRange( + public int findAvgDurationSecByMemberIdWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { - return jooqRunningRecordRepository.findAvgDistanceMeterByMemberIdAndDateRange( + return jooqRunningRecordRepository.findAvgDurationSecByMemberIdWithDateRange( memberId, startDate, nextDateOfEndDate); } @Override - public int findAvgDurationSecByMemberIdAndDateRange( - long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { - return jooqRunningRecordRepository.findAvgDurationSecByMemberIdAndDateRange( - memberId, startDate, nextDateOfEndDate); + public boolean hasByMemberIdAndStartAtBetween(long memberId, OffsetDateTime startTime, OffsetDateTime endTime) { + return jpaRunningRecordRepository.existsByMemberIdAndStartAtBetween(memberId, startTime, endTime); + } + + @Override + public RunningRecord save(RunningRecord runningRecord) { + return jpaRunningRecordRepository + .save(RunningRecordEntity.from(runningRecord)) + .toDomain(); + } + + @Override + public void deleteByMemberId(long memberId) { + jpaRunningRecordRepository.deleteByMemberId(memberId); } } diff --git a/src/main/java/com/dnd/runus/infrastructure/persistence/jooq/running/JooqRunningRecordRepository.java b/src/main/java/com/dnd/runus/infrastructure/persistence/jooq/running/JooqRunningRecordRepository.java index a6d0f986..75d895c9 100644 --- a/src/main/java/com/dnd/runus/infrastructure/persistence/jooq/running/JooqRunningRecordRepository.java +++ b/src/main/java/com/dnd/runus/infrastructure/persistence/jooq/running/JooqRunningRecordRepository.java @@ -21,7 +21,19 @@ public class JooqRunningRecordRepository { private final DSLContext dsl; - public int findTotalDistanceMeterByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime endDate) { + public int findTotalDistanceMeterByMemberId(long memberId) { + Record1 result = dsl.select(sum(RUNNING_RECORD.DISTANCE_METER).cast(Integer.class)) + .from(RUNNING_RECORD) + .where(RUNNING_RECORD.MEMBER_ID.eq(memberId)) + .fetchOne(); + if (result != null && result.value1() != null) { + return result.value1(); + } + return 0; + } + + public int findTotalDistanceMeterByMemberIdWithRangeDate( + long memberId, OffsetDateTime startDate, OffsetDateTime endDate) { Record1 result = dsl.select(sum(RUNNING_RECORD.DISTANCE_METER).cast(Integer.class)) .from(RUNNING_RECORD) .where(RUNNING_RECORD.MEMBER_ID.eq(memberId)) @@ -34,7 +46,20 @@ public int findTotalDistanceMeterByMemberId(long memberId, OffsetDateTime startD return 0; } - public int findAvgDistanceMeterByMemberIdAndDateRange( + public long findTotalDurationByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { + Record1 result = dsl.select(sum(RUNNING_RECORD.DURATION_SECONDS).cast(Long.class)) + .from(RUNNING_RECORD) + .where(RUNNING_RECORD.MEMBER_ID.eq(memberId)) + .and(RUNNING_RECORD.START_AT.ge(startDate)) + .and(RUNNING_RECORD.START_AT.lt(nextDateOfEndDate)) + .fetchOne(); + if (result != null && result.value1() != null) { + return result.value1(); + } + return 0; + } + + public int findAvgDistanceMeterByMemberIdWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { Record1 result = dsl.select(avg(RUNNING_RECORD.DISTANCE_METER).cast(Integer.class)) .from(RUNNING_RECORD) @@ -48,7 +73,7 @@ public int findAvgDistanceMeterByMemberIdAndDateRange( return 0; } - public int findAvgDurationSecByMemberIdAndDateRange( + public int findAvgDurationSecByMemberIdWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { Record1 result = dsl.select( avg(RUNNING_RECORD.DURATION_SECONDS).cast(Integer.class)) @@ -71,7 +96,7 @@ public int findAvgDurationSecByMemberIdAndDateRange( * @return 기간 내 각 날짜별 달린 거리 합계를 포함한 리스트. * 각 요소는 날짜와 해당 날짜의 거리 합계를 나타내는 {@link DailyRunningRecordSummary} 객체입니다. */ - public List findDailyDistancesMeterByDateRange( + public List findDailyDistancesMeterWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { return dsl.select( @@ -94,7 +119,7 @@ public List findDailyDistancesMeterByDateRange( * @return 기간 내 각 날짜별 달린 시간 합계를 포함한 리스트. * 각 요소는 날짜와 해당 날짜의 달린 시간 합계를 나타내는 {@link DailyRunningRecordSummary} 객체입니다. */ - public List findDailyDurationsSecMeterByDateRange( + public List findDailyDurationsSecMeterWithDateRange( long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { return dsl.select( @@ -109,19 +134,6 @@ public List findDailyDurationsSecMeterByDateRange( .fetch(new DailyRunningSummary()); } - public long findTotalDurationByMemberId(long memberId, OffsetDateTime startDate, OffsetDateTime nextDateOfEndDate) { - Record1 result = dsl.select(sum(RUNNING_RECORD.DURATION_SECONDS).cast(Long.class)) - .from(RUNNING_RECORD) - .where(RUNNING_RECORD.MEMBER_ID.eq(memberId)) - .and(RUNNING_RECORD.START_AT.ge(startDate)) - .and(RUNNING_RECORD.START_AT.lt(nextDateOfEndDate)) - .fetchOne(); - if (result != null && result.value1() != null) { - return result.value1(); - } - return 0; - } - private static class DailyRunningSummary implements RecordMapper { @Override public DailyRunningRecordSummary map(Record record) { diff --git a/src/test/java/com/dnd/runus/application/running/RunningRecordServiceTest.java b/src/test/java/com/dnd/runus/application/running/RunningRecordServiceTest.java index 131f5bc6..bc8a4eff 100644 --- a/src/test/java/com/dnd/runus/application/running/RunningRecordServiceTest.java +++ b/src/test/java/com/dnd/runus/application/running/RunningRecordServiceTest.java @@ -427,7 +427,7 @@ void getMonthlyRunningSummery() { .when(() -> OffsetDateTime.now(ZoneId.of(SERVER_TIMEZONE))) .thenReturn(fixedDate); - given(runningRecordRepository.findTotalDistanceMeterByMemberId(eq(memberId), any(), any())) + given(runningRecordRepository.findTotalDistanceMeterByMemberIdWithRangeDate(eq(memberId), any(), any())) .willReturn(45_780); given(memberLevelRepository.findByMemberIdWithLevel(memberId)) @@ -461,10 +461,10 @@ void getWeeklySummary_Distance() { OffsetDateTime runningDate = startWeekDate.plusDays(2); - given(runningRecordRepository.findDailyDistancesMeterByDateRange(memberId, startWeekDate, nextOfEndWeekDate)) + given(runningRecordRepository.findDailyDistancesMeterWithDateRange(memberId, startWeekDate, nextOfEndWeekDate)) .willReturn(List.of(new DailyRunningRecordSummary(runningDate.toLocalDate(), 3567))); - given(runningRecordRepository.findAvgDistanceMeterByMemberIdAndDateRange( + given(runningRecordRepository.findAvgDistanceMeterByMemberIdWithDateRange( memberId, startWeekDate.minusDays(7), nextOfEndWeekDate.minusDays(7))) .willReturn(800); @@ -496,10 +496,10 @@ void getWeeklySummary_Duration() { OffsetDateTime runningDate = startWeekDate.plusDays(2); - given(runningRecordRepository.findDailyDurationsSecByDateRange(memberId, startWeekDate, nextOfEndWeekDate)) + given(runningRecordRepository.findDailyDurationsSecWithDateRange(memberId, startWeekDate, nextOfEndWeekDate)) .willReturn(List.of(new DailyRunningRecordSummary(runningDate.toLocalDate(), runningDurationSec))); - given(runningRecordRepository.findAvgDurationSecByMemberIdAndDateRange( + given(runningRecordRepository.findAvgDurationSecByMemberIdWithDateRange( memberId, startWeekDate.minusDays(7), nextOfEndWeekDate.minusDays(7))) .willReturn(runningDurationSec); diff --git a/src/test/java/com/dnd/runus/application/scale/ScaleServiceTest.java b/src/test/java/com/dnd/runus/application/scale/ScaleServiceTest.java index 2104e608..758591f0 100644 --- a/src/test/java/com/dnd/runus/application/scale/ScaleServiceTest.java +++ b/src/test/java/com/dnd/runus/application/scale/ScaleServiceTest.java @@ -17,8 +17,6 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; @ExtendWith(MockitoExtension.class) @@ -56,7 +54,7 @@ void getAchievements() { new ScaleAchievementLog(scale2, null), new ScaleAchievementLog(scale3, null))); int runningMeterSum = 50; - given(runningRecordRepository.findTotalDistanceMeterByMemberId(eq(memberId), any(), any())) + given(runningRecordRepository.findTotalDistanceMeterByMemberId(memberId)) .willReturn(runningMeterSum); // when @@ -78,7 +76,7 @@ void getAchievementsWithAchievedCourse() { new ScaleAchievementLog(scale1, OffsetDateTime.now()), new ScaleAchievementLog(scale2, null), new ScaleAchievementLog(scale3, null))); - given(runningRecordRepository.findTotalDistanceMeterByMemberId(eq(memberId), any(), any())) + given(runningRecordRepository.findTotalDistanceMeterByMemberId(memberId)) .willReturn(1000); // when @@ -88,8 +86,8 @@ void getAchievementsWithAchievedCourse() { assertNotNull(response); assertEquals(1, response.achievedCourses().size()); - assertEquals(scale1.name(), response.achievedCourses().get(0).name()); - assertEquals("0.2km", response.achievedCourses().get(0).totalDistance()); + assertEquals(scale1.name(), response.achievedCourses().getFirst().name()); + assertEquals("0.2km", response.achievedCourses().getFirst().totalDistance()); assertEquals(scale2.name(), response.currentCourse().name()); assertEquals("800m", response.currentCourse().achievedDistance()); diff --git a/src/test/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImplTest.java b/src/test/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImplTest.java index 7c3db0a3..ae0221c6 100644 --- a/src/test/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImplTest.java +++ b/src/test/java/com/dnd/runus/infrastructure/persistence/domain/running/RunningRecordRepositoryImplTest.java @@ -146,7 +146,7 @@ void getTotalDistanceNoRunningRecord() { OffsetDateTime startDateOfNextMonth = startDateOfMonth.plusMonths(1); // when - int totalDistanceMeterByMemberId = runningRecordRepository.findTotalDistanceMeterByMemberId( + int totalDistanceMeterByMemberId = runningRecordRepository.findTotalDistanceMeterByMemberIdWithRangeDate( savedMember.memberId(), startDateOfMonth, startDateOfNextMonth); // than @@ -181,7 +181,7 @@ void getTotalDistanceWithRunningRecords() { OffsetDateTime startDateOfNextMonth = startDateOfMonth.plusMonths(1); // when - int totalDistanceMeterByMemberId = runningRecordRepository.findTotalDistanceMeterByMemberId( + int totalDistanceMeterByMemberId = runningRecordRepository.findTotalDistanceMeterByMemberIdWithRangeDate( savedMember.memberId(), startDateOfMonth, startDateOfNextMonth); // than @@ -228,7 +228,7 @@ void getWeeklyDistanceSummary_WithOutRunningRecords() { OffsetDateTime nextOfDndDate = startDate.plusDays(7); // when - List result = runningRecordRepository.findDailyDistancesMeterByDateRange( + List result = runningRecordRepository.findDailyDistancesMeterWithDateRange( savedMember.memberId(), startDate, nextOfDndDate); // then @@ -264,12 +264,12 @@ void getWeeklyDistanceSummary_WithRunningRecords() { } // when - List result = runningRecordRepository.findDailyDistancesMeterByDateRange( + List result = runningRecordRepository.findDailyDistancesMeterWithDateRange( savedMember.memberId(), startDate, nextOfDndDate); // then assertThat(result.size()).isEqualTo(1); - assertThat(result.get(0).sumValue()).isEqualTo(10_000); + assertThat(result.getFirst().sumValue()).isEqualTo(10_000); } @DisplayName("러닝 주간 서머리 조회(시간) : 러닝 데이터가 없을 경우") @@ -284,7 +284,7 @@ void getWeeklyDurationSummary_WithOutRunningRecords() { OffsetDateTime nextOfDndDate = startDate.plusDays(7); // when - List result = runningRecordRepository.findDailyDurationsSecByDateRange( + List result = runningRecordRepository.findDailyDurationsSecWithDateRange( savedMember.memberId(), startDate, nextOfDndDate); // then @@ -320,12 +320,12 @@ void getWeeklyDurationSummary_WithRunningRecords() { } // when - List result = runningRecordRepository.findDailyDurationsSecByDateRange( + List result = runningRecordRepository.findDailyDurationsSecWithDateRange( savedMember.memberId(), startDate, nextOfDndDate); // then assertThat(result.size()).isEqualTo(1); - assertThat(result.get(0).sumValue()).isEqualTo(Duration.ofHours(2).toSeconds()); + assertThat(result.getFirst().sumValue()).isEqualTo(Duration.ofHours(2).toSeconds()); } @DisplayName("러닝 기간별 평균 거리 조회: 기간내 러닝 데이터가 없으면 0을 리턴한다.") @@ -340,7 +340,7 @@ void getAvgDistance_WithOutRunningRecords() { OffsetDateTime nextOfDndDate = startDate.plusDays(7); // when - int avgResult = runningRecordRepository.findAvgDistanceMeterByMemberIdAndDateRange( + int avgResult = runningRecordRepository.findAvgDistanceMeterByMemberIdWithDateRange( savedMember.memberId(), startDate, nextOfDndDate); // then @@ -417,7 +417,7 @@ void getAvgDistance_WithRunningRecords() { RunningEmoji.SOSO)); // when - int avgResult = runningRecordRepository.findAvgDistanceMeterByMemberIdAndDateRange( + int avgResult = runningRecordRepository.findAvgDistanceMeterByMemberIdWithDateRange( savedMember.memberId(), startDate.toOffsetDateTime(), nextOfDndDate.toOffsetDateTime()); // then @@ -436,7 +436,7 @@ void getAvgDuration_WithOutRunningRecords() { OffsetDateTime nextOfDndDate = startDate.plusDays(7); // when - int avgResult = runningRecordRepository.findAvgDurationSecByMemberIdAndDateRange( + int avgResult = runningRecordRepository.findAvgDurationSecByMemberIdWithDateRange( savedMember.memberId(), startDate, nextOfDndDate); // then @@ -513,7 +513,7 @@ void getAvgDuration_WithRunningRecords() { RunningEmoji.SOSO)); // when - int avgResult = runningRecordRepository.findAvgDurationSecByMemberIdAndDateRange( + int avgResult = runningRecordRepository.findAvgDurationSecByMemberIdWithDateRange( savedMember.memberId(), startDate.toOffsetDateTime(), nextOfDndDate.toOffsetDateTime()); // then