[JDBC 라이브러리 구현하기 - 3, 4단계] 로건(정다빈) 미션 제출합니다.

app/src/main/java/com/techcourse/dao/UserDao.java

@@ -1,6 +1,7 @@
 package com.techcourse.dao;
 
 import com.techcourse.domain.User;
+import java.sql.Connection;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.jdbc.core.JdbcTemplate;

app/src/main/java/com/techcourse/dao/UserHistoryDao.java

@@ -2,9 +2,6 @@
 
 import com.techcourse.domain.UserHistory;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import javax.sql.DataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -13,51 +10,15 @@ public class UserHistoryDao {
 
     private static final Logger log = LoggerFactory.getLogger(UserHistoryDao.class);
 
-    private final DataSource dataSource;
-
-    public UserHistoryDao(final DataSource dataSource) {
-        this.dataSource = dataSource;
-    }
+    private final JdbcTemplate jdbcTemplate;
 
     public UserHistoryDao(final JdbcTemplate jdbcTemplate) {
-        this.dataSource = null;
+        this.jdbcTemplate = jdbcTemplate;
     }
 
     public void log(final UserHistory userHistory) {
         final var sql = "insert into user_history (user_id, account, password, email, created_at, created_by) values (?, ?, ?, ?, ?, ?)";
-
-        Connection conn = null;
-        PreparedStatement pstmt = null;
-        try {
-            conn = dataSource.getConnection();
-            pstmt = conn.prepareStatement(sql);
-
-            log.debug("query : {}", sql);
-
-            pstmt.setLong(1, userHistory.getUserId());
-            pstmt.setString(2, userHistory.getAccount());
-            pstmt.setString(3, userHistory.getPassword());
-            pstmt.setString(4, userHistory.getEmail());
-            pstmt.setObject(5, userHistory.getCreatedAt());
-            pstmt.setString(6, userHistory.getCreateBy());
-            pstmt.executeUpdate();
-        } catch (SQLException e) {
-            log.error(e.getMessage(), e);
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                if (pstmt != null) {
-                    pstmt.close();
-                }
-            } catch (SQLException ignored) {
-            }
-
-            try {
-                if (conn != null) {
-                    conn.close();
-                }
-            } catch (SQLException ignored) {
-            }
-        }
+        jdbcTemplate.update(sql, userHistory.getUserId(), userHistory.getAccount(), userHistory.getPassword(),
+                userHistory.getEmail(), userHistory.getCreatedAt(), userHistory.getCreateBy());
     }
 }

app/src/main/java/com/techcourse/domain/UserHistory.java

