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

README.md

@@ -1 +1,10 @@
 # jwp-dashboard-jdbc
+
+- [x] Connection 생성 자동으로 해주기
+- [x] PreparedStatement 자동으로 준비 및 실행 해주기
+- [x] ResultSet 만들어주기
+    - [x] JdbcTemplate 사용자가 쿼리와 rowMapper 만 전달해서 매핑 자동화
+- [x] 예외처리 (커스텀 익셉션)
+- [ ] 트랜잭션 관리 (...??)
+- [x] Connection, Statement, ResultSet close (try-with-resource 사용)
+- [x] Insert 아이디 발급 편의를 위해 SimpleJdbcInsert 만들어보기

app/build.gradle

@@ -1,9 +1,14 @@
 plugins {
     id 'application'
     id 'org.sonarqube' version '3.3'
+    id 'jacoco'
     id 'idea'
 }
 
+jacoco {
+    toolVersion = "0.8.7"
+}
+
 application {
     mainClass = 'com.techcourse.JwpApplication'
 }
@@ -47,6 +52,14 @@ dependencies {
 
 tasks.named('test') {
     useJUnitPlatform()
+    finalizedBy(jacocoTestReport)
+}
+
+jacocoTestReport {
+    reports {
+        xml.enabled(true)
+        xml.destination(new File("jacoco/jacoco.xml"))
+    }
 }
 
 sonarqube {
@@ -55,5 +68,6 @@ sonarqube {
         property "sonar.projectKey", "woowacourse_jwp-dashboard-jdbc"
         property "sonar.organization", "woowacourse"
         property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.coverage.jacoco.xmlReportPaths", "jacoco/jacoco.xml"
     }
 }

app/src/main/java/com/techcourse/AppWebApplicationInitializer.java

@@ -1,32 +1,33 @@
 package com.techcourse;
 
+import com.techcourse.config.DataSourceConfig;
+import com.techcourse.support.jdbc.init.DatabasePopulatorUtils;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletRegistration;
 import nextstep.mvc.DispatcherServlet;
-import nextstep.mvc.controller.asis.ControllerHandlerAdapter;
-import nextstep.mvc.controller.tobe.AnnotationHandlerMapping;
-import nextstep.mvc.controller.tobe.HandlerExecutionHandlerAdapter;
+import nextstep.mvc.controller.AnnotationHandlerAdapter;
+import nextstep.mvc.controller.AnnotationHandlerMapping;
+import nextstep.mvc.exception.ComponentContainerException;
+import nextstep.web.ComponentContainer;
 import nextstep.web.WebApplicationInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AppWebApplicationInitializer implements WebApplicationInitializer {
 
-    private static final Logger log = LoggerFactory.getLogger(AppWebApplicationInitializer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AppWebApplicationInitializer.class);
+    private static final String BASE_PACKAGE = "com.techcourse";
 
     @Override
     public void onStartup(ServletContext servletContext) {
         final DispatcherServlet dispatcherServlet = new DispatcherServlet();
-        dispatcherServlet.addHandlerMapping(new ManualHandlerMapping());
-        dispatcherServlet.addHandlerMapping(new AnnotationHandlerMapping("com.techcourse.controller"));
-
-        dispatcherServlet.addHandlerAdapter(new ControllerHandlerAdapter());
-        dispatcherServlet.addHandlerAdapter(new HandlerExecutionHandlerAdapter());
+        dispatcherServlet.addHandlerMapping(new AnnotationHandlerMapping(BASE_PACKAGE));
+        dispatcherServlet.addHandlerAdapter(new AnnotationHandlerAdapter());
 
         final ServletRegistration.Dynamic dispatcher = servletContext.addServlet("dispatcher", dispatcherServlet);
         dispatcher.setLoadOnStartup(1);
         dispatcher.addMapping("/");
 
-        log.info("Start AppWebApplication Initializer");
+        LOG.info("Start AppWebApplication Initializer");
     }
 }

app/src/main/java/com/techcourse/config/DataSourceConfig.java

@@ -1,14 +1,21 @@
 package com.techcourse.config;
 
+import javax.sql.DataSource;
+import nextstep.web.annotation.Configuration;
+import nextstep.web.annotation.Initialize;
 import org.h2.jdbcx.JdbcDataSource;
 
 import java.util.Objects;
 
+@Configuration
 public class DataSourceConfig {
 
-    private static javax.sql.DataSource INSTANCE;
+    private static DataSource INSTANCE;
 
-    public static javax.sql.DataSource getInstance() {
+    private DataSourceConfig() {}
+
+    @Initialize
+    public static DataSource getInstance() {
         if (Objects.isNull(INSTANCE)) {
             INSTANCE = createJdbcDataSource();
         }
@@ -22,6 +29,4 @@ private static JdbcDataSource createJdbcDataSource() {
         jdbcDataSource.setPassword("");
         return jdbcDataSource;
     }
-
-    private DataSourceConfig() {}
 }

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

@@ -0,0 +1,18 @@
+package com.techcourse.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.mvc.view.JspView;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
+
+@Controller
+public class ForwardController {
+
+    @RequestMapping(value = "/", method= RequestMethod.GET)
+    public ModelAndView page(HttpServletRequest request, HttpServletResponse response) {
+        return new ModelAndView(new JspView("/index.jsp"));
+    }
+}

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

@@ -1,12 +1,15 @@
 package com.techcourse.controller;
 
+import com.techcourse.controller.request.LoginRequest;
 import com.techcourse.domain.User;
-import com.techcourse.repository.InMemoryUserRepository;
+import com.techcourse.exception.UnauthorizedException;
+import com.techcourse.service.LoginService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import nextstep.mvc.view.JspView;
 import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Controller;
 import nextstep.web.annotation.RequestMapping;
 import nextstep.web.support.RequestMethod;
@@ -16,43 +19,61 @@
 @Controller
 public class LoginController {
 
-    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoginController.class);
+
+    private final LoginService loginService;
+
+    @Autowired
+    public LoginController(LoginService loginService) {
+        this.loginService = loginService;
+    }
 
     @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")));
+    public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
+        if (UserSession.isAlreadyLogin(request.getSession())) {
+            User user = UserSession.getUser(request.getSession());
+            LOG.debug("logged in {}", user.getAccount());
+            return new ModelAndView(new JspView("redirect:/index.jsp"));
+        }
+
+        return new ModelAndView(new JspView("/login.jsp"));
     }
 
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     public ModelAndView login(HttpServletRequest request, HttpServletResponse response) {
-        if (UserSession.isLoggedIn(request.getSession())) {
-            return redirect("/index.jsp");
+        if (UserSession.isAlreadyLogin(request.getSession())) {
+            return new ModelAndView(new JspView("redirect:/index.jsp"));
         }
 
-        return InMemoryUserRepository.findByAccount(request.getParameter("account"))
-                .map(user -> {
-                    log.info("User : {}", user);
-                    return login(request, user);
-                })
-                .orElse(redirect("/401.jsp"));
-    }
+        try {
+            LoginRequest loginRequest = getLoginRequest(request);
+            loginService.login(loginRequest);
+
+            LOG.debug("Login Success!!");
 
-    private ModelAndView login(HttpServletRequest request, User user) {
-        if (user.checkPassword(request.getParameter("password"))) {
-            final HttpSession session = request.getSession();
-            session.setAttribute(UserSession.SESSION_KEY, user);
-            return redirect("/index.jsp");
-        } else {
-            return redirect("/401.jsp");
+            return new ModelAndView(new JspView("redirect:/index.jsp"));
+        } catch (UnauthorizedException e) {
+            LOG.debug("Login Failed...");
+
+            return new ModelAndView(new JspView("redirect:/401.jsp"));
         }
     }
 
-    private ModelAndView redirect(String path) {
-        return new ModelAndView(new JspView(JspView.REDIRECT_PREFIX + path));
+    private LoginRequest getLoginRequest(HttpServletRequest request) {
+        String account = request.getParameter("account");
+        String password = request.getParameter("password");
+        HttpSession httpSession = request.getSession();
+
+        LOG.debug("Login Request => account: {}", account);
+
+        return new LoginRequest(account, password, httpSession);
+    }
+
+    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    public ModelAndView logout(HttpServletRequest request, HttpServletResponse response) {
+        final HttpSession session = request.getSession();
+        session.removeAttribute(UserSession.SESSION_KEY);
+
+        return new ModelAndView(new JspView("redirect:/"));
     }
 }

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

@@ -1,31 +1,59 @@
 package com.techcourse.controller;
 
-import com.techcourse.domain.User;
-import com.techcourse.repository.InMemoryUserRepository;
+import com.techcourse.controller.request.RegisterRequest;
+import com.techcourse.exception.DuplicateAccountException;
+import com.techcourse.service.RegisterService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.view.JspView;
 import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Autowired;
 import nextstep.web.annotation.Controller;
 import nextstep.web.annotation.RequestMapping;
 import nextstep.web.support.RequestMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Controller
 public class RegisterController {
 
-    @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public ModelAndView register(HttpServletRequest request, HttpServletResponse response) {
-        final User user = new User(2,
-                request.getParameter("account"),
-                request.getParameter("password"),
-                request.getParameter("email"));
-        InMemoryUserRepository.save(user);
-
-        return new ModelAndView(new JspView("redirect:/index.jsp"));
+    private static final Logger LOG = LoggerFactory.getLogger(RegisterController.class);
+
+    private final RegisterService registerService;
+
+    @Autowired
+    public RegisterController(RegisterService registerService) {
+        this.registerService = registerService;
     }
 
     @RequestMapping(value = "/register", method = RequestMethod.GET)
-    public ModelAndView view(HttpServletRequest request, HttpServletResponse response) {
+    public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
         return new ModelAndView(new JspView("/register.jsp"));
     }
+
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public ModelAndView save(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            RegisterRequest registerRequest = getRegisterRequest(request);
+            registerService.registerUser(registerRequest);
+
+            LOG.debug("Register Success!!");
+
+            return new ModelAndView(new JspView("redirect:/index.jsp"));
+        } catch (DuplicateAccountException e) {
+            LOG.debug("Register Failed...");
+
+            return new ModelAndView(new JspView("redirect:/409.jsp"));
+        }
+    }
+
+    private RegisterRequest getRegisterRequest(HttpServletRequest request) {
+        String account = request.getParameter("account");
+        String password = request.getParameter("password");
+        String email = request.getParameter("email");
+
+        LOG.debug("Register Request => account: {}, email: {}", account, email);
+
+        return new RegisterRequest(account, password, email);
+    }
 }