[Step4] 데이터 전송 방식을 일부 변경한다.

app/src/main/java/project/server/app/common/configuration/WebConfiguration.java

@@ -0,0 +1,33 @@
+package project.server.app.common.configuration;
+
+import project.server.app.common.configuration.interceptor.SessionCheckHandlerInterceptor;
+import project.server.app.core.web.user.application.UserLoginUseCase;
+import project.server.app.core.web.user.presentation.validator.UserValidator;
+import project.server.mvc.springframework.annotation.Component;
+import static project.server.mvc.springframework.context.ApplicationContext.getBean;
+import static project.server.mvc.springframework.context.ApplicationContext.register;
+import project.server.mvc.springframework.web.InterceptorRegistry;
+import project.server.mvc.springframework.web.WebMvcConfigurer;
+
+@Component
+public class WebConfiguration implements WebMvcConfigurer {
+
+    private final UserValidator validator;
+    private final UserLoginUseCase loginUseCase;
+
+    public WebConfiguration(
+        UserValidator validator,
+        UserLoginUseCase loginUseCase
+    ) {
+        this.validator = validator;
+        this.loginUseCase = loginUseCase;
+        register(new InterceptorRegistry());
+        addInterceptors(getBean(InterceptorRegistry.class));
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new SessionCheckHandlerInterceptor(validator, loginUseCase))
+            .addPathPatterns("/my-info.html", "/my-info");
+    }
+}

app/src/main/java/project/server/app/common/configuration/interceptor/SessionCheckHandlerInterceptor.java

@@ -0,0 +1,64 @@
+package project.server.app.common.configuration.interceptor;
+
+import lombok.extern.slf4j.Slf4j;
+import project.server.app.common.login.LoginUser;
+import project.server.app.common.login.Session;
+import static project.server.app.common.utils.HeaderUtils.getSessionId;
+import project.server.app.core.web.user.application.UserLoginUseCase;
+import project.server.app.core.web.user.presentation.validator.UserValidator;
+import project.server.mvc.servlet.HttpServletRequest;
+import project.server.mvc.servlet.HttpServletResponse;
+import project.server.mvc.springframework.handler.HandlerInterceptor;
+import project.server.mvc.springframework.web.servlet.ModelAndView;
+
+@Slf4j
+public class SessionCheckHandlerInterceptor implements HandlerInterceptor {
+
+    private final UserValidator validator;
+    private final UserLoginUseCase loginUseCase;
+
+    public SessionCheckHandlerInterceptor(
+        UserValidator validator,
+        UserLoginUseCase loginUseCase
+    ) {
+        this.validator = validator;
+        this.loginUseCase = loginUseCase;
+    }
+
+    @Override
+    public boolean preHandle(
+        HttpServletRequest request,
+        HttpServletResponse response,
+        Object handler
+    ) {
+        Long sessionId = getSessionId(request.getCookies());
+        validator.validateSessionId(sessionId, response);
+
+        Session findSession = loginUseCase.findSessionById(sessionId);
+        log.info("Session:{}", findSession);
+        validator.validateSession(findSession, response);
+
+        LoginUser loginUser = new LoginUser(findSession);
+        request.setAttribute("loginUser", loginUser);
+        return false;
+    }
+
+    @Override
+    public void postHandle(
+        HttpServletRequest request,
+        HttpServletResponse response,
+        Object handler,
+        ModelAndView modelAndView
+    ) {
+        HandlerInterceptor.super.postHandle(request, response, handler, modelAndView);
+    }
+
+    @Override
+    public void afterCompletion(
+        HttpServletRequest request,
+        HttpServletResponse response,
+        Object handler
+    ) {
+        HandlerInterceptor.super.afterCompletion(request, response, handler);
+    }
+}

app/src/main/java/project/server/app/core/web/user/application/UserUpdateUseCase.java

