refactor: 결제 서버 리펙토링

build.gradle

@@ -45,6 +45,9 @@ dependencies {
 	// slack Notification
 	implementation 'com.github.maricn:logback-slack-appender:1.4.0'
 
+	// flyway
+	implementation 'org.flywaydb:flyway-mysql'
+
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'com.squareup.okhttp3:mockwebserver'

src/main/java/in/koreatech/payment/KoinPaymentApplication.java

@@ -7,20 +7,7 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @ConfigurationPropertiesScan
-@SpringBootApplication(
-	scanBasePackages = {
-		"in.koreatech.payment",
-		"in.koreatech.koin"
-	}
-)
-@EnableJpaRepositories(basePackages = {
-	"in.koreatech.payment",
-	"in.koreatech.koin"
-})
-@EntityScan(basePackages = {
-	"in.koreatech.payment",
-	"in.koreatech.koin"
-})
+@SpringBootApplication
 public class KoinPaymentApplication {
 
 	public static void main(String[] args) {

src/main/java/in/koreatech/payment/common/config/datasource/KoinDBProperties.java

@@ -0,0 +1,13 @@
+package in.koreatech.payment.common.config.datasource;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "spring.datasource.koin.hibernate")
+public record KoinDBProperties(
+    String ddlAuto,
+    Boolean showSql,
+    String packagesToScan,
+    String formatSql
+) {
+
+}

src/main/java/in/koreatech/payment/common/config/datasource/KoinDataSourceConfig.java

@@ -0,0 +1,67 @@
+package in.koreatech.payment.common.config.datasource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import jakarta.persistence.EntityManagerFactory;
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+@EnableTransactionManagement
+@EnableJpaRepositories(
+    basePackages = "in.koreatech.koin",
+    entityManagerFactoryRef = "koinEntityManagerFactory",
+    transactionManagerRef = "koinTransactionManager"
+)
+public class KoinDataSourceConfig {
+
+    private final KoinDBProperties koinDBProperties;
+
+    @Bean(name = "koinDataSource")
+    @ConfigurationProperties("spring.datasource.koin")
+    public DataSource koinDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "koinEntityManagerFactory")
+    public LocalContainerEntityManagerFactoryBean koinEntityManagerFactory(
+        @Qualifier(value = "koinDataSource") DataSource dataSource
+    ) {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource);
+        em.setPackagesToScan(koinDBProperties.packagesToScan());
+        em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+        em.setJpaPropertyMap(createJpaVendorProperties());
+        return em;
+    }
+
+    private Map<String, Object> createJpaVendorProperties() {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("hibernate.show_sql", koinDBProperties.showSql());
+        properties.put("hibernate.hbm2ddl.auto", koinDBProperties.ddlAuto());
+        properties.put("hibernate.format_sql", koinDBProperties.formatSql());
+        return properties;
+    }
+
+    @Bean(name = "koinTransactionManager")
+    public PlatformTransactionManager koinTransactionManager(
+        @Qualifier(value = "koinEntityManagerFactory") EntityManagerFactory entityManagerFactory
+    ) {
+        return new JpaTransactionManager(entityManagerFactory);
+    }
+}

src/main/java/in/koreatech/payment/common/config/datasource/KoinPaymentDBProperties.java

@@ -0,0 +1,13 @@
+package in.koreatech.payment.common.config.datasource;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "spring.datasource.koin-payment.hibernate")
+public record KoinPaymentDBProperties(
+    String ddlAuto,
+    Boolean showSql,
+    String packagesToScan,
+    String formatSql
+) {
+
+}

src/main/java/in/koreatech/payment/common/config/datasource/KoinPaymentDataSourceConfig.java

@@ -0,0 +1,70 @@
+package in.koreatech.payment.common.config.datasource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import jakarta.persistence.EntityManagerFactory;
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+@EnableTransactionManagement
+@EnableJpaRepositories(
+    basePackages = "in.koreatech.payment",
+    entityManagerFactoryRef = "koinPaymentEntityManagerFactory",
+    transactionManagerRef = "koinPaymentTransactionManager"
+)
+public class KoinPaymentDataSourceConfig {
+
+    private final KoinPaymentDBProperties koinPaymentDBProperties;
+
+    @Bean(name = "koinPaymentDataSource")
+    @ConfigurationProperties("spring.datasource.koin-payment")
+    public DataSource koinPaymentDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Primary
+    @Bean(name = "koinPaymentEntityManagerFactory")
+    public LocalContainerEntityManagerFactoryBean koinPaymentEntityManagerFactory(
+        @Qualifier(value = "koinPaymentDataSource") DataSource dataSource
+    ) {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource);
+        em.setPackagesToScan(koinPaymentDBProperties.packagesToScan());
+        em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+        em.setJpaPropertyMap(createJpaVendorProperties());
+        return em;
+    }
+
+    private Map<String, Object> createJpaVendorProperties() {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("hibernate.show_sql", koinPaymentDBProperties.showSql());
+        properties.put("hibernate.hbm2ddl.auto", koinPaymentDBProperties.ddlAuto());
+        properties.put("hibernate.format_sql", koinPaymentDBProperties.formatSql());
+        return properties;
+    }
+
+    @Primary
+    @Bean(name = "koinPaymentTransactionManager")
+    public PlatformTransactionManager koinPaymentTransactionManager(
+        @Qualifier(value = "koinPaymentEntityManagerFactory") EntityManagerFactory entityManagerFactory
+    ) {
+        return new JpaTransactionManager(entityManagerFactory);
+    }
+}

