[MVC 구현하기 - 2,3단계] 케빈(박진홍) 미션 제출합니다. (#102)

xlffm3 · web-flow · commit d5618eea486a · 2021-09-23T02:23:16.000+09:00
* chore: jackson 버전 수정

* feat: 404 예외 처리 추가

* feat: 레거시코드 분리 및 비활성화, 애너테이션 기반 컨트롤러 추가

* feat: jsonview 구현

* refactor: 값이 1개일때 예외 추가

* chore: package명 컨벤션에 맞춰 수정

* chore: 클래스명 new 삭제 및 legacy 키워드 추가
diff --git a/app/src/main/java/com/techcourse/AppWebApplicationInitializer.java b/app/src/main/java/com/techcourse/AppWebApplicationInitializer.java
@@ -5,7 +5,6 @@
 import nextstep.mvc.DispatcherServlet;
 import nextstep.mvc.controller.tobe.AnnotationHandlerAdapter;
 import nextstep.mvc.controller.tobe.AnnotationHandlerMapping;
-import nextstep.mvc.controller.tobe.ManualHandlerAdapter;
 import nextstep.web.WebApplicationInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,9 +17,9 @@ public class AppWebApplicationInitializer implements WebApplicationInitializer {
     @Override
     public void onStartup(ServletContext servletContext) {
         final DispatcherServlet dispatcherServlet = new DispatcherServlet();
-        dispatcherServlet.addHandlerMapping(new ManualHandlerMapping());
+//        dispatcherServlet.addHandlerMapping(new ManualHandlerMapping());
         dispatcherServlet.addHandlerMapping(new AnnotationHandlerMapping(BASE_PACKAGE));
-        dispatcherServlet.addHandlerAdapter(new ManualHandlerAdapter());
+//        dispatcherServlet.addHandlerAdapter(new ManualHandlerAdapter());
         dispatcherServlet.addHandlerAdapter(new AnnotationHandlerAdapter());
         final ServletRegistration.Dynamic dispatcher = servletContext.addServlet("dispatcher", dispatcherServlet);
         dispatcher.setLoadOnStartup(1);
diff --git a/app/src/main/java/com/techcourse/ManualHandlerMapping.java b/app/src/main/java/com/techcourse/ManualHandlerMapping.java
@@ -1,6 +1,10 @@
 package com.techcourse;
 
-import com.techcourse.controller.*;
+import com.techcourse.controller.legacy.LegacyLoginController;
+import com.techcourse.controller.legacy.LegacyLoginViewController;
+import com.techcourse.controller.legacy.LegacyLogoutController;
+import com.techcourse.controller.legacy.LegacyRegisterController;
+import com.techcourse.controller.legacy.LegacyRegisterViewController;
 import jakarta.servlet.http.HttpServletRequest;
 import nextstep.mvc.HandlerMapping;
 import nextstep.mvc.controller.asis.Controller;
@@ -20,11 +24,11 @@ public class ManualHandlerMapping implements HandlerMapping {
     @Override
     public void initialize() {
         controllers.put("/", new ForwardController("/index.jsp"));
-        controllers.put("/login", new LoginController());
-        controllers.put("/login/view", new LoginViewController());
-        controllers.put("/logout", new LogoutController());
-        controllers.put("/register/view", new RegisterViewController());
-        controllers.put("/register", new RegisterController());
+        controllers.put("/login", new LegacyLoginController());
+        controllers.put("/login/view", new LegacyLoginViewController());
+        controllers.put("/logout", new LegacyLogoutController());
+        controllers.put("/register/view", new LegacyRegisterViewController());
+        controllers.put("/register", new LegacyRegisterController());
 
         log.info("Initialized Handler Mapping!");
         controllers.keySet().forEach(path -> log.info("Path : {}, Controller : {}", path, controllers.get(path).getClass()));
diff --git a/app/src/main/java/com/techcourse/controller/annotationbase/ForwardController.java b/app/src/main/java/com/techcourse/controller/annotationbase/ForwardController.java
@@ -0,0 +1,17 @@
+package com.techcourse.controller.annotationbase;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+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 indexPage(HttpServletRequest req, HttpServletResponse res) {
+        return ModelAndView.fromJspView("/index.jsp");
+    }
+}
diff --git a/app/src/main/java/com/techcourse/controller/annotationbase/LoginController.java b/app/src/main/java/com/techcourse/controller/annotationbase/LoginController.java
@@ -0,0 +1,53 @@
+package com.techcourse.controller.annotationbase;
+
+import com.techcourse.controller.UserSession;
+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.mvc.view.ModelAndView;
+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 LoginController {
+
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+
+    @RequestMapping(value = "/login/view", method = RequestMethod.GET)
+    public ModelAndView viewLogin(HttpServletRequest req, HttpServletResponse res) {
+        return UserSession.getUserFrom(req.getSession())
+            .map(user -> {
+                log.info("logged in {}", user.getAccount());
+                return ModelAndView.fromJspView("redirect:/index.jsp");
+            })
+            .orElse(ModelAndView.fromJspView("/login.jsp"));
+    }
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public ModelAndView login(HttpServletRequest req, HttpServletResponse res) {
+        if (UserSession.isLoggedIn(req.getSession())) {
+            return ModelAndView.fromJspView("redirect:/index.jsp");
+        }
+
+        return InMemoryUserRepository.findByAccount(req.getParameter("account"))
+            .map(user -> {
+                log.info("User : {}", user);
+                return login(req, user);
+            })
+            .orElse(ModelAndView.fromJspView("redirect:/401.jsp"));
+    }
+
+    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 ModelAndView.fromJspView("redirect:/index.jsp");
+        }
+        return ModelAndView.fromJspView("redirect:/401.jsp");
+    }
+}
diff --git a/app/src/main/java/com/techcourse/controller/annotationbase/LogoutController.java b/app/src/main/java/com/techcourse/controller/annotationbase/LogoutController.java
@@ -0,0 +1,21 @@
+package com.techcourse.controller.annotationbase;
+
+import com.techcourse.controller.UserSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
+
+@Controller
+public class LogoutController {
+
+    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    public ModelAndView logout(HttpServletRequest req, HttpServletResponse res) {
+        final HttpSession session = req.getSession();
+        session.removeAttribute(UserSession.SESSION_KEY);
+        return ModelAndView.fromJspView("redirect:/");
+    }
+}
diff --git a/app/src/main/java/com/techcourse/controller/annotationbase/RegisterController.java b/app/src/main/java/com/techcourse/controller/annotationbase/RegisterController.java
@@ -0,0 +1,29 @@
+package com.techcourse.controller.annotationbase;
+
+import com.techcourse.domain.User;
+import com.techcourse.repository.InMemoryUserRepository;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
+
+@Controller
+public class RegisterController {
+
+    @RequestMapping(value = "/register/view", method = RequestMethod.GET)
+    public ModelAndView viewRegister(HttpServletRequest req, HttpServletResponse res) {
+        return ModelAndView.fromJspView("/register.jsp");
+    }
+
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public ModelAndView register(HttpServletRequest req, HttpServletResponse res) {
+        final User user = new User(2,
+            req.getParameter("account"),
+            req.getParameter("password"),
+            req.getParameter("email"));
+        InMemoryUserRepository.save(user);
+        return ModelAndView.fromJspView("redirect:/index.jsp");
+    }
+}
diff --git a/app/src/main/java/com/techcourse/controller/annotationbase/UserController.java b/app/src/main/java/com/techcourse/controller/annotationbase/UserController.java
@@ -0,0 +1,32 @@
+package com.techcourse.controller.annotationbase;
+
+import com.techcourse.domain.User;
+import com.techcourse.repository.InMemoryUserRepository;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.mvc.view.JsonView;
+import nextstep.mvc.view.ModelAndView;
+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 UserController {
+
+    private static final Logger log = LoggerFactory.getLogger(UserController.class);
+
+    @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();
+
+        modelAndView.addObject("user", user);
+        return modelAndView;
+    }
+}
diff --git a/app/src/main/java/com/techcourse/controller/legacy/LegacyLoginController.java b/app/src/main/java/com/techcourse/controller/legacy/LegacyLoginController.java
@@ -1,5 +1,6 @@
-package com.techcourse.controller;
+package com.techcourse.controller.legacy;
 
+import com.techcourse.controller.UserSession;
 import com.techcourse.domain.User;
 import com.techcourse.repository.InMemoryUserRepository;
 import jakarta.servlet.http.HttpServletRequest;
@@ -9,9 +10,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LoginController implements Controller {
+public class LegacyLoginController implements Controller {
 
-    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+    private static final Logger log = LoggerFactory.getLogger(LegacyLoginController.class);
 
     @Override
     public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
diff --git a/app/src/main/java/com/techcourse/controller/legacy/LegacyLoginViewController.java b/app/src/main/java/com/techcourse/controller/legacy/LegacyLoginViewController.java
@@ -1,14 +1,15 @@
-package com.techcourse.controller;
+package com.techcourse.controller.legacy;
 
+import com.techcourse.controller.UserSession;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.controller.asis.Controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LoginViewController implements Controller {
+public class LegacyLoginViewController implements Controller {
 
-    private static final Logger log = LoggerFactory.getLogger(LoginViewController.class);
+    private static final Logger log = LoggerFactory.getLogger(LegacyLoginViewController.class);
 
     @Override
     public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
diff --git a/app/src/main/java/com/techcourse/controller/legacy/LegacyLogoutController.java b/app/src/main/java/com/techcourse/controller/legacy/LegacyLogoutController.java
@@ -1,11 +1,12 @@
-package com.techcourse.controller;
+package com.techcourse.controller.legacy;
 
+import com.techcourse.controller.UserSession;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import nextstep.mvc.controller.asis.Controller;
 
-public class LogoutController implements Controller {
+public class LegacyLogoutController implements Controller {
 
     @Override
     public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
diff --git a/app/src/main/java/com/techcourse/controller/legacy/LegacyRegisterController.java b/app/src/main/java/com/techcourse/controller/legacy/LegacyRegisterController.java
@@ -1,12 +1,12 @@
-package com.techcourse.controller;
+package com.techcourse.controller.legacy;
 
 import com.techcourse.domain.User;
 import com.techcourse.repository.InMemoryUserRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.controller.asis.Controller;
 
-public class RegisterController implements Controller {
+public class LegacyRegisterController implements Controller {
 
     @Override
     public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
diff --git a/app/src/main/java/com/techcourse/controller/legacy/LegacyRegisterViewController.java b/app/src/main/java/com/techcourse/controller/legacy/LegacyRegisterViewController.java
@@ -1,10 +1,10 @@
-package com.techcourse.controller;
+package com.techcourse.controller.legacy;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.controller.asis.Controller;
 
-public class RegisterViewController implements Controller {
+public class LegacyRegisterViewController implements Controller {
 
     @Override
     public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
diff --git a/mvc/build.gradle b/mvc/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
     implementation 'org.reflections:reflections:0.9.11'
 
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.5'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.3'
     testImplementation 'org.mockito:mockito-core:3.12.3'
diff --git a/mvc/jacoco/jacoco.xml b/mvc/jacoco/jacoco.xml
diff --git a/mvc/src/main/java/nextstep/mvc/DispatcherServlet.java b/mvc/src/main/java/nextstep/mvc/DispatcherServlet.java
@@ -6,6 +6,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import nextstep.mvc.controller.tobe.HandlerAdapters;
 import nextstep.mvc.controller.tobe.HandlerMappings;
+import nextstep.mvc.exception.CannotFindHandlerException;
 import nextstep.mvc.view.ModelAndView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,6 +50,8 @@ protected void service(
             final HandlerAdapter handlerAdapter = handlerAdapters.getHandlerAdapter(handler);
             final ModelAndView modelAndView = handlerAdapter.handle(request, response, handler);
             modelAndView.render(request, response);
+        } catch (CannotFindHandlerException e) {
+            response.setStatus(404);
         } catch (Throwable e) {
             log.error("Exception : {}", e.getMessage(), e);
             throw new ServletException(e.getMessage());
diff --git a/mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerMappings.java b/mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerMappings.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Objects;
 import nextstep.mvc.HandlerMapping;
+import nextstep.mvc.exception.CannotFindHandlerException;
 
 public class HandlerMappings {
 
@@ -27,6 +28,6 @@ public Object getHandler(HttpServletRequest request) {
             .map(handlerMapping -> handlerMapping.getHandler(request))
             .filter(Objects::nonNull)
             .findAny()
-            .orElseThrow(IllegalStateException::new);
+            .orElseThrow(CannotFindHandlerException::new);
     }
 }
diff --git a/mvc/src/main/java/nextstep/mvc/exception/CannotFindHandlerException.java b/mvc/src/main/java/nextstep/mvc/exception/CannotFindHandlerException.java
@@ -0,0 +1,4 @@
+package nextstep.mvc.exception;
+
+public class CannotFindHandlerException extends RuntimeException {
+}
diff --git a/mvc/src/main/java/nextstep/mvc/view/JsonView.java b/mvc/src/main/java/nextstep/mvc/view/JsonView.java
@@ -1,13 +1,31 @@
 package nextstep.mvc.view;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.Map;
+import nextstep.web.support.MediaType;
 
 public class JsonView implements View {
 
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
     @Override
     public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        String responseBody = getResponseBody(model);
+        response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+        response.getWriter().write(responseBody);
+    }
+
+    private String getResponseBody(Map<String, ?> model) throws JsonProcessingException {
+        ObjectWriter objectWriter = objectMapper.writerWithDefaultPrettyPrinter();
+        if (model.size() == 1) {
+            Object value = model.values().iterator().next();
+            return objectWriter.writeValueAsString(value);
+        }
+        return objectWriter.writeValueAsString(model);
     }
 }
diff --git a/mvc/src/main/java/nextstep/mvc/view/ModelAndView.java b/mvc/src/main/java/nextstep/mvc/view/ModelAndView.java
@@ -16,6 +16,10 @@ public ModelAndView(View view) {
         this.model = new HashMap<>();
     }
 
+    public static ModelAndView fromJspView(String viewName) {
+        return new ModelAndView(new JspView(viewName));
+    }
+
     public ModelAndView addObject(String attributeName, Object attributeValue) {
         model.put(attributeName, attributeValue);
         return this;