@@ -0,0 +1,7 @@
+package project.server.app.core.web.user.application;
+
+import project.server.app.common.login.LoginUser;
+
+public interface UserUpdateUseCase {
+    void update(LoginUser loginUser, String password);
+}

app/src/main/java/project/server/app/core/web/user/application/service/UserService.java

@@ -7,12 +7,13 @@
 import project.server.app.core.web.user.application.UserDeleteUseCase;
 import project.server.app.core.web.user.application.UserSaveUseCase;
 import project.server.app.core.web.user.application.UserSearchUseCase;
+import project.server.app.core.web.user.application.UserUpdateUseCase;
 import project.server.app.core.web.user.exception.DuplicatedUsernameException;
 import project.server.app.core.web.user.exception.UserNotFoundException;
 import project.server.mvc.springframework.annotation.Service;
 
 @Service
-public class UserService implements UserSaveUseCase, UserSearchUseCase, UserDeleteUseCase {
+public class UserService implements UserSaveUseCase, UserSearchUseCase, UserUpdateUseCase, UserDeleteUseCase {
 
     private final UserRepository userRepository;
 
@@ -43,6 +44,16 @@ public User findById(Long userId) {
         return findUser;
     }
 
+    @Override
+    public void update(
+        LoginUser loginUser,
+        String password
+    ) {
+        User findUser = userRepository.findById(loginUser.getUserId())
+            .orElseThrow(UserNotFoundException::new);
+
+    }
+
     @Override
     public void delete(LoginUser loginUser) {
         User findUser = userRepository.findById(loginUser.getUserId())

app/src/main/java/project/server/app/core/web/user/application/service/UserServiceProxy.java

@@ -10,6 +10,7 @@
 import project.server.app.core.web.user.application.UserDeleteUseCase;
 import project.server.app.core.web.user.application.UserSaveUseCase;
 import project.server.app.core.web.user.application.UserSearchUseCase;
+import project.server.app.core.web.user.application.UserUpdateUseCase;
 import project.server.jdbc.core.exception.DataAccessException;
 import static project.server.jdbc.core.transaction.DefaultTransactionDefinition.createTransactionDefinition;
 import project.server.jdbc.core.transaction.PlatformTransactionManager;
@@ -18,7 +19,7 @@
 
 @Slf4j
 @Component
-public class UserServiceProxy implements UserSaveUseCase, UserSearchUseCase, UserDeleteUseCase {
+public class UserServiceProxy implements UserSaveUseCase, UserSearchUseCase, UserUpdateUseCase, UserDeleteUseCase {
 
     private final PlatformTransactionManager txManager;
     private final UserService target;
@@ -70,6 +71,24 @@ public User findById(Long userId) {
         }
     }
 
+    @Override
+    public void update(
+        LoginUser loginUser,
+        String password
+    ) {
+        TransactionStatus txStatus = getTransactionStatus(true);
+        log.debug("txStatus:[{}]", txStatus.getTransaction());
+        try {
+            target.update(loginUser, password);
+            txManager.commit(txStatus);
+            log.debug("Transaction finished.");
+        } catch (BusinessException | DataAccessException exception) {
+            txManager.rollback(txStatus);
+            log.error("{}", exception.getMessage());
+            throw exception;
+        }
+    }
+
     @Override
     public void delete(LoginUser loginUser) {
         TransactionStatus txStatus = getTransactionStatus(false);

app/src/main/java/project/server/app/core/web/user/presentation/UserInfoUpdateController.java

@@ -0,0 +1,44 @@
+package project.server.app.core.web.user.presentation;
+
+import lombok.extern.slf4j.Slf4j;
+import project.server.app.common.login.LoginUser;
+import project.server.app.core.web.user.application.UserLoginUseCase;
+import project.server.app.core.web.user.application.UserUpdateUseCase;
+import project.server.app.core.web.user.presentation.validator.UserValidator;
+import project.server.mvc.servlet.HttpServletRequest;
+import project.server.mvc.servlet.HttpServletResponse;
+import static project.server.mvc.servlet.http.HttpStatus.OK;
+import project.server.mvc.springframework.annotation.Controller;
+import project.server.mvc.springframework.web.servlet.Handler;
+import project.server.mvc.springframework.web.servlet.ModelAndView;
+
+@Slf4j
+@Controller
+public class UserInfoUpdateController implements Handler {
+
+    private final UserValidator validator;
+    private final UserLoginUseCase loginUseCase;
+    private final UserUpdateUseCase userUpdateUseCase;
+
+    public UserInfoUpdateController(
+        UserValidator validator,
+        UserLoginUseCase loginUseCase,
+        UserUpdateUseCase userUpdateUseCase
+    ) {
+        this.validator = validator;
+        this.loginUseCase = loginUseCase;
+        this.userUpdateUseCase = userUpdateUseCase;
+    }
+
+    @Override
+    public ModelAndView process(
+        HttpServletRequest request,
+        HttpServletResponse response
+    ) {
+        LoginUser loginUser = (LoginUser) request.getAttribute("loginUser");
+        userUpdateUseCase.update(loginUser, (String) request.getAttribute("password"));
+
+        response.setStatus(OK);
+        return null;
+    }
+}

mvc/src/main/java/project/server/mvc/Application.java

@@ -21,8 +21,7 @@ public Application(
     }
 
     private void initContext(String packages) throws Exception {
-        ApplicationContext context;
-        context = new ApplicationContext(packages);
+        ApplicationContext context = new ApplicationContext(packages);
         ApplicationContextProvider provider = new ApplicationContextProvider();
         provider.setApplicationContext(context);
     }

mvc/src/main/java/project/server/mvc/springframework/annotation/Controller.java

@@ -1,5 +1,14 @@
 package project.server.mvc.springframework.annotation;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 @Component
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
 public @interface Controller {
 }

mvc/src/main/java/project/server/mvc/springframework/annotation/DeleteMapping.java

@@ -0,0 +1,36 @@
+package project.server.mvc.springframework.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import project.server.mvc.servlet.http.HttpMethod;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@RequestMapping(method = HttpMethod.DELETE)
+@Target({ElementType.TYPE_USE, ElementType.METHOD})
+public @interface DeleteMapping {
+
+    @AliasFor(annotation = RequestMapping.class)
+    String name() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] value() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String path() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] params() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] headers() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] consumes() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] produces() default {};
+}