src/main/java/in/koreatech/payment/common/exception/GlobalExceptionHandler.java

@@ -25,7 +25,7 @@
 import org.springframework.web.util.ContentCachingRequestWrapper;
 import org.springframework.web.util.WebUtils;
 
-import in.koreatech.payment.client.exception.TossPaymentException;
+import in.koreatech.payment.gateway.toss.exception.TossPaymentException;
 import in.koreatech.payment.common.exception.custom.AuthenticationException;
 import in.koreatech.payment.common.exception.custom.AuthorizationException;
 import in.koreatech.payment.common.exception.custom.DataNotFoundException;

src/main/java/in/koreatech/payment/controller/PaymentsController.java

@@ -1,7 +1,5 @@
 package in.koreatech.payment.controller;
 
-import java.util.List;
-
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10,7 +8,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import in.koreatech.koin.domain.order.model.PaymentCancel;
 import in.koreatech.payment.common.auth.AccessToken;
 import in.koreatech.payment.dto.request.PaymentCancelRequest;
 import in.koreatech.payment.dto.request.PaymentConfirmRequest;
@@ -36,8 +33,7 @@ public ResponseEntity<TemporaryPaymentResponse> createTemporaryDeliveryPayment(
         @RequestBody @Valid final TemporaryDeliveryPaymentSaveRequest request,
         @AccessToken final String accessToken
     ) {
-        String orderId = paymentService.createTemporaryDeliveryPayment(accessToken, request);
-        TemporaryPaymentResponse response = TemporaryPaymentResponse.of(orderId);
+        TemporaryPaymentResponse response = paymentService.createTemporaryDeliveryPayment(accessToken, request);
         return ResponseEntity.ok(response);
     }
 
@@ -46,8 +42,7 @@ public ResponseEntity<TemporaryPaymentResponse> createTemporaryTakeoutPayment(
         @RequestBody @Valid final TemporaryTakeoutPaymentSaveRequest request,
         @AccessToken final String accessToken
     ) {
-        String orderId = paymentService.createTemporaryTakeoutPayment(accessToken, request);
-        TemporaryPaymentResponse response = TemporaryPaymentResponse.of(orderId);
+        TemporaryPaymentResponse response = paymentService.createTemporaryTakeoutPayment(accessToken, request);
         return ResponseEntity.ok(response);
     }
 
@@ -56,8 +51,7 @@ public ResponseEntity<PaymentConfirmResponse> confirmPayment(
         @RequestBody @Valid final PaymentConfirmRequest request,
         @AccessToken final String accessToken
     ) {
-        PaymentConfirmResponse response = paymentService.confirmPayment(accessToken, request.paymentKey(), request.orderId(),
-            request.amount());
+        PaymentConfirmResponse response = paymentService.confirmPayment(accessToken, request);
         return ResponseEntity.ok(response);
     }
 
@@ -67,9 +61,7 @@ public ResponseEntity<PaymentCancelResponse> cancelPayment(
         @RequestBody @Valid final PaymentCancelRequest request,
         @AccessToken final String accessToken
     ) {
-        List<PaymentCancel> paymentCancels = paymentService.cancelPayment(accessToken, paymentId,
-            request.cancelReason());
-        PaymentCancelResponse response = PaymentCancelResponse.from(paymentCancels);
+        PaymentCancelResponse response = paymentService.cancelPayment(accessToken, paymentId, request);
         return ResponseEntity.ok(response);
     }
 

src/main/java/in/koreatech/payment/dto/response/PaymentCancelResponse.java

@@ -10,7 +10,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
-import in.koreatech.koin.domain.order.model.PaymentCancel;
+import in.koreatech.payment.model.entity.PaymentCancel;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @JsonNaming(value = SnakeCaseStrategy.class)