여행 생성 및 여행 상세 조회 쿼리 개선

backend/src/main/java/hanglog/city/domain/repository/CityRepository.java

@@ -1,7 +1,25 @@
 package hanglog.city.domain.repository;
 
 import hanglog.city.domain.City;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface CityRepository extends JpaRepository<City, Long> {
+
+    @Query("""
+            SELECT c
+            FROM City c
+            WHERE c.id in :ids
+             """)
+    List<City> findCitiesByIds(@Param("ids") final List<Long> ids);
+
+    @Query("""
+            SELECT c
+            FROM City c, TripCity tc
+            WHERE c.id = tc.city.id
+            AND tc.trip.id = :tripId
+            """)
+    List<City> findCitiesByTripId(@Param("tripId") final Long tripId);
 }

backend/src/main/java/hanglog/expense/dto/response/TripExpenseResponse.java

@@ -1,6 +1,7 @@
 package hanglog.expense.dto.response;
 
 
+import hanglog.city.domain.City;
 import hanglog.city.dto.response.CityResponse;
 import hanglog.currency.domain.Currency;
 import hanglog.expense.domain.Amount;

backend/src/main/java/hanglog/global/filter/RequestLoggingFilter.java

@@ -10,11 +10,12 @@ public class RequestLoggingFilter extends AbstractRequestLoggingFilter {
 
     @Override
     protected void beforeRequest(@NonNull final HttpServletRequest request, @NonNull final String message) {
-        logger.info(message);
+        if (!message.contains("prometheus")) {
+            logger.info(message);
+        }
     }
 
     @Override
     protected void afterRequest(@NonNull final HttpServletRequest request, @NonNull final String message) {
-        logger.info(message);
     }
 }

backend/src/main/java/hanglog/trip/domain/DayLog.java

@@ -16,7 +16,9 @@
 import jakarta.persistence.OrderBy;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
