Merge branch 'feature/utils' into develop

Author: jhkim31

build.gradle

@@ -46,6 +46,7 @@ subprojects {
         implementation 'com.fasterxml.jackson.core:jackson-databind'
         implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
         implementation 'org.springframework.retry:spring-retry'
+        implementation 'org.springframework.data:spring-data-envers'
         // utils
 
         // test

core/src/main/java/jshop/core/config/P6SpyConfig.java

@@ -9,7 +9,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
-@Profile("dev")
 @Configuration
 public class P6SpyConfig implements MessageFormattingStrategy {
 

core/src/test/resources/application.yml

@@ -1,4 +1,8 @@
 spring:
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: create-drop
+
+logging:
+  level:
+    sql: trace

jenkins/develop-test.jenkins

@@ -1,3 +1,4 @@
+/*
 pipeline {
     agent any
 
@@ -16,5 +17,5 @@ pipeline {
             junit 'build/test-results/test/*.xml'
         }
     }
-
-}
+}
+*/

jenkins/pr_open_script.jenkins

@@ -1,3 +1,4 @@
+/*
 pipeline {
     agent any
 
@@ -17,3 +18,4 @@ pipeline {
         }
     }
 }
+*/

web/src/main/java/jshop/web/logging/LoggingFilter.java

@@ -46,20 +46,15 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         LoggingHttpServletRequestWrapper requestWrapper = new LoggingHttpServletRequestWrapper(httpRequest);
         LoggingHttpServletResponseWrapper responseWrapper = new LoggingHttpServletResponseWrapper(httpResponse);
 
-        chain.doFilter(requestWrapper, responseWrapper);
+        Enumeration<String> requestHeaderNames = httpRequest.getHeaderNames();
+        Map<String, String> requestHeaders = new HashMap<>();
 
         String requestData = new String(requestWrapper.getRequestData(), Charset.defaultCharset());
 
         if (httpRequest.getRequestURI().equals("/api/login")) {
             requestData = "Secure Info";
         }
 
-        String responseData = new String(responseWrapper.getResponseData(), Charset.defaultCharset());
-
-        // 로그에 기록
-        Enumeration<String> requestHeaderNames = httpRequest.getHeaderNames();
-        Map<String, String> requestHeaders = new HashMap<>();
-
         while (requestHeaderNames.hasMoreElements()) {
             String header = requestHeaderNames.nextElement();
             if (requestHeaders.get(header) == null) {
@@ -80,6 +75,12 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             .body(requestData)
             .build();
 
+        log.info("Request Log\n{}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(requestLog));
+
+        chain.doFilter(requestWrapper, responseWrapper);
+
+        String responseData = new String(responseWrapper.getResponseData(), Charset.defaultCharset());
+
         ResponseLog responseLog = ResponseLog
             .builder()
             .id(uuid)
@@ -94,7 +95,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             .body(responseData)
             .build();
 
-        log.info("Request Log\n{}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(requestLog));
         log.info("Response Log\n{}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(responseLog));
     }
 

web/src/main/resources/application.yml

@@ -4,6 +4,13 @@ spring:
   datasource:
     hikari:
       maximum-pool-size: 20
+      max-lifetime: 250_000
+    p6spy:
+      enable-logging: true
+      multiline: true
+      logging: slf4j
+      tracing:
+        include-parameter-values: true
   jpa:
     hibernate:
       ddl-auto: update
@@ -66,6 +73,7 @@ spring:
     username: ${MYSQL_USERNAME}
     password: ${MYSQL_PASSWORD}
 
+
   jwt:
     secret: ${JWT_SECRET_KEY}
 

web/src/main/resources/logback-spring-dev.xml

@@ -10,19 +10,6 @@
     </encoder>
   </appender>
 
-  <!--  <logger name="jdbc" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqlonly" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqltiming" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="org.hibernate.SQL" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="STDOUT"/>-->
-  <!--  </logger>-->
-
   <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>

web/src/main/resources/logback-spring-prod.xml

@@ -27,20 +27,6 @@
     </encoder>
   </appender>
 
-
-  <!--  <logger name="jdbc" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqlonly" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="jdbc.sqltiming" level="OFF" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-  <!--  <logger name="org.hibernate.SQL" level="DEBUG" additive="false">-->
-  <!--    <appender-ref ref="FILE"/>-->
-  <!--  </logger>-->
-
   <root level="INFO">
     <appender-ref ref="FILE"/>
     <appender-ref ref="STDOUT"/>

web/src/test/java/jshop/web/acceptance/AddressAcceptanceTest.java

@@ -14,6 +14,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Optional;
+import jshop.core.config.P6SpyConfig;
 import jshop.core.domain.address.dto.CreateAddressResponse;
 import jshop.core.domain.address.entity.Address;
 import jshop.core.domain.address.repository.AddressRepository;
@@ -33,6 +34,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrint;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.web.servlet.MockMvc;
@@ -45,6 +47,7 @@
 @AutoConfigureMockMvc(print = MockMvcPrint.NONE)
 @Transactional
 @DisplayName("[통합 테스트] AddressController")
+@Import(P6SpyConfig.class)
 public class AddressAcceptanceTest extends BaseTestContainers {
 
     @Autowired