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

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;
@@ -60,4 +61,37 @@ public static TripExpenseResponse of(
                 dayLogExpenseResponses
         );
     }
+
+    public static TripExpenseResponse of2(
+            final Trip trip,
+            final Amount totalAmount,
+            final List<City> cities,
+            final List<CategoryExpense> categoryExpenses,
+            final Currency currency,
+            final List<DayLogExpense> dayLogExpenses
+    ) {
+        final List<CityResponse> cityExpenseResponses = cities.stream()
+                .map(CityResponse::of)
+                .toList();
+
+        final List<CategoryExpenseResponse> categoryExpenseResponses = categoryExpenses.stream()
+                .map(CategoryExpenseResponse::of)
+                .toList();
+
+        final List<DayLogExpenseResponse> dayLogExpenseResponses = dayLogExpenses.stream()
+                .map(DayLogExpenseResponse::of)
+                .toList();
+
+        return new TripExpenseResponse(
+                trip.getId(),
+                trip.getTitle(),
+                trip.getStartDate(),
+                trip.getEndDate(),
+                cityExpenseResponses,
+                totalAmount.getValue(),
+                categoryExpenseResponses,
+                ExchangeRateResponse.of(currency),
+                dayLogExpenseResponses
+        );
+    }
 }

backend/src/main/java/hanglog/global/detector/ConnectionProxyHandler.java

@@ -0,0 +1,45 @@
+package hanglog.global.detector;
+
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.aop.framework.ProxyFactory;
+
+@RequiredArgsConstructor
+public class ConnectionProxyHandler implements MethodInterceptor {
+
+    private static final String JDBC_PREPARE_STATEMENT_METHOD_NAME = "prepareStatement";
+
+    private final Object connection;
+    private final LoggingForm loggingForm;
+
+    @Nullable
+    @Override
+    public Object invoke(@Nonnull final MethodInvocation invocation) throws Throwable {
+        final Object result = invocation.proceed();
+
+        if (hasConnection(result) && hasPreparedStatementInvoked(invocation)) {
+            final ProxyFactory proxyFactory = new ProxyFactory(result);
+            proxyFactory.addAdvice(new PreparedStatementProxyHandler(loggingForm));
+            return proxyFactory.getProxy();
+        }
+
+        return result;
+    }
+
+    private boolean hasPreparedStatementInvoked(final MethodInvocation invocation) {
+        return invocation.getMethod().getName().equals(JDBC_PREPARE_STATEMENT_METHOD_NAME);
+    }
+
+    private boolean hasConnection(final Object result) {
+        return result != null;
+    }
+
+    public Object getProxy() {
+        final ProxyFactory proxyFactory = new ProxyFactory(connection);
+        proxyFactory.addAdvice(this);
+        return proxyFactory.getProxy();
+    }
+}

backend/src/main/java/hanglog/global/detector/LoggingForm.java

@@ -0,0 +1,30 @@
+package hanglog.global.detector;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class LoggingForm {
+
+    private String apiUrl;
+    private String apiMethod;
+    private Long queryCounts = 0L;
+    private Long queryTime = 0L;
+
+    public void queryCountUp() {
+        queryCounts++;
+    }
+
+    public void addQueryTime(final Long queryTime) {
+        this.queryTime += queryTime;
+    }
+
+    public void setApiUrl(final String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public void setApiMethod(final String apiMethod) {
+        this.apiMethod = apiMethod;
+    }
+}

backend/src/main/java/hanglog/global/detector/PreparedStatementProxyHandler.java

@@ -0,0 +1,38 @@
+package hanglog.global.detector;
+
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import java.lang.reflect.Method;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+@RequiredArgsConstructor
+public class PreparedStatementProxyHandler implements MethodInterceptor {
+
+    private static final List<String> JDBC_QUERY_METHOD =
+            List.of("executeQuery", "execute", "executeUpdate");
+
+    private final LoggingForm loggingForm;
+
+    @Nullable
+    @Override
+    public Object invoke(@Nonnull final MethodInvocation invocation) throws Throwable {
+
+        final Method method = invocation.getMethod();
+
+        if (JDBC_QUERY_METHOD.contains(method.getName())) {
+            final long startTime = System.currentTimeMillis();
+            final Object result = invocation.proceed();
+            final long endTime = System.currentTimeMillis();
+
+            loggingForm.addQueryTime(endTime - startTime);
+            loggingForm.queryCountUp();
+
+            return result;
+        }
+
+        return invocation.proceed();
+    }
+}

backend/src/main/java/hanglog/global/detector/QueryCounterAop.java

@@ -0,0 +1,59 @@
+package hanglog.global.detector;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@Aspect
+@Slf4j
+@Component
+public class QueryCounterAop {
+    private final ThreadLocal<LoggingForm> currentLoggingForm;
+
+    public QueryCounterAop() {
+        this.currentLoggingForm = new ThreadLocal<>();
+    }
+
+    @Around("execution( * javax.sql.DataSource.getConnection())")
+    public Object captureConnection(final ProceedingJoinPoint joinPoint) throws Throwable {
+        final Object connection = joinPoint.proceed();
+
+        return new ConnectionProxyHandler(connection, getCurrentLoggingForm()).getProxy();
+    }
+
+    private LoggingForm getCurrentLoggingForm() {
+        if (currentLoggingForm.get() == null) {
+            currentLoggingForm.set(new LoggingForm());
+        }
+
+        return currentLoggingForm.get();
+    }
+
+    @After("within(@org.springframework.web.bind.annotation.RestController *)")
+    public void loggingAfterApiFinish() {
+        final LoggingForm loggingForm = getCurrentLoggingForm();
+
+        ServletRequestAttributes attributes =
+                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+
+        if (isInRequestScope(attributes)) {
+            HttpServletRequest request = attributes.getRequest();
+
+            loggingForm.setApiMethod(request.getMethod());
+            loggingForm.setApiUrl(request.getRequestURI());
+        }
+
+        log.info("{}", getCurrentLoggingForm());
+        currentLoggingForm.remove();
+    }
+
+    private boolean isInRequestScope(final ServletRequestAttributes attributes) {
+        return attributes != null;
+    }
+}

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

@@ -10,11 +10,13 @@ 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);
+//        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);
+}