@@ -47,7 +49,7 @@ public class DayLog extends BaseEntity {
 
     @OneToMany(mappedBy = "dayLog", cascade = REMOVE, orphanRemoval = true)
     @OrderBy(value = "ordinal ASC")
-    private List<Item> items = new ArrayList<>();
+    private Set<Item> items = new HashSet<>();
 
     public DayLog(
             final Long id,
@@ -60,7 +62,7 @@ public DayLog(
         this.title = title;
         this.ordinal = ordinal;
         this.trip = trip;
-        this.items = items;
+        this.items = new HashSet<>(items);
     }
 
     public DayLog(
@@ -83,4 +85,12 @@ public LocalDate calculateDate() {
         final LocalDate startDate = trip.getStartDate();
         return startDate.plusDays((long) ordinal - DEFAULT_DAY);
     }
+
+    public void addItem(final Item item) {
+        items.add(item);
+    }
+
+    public List<Item> getItems() {
+        return new ArrayList<>(items);
+    }
 }

backend/src/main/java/hanglog/trip/domain/Trip.java

@@ -28,8 +28,10 @@
 import jakarta.persistence.OrderBy;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
@@ -77,7 +79,7 @@ public class Trip extends BaseEntity {
 
     @OneToMany(mappedBy = "trip", cascade = {PERSIST, REMOVE, MERGE}, orphanRemoval = true)
     @OrderBy(value = "ordinal ASC")
-    private List<DayLog> dayLogs = new ArrayList<>();
+    private Set<DayLog> dayLogs = new HashSet<>();
 
     @OneToOne(mappedBy = "trip", cascade = {PERSIST, REMOVE, MERGE}, orphanRemoval = true)
     private SharedTrip sharedTrip;
@@ -104,7 +106,7 @@ public Trip(
         this.endDate = endDate;
         this.description = description;
         this.sharedTrip = sharedTrip;
-        this.dayLogs = dayLogs;
+        this.dayLogs = new HashSet<>(dayLogs);
         this.sharedStatus = sharedStatus;
         this.publishedStatus = publishedStatus;
     }
@@ -169,4 +171,16 @@ public void changePublishedStatus(final Boolean isPublished) {
     public Boolean isWriter(final Long memberId) {
         return this.member.getId().equals(memberId);
     }
+
+    public void addDayLog(final DayLog dayLog) {
+        dayLogs.add(dayLog);
+    }
+
+    public void removeDayLog(final DayLog dayLog) {
+        dayLogs.remove(dayLog);
+    }
+
+    public List<DayLog> getDayLogs() {
+        return new ArrayList<>(dayLogs);
+    }
 }

backend/src/main/java/hanglog/trip/domain/repository/CustomDayLogRepository.java

@@ -0,0 +1,9 @@
+package hanglog.trip.domain.repository;
+
+import hanglog.trip.domain.DayLog;
+import java.util.List;
+
+public interface CustomDayLogRepository {
+
+    void saveAll(final List<DayLog> dayLogs);
+}

backend/src/main/java/hanglog/trip/domain/repository/CustomDayLogRepositoryImpl.java

@@ -0,0 +1,42 @@
+package hanglog.trip.domain.repository;
+
+import hanglog.trip.domain.DayLog;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class CustomDayLogRepositoryImpl implements CustomDayLogRepository {
+
+    private final NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    @Override
+    public void saveAll(final List<DayLog> dayLogs) {
+        final String sql = """
+                    INSERT INTO day_log (created_at, modified_at, ordinal, status, title, trip_id) 
+                    VALUES (:createdAt, :modifiedAt, :ordinal, :status, :title, :tripId)
+                """;
+        namedParameterJdbcTemplate.batchUpdate(sql, getDayLogToSqlParameterSources(dayLogs));
+    }
+
+    private MapSqlParameterSource[] getDayLogToSqlParameterSources(final List<DayLog> dayLogs)  {
+        return dayLogs.stream()
+                .map(this::getDayLogToSqlParameterSource)
+                .toArray(MapSqlParameterSource[]::new);
+    }
+
+    private MapSqlParameterSource getDayLogToSqlParameterSource(final DayLog dayLog) {
+        final LocalDateTime now = LocalDateTime.now();
+        return new MapSqlParameterSource()
+                .addValue("createdAt", now)
+                .addValue("modifiedAt", now)
+                .addValue("ordinal", dayLog.getOrdinal())
+                .addValue("status", dayLog.getStatus().name())
+                .addValue("title", dayLog.getTitle())
+                .addValue("tripId", dayLog.getTrip().getId());
+    }
+}

backend/src/main/java/hanglog/trip/domain/repository/CustomTripCityRepository.java

@@ -0,0 +1,9 @@
+package hanglog.trip.domain.repository;
+
+import hanglog.city.domain.City;
+import java.util.List;
+
+public interface CustomTripCityRepository {
+
+    void saveAll(final List<City> cities, final Long tripId);
+}

backend/src/main/java/hanglog/trip/domain/repository/CustomTripCityRepositoryImpl.java

@@ -0,0 +1,43 @@
+package hanglog.trip.domain.repository;
+
+import static hanglog.global.type.StatusType.USABLE;
+
+import hanglog.city.domain.City;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class CustomTripCityRepositoryImpl implements CustomTripCityRepository {
+
+    private final NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    @Override
+    public void saveAll(final List<City> cities, final Long tripId) {
+        final String sql = """
+                    INSERT INTO trip_city (city_id, created_at, modified_at, status, trip_id) 
+                    VALUES (:cityId, :createdAt, :modifiedAt, :status, :tripId)
+                """;
+        namedParameterJdbcTemplate.batchUpdate(sql, getTripCityToSqlParameterSources(cities, tripId));
+    }
+
+    private MapSqlParameterSource[] getTripCityToSqlParameterSources(final List<City> cities, final Long tripId) {
+        return cities.stream()
+                .map(city -> getTripCityToSqlParameterSource(city, tripId))
+                .toArray(MapSqlParameterSource[]::new);
+    }
+
+    private MapSqlParameterSource getTripCityToSqlParameterSource(final City city, final Long tripId) {
+        final LocalDateTime now = LocalDateTime.now();
+        return new MapSqlParameterSource()
+                .addValue("cityId", city.getId())
+                .addValue("createdAt", now)
+                .addValue("modifiedAt", now)
+                .addValue("status", USABLE.name())
+                .addValue("tripId", tripId);
+    }
+}

backend/src/main/java/hanglog/trip/domain/repository/TripRepository.java

@@ -35,4 +35,18 @@ public interface TripRepository extends JpaRepository<Trip, Long> {
 
     void deleteAllByMemberId(final Long memberId);
 
+    @Query("""
+            SELECT trip
+            FROM Trip trip
+            LEFT JOIN FETCH trip.sharedTrip sharedTrip
+            LEFT JOIN FETCH trip.dayLogs dayLogs
+            LEFT JOIN FETCH dayLogs.items items
+            LEFT JOIN FETCH items.images images
+            LEFT JOIN FETCH items.expense expense
+            LEFT JOIN FETCH items.place place
+            LEFT JOIN FETCH expense.category expense_category
+            LEFT JOIN FETCH place.category place_category
+            WHERE dayLogs.trip.id = :tripId
+            """)
+    Optional<Trip> findById(@Param("tripId") final Long tripId);
 }