@@ -6,7 +6,7 @@ public class UserHistory {
 
     private Long id;
 
-    private final long userId;
+    private final Long userId;
     private final String account;
     private final String password;
     private final String email;
@@ -19,7 +19,7 @@ public UserHistory(final User user, final String createBy) {
         this(null, user.getId(), user.getAccount(), user.getPassword(), user.getEmail(), createBy);
     }
 
-    public UserHistory(final Long id, final long userId, final String account, final String password,
+    public UserHistory(final Long id, final Long userId, final String account, final String password,
                        final String email, final String createBy) {
         this.id = id;
         this.userId = userId;

app/src/main/java/com/techcourse/service/AppUserService.java

@@ -0,0 +1,37 @@
+package com.techcourse.service;
+
+import com.techcourse.dao.UserDao;
+import com.techcourse.dao.UserHistoryDao;
+import com.techcourse.domain.User;
+import com.techcourse.domain.UserHistory;
+import java.util.NoSuchElementException;
+
+public class AppUserService implements UserService {
+
+    private final UserDao userDao;
+    private final UserHistoryDao userHistoryDao;
+
+    public AppUserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
+        this.userDao = userDao;
+        this.userHistoryDao = userHistoryDao;
+    }
+
+    @Override
+    public User findById(final Long id) {
+        return userDao.findById(id)
+                .orElseThrow(NoSuchElementException::new);
+    }
+
+    @Override
+    public void insert(final User user) {
+        userDao.insert(user);
+    }
+
+    @Override
+    public void changePassword(final Long id, final String newPassword, final String createBy) {
+        final var user = findById(id);
+        user.changePassword(newPassword);
+        userDao.update(user);
+        userHistoryDao.log(new UserHistory(user, createBy));
+    }
+}

app/src/main/java/com/techcourse/service/TxUserService.java

@@ -0,0 +1,36 @@
+package com.techcourse.service;
+
+import com.techcourse.domain.User;
+import org.springframework.transaction.support.TransactionTemplate;
+
+public class TxUserService implements UserService {
+
+    private final TransactionTemplate transactionTemplate;
+    private final UserService userService;
+
+    public TxUserService(final TransactionTemplate transactionTemplate, final UserService userService) {
+        this.transactionTemplate = transactionTemplate;
+        this.userService = userService;
+    }
+
+    @Override
+    public User findById(final Long id) {
+        return userService.findById(id);
+    }
+
+    @Override
+    public void insert(final User user) {
+        transactionTemplate.execute(() -> {
+            userService.insert(user);
+            return null;
+        });
+    }
+
+    @Override
+    public void changePassword(final Long id, final String newPassword, final String createBy) {
+        transactionTemplate.execute(() -> {
+            userService.changePassword(id, newPassword, createBy);
+            return null;
+        });
+    }
+}

app/src/main/java/com/techcourse/service/UserService.java

@@ -1,33 +1,12 @@
 package com.techcourse.service;
 
-import com.techcourse.dao.UserDao;
-import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
-import com.techcourse.domain.UserHistory;
 
-public class UserService {
+public interface UserService {
 
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
+    User findById(final Long id);
 
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-    }
+    void insert(final User user);
 
-    public User findById(final long id) {
-        return userDao.findById(id)
-                .orElseThrow(IllegalArgumentException::new);
-    }
-
-    public void insert(final User user) {
-        userDao.insert(user);
-    }
-
-    public void changePassword(final long id, final String newPassword, final String createBy) {
-        final var user = findById(id);
-        user.changePassword(newPassword);
-        userDao.update(user);
-        userHistoryDao.log(new UserHistory(user, createBy));
-    }
+    void changePassword(final Long id, final String newPassword, final String createBy);
 }

app/src/test/java/com/techcourse/service/MockUserHistoryDao.java

@@ -2,6 +2,7 @@
 
 import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.UserHistory;
+import java.sql.Connection;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 

app/src/test/java/com/techcourse/service/UserServiceTest.java

@@ -13,8 +13,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.transaction.support.TransactionTemplate;
 
-@Disabled
 class UserServiceTest {
 
     private JdbcTemplate jdbcTemplate;
@@ -33,7 +33,9 @@ void setUp() {
     @Test
     void testChangePassword() {
         final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var transactionTemplate = new TransactionTemplate(DataSourceConfig.getInstance());
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        final var userService = new TxUserService(transactionTemplate, appUserService);
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
@@ -48,7 +50,9 @@ void testChangePassword() {
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var transactionTemplate = new TransactionTemplate(DataSourceConfig.getInstance());
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        final var userService = new TxUserService(transactionTemplate, appUserService);
 
         final var newPassword = "newPassword";
         final var createBy = "gugu";

jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -12,6 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 
 public class JdbcTemplate {
 
@@ -39,8 +40,8 @@ private int executeUpdate(final PreparedStatement pstmt) {
     }
 
     private <T> T execute(final Function<PreparedStatement, T> function, final String query, final Object... args) {
-        try (final Connection conn = dataSource.getConnection();
-             final PreparedStatement pstmt = getPreparedStatement(conn, query, args)) {
+        final Connection conn = DataSourceUtils.getConnection(dataSource);
+        try (final PreparedStatement pstmt = getPreparedStatement(conn, query, args)) {
             return function.apply(pstmt);
         } catch (SQLException e) {
             log.error(e.getMessage(), e);

jdbc/src/main/java/org/springframework/transaction/support/TransactionExecutor.java

@@ -0,0 +1,7 @@
+package org.springframework.transaction.support;
+
+@FunctionalInterface
+public interface TransactionExecutor<T> {
+
+    T execute();
+}

jdbc/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java

@@ -1,7 +1,9 @@
 package org.springframework.transaction.support;
 
 import java.sql.Connection;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import javax.sql.DataSource;
 
 public abstract class TransactionSynchronizationManager {
@@ -12,13 +14,26 @@ private TransactionSynchronizationManager() {
     }
 
     public static Connection getResource(DataSource key) {
-        return null;
+        Map<DataSource, Connection> connections = resources.get();
+        if (Objects.isNull(connections)) {
+            return null;
+        }
+        return connections.get(key);
     }
 
     public static void bindResource(DataSource key, Connection value) {
+        Map<DataSource, Connection> connections = resources.get();
+        if (Objects.isNull(connections)) {
+            connections = new HashMap<>();
+            resources.set(connections);
+        }
+        connections.put(key, value);
     }
 
     public static Connection unbindResource(DataSource key) {
-        return null;
+        if (Objects.isNull(resources.get())) {
+            return null;
+        }
+        return resources.get().remove(key);
     }
 }

jdbc/src/main/java/org/springframework/transaction/support/TransactionTemplate.java

@@ -0,0 +1,60 @@
+package org.springframework.transaction.support;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.function.Supplier;
+import javax.sql.DataSource;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.datasource.DataSourceUtils;
+
+public class TransactionTemplate {
+
+    private final DataSource dataSource;
+
+    public TransactionTemplate(final DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public <T> T execute(final TransactionExecutor<T> executor) {
+        final Connection connection = beginTransaction();
+        try {
+            final T result = executor.execute();
+            commit(connection);
+            return result;
+        } catch (final DataAccessException e) {
+            rollback(connection);
+            throw e;
+        } finally {
+            DataSourceUtils.releaseConnection(connection, dataSource);
+            TransactionSynchronizationManager.unbindResource(dataSource);
+        }
+    }
+
+    private Connection beginTransaction() {
+        final Connection connection = DataSourceUtils.getConnection(dataSource);
+        try {
+            connection.setAutoCommit(false);
+        } catch (final SQLException e) {
+            throw new DataAccessException(e.getMessage(), e);
+        }
+        return connection;
+    }
+
+    private void commit(final Connection connection) {
+        try {
+            connection.commit();
+            connection.setAutoCommit(true);
+        } catch (final SQLException e) {
+            throw new DataAccessException(e.getMessage(), e);
+        }
+    }
+
+    private void rollback(final Connection connection) {
+        try {
+            connection.rollback();
+            connection.setAutoCommit(true);
+        } catch (final SQLException e) {
+            throw new DataAccessException(e.getMessage(), e);
+        }
+    }
+}

study/src/main/java/transaction/DatabasePopulatorUtils.java

@@ -23,7 +23,9 @@ public static void execute(final DataSource dataSource) {
             final var sql = Files.readString(file.toPath());
             connection = dataSource.getConnection();
             statement = connection.createStatement();
-            statement.execute(sql);
+            for (String query : sql.split(";")) {
+                statement.execute(query + ";");
+            }
         } catch (NullPointerException | IOException | SQLException e) {
             log.error(e.getMessage(), e.getCause());
         } finally {