[JDBC 라이브러리 구현하기 - 1, 2단계] 에어(김준서) 미션 제출합니다.

README.md

@@ -1 +1,13 @@
 # jwp-dashboard-jdbc
+
+## TODO
+- [x] property 파일로 db 연결 정보 관리
+- [x] update, insert 메서드 분리 
+- [x] UpdateJdbcTemplate, InsertJdbcTemplate 클래스 분리
+- [x] UpdateJdbcTemplate, InsertJdbcTemplate 중복 추상클래스(JdbcTemplate)로 제거
+- [x] SelectJdbcTemplate 클래스 분리
+- [x] JdbcTemplate에 SelectJdbcTemplate 합치기
+- [x] mapRow, setValues 인터페이스 분리 
+- [x] SQLException Unchecked Exception으로 관리 
+- [x] RowMapper 제네릭 사용
+- [x] PreparedStatementSetter 가변인자 사용

app/build.gradle

@@ -39,6 +39,8 @@ dependencies {
 
     implementation 'com.h2database:h2:1.4.200'
 
+    testImplementation 'org.mockito:mockito-core:3.12.4'
+
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.3'
     testImplementation 'org.mockito:mockito-core:3.12.3'
     testImplementation 'org.assertj:assertj-core:3.20.2'

app/src/main/java/com/techcourse/controller/LoginController.java

@@ -1,10 +1,13 @@
 package com.techcourse.controller;
 
+import com.techcourse.dao.UserDao;
 import com.techcourse.domain.User;
-import com.techcourse.repository.InMemoryUserRepository;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
+import nextstep.jdbc.datasource.DataSourceConfig;
+import nextstep.jdbc.exception.DataAccessException;
 import nextstep.mvc.view.JspView;
 import nextstep.mvc.view.ModelAndView;
 import nextstep.web.annotation.Controller;
@@ -18,14 +21,16 @@ public class LoginController {
 
     private static final Logger log = LoggerFactory.getLogger(LoginController.class);
 
+    private final UserDao userDao = new UserDao(DataSourceConfig.getInstance());
+
     @RequestMapping(value = "/login", method = RequestMethod.GET)
     public ModelAndView view(HttpServletRequest request, HttpServletResponse response) {
         return UserSession.getUserFrom(request.getSession())
-                .map(user -> {
-                    log.info("logged in {}", user.getAccount());
-                    return redirect("/index.jsp");
-                })
-                .orElse(new ModelAndView(new JspView("/login.jsp")));
+                          .map(user -> {
+                              log.info("logged in {}", user.getAccount());
+                              return redirect("/index.jsp");
+                          })
+                          .orElse(new ModelAndView(new JspView("/login.jsp")));
     }
 
     @RequestMapping(value = "/login", method = RequestMethod.POST)
@@ -34,12 +39,12 @@ public ModelAndView login(HttpServletRequest request, HttpServletResponse respon
             return redirect("/index.jsp");
         }
 
-        return InMemoryUserRepository.findByAccount(request.getParameter("account"))
-                .map(user -> {
-                    log.info("User : {}", user);
-                    return login(request, user);
-                })
-                .orElse(redirect("/401.jsp"));
+        try {
+            User user = userDao.findByAccount(request.getParameter("account"));
+            return login(request, user);
+        } catch (DataAccessException e) {
+            return redirect("/401.jsp");
+        }
     }
 
     private ModelAndView login(HttpServletRequest request, User user) {

app/src/main/java/com/techcourse/controller/RegisterController.java

@@ -1,9 +1,11 @@
 package com.techcourse.controller;
 
+import com.techcourse.dao.UserDao;
 import com.techcourse.domain.User;
-import com.techcourse.repository.InMemoryUserRepository;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import nextstep.jdbc.datasource.DataSourceConfig;
 import nextstep.mvc.view.JspView;
 import nextstep.mvc.view.ModelAndView;
 import nextstep.web.annotation.Controller;
@@ -13,13 +15,16 @@
 @Controller
 public class RegisterController {
 
+    private final UserDao userDao = new UserDao(DataSourceConfig.getInstance());
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public ModelAndView register(HttpServletRequest request, HttpServletResponse response) {
-        final User user = new User(2,
+        final User user = new User(
                 request.getParameter("account"),
                 request.getParameter("password"),
                 request.getParameter("email"));
-        InMemoryUserRepository.save(user);
+
+        userDao.insert(user);
 
         return new ModelAndView(new JspView("redirect:/index.jsp"));
     }

app/src/main/java/com/techcourse/controller/UserController.java

@@ -1,9 +1,11 @@
 package com.techcourse.controller;
 
+import com.techcourse.dao.UserDao;
 import com.techcourse.domain.User;
-import com.techcourse.repository.InMemoryUserRepository;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import nextstep.jdbc.datasource.DataSourceConfig;
 import nextstep.mvc.view.JsonView;
 import nextstep.mvc.view.ModelAndView;
 import nextstep.web.annotation.Controller;
@@ -17,14 +19,15 @@ public class UserController {
 
     private static final Logger log = LoggerFactory.getLogger(UserController.class);
 
+    private final UserDao userDao = new UserDao(DataSourceConfig.getInstance());
+
     @RequestMapping(value = "/api/user", method = RequestMethod.GET)
     public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
         final String account = request.getParameter("account");
         log.debug("user id : {}", account);
 
         final ModelAndView modelAndView = new ModelAndView(new JsonView());
-        final User user = InMemoryUserRepository.findByAccount(account)
-                .orElseThrow();
+        final User user = userDao.findByAccount(account);
 
         modelAndView.addObject("user", user);
         return modelAndView;

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

@@ -1,116 +1,56 @@
 package com.techcourse.dao;
 
+import java.util.List;
+import javax.sql.DataSource;
+
 import com.techcourse.domain.User;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
+import nextstep.jdbc.JdbcTemplate;
+import nextstep.jdbc.RowMapper;
 
 public class UserDao {
 
-    private static final Logger log = LoggerFactory.getLogger(UserDao.class);
+    private static final RowMapper<User> USER_ROW_MAPPER =
+            resultSet -> new User(
+                    resultSet.getLong("id"),
+                    resultSet.getString("account"),
+                    resultSet.getString("password"),
+                    resultSet.getString("email")
+            );
 
-    private final DataSource dataSource;
+    private final JdbcTemplate jdbcTemplate;
 
     public UserDao(DataSource dataSource) {
-        this.dataSource = dataSource;
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
     public void insert(User user) {
         final String sql = "insert into users (account, password, email) values (?, ?, ?)";
-
-        Connection conn = null;
-        PreparedStatement pstmt = null;
-        try {
-            conn = dataSource.getConnection();
-            pstmt = conn.prepareStatement(sql);
-
-            log.debug("query : {}", sql);
-
-            pstmt.setString(1, user.getAccount());
-            pstmt.setString(2, user.getPassword());
-            pstmt.setString(3, user.getEmail());
-            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) {}
-        }
+        jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail());
     }
 
     public void update(User user) {
-        // todo
+        final String sql = "update users set account = ?, password = ?, email = ? where id = ?";
+        jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
     }
 
     public List<User> findAll() {
-        // todo
-        return null;
+        final String sql = "select * from users";
+        return jdbcTemplate.query(sql, USER_ROW_MAPPER);
     }
 
     public User findById(Long id) {
         final String sql = "select id, account, password, email from users where id = ?";
-
-        Connection conn = null;
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-        try {
-            conn = dataSource.getConnection();
-            pstmt = conn.prepareStatement(sql);
-            pstmt.setLong(1, id);
-            rs = pstmt.executeQuery();
-
-            log.debug("query : {}", sql);
-
-            if (rs.next()) {
-                return new User(
-                        rs.getLong(1),
-                        rs.getString(2),
-                        rs.getString(3),
-                        rs.getString(4));
-            }
-            return null;
-        } catch (SQLException e) {
-            log.error(e.getMessage(), e);
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                if (rs != null) {
-                    rs.close();
-                }
-            } catch (SQLException ignored) {}
-
-            try {
-                if (pstmt != null) {
-                    pstmt.close();
-                }
-            } catch (SQLException ignored) {}
-
-            try {
-                if (conn != null) {
-                    conn.close();
-                }
-            } catch (SQLException ignored) {}
-        }
+        return jdbcTemplate.queryForObject(sql, USER_ROW_MAPPER, id);
     }
 
     public User findByAccount(String account) {
-        // todo
-        return null;
+        final String sql = "select id, account, password, email from users where account = ?";
+        return jdbcTemplate.queryForObject(sql, USER_ROW_MAPPER, account);
+    }
+
+    public User findByEmail(String email) {
+        final String sql = "select id, account, password, email from users where email = ?";
+        return jdbcTemplate.queryForObject(sql, USER_ROW_MAPPER, email);
     }
 }

app/src/main/java/com/techcourse/support/context/ContextLoaderListener.java

@@ -1,6 +1,6 @@
 package com.techcourse.support.context;
 
-import com.techcourse.config.DataSourceConfig;
+import nextstep.jdbc.datasource.DataSourceConfig;
 import com.techcourse.support.jdbc.init.DatabasePopulatorUtils;
 import jakarta.servlet.ServletContextEvent;
 import jakarta.servlet.ServletContextListener;

app/src/main/java/com/techcourse/support/jdbc/init/DatabasePopulatorUtils.java

@@ -1,47 +1,41 @@
 package com.techcourse.support.jdbc.init;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import javax.sql.DataSource;
+
+import nextstep.jdbc.exception.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DatabasePopulatorUtils {
 
     private static final Logger log = LoggerFactory.getLogger(DatabasePopulatorUtils.class);
 
     public static void execute(DataSource dataSource) {
-        Connection connection = null;
-        Statement statement = null;
-        try {
-            final URL url = DatabasePopulatorUtils.class.getClassLoader().getResource("schema.sql");
-            final File file = new File(url.getFile());
-            final String sql = Files.readString(file.toPath());
-            connection = dataSource.getConnection();
-            statement = connection.createStatement();
+        try (Connection conn = dataSource.getConnection();
+             Statement statement = conn.createStatement()) {
+            final String sql = getInitSchema();
             statement.execute(sql);
-        } catch (NullPointerException | IOException | SQLException e) {
+        } catch (SQLException e) {
+            throw new DataAccessException(e.getMessage());
+        } catch (URISyntaxException | IOException e) {
             log.error(e.getMessage(), e);
-        } finally {
-            try {
-                if (statement != null) {
-                    statement.close();
-                }
-            } catch (SQLException ignored) {}
-
-            try {
-                if (connection != null) {
-                    connection.close();
-                }
-            } catch (SQLException ignored) {}
         }
     }
 
+    private static String getInitSchema() throws URISyntaxException, IOException {
+        final URL url = DatabasePopulatorUtils.class.getClassLoader().getResource("schema.sql");
+        final File file = Paths.get(url.toURI()).toFile();
+        return Files.readString(file.toPath());
+    }
+
     private DatabasePopulatorUtils() {}
 }

app/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+datasource.url=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;
+datasource.username=
+datasource.password=