From 102f24bebd29744c37d8ff35d916d92b8a9cd3ab Mon Sep 17 00:00:00 2001 From: mcodnjs Date: Fri, 28 Jul 2023 02:04:36 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=A9=94=EC=86=8C=EB=93=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hanglog/trip/service/TripService.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/hanglog/trip/service/TripService.java b/backend/src/main/java/hanglog/trip/service/TripService.java index 57004b67f..10c8f2cf5 100644 --- a/backend/src/main/java/hanglog/trip/service/TripService.java +++ b/backend/src/main/java/hanglog/trip/service/TripService.java @@ -40,7 +40,7 @@ public Long save(final TripCreateRequest tripCreateRequest) { .toList(); final Trip newTrip = Trip.of( - getInitTitle(cites), + generateInitialTitle(cites), tripCreateRequest.getStartDate(), tripCreateRequest.getEndDate() ); @@ -68,24 +68,26 @@ private void saveDayLogs(final Trip savedTrip) { public List getAllTrips() { final List trips = tripRepository.findAll(); return trips.stream() - .map(this::getTrip) + .map(this::getTripResponse) .toList(); } - private TripResponse getTrip(final Trip trip) { - final List cities = tripCityRepository.findByTripId(trip.getId()).stream() - .map(TripCity::getCity) - .toList(); + private TripResponse getTripResponse(final Trip trip) { + final List cities = getCitiesByTripId(trip.getId()); return TripResponse.of(trip, cities); } public TripDetailResponse getTripDetail(final Long tripId) { final Trip trip = tripRepository.findById(tripId) .orElseThrow(() -> new BadRequestException(NOT_FOUND_TRIP_ID)); - final List cities = tripCityRepository.findByTripId(tripId).stream() + final List cities = getCitiesByTripId(tripId); + return TripDetailResponse.of(trip, cities); + } + + private List getCitiesByTripId(final Long tripId) { + return tripCityRepository.findByTripId(tripId).stream() .map(TripCity::getCity) .toList(); - return TripDetailResponse.of(trip, cities); } public void update(final Long tripId, final TripUpdateRequest updateRequest) { @@ -150,7 +152,7 @@ public void delete(final Long tripId) { tripRepository.delete(trip); } - private String getInitTitle(final List cites) { + private String generateInitialTitle(final List cites) { return cites.get(0).getName() + TITLE_POSTFIX; } }