[MVC 구현하기 - 3단계] 도기(김동호) 미션 제출합니다.

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

@@ -4,6 +4,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import web.org.springframework.web.WebApplicationInitializer;
+import webmvc.org.springframework.web.servlet.mvc.dispatcher.DispatcherServlet;
 
 /**
  * Base class for {@link WebApplicationInitializer}

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

@@ -1,27 +1,42 @@
 package com.techcourse.controller;
 
+import static web.org.springframework.web.bind.annotation.RequestMethod.GET;
+import static web.org.springframework.web.bind.annotation.RequestMethod.POST;
+
 import com.techcourse.domain.User;
 import com.techcourse.repository.InMemoryUserRepository;
+import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import web.org.springframework.web.bind.annotation.RequestMapping;
 
-public class LoginController implements Controller {
+@Controller
+public class LoginController {
 
     private static final Logger log = LoggerFactory.getLogger(LoginController.class);
 
-    @Override
-    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
-        if (UserSession.isLoggedIn(req.getSession())) {
+    @RequestMapping(value = "/login", method = GET)
+    public String getLoginPage(HttpServletRequest request, HttpServletResponse response) {
+        return UserSession.getUserFrom(request.getSession())
+                .map(user -> {
+                    log.info("logged in {}", user.getAccount());
+                    return "redirect:/index.jsp";
+                })
+                .orElse("/login.jsp");
+    }
+
+    @RequestMapping(value = "/login", method = POST)
+    public String login(HttpServletRequest request, HttpServletResponse response) {
+        if (UserSession.isLoggedIn(request.getSession())) {
             return "redirect:/index.jsp";
         }
 
-        return InMemoryUserRepository.findByAccount(req.getParameter("account"))
+        return InMemoryUserRepository.findByAccount(request.getParameter("account"))
                 .map(user -> {
                     log.info("User : {}", user);
-                    return login(req, user);
+                    return login(request, user);
                 })
                 .orElse("redirect:/401.jsp");
     }

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

@@ -1,14 +1,18 @@
 package com.techcourse.controller;
 
+import static web.org.springframework.web.bind.annotation.RequestMethod.GET;
+
+import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
+import web.org.springframework.web.bind.annotation.RequestMapping;
 
-public class LogoutController implements Controller {
+@Controller
+public class LogoutController {
 
-    @Override
-    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
-        final var session = req.getSession();
+    @RequestMapping(value = "/logout", method = GET)
+    public String logout(HttpServletRequest request, HttpServletResponse response) {
+        final var session = request.getSession();
         session.removeAttribute(UserSession.SESSION_KEY);
         return "redirect:/";
     }

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

@@ -1,21 +1,30 @@
 package com.techcourse.controller;
 
+import static web.org.springframework.web.bind.annotation.RequestMethod.GET;
+import static web.org.springframework.web.bind.annotation.RequestMethod.POST;
+
 import com.techcourse.domain.User;
 import com.techcourse.repository.InMemoryUserRepository;
+import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
+import web.org.springframework.web.bind.annotation.RequestMapping;
 
-public class RegisterController implements Controller {
+@Controller
+public class RegisterController {
 
-    @Override
-    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
-        final var user = new User(2,
-                req.getParameter("account"),
-                req.getParameter("password"),
-                req.getParameter("email"));
-        InMemoryUserRepository.save(user);
+    @RequestMapping(value = "/register", method = GET)
+    public String getRegisterPage(HttpServletRequest request, HttpServletResponse response) {
+        return "/register.jsp";
+    }
 
+    @RequestMapping(value = "/register", method = POST)
+    public String register(HttpServletRequest request, HttpServletResponse response) {
+        User user = new User(2,
+                request.getParameter("account"),
+                request.getParameter("password"),
+                request.getParameter("email"));
+        InMemoryUserRepository.save(user);
         return "redirect:/index.jsp";
     }
 }