From d33ddf5f793da21fdd91907b53082dd997a5149d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= <hyunsp@gmail.com>
Date: Mon, 11 Sep 2023 13:15:29 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{HttptHandler.java => HttpHandler.java}   |  4 ++--
 .../client/service/NettyApiClient.java        |  2 +-
 .../user/controller/AccountController.java    | 20 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename src/main/java/com/eactive/httpmockserver/client/service/{HttptHandler.java => HttpHandler.java} (93%)

diff --git a/src/main/java/com/eactive/httpmockserver/client/service/HttptHandler.java b/src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java
similarity index 93%
rename from src/main/java/com/eactive/httpmockserver/client/service/HttptHandler.java
rename to src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java
index bf00325..36f08c5 100644
--- a/src/main/java/com/eactive/httpmockserver/client/service/HttptHandler.java
+++ b/src/main/java/com/eactive/httpmockserver/client/service/HttpHandler.java
@@ -13,11 +13,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public class HttptHandler extends SimpleChannelInboundHandler<FullHttpResponse> {
+public class HttpHandler extends SimpleChannelInboundHandler<FullHttpResponse> {
 
     private final CompletableFuture<ApiResponse> responseFuture;
 
-    public HttptHandler(CompletableFuture<ApiResponse> responseFuture) {
+    public HttpHandler(CompletableFuture<ApiResponse> responseFuture) {
         this.responseFuture = responseFuture;
     }
 
diff --git a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java b/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java
index 058e7a8..be928f7 100644
--- a/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java
+++ b/src/main/java/com/eactive/httpmockserver/client/service/NettyApiClient.java
@@ -59,7 +59,7 @@ public class NettyApiClient {
                             ch.pipeline().addLast(new HttpClientCodec());
                             ch.pipeline().addLast(new HttpObjectAggregator(65536));
                             ch.pipeline().addLast(new HttpContentDecompressor());
-                            ch.pipeline().addLast(new HttptHandler(responseFuture));
+                            ch.pipeline().addLast(new HttpHandler(responseFuture));
                         }
                     });
 
diff --git a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java b/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java
index 6672268..a0ef558 100644
--- a/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java
+++ b/src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java
@@ -26,7 +26,7 @@ public class AccountController {
     }
 
     @GetMapping("/change_password.do")
-    public String changePassword( @ModelAttribute("passwordChangeRequest") PasswordChangeRequestDTO passwordChangeRequestDTO) {
+    public String changePassword(@ModelAttribute("passwordChangeRequest") PasswordChangeRequestDTO passwordChangeRequestDTO) {
         return UPDATE_PW;
     }
 
@@ -39,18 +39,18 @@ public class AccountController {
 
         if (result.hasErrors()) {
             model.addAttribute("errors", result);
-            return UPDATE_PW;
+        } else {
+            String oldPassword = passwordChangeRequestDTO.getOldPassword();
+            String newPassword = passwordChangeRequestDTO.getNewPassword();
+            String newPassword2 = passwordChangeRequestDTO.getNewPassword2();
+            String resultMsg = userService.updateUserPassword(SecurityUtil.getCurrentUserEsntlId(), oldPassword, newPassword, newPassword2);
+
+            model.addAttribute("resultMsg", resultMsg);
+            model.addAttribute("passwordChangeRequest", new PasswordChangeRequestDTO());
         }
 
-        String oldPassword = passwordChangeRequestDTO.getOldPassword();
-        String newPassword = passwordChangeRequestDTO.getNewPassword();
-        String newPassword2 = passwordChangeRequestDTO.getNewPassword2();
-        String resultMsg = userService.updateUserPassword(SecurityUtil.getCurrentUserEsntlId(), oldPassword, newPassword, newPassword2);
 
-        model.addAttribute("resultMsg", resultMsg);
-        model.addAttribute("passwordChangeRequest", new PasswordChangeRequestDTO());
-
-        return "redirect:/";
+        return UPDATE_PW;
     }