[JDBC 3,4단계] 키아라 미션 제출합니다

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

@@ -1,13 +1,16 @@
 package com.techcourse.dao;
 
+import com.techcourse.config.DataSourceConfig;
 import com.techcourse.domain.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
 import java.util.List;
-import java.util.Optional;
 
 public class UserDao {
 
@@ -20,39 +23,49 @@ public class UserDao {
                     rs.getString("email")
             );
 
-    private JdbcTemplate jdbcTemplate;
+    private final JdbcTemplate jdbcTemplate;
+    private final DataSource dataSource = DataSourceConfig.getInstance();
 
     public UserDao(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
     public void insert(User user) {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
         String sql = "insert into users (account, password, email) values (?, ?, ?)";
         log.info("[LOG] insert user into users");
-        jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail());
+        jdbcTemplate.update(connection, sql, user.getAccount(), user.getPassword(), user.getEmail());
     }
 
-    public void update(User user) {
-        String sql = "update users set account = ?, password = ? where email = ?";
+    public int update(Connection connection, User user) {
+        String sql = "update users set account = ?, password = ?, email = ? where id = ?";
         log.info("[LOG] update user");
-        jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail());
+        return jdbcTemplate.update(connection, sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
     }
 
-    public List<User> findAll() {
+    public int update(User user) {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
+        String sql = "update users set account = ?, password = ?, email = ? where id = ?";
+        log.info("[LOG] update user");
+        return jdbcTemplate.update(connection, sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
+    }
+
+    public List<User> findAll(Connection connection) {
         String sql = "select id, account, password, email from users";
         log.info("[LOG] select all from users");
-        return jdbcTemplate.query(sql, USER_ROW_MAPPER);
+        return jdbcTemplate.query(connection, sql, USER_ROW_MAPPER);
     }
 
-    public Optional<User> findById(Long id) {
+    public User findById(Long id) {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
         String sql = "select id, account, password, email from users where id = ?";
         log.info("[LOG] select user by id");
-        return jdbcTemplate.queryForObject(sql, USER_ROW_MAPPER, id);
+        return jdbcTemplate.queryForObject(connection, sql, USER_ROW_MAPPER, id);
     }
 
-    public Optional<User> findByAccount(String account) {
+    public User findByAccount(Connection connection, String account) {
         String sql = "select id, account, password, email from users where account = ?";
         log.info("[LOG] select user by account");
-        return jdbcTemplate.queryForObject(sql, USER_ROW_MAPPER, account);
+        return jdbcTemplate.queryForObject(connection, sql, USER_ROW_MAPPER, account);
     }
 }

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

@@ -1,62 +1,30 @@
 package com.techcourse.dao;
 
+import com.techcourse.config.DataSourceConfig;
 import com.techcourse.domain.UserHistory;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 
 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;
+    private final DataSource dataSource = DataSourceConfig.getInstance();
 
     public UserHistoryDao(final JdbcTemplate jdbcTemplate) {
-        this.dataSource = null;
+        this.jdbcTemplate = jdbcTemplate;
     }
 
-    public void log(final UserHistory userHistory) {
+    public void log(UserHistory userHistory) {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
         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) {}
-        }
+        log.info("[LOG] insert user into user_history");
+        jdbcTemplate.update(connection, sql, userHistory.getUserId(), userHistory.getAccount(), userHistory.getPassword(), userHistory.getEmail(), userHistory.getCreatedAt(), userHistory.getCreateBy());
     }
 }

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

@@ -0,0 +1,41 @@
+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.springframework.dao.DataAccessException;
+
+public class AppUserService implements UserService {
+
+    private final UserDao userDao;
+    private final UserHistoryDao userHistoryDao;
+    private static final int QUERY_SINGLE_SIZE = 1;
+
+    public AppUserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
+        this.userDao = userDao;
+        this.userHistoryDao = userHistoryDao;
+    }
+
+    public User findById(long id) {
+        return userDao.findById(id);
+    }
+
+    public void insert(User user) {
+        userDao.insert(user);
+    }
+
+    public void changePassword(long id, String newPassword, String createBy) {
+        User user = findById(id);
+        user.changePassword(newPassword);
+        updateUser(user);
+        userHistoryDao.log(new UserHistory(user, createBy));
+    }
+
+    private void updateUser(User user) {
+        int updateSize = userDao.update(user);
+        if (updateSize != QUERY_SINGLE_SIZE) {
+            throw new DataAccessException("갱신된 데이터의 개수가 올바르지 않습니다.");
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.techcourse.service;
+
+import com.techcourse.config.DataSourceConfig;
+import com.techcourse.domain.User;
+import org.springframework.jdbc.datasource.DataSourceUtils;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLTransactionRollbackException;
+
+public class TxUserService implements UserService {
+
+    private UserService userService;
+    private final DataSource dataSource = DataSourceConfig.getInstance();
+
+    public TxUserService(UserService userService) {
+        this.userService = userService;
+    }
+
+    @Override
+    public User findById(long id) throws SQLException {
+        Connection connection = null;
+        try {
+            if (TransactionSynchronizationManager.hasConnection(dataSource)) {
+                return userService.findById(id);
+            }
+            connection = DataSourceUtils.getConnection(dataSource);
+            connection.setAutoCommit(false);
+            User user = userService.findById(id);
+            connection.commit();
+            DataSourceUtils.releaseConnection(connection, dataSource);
+            return user;
+        } catch (SQLException e) {
+            connection.rollback();
+            throw new SQLTransactionRollbackException(e.getMessage());
+        }
+    }
+
+    @Override
+    public void insert(User user) throws SQLException {
+        Connection connection = null;
+        try {
+            if (TransactionSynchronizationManager.hasConnection(dataSource)) {
+                userService.insert(user);
+                return;
+            }
+            connection = DataSourceUtils.getConnection(dataSource);
+            connection.setAutoCommit(false);
+            userService.insert(user);
+            connection.commit();
+        } catch (SQLException e) {
+            connection.rollback();
+            throw new SQLTransactionRollbackException(e.getMessage());
+        }
+    }
+
+    @Override
+    public void changePassword(long id, String newPassword, String createBy) throws SQLException {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
+        connection.setAutoCommit(false);
+        try {
+            userService.changePassword(id, newPassword, createBy);
+            connection.commit();
+        } catch (SQLException e) {
+            connection.rollback();
+            throw new SQLTransactionRollbackException(e.getMessage());
+        } finally {
+            DataSourceUtils.releaseConnection(connection, dataSource);
+        }
+    }
+}

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

@@ -1,33 +1,14 @@
 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 {
+import java.sql.SQLException;
 
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
+public interface UserService {
 
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-    }
+    User findById(long id) throws SQLException;
 
-    public User findById(final long id) {
-        return userDao.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("해당하는 유저가 없습니다."));
-    }
+    void insert(User user) throws SQLException;
 
-    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(long id, String newPassword, String createBy) throws SQLException;
 }

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

@@ -7,63 +7,79 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import javax.sql.DataSource;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 
 class UserDaoTest {
 
     private UserDao userDao;
+    private Connection connection;
 
     @BeforeEach
-    void setup() {
-        DatabasePopulatorUtils.execute(DataSourceConfig.getInstance());
+    void setup() throws SQLException {
+        DataSource dataSource = DataSourceConfig.getInstance();
+        DatabasePopulatorUtils.execute(dataSource);
+        connection = dataSource.getConnection();
 
-        userDao = new UserDao(new JdbcTemplate(DataSourceConfig.getInstance()));
         final var user = new User("gugu", "password", "[email protected]");
+        userDao = new UserDao(new JdbcTemplate(dataSource));
         userDao.insert(user);
     }
 
     @Test
     void findAll() {
-        final var users = userDao.findAll();
+        final var users = userDao.findAll(connection);
 
         assertThat(users).isNotEmpty();
     }
 
     @Test
     void findById() {
-        final var user = userDao.findById(1L).get();
+        final var user = userDao.findById(1L);
 
         assertThat(user.getAccount()).isEqualTo("gugu");
     }
 
     @Test
     void findByAccount() {
         final var account = "gugu";
-        final var user = userDao.findByAccount(account).get();
+        final var user = userDao.findByAccount(connection, account);
 
         assertThat(user.getAccount()).isEqualTo(account);
     }
 
+    @Test
+    void findByWrongAccount() {
+        final var account = "gaga";
+        assertThatThrownBy(() -> userDao.findByAccount(connection, account))
+                .isInstanceOf(RuntimeException.class);
+    }
+
     @Test
     void insert() {
         final var account = "insert-gugu";
         final var user = new User(account, "password", "[email protected]");
         userDao.insert(user);
 
-        final var actual = userDao.findById(2L).get();
+        final var actual = userDao.findById(2L);
 
         assertThat(actual.getAccount()).isEqualTo(account);
     }
 
     @Test
     void update() {
         final var newPassword = "password99";
-        final var user = userDao.findById(1L).get();
+        final var user = userDao.findById(1L);
         user.changePassword(newPassword);
 
-        userDao.update(user);
+        userDao.update(connection, user);
 
-        final var actual = userDao.findById(1L).get();
+        final var actual = userDao.findById(1L);
 
         assertThat(actual.getPassword()).isEqualTo(newPassword);
     }