Skip to content

fix(route): map small return gaps to Seoul #13

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

Merged
ccjngwn merged 1 commit into from
Jul 10, 2026
Merged

fix(route): map small return gaps to Seoul #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/com/cotato/cokerthon/domain/route/service/ReturnRouteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class ReturnRouteService {

private static final Logger log = LoggerFactory.getLogger(ReturnRouteService.class);
private static final int DAILY_ADJUST_MINUTES = 30;
private static final int SEOUL_FALLBACK_GAP_MINUTES = 15;

private final ReturnRouteRepository returnRouteRepository;
private final ReturnRouteDayRepository returnRouteDayRepository;
Expand Down Expand Up @@ -178,7 +179,7 @@ private City pickRandomCity(int signedGapMinutes) {
int gapMinutes = Math.abs(signedGapMinutes);
List<City> candidates;

if (direction == CityDirection.BASE || gapMinutes == 0) {
if (direction == CityDirection.BASE || gapMinutes <= SEOUL_FALLBACK_GAP_MINUTES) {
return getSeoulCity();
}

Expand Down
35 changes: 35 additions & 0 deletions src/test/java/com/cotato/cokerthon/domain/route/service/ReturnRouteServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.cotato.cokerthon.domain.city.entity.City;
Expand All @@ -11,6 +13,7 @@
import com.cotato.cokerthon.domain.member.entity.Member;
import com.cotato.cokerthon.domain.member.repository.MemberRepository;
import com.cotato.cokerthon.domain.route.entity.ReturnRoute;
import com.cotato.cokerthon.domain.route.entity.ReturnRouteDay;
import com.cotato.cokerthon.domain.route.entity.ReturnRouteStatus;
import com.cotato.cokerthon.domain.route.repository.ReturnRouteDayRepository;
import com.cotato.cokerthon.domain.route.repository.ReturnRouteRepository;
Expand All @@ -28,6 +31,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.test.util.ReflectionTestUtils;
Expand Down Expand Up @@ -124,6 +128,37 @@ void createReturnRouteThrowsReturnRouteCityNotFoundWithDirectionAndGapMinutesWhe
});
}

@Test
void createReturnRouteMapsWest15MinutesToSeoulWithoutFindingCityCandidates() {
Member member = member(MEMBER_ID);
SleepJetlagResult result = sleepJetlagResult(member);
City seoul = city(CityDirection.BASE);
when(memberRepository.findById(MEMBER_ID)).thenReturn(Optional.of(member));
when(sleepJetlagResultRepository.findById(RESULT_ID)).thenReturn(Optional.of(result));
when(returnRouteRepository.findAllByMemberAndStatus(member, ReturnRouteStatus.IN_PROGRESS))
.thenReturn(List.of());
when(returnRouteRepository.save(any(ReturnRoute.class))).thenAnswer(invocation -> invocation.getArgument(0));
when(returnRouteDayRepository.save(any())).thenAnswer(invocation -> invocation.getArgument(0));
when(sleepTimeCalculator.reached(any(), any(), any(), any())).thenReturn(false, true);
when(sleepTimeCalculator.moveTowardTarget(LocalTime.of(3, 0), LocalTime.of(23, 0)))
.thenReturn(LocalTime.of(2, 45));
when(sleepTimeCalculator.moveTowardTarget(LocalTime.of(11, 0), LocalTime.of(7, 0)))
.thenReturn(LocalTime.of(10, 45));
when(sleepTimeCalculator.calculateMidTime(LocalTime.of(2, 45), LocalTime.of(10, 45)))
.thenReturn(LocalTime.of(6, 45));
when(sleepTimeCalculator.signedMidDifferenceMinutes(LocalTime.of(3, 0), LocalTime.of(6, 45)))
.thenReturn(15);
when(cityRepository.findFirstByDirectionOrderByDisplayOrderAsc(CityDirection.BASE))
.thenReturn(Optional.of(seoul));

returnRouteService.createReturnRoute(MEMBER_ID, RESULT_ID);

ArgumentCaptor<ReturnRouteDay> dayCaptor = ArgumentCaptor.forClass(ReturnRouteDay.class);
verify(returnRouteDayRepository).save(dayCaptor.capture());
assertThat(dayCaptor.getValue().getCheckpointCity()).isSameAs(seoul);
verify(cityRepository, never()).findAllByDirectionAndGapMinutes(CityDirection.WEST, 15);
}

@Test
void createReturnRouteThrowsSeoulCityNotFoundWhenBaseCityDoesNotExist() {
Member member = member(MEMBER_ID);
Expand Down
Loading