feat: UserDao 투두 로직 구현

woowacourse · Sep 28, 2023 · 8b660b8 · 8b660b8
1 parent cd9c89a
commit 8b660b8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -3,4 +3,4 @@
 ### 1단계
 - [x] JdbcTemplate insert, update, delete, select 쿼리 메서드 구현
   - [x] UserDao rowmapper 구현
-- [ ] UserDao todo 쿼리 로직 구현
+- [x] UserDao todo 쿼리 로직 구현
diff --git a/app/src/main/java/com/techcourse/dao/UserDao.java b/app/src/main/java/com/techcourse/dao/UserDao.java
@@ -2,16 +2,14 @@
 
 import com.techcourse.domain.User;
 import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
 public class UserDao {
 
-    private static final Logger log = LoggerFactory.getLogger(UserDao.class);
     private static final RowMapper<User> ROW_MAPPER = (rs, count) ->
-        new User(rs.getLong("id"),
+        new User(
+            rs.getLong("id"),
             rs.getString("account"),
             rs.getString("password"),
             rs.getString("email")
@@ -24,7 +22,7 @@ public UserDao(final JdbcTemplate jdbcTemplate) {
     }
 
     public void insert(final User user) {
-        final var sql = "insert into users (account, password, email) values (?, ?, ?)";
+        final String sql = "insert into users (account, password, email) values (?, ?, ?)";
 
         jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail());
     }
@@ -42,7 +40,7 @@ public List<User> findAll() {
     }
 
     public User findById(final Long id) {
-        final var sql = "select id, account, password, email from users where id = ?";
+        final String sql = "select id, account, password, email from users where id = ?";
 
         return jdbcTemplate.queryForObject(sql, ROW_MAPPER, id);
     }

diff --git a/jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
@@ -9,7 +9,6 @@
 import javax.sql.DataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.datasource.DataSourceUtils;
 
 public class JdbcTemplate {
 
@@ -22,35 +21,38 @@ public JdbcTemplate(final DataSource dataSource) {
     }
 
     public <T> List<T> query(final String sql, final RowMapper<T> rowMapper, final Object... args) {
-        try (final Connection connection = DataSourceUtils.getConnection(dataSource);
+        try (final Connection connection = dataSource.getConnection();
             final PreparedStatement pstmt = connection.prepareStatement(sql)) {
             log.debug("query : {}", sql);
 
-            final Object[] parameters = args;
-            for (int i = 0; i < parameters.length; i++) {
-                pstmt.setObject(i + 1, parameters[i]);
-            }
+            setParamsToPreparedStatement(pstmt, args);
 
             final ResultSet resultSet = pstmt.executeQuery();
             final List<T> results = new ArrayList<>();
             if (resultSet.next()) {
                 results.add(rowMapper.mapRow(resultSet, resultSet.getRow()));
             }
+
             return results;
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
     }
 
+    private void setParamsToPreparedStatement(final PreparedStatement pstmt, final Object[] args)
+        throws SQLException
+    {
+        for (int i = 0; i < args.length; i++) {
+            pstmt.setObject(i + 1, args[i]);
+        }
+    }
+
     public <T> T queryForObject(final String sql, final RowMapper<T> rowMapper, final Object... args) {
-        try (final Connection connection = DataSourceUtils.getConnection(dataSource);
+        try (final Connection connection = dataSource.getConnection();
             final PreparedStatement pstmt = connection.prepareStatement(sql)) {
             log.debug("query : {}", sql);
 
-            final Object[] parameters = args;
-            for (int i = 0; i < parameters.length; i++) {
-                pstmt.setObject(i + 1, parameters[i]);
-            }
+            setParamsToPreparedStatement(pstmt, args);
 
             final ResultSet resultSet = pstmt.executeQuery();
             if (resultSet.next()) {
@@ -63,14 +65,11 @@ public <T> T queryForObject(final String sql, final RowMapper<T> rowMapper, fina
     }
 
     public int update(final String sql, final Object... args) {
-        try (final Connection connection = DataSourceUtils.getConnection(dataSource);
+        try (final Connection connection = dataSource.getConnection();
             final PreparedStatement pstmt = connection.prepareStatement(sql)) {
             log.debug("query : {}", sql);
 
-            final Object[] parameters = args;
-            for (int i = 0; i < parameters.length; i++) {
-                pstmt.setObject(i + 1, parameters[i]);
-            }
+            setParamsToPreparedStatement(pstmt, args);
 
             return pstmt.executeUpdate();
         } catch (SQLException e) {