[4단계 - Transaction synchronization 적용하기] 대니(정구홍) 미션 제출합니다.

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

@@ -3,15 +3,13 @@
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.interface21.jdbc.core.RowMapper;
 import com.techcourse.domain.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.sql.Connection;
+import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class UserDao {
 
@@ -38,11 +36,6 @@ public void update(final User user) {
         jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
     }
 
-    public void update(final Connection conn, final User user) {
-        final var sql = "update users set account = ?, password = ?, email = ? where id = ?;";
-        jdbcTemplate.update(conn, sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
-    }
-
     public List<User> findAll() {
         final var sql = "select id, account, password, email from users";
         return jdbcTemplate.queryForList(sql, userRowMapper);

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

@@ -7,7 +7,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -39,31 +38,17 @@ public void log(final UserHistory userHistory) {
         );
     }
 
-    public void log(final Connection conn, final UserHistory userHistory) {
-        final var sql = "insert into user_history (user_id, account, password, email, created_at, created_by) values (?, ?, ?, ?, ?, ?)";
-        jdbcTemplate.update(
-                conn,
-                sql,
-                userHistory.getUserId(),
-                userHistory.getAccount(),
-                userHistory.getPassword(),
-                userHistory.getEmail(),
-                userHistory.getCreatedAt(),
-                userHistory.getCreateBy()
-        );
-    }
-
     private static class UserHistoryRowMapper implements RowMapper<UserHistory> {
 
         @Override
         public UserHistory mapRow(final ResultSet resultSet) throws SQLException {
             return new UserHistory(
                     resultSet.getLong("id"),
-                    resultSet.getLong("userId"),
+                    resultSet.getLong("user_id"),
                     resultSet.getString("account"),
                     resultSet.getString("password"),
                     resultSet.getString("email"),
-                    resultSet.getString("createBy"));
+                    resultSet.getString("created_by"));
         }
     }
 }

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

@@ -0,0 +1,39 @@
+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);
+    }
+
+    @Override
+    public void save(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/TransactionUserService.java

@@ -0,0 +1,37 @@
+package com.techcourse.service;
+
+import com.interface21.transaction.TransactionTemplate;
+import com.techcourse.config.DataSourceConfig;
+import com.techcourse.domain.User;
+
+public class TransactionUserService implements UserService {
+
+    private final UserService userService;
+    private final TransactionTemplate transactionTemplate;
+
+    public TransactionUserService(final UserService userService) {
+        this.userService = userService;
+        this.transactionTemplate = new TransactionTemplate(DataSourceConfig.getInstance());
+    }
+
+    @Override
+    public User findById(final long id) {
+        return transactionTemplate.executeReadOnly(() -> userService.findById(id));
+    }
+
+    @Override
+    public void save(final User user) {
+        transactionTemplate.execute(() -> {
+            userService.save(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,70 +1,12 @@
 package com.techcourse.service;
 
-import com.interface21.dao.DataAccessException;
-import com.techcourse.config.DataSourceConfig;
-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;
 
-import java.sql.Connection;
-import java.sql.SQLException;
+public interface UserService {
 
-public class UserService {
+    User findById(final long id);
 
-    private static final Logger log = LoggerFactory.getLogger(UserService.class);
+    void save(final User user);
 
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
-
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-    }
-
-    public User findById(final long id) {
-        return userDao.findById(id);
-    }
-
-    public void insert(final User user) {
-        userDao.insert(user);
-    }
-
-    public void changePassword(final long id, final String newPassword, final String createBy) {
-        Connection conn = null;
-        try {
-            conn = DataSourceConfig.getInstance().getConnection();
-            conn.setAutoCommit(false);
-
-            final var user = findById(id);
-            user.changePassword(newPassword);
-
-            userDao.update(conn, user);
-            userHistoryDao.log(conn, new UserHistory(user, createBy));
-
-            conn.commit();
-        } catch (Exception e) {
-            log.atError().log("Transaction is being rolled back", e);
-            if (conn != null) {
-                try {
-                    conn.rollback();
-                } catch (SQLException ex) {
-                    throw new DataAccessException("Rollback failed: " + ex.getMessage(), ex);
-                }
-            }
-            throw new DataAccessException("Failed to change password: " + e.getMessage(), e);
-
-        } finally {
-            if (conn != null) {
-                try {
-                    conn.setAutoCommit(true);
-                    conn.close();
-                } catch (SQLException e) {
-                    log.atError().log("Error closing connection", e);
-                }
-            }
-        }
-    }
+    void changePassword(final long id, final String newPassword, final String createdBy);
 }

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

@@ -1,23 +1,16 @@
 package com.techcourse.service;
 
-import com.techcourse.dao.UserHistoryDao;
-import com.techcourse.domain.UserHistory;
 import com.interface21.dao.DataAccessException;
 import com.interface21.jdbc.core.JdbcTemplate;
-
-import java.sql.Connection;
+import com.techcourse.dao.UserHistoryDao;
+import com.techcourse.domain.UserHistory;
 
 public class MockUserHistoryDao extends UserHistoryDao {
 
     public MockUserHistoryDao(final JdbcTemplate jdbcTemplate) {
         super(jdbcTemplate);
     }
 
-    @Override
-    public void log(final Connection conn, final UserHistory userHistory) {
-        throw new DataAccessException();
-    }
-
     @Override
     public void log(final UserHistory userHistory) {
         throw new DataAccessException();

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

@@ -1,14 +1,13 @@
 package com.techcourse.service;
 
+import com.interface21.dao.DataAccessException;
+import com.interface21.jdbc.core.JdbcTemplate;
 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 com.interface21.dao.DataAccessException;
-import com.interface21.jdbc.core.JdbcTemplate;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,7 +31,8 @@ void setUp() {
     @Test
     void testChangePassword() {
         final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        final var userService = new TransactionUserService(appUserService);
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
@@ -47,12 +47,16 @@ void testChangePassword() {
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        // 애플리케이션 서비스
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        // 트랜잭션 서비스 추상화
+        final var userService = new TransactionUserService(appUserService);
 
         final var newPassword = "newPassword";
-        final var createBy = "gugu";
+        final var createdBy = "gugu";
         // 트랜잭션이 정상 동작하는지 확인하기 위해 의도적으로 MockUserHistoryDao에서 예외를 발생시킨다.
-        assertThrows(DataAccessException.class, () -> userService.changePassword(1L, newPassword, createBy));
+        assertThrows(DataAccessException.class,
+                () -> userService.changePassword(1L, newPassword, createdBy));
 
         final var actual = userService.findById(1L);
 

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

@@ -1,16 +1,15 @@
 package com.interface21.jdbc.core;
 
-import java.sql.Connection;
+import com.interface21.dao.DataAccessException;
+import com.interface21.jdbc.datasource.DataSourceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import javax.sql.DataSource;
-
-import com.interface21.dao.DataAccessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class JdbcTemplate {
 
@@ -26,10 +25,6 @@ public int update(final String sql, final Object... args) {
         return execute(sql, PreparedStatement::executeUpdate, args);
     }
 
-    public int update(final Connection conn, final String sql, final Object... args) {
-        return execute(conn, sql, PreparedStatement::executeUpdate, args);
-    }
-
     public <T> T queryForObject(final String sql, final RowMapper<T> rowMapper, final Object... args) {
         return execute(sql, pstmt -> {
             try (final var rs = pstmt.executeQuery()) {
@@ -54,21 +49,7 @@ public <T> List<T> queryForList(final String sql, final RowMapper<T> rowMapper,
     }
 
     private <T> T execute(final String sql, final StatementCallback<T> action, final Object... args) {
-        try (final var conn = dataSource.getConnection(); final var pstmt = conn.prepareStatement(sql)) {
-            log.debug("query : {}", sql);
-            if (args != null) {
-                for (int i = 0; i < args.length; i++) {
-                    pstmt.setObject(i + 1, args[i]);
-                }
-            }
-            return action.doInPreparedStatement(pstmt);
-        } catch (SQLException e) {
-            log.error(e.getMessage(), e);
-            throw new DataAccessException(e);
-        }
-    }
-
-    private <T> T execute(final Connection conn, final String sql, final StatementCallback<T> action, final Object... args) {
+        final var conn = DataSourceUtils.getConnection(dataSource);
         try (final var pstmt = conn.prepareStatement(sql)) {
             log.debug("query : {}", sql);
             if (args != null) {

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

@@ -30,6 +30,7 @@ public static Connection getConnection(DataSource dataSource) throws CannotGetJd
     public static void releaseConnection(Connection connection, DataSource dataSource) {
         try {
             connection.close();
+            TransactionSynchronizationManager.unbindResource(dataSource);
         } catch (SQLException ex) {
             throw new CannotGetJdbcConnectionException("Failed to close JDBC Connection");
         }

jdbc/src/main/java/com/interface21/transaction/TransactionCallback.java

@@ -0,0 +1,8 @@
+package com.interface21.transaction;
+
+import java.sql.SQLException;
+
+@FunctionalInterface
+public interface TransactionCallback<T> {
+    T doInTransaction() throws SQLException;
+}