[4단계 - Transaction synchronization 적용하기] 아마(유석현) 미션 제출합니다.

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

@@ -47,17 +47,6 @@ public void update(final User user) {
         });
     }
 
-    public void update(final Connection connection, final User user) {
-        final String sql = "update users set account=?, email=?, password=? where id=?";
-
-        jdbcTemplate.executeUpdate(connection, sql, pstmt -> {
-            pstmt.setString(1, user.getAccount());
-            pstmt.setString(2, user.getEmail());
-            pstmt.setString(3, user.getPassword());
-            pstmt.setLong(4, user.getId());
-        });
-    }
-
     public List<User> findAll() {
         final var sql = "select id, account, email, password from users";
 

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

@@ -32,17 +32,4 @@ public void log(final UserHistory userHistory) {
             pstmt.setString(6, userHistory.getCreateBy());
         });
     }
-
-    public void log(final Connection connection, final UserHistory userHistory) {
-        final var sql = "insert into user_history (user_id, account, password, email, created_at, created_by) values (?, ?, ?, ?, ?, ?)";
-
-        jdbcTemplate.executeUpdate(connection, sql, pstmt -> {
-            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());
-        });
-    }
 }

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

@@ -0,0 +1,44 @@
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AppUserService implements UserService {
+
+    private static final Logger log = LoggerFactory.getLogger(AppUserService.class);
+
+    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(IllegalArgumentException::new);
+    }
+
+    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));
+    }
+
+    @Override
+    public void save(final User user) {
+        userDao.insert(user);
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.techcourse.service;
+
+import com.interface21.dao.DataAccessException;
+import com.interface21.jdbc.datasource.DataSourceUtils;
+import com.interface21.transaction.support.TransactionSynchronizationManager;
+import com.interface21.transaction.support.TransactionTemplate;
+import com.techcourse.domain.User;
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TxUserService implements UserService {
+
+    private static final Logger log = LoggerFactory.getLogger(TxUserService.class);
+
+    private final UserService userService;
+    private final TransactionTemplate transactionTemplate;
+
+    public TxUserService(final UserService userService, final DataSource dataSource) {
+        this.userService = userService;
+        this.transactionTemplate = new TransactionTemplate(dataSource);
+    }
+
+    @Override
+    public User findById(final long id) {
+        return userService.findById(id);
+    }
+
+    @Override
+    public void save(final User user) {
+        userService.save(user);
+    }
+
+    @Override
+    public void changePassword(final long id, final String newPassword, final String createdBy) {
+        transactionTemplate.execute(() -> userService.changePassword(id, newPassword, createdBy));
+    }
+}

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

@@ -1,67 +1,10 @@
 package com.techcourse.service;
 
-import com.interface21.dao.DataAccessException;
-import com.techcourse.dao.UserDao;
-import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
-import com.techcourse.domain.UserHistory;
-import java.sql.Connection;
-import java.sql.SQLException;
-import javax.sql.DataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class UserService {
+public interface UserService {
 
-    private static final Logger log = LoggerFactory.getLogger(UserService.class);
-
-
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
-    private final DataSource dataSource;
-
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao, final DataSource dataSource) {
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-        this.dataSource = dataSource;
-    }
-
-    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) {
-        try(Connection connection = dataSource.getConnection()) { // 외부 try - catch: connection 연결 과정 에러 관리
-            connection.setAutoCommit(false);
-
-            try { // 내부 try - catch 트랜잭션 관리 보장.
-                final var user = findById(id);
-                user.changePassword(newPassword);
-                userDao.update(connection, user);
-                userHistoryDao.log(connection, new UserHistory(user, createBy));
-
-                connection.commit();
-            } catch (Exception exceptionWhenCommit) {
-                log.error("커밋 실패, 롤백 시도", exceptionWhenCommit);
-
-                try { // 롤백 try - catch
-                    connection.rollback();
-                } catch (SQLException exceptionWhenRollback) {
-                    log.error("트랜잭션 롤벡 실패", exceptionWhenRollback);
-                }
-
-                // 롤백 성공, 실패와 상관 없이 원본 예외를 다시 던진다.
-                throw new DataAccessException("커밋 중 에러가 발생했습니다. 롤백합니다.", exceptionWhenCommit);
-            }
-
-        } catch (SQLException exceptionWhenConnect) {
-            log.error("DB 커넥션 획득 실패.", exceptionWhenConnect);
-            throw new DataAccessException("커넥션을 얻지 못했습니다.", exceptionWhenConnect);
-        }
-    }
+    User findById(final long id);
+    void save(final User user);
+    void changePassword(final long id, final String newPassword, final String createdBy);
 }

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

@@ -5,19 +5,16 @@
 
 import com.interface21.dao.DataAccessException;
 import com.interface21.jdbc.core.JdbcTemplate;
