refactor: 메소드 분리 및 네이밍 수정

woowacourse-teams · Jul 27, 2023 · 102f24b · 102f24b
1 parent 7ce3e87
commit 102f24b
Showing 1 changed file with 11 additions and 9 deletions.
diff --git 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<TripResponse> getAllTrips() {
         final List<Trip> trips = tripRepository.findAll();
         return trips.stream()
-                .map(this::getTrip)
+                .map(this::getTripResponse)
                 .toList();
     }
 
-    private TripResponse getTrip(final Trip trip) {
-        final List<City> cities = tripCityRepository.findByTripId(trip.getId()).stream()
-                .map(TripCity::getCity)
-                .toList();
+    private TripResponse getTripResponse(final Trip trip) {
+        final List<City> 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<City> cities = tripCityRepository.findByTripId(tripId).stream()
+        final List<City> cities = getCitiesByTripId(tripId);
+        return TripDetailResponse.of(trip, cities);
+    }
+
+    private List<City> 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<City> cites) {
+    private String generateInitialTitle(final List<City> cites) {
         return cites.get(0).getName() + TITLE_POSTFIX;
     }
 }