diff --git a/backend/JiShop/src/main/java/com/jishop/config/ShopDBConfig.java b/backend/JiShop/src/main/java/com/jishop/config/ShopDBConfig.java index 0d522b65..0c8fc9c2 100644 --- a/backend/JiShop/src/main/java/com/jishop/config/ShopDBConfig.java +++ b/backend/JiShop/src/main/java/com/jishop/config/ShopDBConfig.java @@ -1,8 +1,11 @@ package com.jishop.config; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.*; +import org.springframework.core.env.Environment; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.orm.jpa.JpaTransactionManager; @@ -20,7 +23,10 @@ transactionManagerRef = "shopTransactionManager" ) @Configuration +@RequiredArgsConstructor +@Slf4j public class ShopDBConfig { + private final Environment env; @Primary @Bean public LocalContainerEntityManagerFactoryBean shopEntityManager() { @@ -30,7 +36,10 @@ public LocalContainerEntityManagerFactoryBean shopEntityManager() { em.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); Properties properties = new Properties(); - properties.put("hibernate.hbm2ddl.auto", "create-drop"); + + properties.setProperty("hibernate.hbm2ddl.auto", + env.getProperty("spring.jpa.properties.hibernate.hbm2ddl.auto", "update")); + properties.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQL8Dialect"); properties.setProperty("hibernate.physical_naming_strategy", "org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy"); diff --git a/backend/JiShop/src/main/resources/config b/backend/JiShop/src/main/resources/config index 44691726..4cfe2636 160000 --- a/backend/JiShop/src/main/resources/config +++ b/backend/JiShop/src/main/resources/config @@ -1 +1 @@ -Subproject commit 44691726d4e063bdab890bec8ab86873f734dc65 +Subproject commit 4cfe2636a840bcba5c09dd7a116229acfc7d421d diff --git a/backend/JiShop/src/test/java/com/jishop/order/service/OrderServiceTest.java b/backend/JiShop/src/test/java/com/jishop/order/service/OrderServiceTest.java index 4fe433dc..348c96bc 100644 --- a/backend/JiShop/src/test/java/com/jishop/order/service/OrderServiceTest.java +++ b/backend/JiShop/src/test/java/com/jishop/order/service/OrderServiceTest.java @@ -30,7 +30,7 @@ public class OrderServiceTest { @Autowired - private OrderService orderService; + private OrderCreationService orderService; private static final int THREAD_COUNT = 10; private ExecutorService executorService; diff --git a/backend/JiShop/src/test/java/com/jishop/review/ReviewIntegrationTest.java b/backend/JiShop/src/test/java/com/jishop/review/ReviewIntegrationTest.java index f7147a23..81fa3eee 100644 --- a/backend/JiShop/src/test/java/com/jishop/review/ReviewIntegrationTest.java +++ b/backend/JiShop/src/test/java/com/jishop/review/ReviewIntegrationTest.java @@ -62,9 +62,6 @@ public class ReviewIntegrationTest { @Autowired private OptionRepository optionRepository; - @Autowired - private ReviewService reviewService; - @Autowired private CategoryRepository categoryRepository; diff --git a/backend/JiShop/src/test/resources/application-test.yml b/backend/JiShop/src/test/resources/application-test.yml index 0bdea12c..4a2dc49b 100644 --- a/backend/JiShop/src/test/resources/application-test.yml +++ b/backend/JiShop/src/test/resources/application-test.yml @@ -18,6 +18,8 @@ spring: properties: hibernate.format_sql: true # SQL 이쁘게 출력 hibernate.highlight_sql: true # SQL 컬러 출력 + hibernate: + hbm2ddl.auto: create data: redis: