[3단계 - Transaction 적용하기] 멍구(이유영) 미션 제출합니다.

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

@@ -2,6 +2,7 @@
 
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.techcourse.domain.User;
+import java.sql.Connection;
 import java.util.List;
 import java.util.Optional;
 
@@ -13,27 +14,35 @@ public UserDao(final JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    public void insert(final User user) {
+    public void insert(final Connection connection, final User user) {
         jdbcTemplate.insertInto("users")
                 .value("account", user.getAccount())
                 .value("password", user.getPassword())
                 .value("email", user.getEmail())
-                .execute();
+                .execute(connection);
     }
 
-    public void update(final User user) {
+    public void update(final Connection connection, final User user) {
         jdbcTemplate.update("users")
                 .set("password", user.getPassword())
                 .set("email", user.getEmail())
                 .where("account", user.getAccount())
-                .execute();
+                .execute(connection);
     }
 
-    public List<User> findAll() {
+    public List<User> findAll(final Connection connection) {
         return jdbcTemplate.select(User.class)
                 .columns("id", "account", "password", "email")
                 .from("users")
-                .toList();
+                .toList(connection);
+    }
+
+    public Optional<User> findById(final Connection connection, final Long id) {
+        return jdbcTemplate.select(User.class)
+                .columns("id", "account", "password", "email")
+                .from("users")
+                .where("id", id)
+                .findFirst(connection);
     }
 
     public Optional<User> findById(final Long id) {
@@ -44,11 +53,11 @@ public Optional<User> findById(final Long id) {
                 .findFirst();
     }
 
-    public Optional<User> findByAccount(final String account) {
+    public Optional<User> findByAccount(final Connection connection, final String account) {
         return jdbcTemplate.select(User.class)
                 .columns("id", "account", "password", "email")
                 .from("users")
                 .where("account", account)
-                .findFirst();
+                .findFirst(connection);
     }
 }

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

@@ -2,6 +2,7 @@
 
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.techcourse.domain.UserHistory;
+import java.sql.Connection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,15 +16,14 @@ public UserHistoryDao(final JdbcTemplate jdbcTemplate) {
         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 (?, ?, ?, ?, ?, ?)";
-        jdbcTemplate.update(sql,
-                userHistory.getUserId(),
-                userHistory.getAccount(),
-                userHistory.getPassword(),
-                userHistory.getEmail(),
-                userHistory.getCreatedAt(),
-                userHistory.getCreateBy()
-        );
+    public void log(final Connection connection, final UserHistory userHistory) {
+        jdbcTemplate.insertInto("user_history")
+                .value("user_id", userHistory.getUserId())
+                .value("account", userHistory.getAccount())
+                .value("password", userHistory.getPassword())
+                .value("email", userHistory.getEmail())
+                .value("created_at", userHistory.getCreatedAt())
+                .value("created_by", userHistory.getCreateBy())
+                .execute(connection);
     }
 }

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

@@ -1,33 +1,48 @@
 package com.techcourse.service;
 
+import com.interface21.transaction.support.TransactionTemplate;
 import com.techcourse.dao.UserDao;
 import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
 import com.techcourse.domain.UserHistory;
+import java.sql.Connection;
 
 public class UserService {
 
     private final UserDao userDao;
     private final UserHistoryDao userHistoryDao;
+    private final TransactionTemplate transactionTemplate;
 
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
+    public UserService(final UserDao userDao,
+                       final UserHistoryDao userHistoryDao,
+                       final TransactionTemplate transactionTemplate) {
         this.userDao = userDao;
         this.userHistoryDao = userHistoryDao;
+        this.transactionTemplate = transactionTemplate;
     }
 
-    public User findById(final long id) {
+    public User getById(final long id) {
         return userDao.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("해당 id의 user를 찾을 수 없습니다, id: " + id));
-    }
+    };
 
     public void insert(final User user) {
-        userDao.insert(user);
+        transactionTemplate.execute(connection ->
+                userDao.insert(connection, 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));
+        transactionTemplate.execute(connection -> {
+            final var user = getByIdInTransaction(connection, id);
+            user.changePassword(newPassword);
+            userDao.update(connection, user);
+            userHistoryDao.log(connection, new UserHistory(user, createBy));
+        });
+    }
+
+    private User getByIdInTransaction(final Connection connection, final long id) {
+        return userDao.findById(connection, id)
+                .orElseThrow(() -> new IllegalArgumentException("해당 id의 user를 찾을 수 없습니다, id: " + id));
     }
 }

app/src/test/java/com/techcourse/dao/UserDaoTest.java

@@ -6,37 +6,50 @@
 import com.interface21.jdbc.core.conversion.TypeConversionService;
 import com.techcourse.domain.User;
 import com.techcourse.support.jdbc.init.DatabasePopulatorUtils;
+import java.sql.Connection;
+import java.sql.SQLException;
 import javax.sql.DataSource;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class UserDaoTest {
 
+    DataSource dataSource;
+    Connection connection;
     UserDao userDao;
 
     @BeforeEach
-    void setup() {
-        DataSource dataSource = TestDataSourceConfig.create();
+    void setup() throws SQLException {
+        dataSource = TestDataSourceConfig.create();
+        connection = dataSource.getConnection();
         TypeConversionService typeConversionService = new TypeConversionService();
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource, typeConversionService);
         DatabasePopulatorUtils.execute(dataSource);
 
         userDao = new UserDao(jdbcTemplate);
         final var user = new User("gugu", "password", "[email protected]");
-        userDao.insert(user);
+        userDao.insert(connection, user);
+    }
+
+    @AfterEach
+    void tearDown() throws SQLException {
+        if (connection != null) {
+            connection.close();
+        }
     }
 
     @Test
     void findAll() {
-        final var users = userDao.findAll();
+        final var users = userDao.findAll(connection);
 
         assertThat(users).isNotEmpty();
     }
 
     @Test
     void findById() {
-        final var optionalUser = userDao.findById(1L);
+        final var optionalUser = userDao.findById(connection, 1L);
 
         Assertions.assertThat(optionalUser)
                 .get()
@@ -47,7 +60,7 @@ void findById() {
     @Test
     void findByAccount() {
         final var account = "gugu";
-        final var optionalUser = userDao.findByAccount(account);
+        final var optionalUser = userDao.findByAccount(connection, account);
 
         Assertions.assertThat(optionalUser)
                 .get()
@@ -59,9 +72,9 @@ void findByAccount() {
     void insert() {
         final var account = "insert-gugu";
         final var user = new User(account, "password", "[email protected]");
-        userDao.insert(user);
+        userDao.insert(connection, user);
 
-        final var optionalActual = userDao.findById(2L);
+        final var optionalActual = userDao.findById(connection, 2L);
 
         Assertions.assertThat(optionalActual)
                 .get()
@@ -73,14 +86,14 @@ void insert() {
     void update() {
          // given
         final var newPassword = "password99";
-        final var user = userDao.findById(1L).get();
+        final var user = userDao.findById(connection, 1L).get();
         user.changePassword(newPassword);
 
         // when
-        userDao.update(user);
+        userDao.update(connection, user);
 
         // then
-        final var optionalActual = userDao.findById(1L);
+        final var optionalActual = userDao.findById(connection, 1L);
 
         Assertions.assertThat(optionalActual)
                 .get()

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

@@ -4,6 +4,7 @@
 import com.techcourse.domain.UserHistory;
 import com.interface21.dao.DataAccessException;
 import com.interface21.jdbc.core.JdbcTemplate;
+import java.sql.Connection;
 
 public class MockUserHistoryDao extends UserHistoryDao {
 
@@ -12,7 +13,7 @@ public MockUserHistoryDao(final JdbcTemplate jdbcTemplate) {
     }
 
     @Override
-    public void log(final UserHistory userHistory) {
+    public void log(final Connection connection, final UserHistory userHistory) {
         throw new DataAccessException();
     }
 }

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

@@ -6,41 +6,57 @@
 import com.interface21.dao.DataAccessException;
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.interface21.jdbc.core.conversion.TypeConversionService;
+import com.interface21.transaction.support.TransactionTemplate;
 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 java.sql.Connection;
+import java.sql.SQLException;
+import javax.sql.DataSource;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Disabled
 class UserServiceTest {
 
-    private JdbcTemplate jdbcTemplate;
-    private UserDao userDao;
+    JdbcTemplate jdbcTemplate;
+    UserDao userDao;
+    TransactionTemplate transactionTemplate;
+    DataSource dataSource;
+    Connection connection;
 
     @BeforeEach
-    void setUp() {
-        this.jdbcTemplate = new JdbcTemplate(DataSourceConfig.getInstance(), new TypeConversionService());
+    void setUp() throws SQLException {
+        dataSource = DataSourceConfig.getInstance();
+        connection = dataSource.getConnection();
+        transactionTemplate = new TransactionTemplate(dataSource);
+        this.jdbcTemplate = new JdbcTemplate(dataSource, new TypeConversionService());
         this.userDao = new UserDao(jdbcTemplate);
 
-        DatabasePopulatorUtils.execute(DataSourceConfig.getInstance());
+        DatabasePopulatorUtils.execute(dataSource);
         final var user = new User("gugu", "password", "[email protected]");
-        userDao.insert(user);
+        userDao.insert(connection, user);
+    }
+
+    @AfterEach
+    void tearDown() throws SQLException {
+        if (connection != null) {
+            connection.close();
+        }
     }
 
     @Test
     void testChangePassword() {
         final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var userService = new UserService(userDao, userHistoryDao, transactionTemplate);
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
         userService.changePassword(1L, newPassword, createBy);
 
-        final var actual = userService.findById(1L);
+        final var actual = userService.getById(1L);
 
         assertThat(actual.getPassword()).isEqualTo(newPassword);
     }
@@ -49,15 +65,15 @@ void testChangePassword() {
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var userService = new UserService(userDao, userHistoryDao, transactionTemplate);
 
         final var newPassword = "newPassword";
         final var createBy = "gugu";
         // 트랜잭션이 정상 동작하는지 확인하기 위해 의도적으로 MockUserHistoryDao에서 예외를 발생시킨다.
         assertThrows(DataAccessException.class,
                 () -> userService.changePassword(1L, newPassword, createBy));
 
-        final var actual = userService.findById(1L);
+        final var actual = userService.getById(1L);
 
         assertThat(actual.getPassword()).isNotEqualTo(newPassword);
     }