Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 지구한바퀴 코스 저장 시, 달성 가능한 코스 id 조회 오류 수정 #331

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Fix: 지구한바퀴 코스 저장 시, 달성 가능한 코스 id 조회 오류 수정 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3cf6a1
Fix: 달성 가능한 코스 조회 시 코스 Index 순으로 범위 확인
hee9841 Jan 13, 2025
c1725d1
Test: 달성 가능한 코스 조회 시 코스 Index 순으로 조회 테스트 케이스 추가
hee9841 Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/com/dnd/runus/infrastructure/persistence/jooq/scale/JooqScaleRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ public List<Long> findAchievableScaleIds(long memberId) {
.fields("id", "cumulative_sum")
.as(select(
SCALE.ID,
sum(SCALE.SIZE_METER).over().orderBy(SCALE.ID).cast(int.class))
sum(SCALE.SIZE_METER)
.over()
.orderBy(SCALE.INDEX)
.cast(int.class))
.from(SCALE));

return dsl.with(totalDistance)
Expand Down
74 changes: 57 additions & 17 deletions ...t/java/com/dnd/runus/infrastructure/persistence/domain/scale/ScaleRepositoryImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.time.Duration;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.Comparator;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -50,32 +51,37 @@ public class ScaleRepositoryImplTest {
@Autowired
private ScaleAchievementRepository scaleAchievementRepository;

private Long scale1Id;
private Long scale2Id;
private Long scale3Id;
private Scale scale1;
private Scale scale2;
private Scale scale3;
private Scale scale4;

@BeforeEach
void setUp() {
// insert test data
em.persist(ScaleEntity.from(new Scale(0, "scale1", 1_000_000, 1, "서울(한국)", "도쿄(일본)"))); // 누적 달성 거리 : 1_000_000
em.persist(ScaleEntity.from(new Scale(0, "scale2", 2_100_000, 2, "도쿄(일본)", "베이징(중국)"))); // 누적 달성 거리 : 3_100_000
em.persist(
ScaleEntity.from(new Scale(0, "scale3", 1_000_000, 3, "베이징(중국)", "타이베이(대만)"))); // 누적 달성 거리 : 4_100_000
ScaleEntity.from(new Scale(0, "scale3", 1_000_000, 4, "베이징(중국)", "타이베이(대만)"))); // 누적 달성 거리 : 4_100_000
em.persist(
ScaleEntity.from(new Scale(0, "scale4", 1_000_000, 4, "베이징(중국)", "타이베이(대만)"))); // 누적 달성 거리 : 5_100_000
ScaleEntity.from(new Scale(0, "scale4", 1_000_000, 3, "베이징(중국)", "타이베이(대만)"))); // 누적 달성 거리 : 5_100_000
em.flush();

CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
CriteriaQuery<ScaleEntity> query = criteriaBuilder.createQuery(ScaleEntity.class);
Root<ScaleEntity> from = query.from(ScaleEntity.class);
query.select(from).orderBy(criteriaBuilder.asc(from.get("index")));

List<Long> idList =
em.createQuery(query).getResultStream().map(ScaleEntity::getId).toList();
List<Scale> scales = em.createQuery(query)
.getResultStream()
.sorted(Comparator.comparing(ScaleEntity::getIndex))
.map(ScaleEntity::toDomain)
.toList();

scale1Id = idList.get(0);
scale2Id = idList.get(1);
scale3Id = idList.get(2);
scale1 = scales.get(0); // total sum : 1_000_000
scale2 = scales.get(1); // total sum : 3_100_000
scale4 = scales.get(2); // total sum : 4_100_000
scale3 = scales.get(3); // total sum : 5_100_000
}

@DisplayName("scale_achievement에 기록이 없는 경우 성취 가능한 scale_id를 반환한다.")
Expand Down Expand Up @@ -107,8 +113,8 @@ void findAchievableScaleIdsWithoutNoAchievementRecords() {
// then
assertNotNull(achievableScaleIds);
assertThat(achievableScaleIds.size()).isEqualTo(2);
assertTrue(achievableScaleIds.contains(scale1Id));
assertTrue(achievableScaleIds.contains(scale2Id));
assertTrue(achievableScaleIds.contains(scale1.scaleId()));
assertTrue(achievableScaleIds.contains(scale2.scaleId()));
}

@DisplayName("scale_achievement에 기록이 존재 할 경우, 성취 가능한 scale_id를 반환한다.")
Expand All @@ -132,9 +138,42 @@ void findAchievableScaleIds() {
RunningEmoji.SOSO));
// scale1 기록 달성(달성 거리 1_000_000 달성), 현재 누적 거리 : 1_100_000
scaleAchievementRepository.saveAll(
List.of(new ScaleAchievement(savedMember, new Scale(scale1Id), OffsetDateTime.now())));
List.of(new ScaleAchievement(savedMember, new Scale(scale1.scaleId()), OffsetDateTime.now())));

for (int i = 0; i < 3; i++) {
for (int i = 0; i < 2; i++) {
RunningRecord runningRecord = new RunningRecord(
0,
savedMember,
1_100_000,
Duration.ofHours(12).plusMinutes(23).plusSeconds(56),
1,
new Pace(5, 11),
ZonedDateTime.now(),
ZonedDateTime.now().plusHours(1),
List.of(new CoordinatePoint(1, 2, 3), new CoordinatePoint(4, 5, 6)),
"start location",
"end location",
RunningEmoji.SOSO);
runningRecordRepository.save(runningRecord);
} // 현재 누넉 거리 : 3_300_000

// when
List<Long> achievableScaleIds = scaleRepository.findAchievableScaleIds(savedMember.memberId());

// then
assertNotNull(achievableScaleIds);
assertThat(achievableScaleIds.size()).isEqualTo(1);
assertTrue(achievableScaleIds.contains(scale2.scaleId()));
}

@DisplayName("scaled의 id와 index값의 순서가 달를 경우, 성취 가능한 scale_id를 올바르게 반환한다.")
@Test
void findAchievableScaleIds_diffIDAndIndex() {
// given
Member savedMember = memberRepository.save(
new Member(1L, MemberRole.USER, "nickname", OffsetDateTime.now(), OffsetDateTime.now()));

for (int i = 0; i < 4; i++) {
RunningRecord runningRecord = new RunningRecord(
0,
savedMember,
Expand All @@ -156,8 +195,9 @@ void findAchievableScaleIds() {

// then
assertNotNull(achievableScaleIds);
assertThat(achievableScaleIds.size()).isEqualTo(2);
assertTrue(achievableScaleIds.contains(scale2Id));
assertTrue(achievableScaleIds.contains(scale3Id));
assertThat(achievableScaleIds.size()).isEqualTo(3);
assertTrue(achievableScaleIds.contains(scale1.scaleId()));
assertTrue(achievableScaleIds.contains(scale2.scaleId()));
assertTrue(achievableScaleIds.contains(scale4.scaleId()));
}
}