-import com.interface21.jdbc.mapper.Mapper;
-import com.interface21.jdbc.mapper.ReflectionResultSetMapper;
 import com.techcourse.config.DataSourceConfig;
 import com.techcourse.dao.UserDao;
 import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
 import com.techcourse.support.jdbc.init.DatabasePopulatorUtils;
 import javax.sql.DataSource;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-class UserServiceTest {
+class AppUserServiceTest {
 
     private JdbcTemplate jdbcTemplate;
     private UserDao userDao;
@@ -36,7 +33,7 @@ void setUp() {
     @Test
     void testChangePassword() {
         final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao, dataSource);
+        final var userService = new AppUserService(userDao, userHistoryDao);
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
@@ -51,7 +48,8 @@ void testChangePassword() {
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao, dataSource);
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        final var userService = new TxUserService(appUserService, dataSource);
 
         final var newPassword = "newPassword";
         final var createBy = "gugu";

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

@@ -13,7 +13,7 @@ public MockUserHistoryDao(final JdbcTemplate jdbcTemplate) {
     }
 
     @Override
-    public void log(final Connection connection, final UserHistory userHistory) {
+    public void log(final UserHistory userHistory) {
         throw new DataAccessException();
     }
 }

jdbc/src/main/java/com/interface21/jdbc/core/JdbcTemplate.java

@@ -2,6 +2,8 @@
 
 import com.interface21.dao.DataAccessException;
 import com.interface21.dao.IncorrectResultSizeDataAccessException;
+import com.interface21.jdbc.datasource.DataSourceUtils;
+import com.interface21.transaction.support.TransactionSynchronizationManager;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -32,15 +34,6 @@ public void executeUpdate(String sql, PreparedStatementSetter pss) {
         );
     }
 
-    public void executeUpdate(Connection conn, String sql, PreparedStatementSetter pss) {
-        execute(conn, sql, pstmt -> {
-                    pss.setValue(pstmt);
-                    pstmt.executeUpdate();
-                    return null;
-                }
-        );
-    }
-
     public <T> Optional<T> executeSelect(String sql, PreparedStatementSetter pss, RowMapper<T> rowMapper) {
         return execute(sql, pstmt -> {
             pss.setValue(pstmt);
@@ -75,16 +68,8 @@ public <T> List<T> executeSelectAll(String sql, RowMapper<T> rowMapper) {
     }
 
     private <T> T execute(String sql, PreparedStatementCallback<T> psc) {
-        try (Connection conn = dataSource.getConnection();
-             PreparedStatement pstmt = conn.prepareStatement(sql)) {
-
-            return psc.action(pstmt);
-        } catch (SQLException e) {
-            throw new DataAccessException(e);
-        }
-    }
+        Connection conn = DataSourceUtils.getConnection(dataSource);
 
-    private <T> T execute(Connection conn, String sql, PreparedStatementCallback<T> psc) {
         try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
 
             return psc.action(pstmt);

jdbc/src/main/java/com/interface21/jdbc/datasource/DataSourceUtils.java

@@ -7,8 +7,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-// 4단계 미션에서 사용할 것
-public abstract class DataSourceUtils {
+public final class DataSourceUtils {
 
     private DataSourceUtils() {}
 

jdbc/src/main/java/com/interface21/transaction/support/TransactionInterface.java

@@ -0,0 +1,7 @@
+package com.interface21.transaction.support;
+
+@FunctionalInterface
+public interface TransactionInterface {
+
+    void doTransaction() throws Exception;
+}

jdbc/src/main/java/com/interface21/transaction/support/TransactionSynchronizationManager.java

@@ -1,23 +1,30 @@
 package com.interface21.transaction.support;
 
+import java.util.HashMap;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.util.Map;
 
-public abstract class TransactionSynchronizationManager {
+public final class TransactionSynchronizationManager {
 
-    private static final ThreadLocal<Map<DataSource, Connection>> resources = new ThreadLocal<>();
+    private static final ThreadLocal<Map<DataSource, Connection>> resources = ThreadLocal.withInitial(HashMap::new);
 
     private TransactionSynchronizationManager() {}
 
     public static Connection getResource(DataSource key) {
-        return null;
+        Map<DataSource, Connection> connections = resources.get();
+
+        return connections.get(key);
     }
 
     public static void bindResource(DataSource key, Connection value) {
+        Map<DataSource, Connection> connections = resources.get();
+        connections.put(key, value);
     }
 
     public static Connection unbindResource(DataSource key) {
-        return null;
+        Map<DataSource, Connection> connections = resources.get();
+
+        return connections.remove(key);
     }
 }

jdbc/src/main/java/com/interface21/transaction/support/TransactionTemplate.java

@@ -0,0 +1,47 @@
+package com.interface21.transaction.support;
+
+import com.interface21.dao.DataAccessException;
+import com.interface21.jdbc.datasource.DataSourceUtils;
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TransactionTemplate {
+
+    private static final Logger log = LoggerFactory.getLogger(TransactionTemplate.class);
+
+    private final DataSource dataSource;
+
+    public TransactionTemplate(final DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public void execute(TransactionInterface callback) {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
+
+        try { // 트랜잭션 보장 try - catch
+            connection.setAutoCommit(false);
+
+            callback.doTransaction();
+
+            connection.commit();
+
+        } catch (Exception exceptionWhenCommit) {
+            log.error("커밋 실패. 롤백합니다.", exceptionWhenCommit);
+
+            try { // 롤백 try - catch
+                connection.rollback();
+            } catch (SQLException exceptionWhenRollback) {
+                log.error("롤백 실패", exceptionWhenRollback);
+            }
+
+            throw new DataAccessException("커밋 중 에러가 발생했습니다. 롤백합니다.", exceptionWhenCommit);
+
+        } finally {
+            DataSourceUtils.releaseConnection(connection, dataSource);
+            TransactionSynchronizationManager.unbindResource(dataSource);
+        }
+    }
+}