mvc/src/main/java/project/server/mvc/springframework/annotation/GetMapping.java

@@ -20,7 +20,7 @@
     String[] value() default {};
 
     @AliasFor(annotation = RequestMapping.class)
-    String[] path() default {};
+    String path() default "";
 
     @AliasFor(annotation = RequestMapping.class)
     String[] params() default {};

mvc/src/main/java/project/server/mvc/springframework/annotation/PostMapping.java

@@ -0,0 +1,36 @@
+package project.server.mvc.springframework.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import project.server.mvc.servlet.http.HttpMethod;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@RequestMapping(method = HttpMethod.POST)
+@Target({ElementType.TYPE_USE, ElementType.METHOD})
+public @interface PostMapping {
+
+    @AliasFor(annotation = RequestMapping.class)
+    String name() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] value() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String path() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] params() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] headers() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] consumes() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] produces() default {};
+}

mvc/src/main/java/project/server/mvc/springframework/annotation/PutMapping.java

@@ -0,0 +1,39 @@
+package project.server.mvc.springframework.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import project.server.mvc.servlet.http.HttpMethod;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@RequestMapping(method = HttpMethod.PUT)
+@Target({ElementType.TYPE_USE, ElementType.METHOD})
+public @interface PutMapping {
+
+    @AliasFor(annotation = RequestMapping.class)
+    String name() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] value() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] put() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String path() default "";
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] params() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] headers() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] consumes() default {};
+
+    @AliasFor(annotation = RequestMapping.class)
+    String[] produces() default {};
+}