From c9bbdda40d684082b20cee5fc558add82b937b34 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 19:46:39 +0900
Subject: [PATCH 01/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD1=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.name                                 |  1 +
 .idea/gradle.xml                            |  1 -
 .idea/misc.xml                              |  2 +-
 src/main/java/webserver/RequestHandler.java | 38 +++++++++++++++++----
 webapp/user/form.html                       |  2 +-
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 .idea/.name

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..d53760f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+custom-tomcat
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2a65317..ce1c62c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8f86b33..b85daca 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="homebrew-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="homebrew-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index f87ac24..fdfd912 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -1,13 +1,23 @@
 package webserver;
 
+import db.MemoryUserRepository;
+import db.Repository;
+import http.util.HttpRequestUtils;
+import model.User;
+
 import java.io.*;
 import java.net.Socket;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class RequestHandler implements Runnable{
+public class RequestHandler implements Runnable {
     Socket connection;
     private static final Logger log = Logger.getLogger(RequestHandler.class.getName());
+    private static final String WEBAPP_PATH = "webapp/";
 
     public RequestHandler(Socket connection) {
         this.connection = connection;
@@ -16,16 +26,32 @@ public RequestHandler(Socket connection) {
     @Override
     public void run() {
         log.log(Level.INFO, "New Client Connect! Connected IP : " + connection.getInetAddress() + ", Port : " + connection.getPort());
-        try (InputStream in = connection.getInputStream(); OutputStream out = connection.getOutputStream()){
+        try (InputStream in = connection.getInputStream(); OutputStream out = connection.getOutputStream()) {
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
             DataOutputStream dos = new DataOutputStream(out);
 
-            byte[] body = "Hello World".getBytes();
-            response200Header(dos, body.length);
-            responseBody(dos, body);
+
+            // 요청 읽기
+            String requestLine = br.readLine();
+            log.log(Level.INFO, "Request Line: " + requestLine);
+
+            // 요청 path 읽기
+            String[] requestParts = requestLine.split(" ");
+            String method = requestParts[0];
+            String path = requestParts[1];   // 0: HTTP Method, 1: request URL, 2: HTTP Version
+            log.log(Level.INFO, "METHOD: " + method);
+            log.log(Level.INFO, "Request Path: " + path);
+
+            //80 포트로 들어오거나, index.html로 주소가 들어올 경우 index.html을 출력하도록 함
+            if (path.equals("/") || path.equals("/index.html")) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
+                response200Header(dos, body.length);
+                responseBody(dos, body);
+            }
+
 
         } catch (IOException e) {
-            log.log(Level.SEVERE,e.getMessage());
+            log.log(Level.SEVERE, e.getMessage());
         }
     }
 
diff --git a/webapp/user/form.html b/webapp/user/form.html
index e2c90ec..3d54487 100644
--- a/webapp/user/form.html
+++ b/webapp/user/form.html
@@ -55,7 +55,7 @@ <h1>Sign up</h1>
 
   <main class="form-signin">
 
-    <form name="sign-up" method="post" action="/user/signup">
+    <form name="sign-up" method="get" action="/user/signup">
       <div class="form-floating">
         <input type="text" class="form-control" id="userId" name="userId" placeholder="Id">
         <label for="userId">User Id</label>

From 6cd8ec0f66f4894508905d242e36867c3ed70829 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 19:53:02 +0900
Subject: [PATCH 02/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD2=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/webserver/RequestHandler.java | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index fdfd912..ef1b8a7 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -42,6 +42,7 @@ public void run() {
             log.log(Level.INFO, "METHOD: " + method);
             log.log(Level.INFO, "Request Path: " + path);
 
+            // 요구사항 1
             //80 포트로 들어오거나, index.html로 주소가 들어올 경우 index.html을 출력하도록 함
             if (path.equals("/") || path.equals("/index.html")) {
                 byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
@@ -49,6 +50,42 @@ public void run() {
                 responseBody(dos, body);
             }
 
+            // 요구사항 2
+            if (path.equals("/user/form.html")) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/form.html"));
+                response200Header(dos, body.length);
+                responseBody(dos, body);
+            }
+
+            if(path.contains("/user/signup")) {
+                log.log(Level.INFO, "Signup request received");
+
+                if(path.contains("?")) {
+                    // URL 에서 쿼리 파라미터 분리
+                    String queryString = path.substring(path.indexOf("?") + 1);
+                    Map<String, String> queryParameter = HttpRequestUtils.parseQueryParameter(queryString);
+
+                    // 파라미터들 확인
+                    queryParameter.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
+
+                    String userId = queryParameter.get("userId");
+                    String password = queryParameter.get("password");
+                    String name = queryParameter.get("name");
+                    String email = queryParameter.get("email");
+
+                    User user = new User(userId, password, name, email);
+                    log.log(Level.INFO, "user: " + user);
+
+                    Repository repository = MemoryUserRepository.getInstance();
+                    repository.addUser(user);
+                    log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
+
+                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
+                    response200Header(dos, body.length);
+                    responseBody(dos, body);
+                }
+            }
+
 
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());

From 6043d6152d674a1860b681be869965a0a88193e2 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 20:22:53 +0900
Subject: [PATCH 03/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD3=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/webserver/RequestHandler.java | 74 +++++++++++++++++----
 webapp/user/form.html                       |  2 +-
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index ef1b8a7..265e34b 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -3,6 +3,7 @@
 import db.MemoryUserRepository;
 import db.Repository;
 import http.util.HttpRequestUtils;
+import http.util.IOUtils;
 import model.User;
 
 import java.io.*;
@@ -30,7 +31,6 @@ public void run() {
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
             DataOutputStream dos = new DataOutputStream(out);
 
-
             // 요청 읽기
             String requestLine = br.readLine();
             log.log(Level.INFO, "Request Line: " + requestLine);
@@ -51,27 +51,27 @@ public void run() {
             }
 
             // 요구사항 2
-            if (path.equals("/user/form.html")) {
+            if (method.equals("GET") && path.equals("/user/form.html")) {
                 byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/form.html"));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
-            if(path.contains("/user/signup")) {
-                log.log(Level.INFO, "Signup request received");
+            if (method.equals("GET") && path.contains("/user/signup")) {
+                log.log(Level.INFO, "Signup request received GET Method");
 
-                if(path.contains("?")) {
+                if (path.contains("?")) {
                     // URL 에서 쿼리 파라미터 분리
-                    String queryString = path.substring(path.indexOf("?") + 1);
-                    Map<String, String> queryParameter = HttpRequestUtils.parseQueryParameter(queryString);
+                    String queryString = subtractQueryParameters(path);
+                    Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
 
                     // 파라미터들 확인
-                    queryParameter.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
+                    queryParameters.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
 
-                    String userId = queryParameter.get("userId");
-                    String password = queryParameter.get("password");
-                    String name = queryParameter.get("name");
-                    String email = queryParameter.get("email");
+                    String userId = queryParameters.get("userId");
+                    String password = queryParameters.get("password");
+                    String name = queryParameters.get("name");
+                    String email = queryParameters.get("email");
 
                     User user = new User(userId, password, name, email);
                     log.log(Level.INFO, "user: " + user);
@@ -86,12 +86,62 @@ public void run() {
                 }
             }
 
+            // 요구사항 3
+            // POST 방식으로 전송하면 쿼리 파라미터가 사라진다. 즉 parseQueryParameter를 통해서 값을 얻어올 수 없다.
+            // 대신 POST 방식에서는 이 쿼리 파라미터가 body 안에 들어간다.
+            if (method.equals("POST") && path.equals("/user/signup")) {
+                log.log(Level.INFO, "Signup request received Post Method");
+
+                int requestContentLength = 0;
+
+                while (true) {
+                    final String line = br.readLine();
+                    if (line.equals("")) {
+                        break;
+                    }
+
+                    // header info
+                    if (line.startsWith("Content-Length")) {
+                        requestContentLength = Integer.parseInt(line.split(": ")[1]);
+                    }
+                }
+
+                String requestBody = IOUtils.readData(br, requestContentLength);
+                log.log(Level.INFO, "reqeustBody: " + requestBody);
+
+                String queryString = subtractQueryParameters(requestBody);
+                Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
+
+                // 파라미터들 확인
+                queryParameters.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
+
+                String userId = queryParameters.get("userId");
+                String password = queryParameters.get("password");
+                String name = queryParameters.get("name");
+                String email = queryParameters.get("email");
+
+                User user = new User(userId, password, name, email);
+                log.log(Level.INFO, "user: " + user);
+
+                Repository repository = MemoryUserRepository.getInstance();
+                repository.addUser(user);
+                log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
+
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
+                response200Header(dos, body.length);
+                responseBody(dos, body);
+            }
+
 
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
         }
     }
 
+    private String subtractQueryParameters(String path) {
+        return path.substring(path.indexOf("?") + 1);
+    }
+
     private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
         try {
             dos.writeBytes("HTTP/1.1 200 OK \r\n");
diff --git a/webapp/user/form.html b/webapp/user/form.html
index 3d54487..e2c90ec 100644
--- a/webapp/user/form.html
+++ b/webapp/user/form.html
@@ -55,7 +55,7 @@ <h1>Sign up</h1>
 
   <main class="form-signin">
 
-    <form name="sign-up" method="get" action="/user/signup">
+    <form name="sign-up" method="post" action="/user/signup">
       <div class="form-floating">
         <input type="text" class="form-control" id="userId" name="userId" placeholder="Id">
         <label for="userId">User Id</label>

From d79aee85a75b0ccb5031ebe50ebcf4f7ad22ed0c Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 20:33:55 +0900
Subject: [PATCH 04/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD4=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/webserver/RequestHandler.java | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 265e34b..8d50ad0 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -80,9 +80,8 @@ public void run() {
                     repository.addUser(user);
                     log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
 
-                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
-                    response200Header(dos, body.length);
-                    responseBody(dos, body);
+                    // 요구사항 4 적용
+                    response302Header(dos);
                 }
             }
 
@@ -127,9 +126,8 @@ public void run() {
                 repository.addUser(user);
                 log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
 
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
-                response200Header(dos, body.length);
-                responseBody(dos, body);
+                // 요구사항 4 적용
+                response302Header(dos);
             }
 
 
@@ -153,6 +151,17 @@ private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
         }
     }
 
+    // 요구사항 4
+    private void response302Header(DataOutputStream dos) {
+        try{
+            dos.writeBytes("HTTP/1.1 302 Found \r\n");
+            dos.writeBytes("Location: /index.html\r\n");
+            dos.writeBytes("\r\n");
+        } catch (IOException e) {
+            log.log(Level.SEVERE, e.getMessage());
+        }
+    }
+
     private void responseBody(DataOutputStream dos, byte[] body) {
         try {
             dos.write(body, 0, body.length);

From 95e442fc2589c79e753b0153c8a58816a491dd1e Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 21:11:24 +0900
Subject: [PATCH 05/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD5=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/webserver/RequestHandler.java | 97 ++++++++++++++++++++-
 1 file changed, 95 insertions(+), 2 deletions(-)

diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 8d50ad0..57ddcdd 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -30,6 +30,7 @@ public void run() {
         try (InputStream in = connection.getInputStream(); OutputStream out = connection.getOutputStream()) {
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
             DataOutputStream dos = new DataOutputStream(out);
+            Repository repository = MemoryUserRepository.getInstance();
 
             // 요청 읽기
             String requestLine = br.readLine();
@@ -76,7 +77,6 @@ public void run() {
                     User user = new User(userId, password, name, email);
                     log.log(Level.INFO, "user: " + user);
 
-                    Repository repository = MemoryUserRepository.getInstance();
                     repository.addUser(user);
                     log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
 
@@ -122,7 +122,6 @@ public void run() {
                 User user = new User(userId, password, name, email);
                 log.log(Level.INFO, "user: " + user);
 
-                Repository repository = MemoryUserRepository.getInstance();
                 repository.addUser(user);
                 log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
 
@@ -130,6 +129,77 @@ public void run() {
                 response302Header(dos);
             }
 
+            // 요구사항 5
+            if(method.equals("GET") && path.equals("/user/login.html")) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/login.html"));
+                response200Header(dos, body.length);
+                responseBody(dos, body);
+            }
+
+            if(method.equals("POST") && path.equals("/user/login")) {
+                log.log(Level.INFO, "Login request received");
+
+                int requestContentLength = 0;
+
+                while (true) {
+                    final String line = br.readLine();
+                    if (line.equals("")) {
+                        break;
+                    }
+
+                    // header info
+                    if (line.startsWith("Content-Length")) {
+                        requestContentLength = Integer.parseInt(line.split(": ")[1]);
+                    }
+                }
+
+                String requestBody = IOUtils.readData(br, requestContentLength);
+                log.log(Level.INFO, "reqeustBody: " + requestBody);
+
+                String queryString = subtractQueryParameters(requestBody);
+
+                Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
+
+                queryParameters.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
+
+                String userId = queryParameters.get("userId");
+                String password = queryParameters.get("password");
+
+                log.log(Level.INFO, "user: " + userId +", password: " + password);
+
+                User findUser = repository.findUserById(userId);
+
+                // 입력한 ID에 대한 회원 자체가 존재하지 않는 경우
+                if(findUser == null) {
+                    log.log(Level.INFO, "로그인에 실패했습니다.");
+
+                    response302LoginFailureHeader(dos);
+                } else { // 입력한 ID에 대한 회원은 존재하는 경우
+
+                    String findUserPassword = findUser.getPassword();
+
+                    if (findUserPassword.equals(password)) {  // repository에서 찾아온 회원의 정보와 로그인 시 넘긴 회원의 정보가 일치하는 경우
+                        log.log(Level.INFO, "로그인에 성공했습니다.");
+
+                        response302LoginSuccessHeader(dos);
+                    } else {  // repository에서 찾아온 회원의 정보와 로그인 시 넘긴 회원의 정보가 일치하지 않는 경우
+                        log.log(Level.INFO, "로그인에 실패했습니다.");
+
+                        response302LoginFailureHeader(dos);
+                    }
+                }
+
+
+            }
+
+            if(method.equals("GET") && path.equals("/user/login_failed.html")) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/login_failed.html"));
+                response200Header(dos, body.length);
+                responseBody(dos, body);
+            }
+
+
+
 
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -162,6 +232,29 @@ private void response302Header(DataOutputStream dos) {
         }
     }
 
+    // 요구사항 5
+    private void response302LoginSuccessHeader(DataOutputStream dos) {
+        try{
+            dos.writeBytes("HTTP/1.1 302 Found \r\n");
+            dos.writeBytes("Location: /index.html\r\n");
+            dos.writeBytes("Cookie: logined=true\r\n");  // 쿠키 설정
+            dos.writeBytes("\r\n");
+        } catch (IOException e) {
+            log.log(Level.SEVERE, e.getMessage());
+        }
+    }
+
+    // 요구사항 5
+    private void response302LoginFailureHeader(DataOutputStream dos) {
+        try{
+            dos.writeBytes("HTTP/1.1 302 Found \r\n");
+            dos.writeBytes("Location: /user/login_failed.html\r\n");
+            dos.writeBytes("\r\n");
+        } catch (IOException e) {
+            log.log(Level.SEVERE, e.getMessage());
+        }
+    }
+
     private void responseBody(DataOutputStream dos, byte[] body) {
         try {
             dos.write(body, 0, body.length);

From de75ca67add649cb95274edd26bb1057d60247eb Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 22:22:36 +0900
Subject: [PATCH 06/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD6=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/webserver/RequestHandler.java | 116 ++++++++++++++++++--
 1 file changed, 106 insertions(+), 10 deletions(-)

diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 57ddcdd..9824fa1 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -58,6 +58,7 @@ public void run() {
                 responseBody(dos, body);
             }
 
+            // 요구사항 2
             if (method.equals("GET") && path.contains("/user/signup")) {
                 log.log(Level.INFO, "Signup request received GET Method");
 
@@ -130,13 +131,14 @@ public void run() {
             }
 
             // 요구사항 5
-            if(method.equals("GET") && path.equals("/user/login.html")) {
+            if (method.equals("GET") && path.equals("/user/login.html")) {
                 byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/login.html"));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
-            if(method.equals("POST") && path.equals("/user/login")) {
+            // 요구사항 5
+            if (method.equals("POST") && path.equals("/user/login")) {
                 log.log(Level.INFO, "Login request received");
 
                 int requestContentLength = 0;
@@ -165,12 +167,12 @@ public void run() {
                 String userId = queryParameters.get("userId");
                 String password = queryParameters.get("password");
 
-                log.log(Level.INFO, "user: " + userId +", password: " + password);
+                log.log(Level.INFO, "user: " + userId + ", password: " + password);
 
                 User findUser = repository.findUserById(userId);
 
                 // 입력한 ID에 대한 회원 자체가 존재하지 않는 경우
-                if(findUser == null) {
+                if (findUser == null) {
                     log.log(Level.INFO, "로그인에 실패했습니다.");
 
                     response302LoginFailureHeader(dos);
@@ -189,15 +191,81 @@ public void run() {
                     }
                 }
 
-
             }
 
-            if(method.equals("GET") && path.equals("/user/login_failed.html")) {
+            // 요구사항 5
+            if (method.equals("GET") && path.equals("/user/login_failed.html")) {
                 byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/login_failed.html"));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
+            // 요구사항 6
+            if (method.equals("GET") && path.equals("/user/userList")) {
+                log.log(Level.INFO, "UserList request received GET Method");
+
+                boolean login = false;
+
+                while (true) {
+                    final String line = br.readLine();
+                    if (line.equals("")) {
+                        break;
+                    }
+
+                    if (line.startsWith("Cookie")) {
+                        String loginState = line.split(": ")[1];
+
+                        if (loginState.equals("logined=true")) {
+                            login = true;
+                        }
+
+                        if (loginState.equals("logined=false")) {
+                            login = false;
+                        }
+                    }
+                }
+
+                log.log(Level.INFO, "login: " + login);
+
+                if (login) {
+                    response302UserListHeader(dos);
+                } else {
+                    response302LoginHeader(dos);
+                }
+            }
+
+            // 요구사항 6
+            if (method.equals("GET") && path.equals("/user/list.html")) {
+
+                boolean login = false;
+
+                while (true) {
+                    final String line = br.readLine();
+                    if (line.equals("")) {
+                        break;
+                    }
+
+                    if (line.startsWith("Cookie")) {
+                        String loginState = line.split(": ")[1];
+
+                        if (loginState.equals("logined=true")) {
+                            login = true;
+                        }
+
+                        if (loginState.equals("logined=false")) {
+                            login = false;
+                        }
+                    }
+                }
+
+                if(login) {
+                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/list.html"));
+                    response200Header(dos, body.length);
+                    responseBody(dos, body);
+                } else{
+                    response302LoginHeader(dos);
+                }
+            }
 
 
 
@@ -222,8 +290,9 @@ private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
     }
 
     // 요구사항 4
+    // 그냥 index.html로 redirect
     private void response302Header(DataOutputStream dos) {
-        try{
+        try {
             dos.writeBytes("HTTP/1.1 302 Found \r\n");
             dos.writeBytes("Location: /index.html\r\n");
             dos.writeBytes("\r\n");
@@ -233,11 +302,12 @@ private void response302Header(DataOutputStream dos) {
     }
 
     // 요구사항 5
+    // 로그인 성공시 index.html로 redirect
     private void response302LoginSuccessHeader(DataOutputStream dos) {
-        try{
+        try {
             dos.writeBytes("HTTP/1.1 302 Found \r\n");
             dos.writeBytes("Location: /index.html\r\n");
-            dos.writeBytes("Cookie: logined=true\r\n");  // 쿠키 설정
+            dos.writeBytes("Set-Cookie: logined=true\r\n");  // 쿠키 설정
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -245,10 +315,36 @@ private void response302LoginSuccessHeader(DataOutputStream dos) {
     }
 
     // 요구사항 5
+    // 로그인 실패 화면으로 redirect
     private void response302LoginFailureHeader(DataOutputStream dos) {
-        try{
+        try {
             dos.writeBytes("HTTP/1.1 302 Found \r\n");
             dos.writeBytes("Location: /user/login_failed.html\r\n");
+            dos.writeBytes("Set-Cookie: logined=false\r\n");  // 쿠키 설정
+            dos.writeBytes("\r\n");
+        } catch (IOException e) {
+            log.log(Level.SEVERE, e.getMessage());
+        }
+    }
+
+    // 요구사항 6
+    // user list 화면으로 redirect
+    private void response302UserListHeader(DataOutputStream dos) {
+        try {
+            dos.writeBytes("HTTP/1.1 302 Found \r\n");
+            dos.writeBytes("Location: /user/list.html\r\n");
+            dos.writeBytes("\r\n");
+        } catch (IOException e) {
+            log.log(Level.SEVERE, e.getMessage());
+        }
+    }
+
+    // 요구사항 6
+    // 로그인 화면으로 redirect
+    private void response302LoginHeader(DataOutputStream dos) {
+        try {
+            dos.writeBytes("HTTP/1.1 302 Found \r\n");
+            dos.writeBytes("Location: /user/login.html\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());

From 8b099629373bcf0b886044f1253c99074deb493c Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Mon, 30 Sep 2024 22:50:57 +0900
Subject: [PATCH 07/15] =?UTF-8?q?feat:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD7=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/webserver/RequestHandler.java | 21 +++++++++++++++++++++
 webapp/css/styles.css                       | 10 +++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 9824fa1..e9f4290 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -267,6 +267,14 @@ public void run() {
                 }
             }
 
+            // 요구사항 7
+            // .css 파일 요청 처리
+            if (path.endsWith(".css")) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + path));
+                responseCssHeader(dos, body.length);  // css 응답 헤더 설정
+                responseBody(dos, body);  // css 파일 내용 전송
+            }
+
 
 
         } catch (IOException e) {
@@ -351,6 +359,19 @@ private void response302LoginHeader(DataOutputStream dos) {
         }
     }
 
+    // 요구사항 7
+    // css 화면 적용
+    private void responseCssHeader(DataOutputStream dos, int lengthOfBodyContent) {
+        try {
+            dos.writeBytes("HTTP/1.1 200 OK \r\n");
+            dos.writeBytes("Content-Type: text/css;charset=utf-8\r\n");  // Content-Type을 text/css로 설정
+            dos.writeBytes("Content-Length: " + lengthOfBodyContent + "\r\n");
+            dos.writeBytes("\r\n");
+        } catch (IOException e) {
+            log.log(Level.SEVERE, e.getMessage());
+        }
+    }
+
     private void responseBody(DataOutputStream dos, byte[] body) {
         try {
             dos.write(body, 0, body.length);
diff --git a/webapp/css/styles.css b/webapp/css/styles.css
index 184fb8f..0027ac6 100644
--- a/webapp/css/styles.css
+++ b/webapp/css/styles.css
@@ -61,7 +61,7 @@ a {
 
 .btn i,.btn span{
     color:#666666;
-}   
+}
 
 /* .qna-list .list .reply {
     position:absolute;left:0;top:.8em;width:4em;text-align:center;
@@ -170,21 +170,21 @@ a {
     padding: 30px;
     margin: auto;
   }
-  
+
   .form-signin .checkbox {
     font-weight: 400;
   }
-  
+
   .form-signin .form-floating:focus-within {
     z-index: 2;
   }
-  
+
   .form-signin input[type="email"] {
     margin-bottom: -1px;
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
   }
-  
+
   .form-signin input[type="password"] {
     margin-bottom: 10px;
     border-top-left-radius: 0;

From 043db4054cdf98b01f6493a0d50c722ddb31c290 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Wed, 2 Oct 2024 04:01:55 +0900
Subject: [PATCH 08/15] =?UTF-8?q?refactor:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD1=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/constant/HttpHeader.java      |  20 +++
 src/main/java/constant/HttpMethod.java      |  17 +++
 src/main/java/constant/QueryKey.java        |  19 +++
 src/main/java/constant/StatusCode.java      |  18 +++
 src/main/java/constant/Url.java             |  26 ++++
 src/main/java/webserver/RequestHandler.java | 133 +++++++++-----------
 6 files changed, 158 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/constant/HttpHeader.java
 create mode 100644 src/main/java/constant/HttpMethod.java
 create mode 100644 src/main/java/constant/QueryKey.java
 create mode 100644 src/main/java/constant/StatusCode.java
 create mode 100644 src/main/java/constant/Url.java

diff --git a/src/main/java/constant/HttpHeader.java b/src/main/java/constant/HttpHeader.java
new file mode 100644
index 0000000..c9fdc5d
--- /dev/null
+++ b/src/main/java/constant/HttpHeader.java
@@ -0,0 +1,20 @@
+package constant;
+
+public enum HttpHeader {
+
+    CONTENT_TYPE("Content-Type"),
+    CONTENT_LENGTH("Content-Length"),
+    LOCATION("Location"),
+    SET_COOKIE("Set-Cookie"),
+    COOKIE("Cookie");
+
+    String value;
+
+    private HttpHeader(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/constant/HttpMethod.java b/src/main/java/constant/HttpMethod.java
new file mode 100644
index 0000000..4c4542a
--- /dev/null
+++ b/src/main/java/constant/HttpMethod.java
@@ -0,0 +1,17 @@
+package constant;
+
+public enum HttpMethod {
+
+    GET("GET"),
+    POST("POST");
+
+    final String value;
+
+    private HttpMethod(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/constant/QueryKey.java b/src/main/java/constant/QueryKey.java
new file mode 100644
index 0000000..c13f3bf
--- /dev/null
+++ b/src/main/java/constant/QueryKey.java
@@ -0,0 +1,19 @@
+package constant;
+
+public enum QueryKey {
+
+    USERID("userId"),
+    PASSWORD("password"),
+    NAME("name"),
+    EMAIL("email");
+
+    String value;
+
+    private QueryKey(String value){
+        this.value = value;
+    }
+
+    public String getValue(){
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/constant/StatusCode.java b/src/main/java/constant/StatusCode.java
new file mode 100644
index 0000000..b6cbac7
--- /dev/null
+++ b/src/main/java/constant/StatusCode.java
@@ -0,0 +1,18 @@
+package constant;
+
+public enum StatusCode {
+
+    OK("200 OK"),
+    Found("302 Found");
+
+
+    final String value;
+
+    private StatusCode(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/constant/Url.java b/src/main/java/constant/Url.java
new file mode 100644
index 0000000..a0827e5
--- /dev/null
+++ b/src/main/java/constant/Url.java
@@ -0,0 +1,26 @@
+package constant;
+
+public enum Url {
+
+    WEBAPP("webapp"),
+    ROOT("/"),
+    INDEX_HTML("/index.html"),
+    USER_FORM_HTML("/user/form.html"),
+    USER_SIGNUP("/user/signup"),
+    USER_LOGIN("/user/login"),
+    USER_LOGIN_HTML("/user/login.html"),
+    USER_LOGIN_FAILED_HTML("/user/login_failed.html"),
+    USER_USERLIST("/user/userList"),
+    USER_LIST_HTML("/user/list.html"),
+    CSS_EXTENSION(".css");
+
+    final String value;
+
+    private Url(String value){
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index e9f4290..9055ae1 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -1,5 +1,6 @@
 package webserver;
 
+import constant.*;
 import db.MemoryUserRepository;
 import db.Repository;
 import http.util.HttpRequestUtils;
@@ -15,10 +16,16 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static constant.HttpHeader.*;
+import static constant.HttpMethod.*;
+import static constant.QueryKey.*;
+import static constant.StatusCode.*;
+import static constant.Url.*;
+
 public class RequestHandler implements Runnable {
     Socket connection;
     private static final Logger log = Logger.getLogger(RequestHandler.class.getName());
-    private static final String WEBAPP_PATH = "webapp/";
+    Repository repository = MemoryUserRepository.getInstance();
 
     public RequestHandler(Socket connection) {
         this.connection = connection;
@@ -30,56 +37,46 @@ public void run() {
         try (InputStream in = connection.getInputStream(); OutputStream out = connection.getOutputStream()) {
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
             DataOutputStream dos = new DataOutputStream(out);
-            Repository repository = MemoryUserRepository.getInstance();
 
             // 요청 읽기
             String requestLine = br.readLine();
-            log.log(Level.INFO, "Request Line: " + requestLine);
 
             // 요청 path 읽기
             String[] requestParts = requestLine.split(" ");
             String method = requestParts[0];
             String path = requestParts[1];   // 0: HTTP Method, 1: request URL, 2: HTTP Version
-            log.log(Level.INFO, "METHOD: " + method);
-            log.log(Level.INFO, "Request Path: " + path);
 
             // 요구사항 1
             //80 포트로 들어오거나, index.html로 주소가 들어올 경우 index.html을 출력하도록 함
-            if (path.equals("/") || path.equals("/index.html")) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "index.html"));
+            if (path.equals(ROOT.getValue()) || path.equals(INDEX_HTML.getValue())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + INDEX_HTML.getValue()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 2
-            if (method.equals("GET") && path.equals("/user/form.html")) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/form.html"));
+            if (method.equals(GET.getValue()) && path.equals(USER_FORM_HTML.getValue())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_FORM_HTML.getValue()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 2
-            if (method.equals("GET") && path.contains("/user/signup")) {
-                log.log(Level.INFO, "Signup request received GET Method");
+            if (method.equals(GET.getValue()) && path.contains(USER_SIGNUP.getValue())) {
 
                 if (path.contains("?")) {
                     // URL 에서 쿼리 파라미터 분리
                     String queryString = subtractQueryParameters(path);
                     Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
 
-                    // 파라미터들 확인
-                    queryParameters.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
-
-                    String userId = queryParameters.get("userId");
-                    String password = queryParameters.get("password");
-                    String name = queryParameters.get("name");
-                    String email = queryParameters.get("email");
+                    String userId = queryParameters.get(USERID.getValue());
+                    String password = queryParameters.get(PASSWORD.getValue());
+                    String name = queryParameters.get(NAME.getValue());
+                    String email = queryParameters.get(EMAIL.getValue());
 
                     User user = new User(userId, password, name, email);
-                    log.log(Level.INFO, "user: " + user);
 
                     repository.addUser(user);
-                    log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
 
                     // 요구사항 4 적용
                     response302Header(dos);
@@ -89,8 +86,7 @@ public void run() {
             // 요구사항 3
             // POST 방식으로 전송하면 쿼리 파라미터가 사라진다. 즉 parseQueryParameter를 통해서 값을 얻어올 수 없다.
             // 대신 POST 방식에서는 이 쿼리 파라미터가 body 안에 들어간다.
-            if (method.equals("POST") && path.equals("/user/signup")) {
-                log.log(Level.INFO, "Signup request received Post Method");
+            if (method.equals(POST.getValue()) && path.equals(USER_SIGNUP.getValue())) {
 
                 int requestContentLength = 0;
 
@@ -101,45 +97,38 @@ public void run() {
                     }
 
                     // header info
-                    if (line.startsWith("Content-Length")) {
+                    if (line.startsWith(CONTENT_LENGTH.getValue())) {
                         requestContentLength = Integer.parseInt(line.split(": ")[1]);
                     }
                 }
 
                 String requestBody = IOUtils.readData(br, requestContentLength);
-                log.log(Level.INFO, "reqeustBody: " + requestBody);
 
                 String queryString = subtractQueryParameters(requestBody);
                 Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
 
-                // 파라미터들 확인
-                queryParameters.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
-
-                String userId = queryParameters.get("userId");
-                String password = queryParameters.get("password");
-                String name = queryParameters.get("name");
-                String email = queryParameters.get("email");
+                String userId = queryParameters.get(USERID.getValue());
+                String password = queryParameters.get(PASSWORD.getValue());
+                String name = queryParameters.get(NAME.getValue());
+                String email = queryParameters.get(EMAIL.getValue());
 
                 User user = new User(userId, password, name, email);
-                log.log(Level.INFO, "user: " + user);
 
                 repository.addUser(user);
-                log.log(Level.INFO, "findUser: " + repository.findUserById(userId));
 
                 // 요구사항 4 적용
                 response302Header(dos);
             }
 
             // 요구사항 5
-            if (method.equals("GET") && path.equals("/user/login.html")) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/login.html"));
+            if (path.equals(USER_LOGIN_HTML.getValue())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_LOGIN_HTML.getValue()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 5
-            if (method.equals("POST") && path.equals("/user/login")) {
-                log.log(Level.INFO, "Login request received");
+            if (path.equals(USER_LOGIN.getValue())) {
 
                 int requestContentLength = 0;
 
@@ -150,24 +139,20 @@ public void run() {
                     }
 
                     // header info
-                    if (line.startsWith("Content-Length")) {
+                    if (line.startsWith(CONTENT_LENGTH.getValue())) {
                         requestContentLength = Integer.parseInt(line.split(": ")[1]);
                     }
                 }
 
                 String requestBody = IOUtils.readData(br, requestContentLength);
-                log.log(Level.INFO, "reqeustBody: " + requestBody);
 
                 String queryString = subtractQueryParameters(requestBody);
 
                 Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
 
-                queryParameters.forEach((key, value) -> log.log(Level.INFO, key + "=" + value));
-
-                String userId = queryParameters.get("userId");
-                String password = queryParameters.get("password");
+                String userId = queryParameters.get(USERID.getValue());
+                String password = queryParameters.get(PASSWORD.getValue());
 
-                log.log(Level.INFO, "user: " + userId + ", password: " + password);
 
                 User findUser = repository.findUserById(userId);
 
@@ -194,15 +179,14 @@ public void run() {
             }
 
             // 요구사항 5
-            if (method.equals("GET") && path.equals("/user/login_failed.html")) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/login_failed.html"));
+            if (path.equals(USER_LOGIN_FAILED_HTML.getValue())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_LOGIN_FAILED_HTML.getValue()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 6
-            if (method.equals("GET") && path.equals("/user/userList")) {
-                log.log(Level.INFO, "UserList request received GET Method");
+            if (path.equals(USER_USERLIST.getValue())) {
 
                 boolean login = false;
 
@@ -212,7 +196,7 @@ public void run() {
                         break;
                     }
 
-                    if (line.startsWith("Cookie")) {
+                    if (line.startsWith(COOKIE.getValue())) {
                         String loginState = line.split(": ")[1];
 
                         if (loginState.equals("logined=true")) {
@@ -235,7 +219,7 @@ public void run() {
             }
 
             // 요구사항 6
-            if (method.equals("GET") && path.equals("/user/list.html")) {
+            if (path.equals(USER_LIST_HTML.getValue())) {
 
                 boolean login = false;
 
@@ -245,7 +229,7 @@ public void run() {
                         break;
                     }
 
-                    if (line.startsWith("Cookie")) {
+                    if (line.startsWith(COOKIE.getValue())) {
                         String loginState = line.split(": ")[1];
 
                         if (loginState.equals("logined=true")) {
@@ -258,25 +242,24 @@ public void run() {
                     }
                 }
 
-                if(login) {
-                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + "/user/list.html"));
+                if (login) {
+                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_LIST_HTML.getValue()));
                     response200Header(dos, body.length);
                     responseBody(dos, body);
-                } else{
+                } else {
                     response302LoginHeader(dos);
                 }
             }
 
             // 요구사항 7
             // .css 파일 요청 처리
-            if (path.endsWith(".css")) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP_PATH + path));
+            if (path.endsWith(CSS_EXTENSION.getValue())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + "/" + path));
                 responseCssHeader(dos, body.length);  // css 응답 헤더 설정
                 responseBody(dos, body);  // css 파일 내용 전송
             }
 
 
-
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
         }
@@ -288,9 +271,9 @@ private String subtractQueryParameters(String path) {
 
     private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
         try {
-            dos.writeBytes("HTTP/1.1 200 OK \r\n");
-            dos.writeBytes("Content-Type: text/html;charset=utf-8\r\n");
-            dos.writeBytes("Content-Length: " + lengthOfBodyContent + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + OK.getValue() + " \r\n");
+            dos.writeBytes(CONTENT_TYPE.getValue() + ": text/html;charset=utf-8\r\n");
+            dos.writeBytes(CONTENT_LENGTH.getValue() + ": " + lengthOfBodyContent + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -301,8 +284,8 @@ private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
     // 그냥 index.html로 redirect
     private void response302Header(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 302 Found \r\n");
-            dos.writeBytes("Location: /index.html\r\n");
+            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
+            dos.writeBytes(LOCATION.getValue() + ": " + INDEX_HTML.getValue() + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -313,9 +296,9 @@ private void response302Header(DataOutputStream dos) {
     // 로그인 성공시 index.html로 redirect
     private void response302LoginSuccessHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 302 Found \r\n");
-            dos.writeBytes("Location: /index.html\r\n");
-            dos.writeBytes("Set-Cookie: logined=true\r\n");  // 쿠키 설정
+            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
+            dos.writeBytes(LOCATION.getValue() + ": " + INDEX_HTML.getValue() + "\r\n");
+            dos.writeBytes(SET_COOKIE.getValue() + ": logined=true\r\n");  // 쿠키 설정
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -326,9 +309,9 @@ private void response302LoginSuccessHeader(DataOutputStream dos) {
     // 로그인 실패 화면으로 redirect
     private void response302LoginFailureHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 302 Found \r\n");
-            dos.writeBytes("Location: /user/login_failed.html\r\n");
-            dos.writeBytes("Set-Cookie: logined=false\r\n");  // 쿠키 설정
+            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
+            dos.writeBytes(LOCATION.getValue() + ": " + USER_LOGIN_FAILED_HTML.getValue() + "\r\n");
+            dos.writeBytes(SET_COOKIE.getValue() + ": logined=false\r\n");  // 쿠키 설정
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -339,8 +322,8 @@ private void response302LoginFailureHeader(DataOutputStream dos) {
     // user list 화면으로 redirect
     private void response302UserListHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 302 Found \r\n");
-            dos.writeBytes("Location: /user/list.html\r\n");
+            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
+            dos.writeBytes(LOCATION.getValue() + ": " + USER_LIST_HTML.getValue() + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -351,8 +334,8 @@ private void response302UserListHeader(DataOutputStream dos) {
     // 로그인 화면으로 redirect
     private void response302LoginHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 302 Found \r\n");
-            dos.writeBytes("Location: /user/login.html\r\n");
+            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
+            dos.writeBytes(LOCATION.getValue() + ": " + USER_LOGIN_HTML.getValue() + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -363,9 +346,9 @@ private void response302LoginHeader(DataOutputStream dos) {
     // css 화면 적용
     private void responseCssHeader(DataOutputStream dos, int lengthOfBodyContent) {
         try {
-            dos.writeBytes("HTTP/1.1 200 OK \r\n");
-            dos.writeBytes("Content-Type: text/css;charset=utf-8\r\n");  // Content-Type을 text/css로 설정
-            dos.writeBytes("Content-Length: " + lengthOfBodyContent + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + OK.getValue() + " \r\n");
+            dos.writeBytes(CONTENT_TYPE.getValue() + ": text/css;charset=utf-8\r\n");  // Content-Type을 text/css로 설정
+            dos.writeBytes(CONTENT_LENGTH.getValue() + ": " + lengthOfBodyContent + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());

From 6531b57b22ed43e9de9b2b2ddd3857de11ec8852 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Wed, 2 Oct 2024 22:58:35 +0900
Subject: [PATCH 09/15] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD2=20?=
 =?UTF-8?q?=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/constant/HttpHeader.java      |  20 --
 src/main/java/constant/HttpHeaderTitle.java |  20 ++
 src/main/java/constant/HttpMethod.java      |  10 +-
 src/main/java/constant/QueryKey.java        |  10 +-
 src/main/java/constant/StatusCode.java      |  10 +-
 src/main/java/constant/Url.java             |  10 +-
 src/main/java/http/Body.java                |  39 ++++
 src/main/java/http/HttpHeader.java          |  46 +++++
 src/main/java/http/HttpRequest.java         |  77 ++++++++
 src/main/java/http/HttpStartLine.java       |  59 ++++++
 src/main/java/webserver/RequestHandler.java | 194 +++++---------------
 src/test/java/HttpRequestTest.java          |  40 ++++
 src/test/resource/test.txt                  |   7 +
 13 files changed, 358 insertions(+), 184 deletions(-)
 delete mode 100644 src/main/java/constant/HttpHeader.java
 create mode 100644 src/main/java/constant/HttpHeaderTitle.java
 create mode 100644 src/main/java/http/Body.java
 create mode 100644 src/main/java/http/HttpHeader.java
 create mode 100644 src/main/java/http/HttpRequest.java
 create mode 100644 src/main/java/http/HttpStartLine.java
 create mode 100644 src/test/java/HttpRequestTest.java
 create mode 100644 src/test/resource/test.txt

diff --git a/src/main/java/constant/HttpHeader.java b/src/main/java/constant/HttpHeader.java
deleted file mode 100644
index c9fdc5d..0000000
--- a/src/main/java/constant/HttpHeader.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package constant;
-
-public enum HttpHeader {
-
-    CONTENT_TYPE("Content-Type"),
-    CONTENT_LENGTH("Content-Length"),
-    LOCATION("Location"),
-    SET_COOKIE("Set-Cookie"),
-    COOKIE("Cookie");
-
-    String value;
-
-    private HttpHeader(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/constant/HttpHeaderTitle.java b/src/main/java/constant/HttpHeaderTitle.java
new file mode 100644
index 0000000..50db3c6
--- /dev/null
+++ b/src/main/java/constant/HttpHeaderTitle.java
@@ -0,0 +1,20 @@
+package constant;
+
+public enum HttpHeaderTitle {
+
+    CONTENT_TYPE("Content-Type"),
+    CONTENT_LENGTH("Content-Length"),
+    LOCATION("Location"),
+    SET_COOKIE("Set-Cookie"),
+    COOKIE("Cookie");
+
+    String headerTitle;
+
+    private HttpHeaderTitle(String headerTitle) {
+        this.headerTitle = headerTitle;
+    }
+
+    public String getHeaderTitle() {
+        return headerTitle;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/constant/HttpMethod.java b/src/main/java/constant/HttpMethod.java
index 4c4542a..a40d527 100644
--- a/src/main/java/constant/HttpMethod.java
+++ b/src/main/java/constant/HttpMethod.java
@@ -5,13 +5,13 @@ public enum HttpMethod {
     GET("GET"),
     POST("POST");
 
-    final String value;
+    final String method;
 
-    private HttpMethod(String value) {
-        this.value = value;
+    private HttpMethod(String method) {
+        this.method = method;
     }
 
-    public String getValue() {
-        return value;
+    public String getMethod() {
+        return method;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/constant/QueryKey.java b/src/main/java/constant/QueryKey.java
index c13f3bf..7d57aa1 100644
--- a/src/main/java/constant/QueryKey.java
+++ b/src/main/java/constant/QueryKey.java
@@ -7,13 +7,13 @@ public enum QueryKey {
     NAME("name"),
     EMAIL("email");
 
-    String value;
+    String key;
 
-    private QueryKey(String value){
-        this.value = value;
+    private QueryKey(String key){
+        this.key = key;
     }
 
-    public String getValue(){
-        return value;
+    public String getKey(){
+        return key;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/constant/StatusCode.java b/src/main/java/constant/StatusCode.java
index b6cbac7..5776bd5 100644
--- a/src/main/java/constant/StatusCode.java
+++ b/src/main/java/constant/StatusCode.java
@@ -6,13 +6,13 @@ public enum StatusCode {
     Found("302 Found");
 
 
-    final String value;
+    final String code;
 
-    private StatusCode(String value) {
-        this.value = value;
+    private StatusCode(String code) {
+        this.code = code;
     }
 
-    public String getValue() {
-        return value;
+    public String getStatusCode() {
+        return code;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/constant/Url.java b/src/main/java/constant/Url.java
index a0827e5..8cc53b5 100644
--- a/src/main/java/constant/Url.java
+++ b/src/main/java/constant/Url.java
@@ -14,13 +14,13 @@ public enum Url {
     USER_LIST_HTML("/user/list.html"),
     CSS_EXTENSION(".css");
 
-    final String value;
+    final String url;
 
-    private Url(String value){
-        this.value = value;
+    private Url(String url){
+        this.url = url;
     }
 
-    public String getValue() {
-        return value;
+    public String getUrl() {
+        return url;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/http/Body.java b/src/main/java/http/Body.java
new file mode 100644
index 0000000..aa7d928
--- /dev/null
+++ b/src/main/java/http/Body.java
@@ -0,0 +1,39 @@
+package http;
+
+import http.util.HttpRequestUtils;
+import http.util.IOUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Body {
+
+    String body;
+    Map<String, String> bodyMap;
+    BufferedReader br;
+
+    private Body(BufferedReader br) throws IOException {
+        this.br = br;
+        bodyMap = new HashMap<>();
+    }
+
+    public static Body from(BufferedReader br) throws IOException {
+        return new Body(br);
+    }
+
+    public void setBody(int requestContentLength) throws IOException {
+       body = IOUtils.readData(br, requestContentLength);
+    }
+
+    public void parseBody(){
+        String queryString = body.substring(body.indexOf("?") + 1);
+
+        bodyMap = HttpRequestUtils.parseQueryParameter(queryString);
+    }
+
+    public String getBodyParamValue(String key) {
+        return bodyMap.get(key);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/http/HttpHeader.java b/src/main/java/http/HttpHeader.java
new file mode 100644
index 0000000..14bc7db
--- /dev/null
+++ b/src/main/java/http/HttpHeader.java
@@ -0,0 +1,46 @@
+package http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpHeader {
+
+    private Map<String, String> headerMap;
+    private BufferedReader br;
+
+    private HttpHeader(BufferedReader br) throws IOException {
+        this.headerMap = new HashMap<>();
+        this.br = br;
+    }
+
+    public static HttpHeader from(BufferedReader br) throws IOException {
+        return new HttpHeader(br);
+    }
+
+    public String getValue(String key) {
+        return headerMap.get(key);
+    }
+
+    public void parseHeader() throws IOException {
+
+        String line;
+        while (!(line = br.readLine()).isEmpty()) {
+
+            String key = line.split(": ")[0];
+            String value = line.split(": ")[1];
+
+            if (headerMap.containsKey(key)) {
+                headerMap.replace(key, value);
+                continue;
+            }
+
+            headerMap.put(key, value);
+        }
+    }
+
+    public boolean containsKey(String key) {
+        return headerMap.containsKey(key);
+    }
+}
diff --git a/src/main/java/http/HttpRequest.java b/src/main/java/http/HttpRequest.java
new file mode 100644
index 0000000..1265f81
--- /dev/null
+++ b/src/main/java/http/HttpRequest.java
@@ -0,0 +1,77 @@
+package http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static constant.HttpHeaderTitle.CONTENT_LENGTH;
+import static constant.HttpHeaderTitle.COOKIE;
+
+public class HttpRequest {
+
+    private HttpStartLine httpStartLine;
+    private HttpHeader httpHeader;
+    private Body body;
+
+    private HttpRequest(BufferedReader br) throws IOException {
+        httpStartLine = HttpStartLine.from(br);
+        httpHeader = HttpHeader.from(br);
+        body = Body.from(br);
+
+        httpHeader.parseHeader();
+
+        if (httpHeader.containsKey(CONTENT_LENGTH.getHeaderTitle())) {
+            body.setBody(Integer.parseInt(httpHeader.getValue(CONTENT_LENGTH.getHeaderTitle())));
+            body.parseBody();
+        }
+
+    }
+
+    public static HttpRequest from(BufferedReader br) throws IOException {
+        return new HttpRequest(br);
+    }
+
+    public String getMethod() {
+        return httpStartLine.getMethod();
+    }
+
+    public String getUrl() {
+        return httpStartLine.getUrl();
+    }
+
+    public String getVersion() {
+        return httpStartLine.getVersion();
+    }
+
+    public String getHeaderValue(String key) {
+        return httpHeader.getValue(key);
+    }
+
+    public boolean checkLogin() {
+        boolean login = false;
+
+        if (getHeaderValue(COOKIE.getHeaderTitle()) != null && getHeaderValue(COOKIE.getHeaderTitle()).equals("logined=true")) {
+            login = true;
+        }
+
+        if (getHeaderValue(COOKIE.getHeaderTitle()) == null || getHeaderValue(COOKIE.getHeaderTitle()).equals("logined=false")) {
+            login = false;
+        }
+
+        return login;
+    }
+
+    // body를 통해 들어온 queryParameter들을 파싱한 맵에서 key에 대응되는 value를 가져옴
+    public String getBodyParamValue(String key) {
+        return body.getBodyParamValue(key);
+    }
+
+    // queryString을 통해 들어온 queryparameter들을 파싱한 맵에서 key에 대응되는 value를 가져옴
+    public String getQueryParamValue(String key) {
+        return httpStartLine.getQueryParamValue(key);
+    }
+
+
+
+}
diff --git a/src/main/java/http/HttpStartLine.java b/src/main/java/http/HttpStartLine.java
new file mode 100644
index 0000000..78534c2
--- /dev/null
+++ b/src/main/java/http/HttpStartLine.java
@@ -0,0 +1,59 @@
+package http;
+
+import http.util.HttpRequestUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpStartLine {
+
+    private String method;
+    private String url;
+    private String version;
+
+    private Map<String, String> queryParamMap;
+
+    private BufferedReader br;
+
+    private HttpStartLine(BufferedReader br) throws IOException {
+        this.br = br;
+        queryParamMap = new HashMap<>();
+
+        String requestLine = br.readLine();
+
+        String[] requestParts = requestLine.split(" ");
+
+        method = requestParts[0];
+        url = requestParts[1];
+        version = requestParts[2];
+
+        if(url.contains("?")) {
+            String queryString = url.substring(url.indexOf("?") + 1);
+            queryParamMap = HttpRequestUtils.parseQueryParameter(queryString);
+        }
+    }
+
+    public static HttpStartLine from(BufferedReader br) throws IOException {
+        return new HttpStartLine(br);
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+
+    // url에 연달아서 ?를 통해 표현되는 queryString을 parsing하여 만든 맵에서 key에 매핑되어있는 value값을 얻어옴
+    public String getQueryParamValue(String key) {
+        return queryParamMap.get(key);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 9055ae1..1a1876f 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -1,22 +1,20 @@
 package webserver;
 
-import constant.*;
 import db.MemoryUserRepository;
 import db.Repository;
+import http.HttpRequest;
 import http.util.HttpRequestUtils;
-import http.util.IOUtils;
 import model.User;
 
 import java.io.*;
 import java.net.Socket;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static constant.HttpHeader.*;
+import static constant.HttpHeaderTitle.*;
 import static constant.HttpMethod.*;
 import static constant.QueryKey.*;
 import static constant.StatusCode.*;
@@ -38,41 +36,32 @@ public void run() {
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
             DataOutputStream dos = new DataOutputStream(out);
 
-            // 요청 읽기
-            String requestLine = br.readLine();
-
-            // 요청 path 읽기
-            String[] requestParts = requestLine.split(" ");
-            String method = requestParts[0];
-            String path = requestParts[1];   // 0: HTTP Method, 1: request URL, 2: HTTP Version
+            HttpRequest httpRequest = HttpRequest.from(br);
 
             // 요구사항 1
             //80 포트로 들어오거나, index.html로 주소가 들어올 경우 index.html을 출력하도록 함
-            if (path.equals(ROOT.getValue()) || path.equals(INDEX_HTML.getValue())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + INDEX_HTML.getValue()));
+            if (httpRequest.getUrl().equals(ROOT.getUrl()) || httpRequest.getUrl().equals(INDEX_HTML.getUrl())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + INDEX_HTML.getUrl()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 2
-            if (method.equals(GET.getValue()) && path.equals(USER_FORM_HTML.getValue())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_FORM_HTML.getValue()));
+            if (httpRequest.getMethod().equals(GET.getMethod()) && httpRequest.getUrl().equals(USER_FORM_HTML.getUrl())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_FORM_HTML.getUrl()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 2
-            if (method.equals(GET.getValue()) && path.contains(USER_SIGNUP.getValue())) {
+            if (httpRequest.getMethod().equals(GET.getMethod()) && httpRequest.getUrl().contains(USER_SIGNUP.getUrl())) {
 
-                if (path.contains("?")) {
-                    // URL 에서 쿼리 파라미터 분리
-                    String queryString = subtractQueryParameters(path);
-                    Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
+                if (httpRequest.getUrl().contains("?")) {
 
-                    String userId = queryParameters.get(USERID.getValue());
-                    String password = queryParameters.get(PASSWORD.getValue());
-                    String name = queryParameters.get(NAME.getValue());
-                    String email = queryParameters.get(EMAIL.getValue());
+                    String userId = httpRequest.getQueryParamValue(USERID.getKey());
+                    String password = httpRequest.getQueryParamValue(PASSWORD.getKey());
+                    String name = httpRequest.getQueryParamValue(NAME.getKey());
+                    String email = httpRequest.getQueryParamValue(EMAIL.getKey());
 
                     User user = new User(userId, password, name, email);
 
@@ -86,31 +75,12 @@ public void run() {
             // 요구사항 3
             // POST 방식으로 전송하면 쿼리 파라미터가 사라진다. 즉 parseQueryParameter를 통해서 값을 얻어올 수 없다.
             // 대신 POST 방식에서는 이 쿼리 파라미터가 body 안에 들어간다.
-            if (method.equals(POST.getValue()) && path.equals(USER_SIGNUP.getValue())) {
-
-                int requestContentLength = 0;
-
-                while (true) {
-                    final String line = br.readLine();
-                    if (line.equals("")) {
-                        break;
-                    }
-
-                    // header info
-                    if (line.startsWith(CONTENT_LENGTH.getValue())) {
-                        requestContentLength = Integer.parseInt(line.split(": ")[1]);
-                    }
-                }
-
-                String requestBody = IOUtils.readData(br, requestContentLength);
-
-                String queryString = subtractQueryParameters(requestBody);
-                Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
+            if (httpRequest.getMethod().equals(POST.getMethod()) && httpRequest.getUrl().equals(USER_SIGNUP.getUrl())) {
 
-                String userId = queryParameters.get(USERID.getValue());
-                String password = queryParameters.get(PASSWORD.getValue());
-                String name = queryParameters.get(NAME.getValue());
-                String email = queryParameters.get(EMAIL.getValue());
+                String userId = httpRequest.getBodyParamValue(USERID.getKey());
+                String password = httpRequest.getBodyParamValue(PASSWORD.getKey());
+                String name = httpRequest.getBodyParamValue(NAME.getKey());
+                String email = httpRequest.getBodyParamValue(EMAIL.getKey());
 
                 User user = new User(userId, password, name, email);
 
@@ -121,37 +91,17 @@ public void run() {
             }
 
             // 요구사항 5
-            if (path.equals(USER_LOGIN_HTML.getValue())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_LOGIN_HTML.getValue()));
+            if (httpRequest.getUrl().equals(USER_LOGIN_HTML.getUrl())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_LOGIN_HTML.getUrl()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 5
-            if (path.equals(USER_LOGIN.getValue())) {
-
-                int requestContentLength = 0;
-
-                while (true) {
-                    final String line = br.readLine();
-                    if (line.equals("")) {
-                        break;
-                    }
-
-                    // header info
-                    if (line.startsWith(CONTENT_LENGTH.getValue())) {
-                        requestContentLength = Integer.parseInt(line.split(": ")[1]);
-                    }
-                }
-
-                String requestBody = IOUtils.readData(br, requestContentLength);
-
-                String queryString = subtractQueryParameters(requestBody);
-
-                Map<String, String> queryParameters = HttpRequestUtils.parseQueryParameter(queryString);
+            if (httpRequest.getUrl().equals(USER_LOGIN.getUrl())) {
 
-                String userId = queryParameters.get(USERID.getValue());
-                String password = queryParameters.get(PASSWORD.getValue());
+                String userId = httpRequest.getBodyParamValue(USERID.getKey());
+                String password = httpRequest.getBodyParamValue(PASSWORD.getKey());
 
 
                 User findUser = repository.findUserById(userId);
@@ -179,37 +129,16 @@ public void run() {
             }
 
             // 요구사항 5
-            if (path.equals(USER_LOGIN_FAILED_HTML.getValue())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_LOGIN_FAILED_HTML.getValue()));
+            if (httpRequest.getUrl().equals(USER_LOGIN_FAILED_HTML.getUrl())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_LOGIN_FAILED_HTML.getUrl()));
                 response200Header(dos, body.length);
                 responseBody(dos, body);
             }
 
             // 요구사항 6
-            if (path.equals(USER_USERLIST.getValue())) {
+            if (httpRequest.getUrl().equals(USER_USERLIST.getUrl())) {
 
-                boolean login = false;
-
-                while (true) {
-                    final String line = br.readLine();
-                    if (line.equals("")) {
-                        break;
-                    }
-
-                    if (line.startsWith(COOKIE.getValue())) {
-                        String loginState = line.split(": ")[1];
-
-                        if (loginState.equals("logined=true")) {
-                            login = true;
-                        }
-
-                        if (loginState.equals("logined=false")) {
-                            login = false;
-                        }
-                    }
-                }
-
-                log.log(Level.INFO, "login: " + login);
+                boolean login = httpRequest.checkLogin();
 
                 if (login) {
                     response302UserListHeader(dos);
@@ -219,31 +148,12 @@ public void run() {
             }
 
             // 요구사항 6
-            if (path.equals(USER_LIST_HTML.getValue())) {
+            if (httpRequest.getUrl().equals(USER_LIST_HTML.getUrl())) {
 
-                boolean login = false;
-
-                while (true) {
-                    final String line = br.readLine();
-                    if (line.equals("")) {
-                        break;
-                    }
-
-                    if (line.startsWith(COOKIE.getValue())) {
-                        String loginState = line.split(": ")[1];
-
-                        if (loginState.equals("logined=true")) {
-                            login = true;
-                        }
-
-                        if (loginState.equals("logined=false")) {
-                            login = false;
-                        }
-                    }
-                }
+                boolean login = httpRequest.checkLogin();
 
                 if (login) {
-                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + USER_LIST_HTML.getValue()));
+                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_LIST_HTML.getUrl()));
                     response200Header(dos, body.length);
                     responseBody(dos, body);
                 } else {
@@ -253,8 +163,8 @@ public void run() {
 
             // 요구사항 7
             // .css 파일 요청 처리
-            if (path.endsWith(CSS_EXTENSION.getValue())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getValue() + "/" + path));
+            if (httpRequest.getUrl().endsWith(CSS_EXTENSION.getUrl())) {
+                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + "/" + httpRequest.getUrl()));
                 responseCssHeader(dos, body.length);  // css 응답 헤더 설정
                 responseBody(dos, body);  // css 파일 내용 전송
             }
@@ -265,15 +175,11 @@ public void run() {
         }
     }
 
-    private String subtractQueryParameters(String path) {
-        return path.substring(path.indexOf("?") + 1);
-    }
-
     private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
         try {
-            dos.writeBytes("HTTP/1.1 " + OK.getValue() + " \r\n");
-            dos.writeBytes(CONTENT_TYPE.getValue() + ": text/html;charset=utf-8\r\n");
-            dos.writeBytes(CONTENT_LENGTH.getValue() + ": " + lengthOfBodyContent + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + OK.getStatusCode() + " \r\n");
+            dos.writeBytes(CONTENT_TYPE.getHeaderTitle() + ": text/html;charset=utf-8\r\n");
+            dos.writeBytes(CONTENT_LENGTH.getHeaderTitle() + ": " + lengthOfBodyContent + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -284,8 +190,8 @@ private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
     // 그냥 index.html로 redirect
     private void response302Header(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
-            dos.writeBytes(LOCATION.getValue() + ": " + INDEX_HTML.getValue() + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
+            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + INDEX_HTML.getUrl() + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -296,9 +202,9 @@ private void response302Header(DataOutputStream dos) {
     // 로그인 성공시 index.html로 redirect
     private void response302LoginSuccessHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
-            dos.writeBytes(LOCATION.getValue() + ": " + INDEX_HTML.getValue() + "\r\n");
-            dos.writeBytes(SET_COOKIE.getValue() + ": logined=true\r\n");  // 쿠키 설정
+            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
+            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + INDEX_HTML.getUrl() + "\r\n");
+            dos.writeBytes(SET_COOKIE.getHeaderTitle() + ": logined=true\r\n");  // 쿠키 설정
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -309,9 +215,9 @@ private void response302LoginSuccessHeader(DataOutputStream dos) {
     // 로그인 실패 화면으로 redirect
     private void response302LoginFailureHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
-            dos.writeBytes(LOCATION.getValue() + ": " + USER_LOGIN_FAILED_HTML.getValue() + "\r\n");
-            dos.writeBytes(SET_COOKIE.getValue() + ": logined=false\r\n");  // 쿠키 설정
+            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
+            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + USER_LOGIN_FAILED_HTML.getUrl() + "\r\n");
+            dos.writeBytes(SET_COOKIE.getHeaderTitle() + ": logined=false\r\n");  // 쿠키 설정
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -322,8 +228,8 @@ private void response302LoginFailureHeader(DataOutputStream dos) {
     // user list 화면으로 redirect
     private void response302UserListHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
-            dos.writeBytes(LOCATION.getValue() + ": " + USER_LIST_HTML.getValue() + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
+            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + USER_LIST_HTML.getUrl() + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -334,8 +240,8 @@ private void response302UserListHeader(DataOutputStream dos) {
     // 로그인 화면으로 redirect
     private void response302LoginHeader(DataOutputStream dos) {
         try {
-            dos.writeBytes("HTTP/1.1 " + Found.getValue() + " \r\n");
-            dos.writeBytes(LOCATION.getValue() + ": " + USER_LOGIN_HTML.getValue() + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
+            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + USER_LOGIN_HTML.getUrl() + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
@@ -346,9 +252,9 @@ private void response302LoginHeader(DataOutputStream dos) {
     // css 화면 적용
     private void responseCssHeader(DataOutputStream dos, int lengthOfBodyContent) {
         try {
-            dos.writeBytes("HTTP/1.1 " + OK.getValue() + " \r\n");
-            dos.writeBytes(CONTENT_TYPE.getValue() + ": text/css;charset=utf-8\r\n");  // Content-Type을 text/css로 설정
-            dos.writeBytes(CONTENT_LENGTH.getValue() + ": " + lengthOfBodyContent + "\r\n");
+            dos.writeBytes("HTTP/1.1 " + OK.getStatusCode() + " \r\n");
+            dos.writeBytes(CONTENT_TYPE.getHeaderTitle() + ": text/css;charset=utf-8\r\n");  // Content-Type을 text/css로 설정
+            dos.writeBytes(CONTENT_LENGTH.getHeaderTitle() + ": " + lengthOfBodyContent + "\r\n");
             dos.writeBytes("\r\n");
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());
diff --git a/src/test/java/HttpRequestTest.java b/src/test/java/HttpRequestTest.java
new file mode 100644
index 0000000..72a97c1
--- /dev/null
+++ b/src/test/java/HttpRequestTest.java
@@ -0,0 +1,40 @@
+import constant.QueryKey;
+import http.HttpRequest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static constant.QueryKey.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class HttpRequestTest {
+
+    private BufferedReader bufferedReaderFromFile(String path) throws IOException {
+        return new BufferedReader(new InputStreamReader(Files.newInputStream(Paths.get(path))));
+    }
+
+    @Test
+    @DisplayName("http 요청 받아오기 테스트")
+    void http_request_test() throws IOException {
+        HttpRequest httpRequest = HttpRequest.from(bufferedReaderFromFile("src/test/resource/" + "test.txt"));
+
+        assertEquals("/user/create", httpRequest.getUrl());
+        assertEquals("POST", httpRequest.getMethod());
+        assertEquals("HTTP/1.1", httpRequest.getVersion());
+
+        assertEquals("localhost:8080", httpRequest.getHeaderValue("Host"));
+        assertEquals("keep-alive", httpRequest.getHeaderValue("Connection"));
+        assertEquals("40", httpRequest.getHeaderValue("Content-Length"));
+        assertEquals("*/*", httpRequest.getHeaderValue("Accept"));
+
+        assertEquals("jw", httpRequest.getBodyParamValue(USERID.getKey()));
+        assertEquals("password", httpRequest.getBodyParamValue(PASSWORD.getKey()));
+        assertEquals("jungwoo", httpRequest.getBodyParamValue(NAME.getKey()));
+
+    }
+}
diff --git a/src/test/resource/test.txt b/src/test/resource/test.txt
new file mode 100644
index 0000000..147edd6
--- /dev/null
+++ b/src/test/resource/test.txt
@@ -0,0 +1,7 @@
+POST /user/create HTTP/1.1
+Host: localhost:8080
+Connection: keep-alive
+Content-Length: 40
+Accept: */*
+
+userId=jw&password=password&name=jungwoo
\ No newline at end of file

From 8dc511b11381a1b782fd3bf2350a46ef5b157860 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Thu, 3 Oct 2024 00:44:44 +0900
Subject: [PATCH 10/15] =?UTF-8?q?refactor:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD3=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/constant/StatusCode.java        |  17 +-
 .../java/http/{ => request}/HttpRequest.java  |  36 ++---
 .../HttpRequestHeader.java}                   |  10 +-
 .../HttpRequestStartLine.java}                |  13 +-
 .../{Body.java => request/RequestBody.java}   |  10 +-
 src/main/java/http/response/HttpResponse.java |  91 +++++++++++
 .../http/response/HttpResponseHeader.java     |  20 +++
 .../http/response/HttpResponseStartLine.java  |  29 ++++
 src/main/java/http/response/ResponseBody.java |  18 +++
 src/main/java/webserver/RequestHandler.java   | 149 +++---------------
 src/test/java/{ => http}/HttpRequestTest.java |   7 +-
 src/test/java/http/HttpResponseTest.java      |  27 ++++
 .../resource/{test.txt => requestTest.txt}    |   0
 src/test/resource/responseTest.txt            | 127 +++++++++++++++
 14 files changed, 386 insertions(+), 168 deletions(-)
 rename src/main/java/http/{ => request}/HttpRequest.java (59%)
 rename src/main/java/http/{HttpHeader.java => request/HttpRequestHeader.java} (77%)
 rename src/main/java/http/{HttpStartLine.java => request/HttpRequestStartLine.java} (80%)
 rename src/main/java/http/{Body.java => request/RequestBody.java} (76%)
 create mode 100644 src/main/java/http/response/HttpResponse.java
 create mode 100644 src/main/java/http/response/HttpResponseHeader.java
 create mode 100644 src/main/java/http/response/HttpResponseStartLine.java
 create mode 100644 src/main/java/http/response/ResponseBody.java
 rename src/test/java/{ => http}/HttpRequestTest.java (93%)
 create mode 100644 src/test/java/http/HttpResponseTest.java
 rename src/test/resource/{test.txt => requestTest.txt} (100%)
 create mode 100644 src/test/resource/responseTest.txt

diff --git a/src/main/java/constant/StatusCode.java b/src/main/java/constant/StatusCode.java
index 5776bd5..1bfb327 100644
--- a/src/main/java/constant/StatusCode.java
+++ b/src/main/java/constant/StatusCode.java
@@ -2,17 +2,28 @@
 
 public enum StatusCode {
 
-    OK("200 OK"),
-    Found("302 Found");
+    OK("200", "OK"),
+    Found("302", "Found");
 
 
     final String code;
+    final String message;
 
-    private StatusCode(String code) {
+    private StatusCode(String code, String message) {
         this.code = code;
+        this.message = message;
     }
 
     public String getStatusCode() {
         return code;
     }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return code + " " + message;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/http/HttpRequest.java b/src/main/java/http/request/HttpRequest.java
similarity index 59%
rename from src/main/java/http/HttpRequest.java
rename to src/main/java/http/request/HttpRequest.java
index 1265f81..03ae89f 100644
--- a/src/main/java/http/HttpRequest.java
+++ b/src/main/java/http/request/HttpRequest.java
@@ -1,29 +1,27 @@
-package http;
+package http.request;
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import static constant.HttpHeaderTitle.CONTENT_LENGTH;
 import static constant.HttpHeaderTitle.COOKIE;
 
 public class HttpRequest {
 
-    private HttpStartLine httpStartLine;
-    private HttpHeader httpHeader;
-    private Body body;
+    private HttpRequestStartLine httpRequestStartLine;
+    private HttpRequestHeader httpRequestHeader;
+    private RequestBody requestBody;
 
     private HttpRequest(BufferedReader br) throws IOException {
-        httpStartLine = HttpStartLine.from(br);
-        httpHeader = HttpHeader.from(br);
-        body = Body.from(br);
+        httpRequestStartLine = HttpRequestStartLine.from(br);
+        httpRequestHeader = HttpRequestHeader.from(br);
+        requestBody = RequestBody.from(br);
 
-        httpHeader.parseHeader();
+        httpRequestHeader.parseHeader();
 
-        if (httpHeader.containsKey(CONTENT_LENGTH.getHeaderTitle())) {
-            body.setBody(Integer.parseInt(httpHeader.getValue(CONTENT_LENGTH.getHeaderTitle())));
-            body.parseBody();
+        if (httpRequestHeader.containsKey(CONTENT_LENGTH.getHeaderTitle())) {
+            requestBody.setBody(Integer.parseInt(httpRequestHeader.getValue(CONTENT_LENGTH.getHeaderTitle())));
+            requestBody.parseBody();
         }
 
     }
@@ -33,19 +31,19 @@ public static HttpRequest from(BufferedReader br) throws IOException {
     }
 
     public String getMethod() {
-        return httpStartLine.getMethod();
+        return httpRequestStartLine.getMethod();
     }
 
     public String getUrl() {
-        return httpStartLine.getUrl();
+        return httpRequestStartLine.getUrl();
     }
 
     public String getVersion() {
-        return httpStartLine.getVersion();
+        return httpRequestStartLine.getVersion();
     }
 
     public String getHeaderValue(String key) {
-        return httpHeader.getValue(key);
+        return httpRequestHeader.getValue(key);
     }
 
     public boolean checkLogin() {
@@ -64,12 +62,12 @@ public boolean checkLogin() {
 
     // body를 통해 들어온 queryParameter들을 파싱한 맵에서 key에 대응되는 value를 가져옴
     public String getBodyParamValue(String key) {
-        return body.getBodyParamValue(key);
+        return requestBody.getBodyParamValue(key);
     }
 
     // queryString을 통해 들어온 queryparameter들을 파싱한 맵에서 key에 대응되는 value를 가져옴
     public String getQueryParamValue(String key) {
-        return httpStartLine.getQueryParamValue(key);
+        return httpRequestStartLine.getQueryParamValue(key);
     }
 
 
diff --git a/src/main/java/http/HttpHeader.java b/src/main/java/http/request/HttpRequestHeader.java
similarity index 77%
rename from src/main/java/http/HttpHeader.java
rename to src/main/java/http/request/HttpRequestHeader.java
index 14bc7db..a89a77e 100644
--- a/src/main/java/http/HttpHeader.java
+++ b/src/main/java/http/request/HttpRequestHeader.java
@@ -1,22 +1,22 @@
-package http;
+package http.request;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-public class HttpHeader {
+public class HttpRequestHeader {
 
     private Map<String, String> headerMap;
     private BufferedReader br;
 
-    private HttpHeader(BufferedReader br) throws IOException {
+    private HttpRequestHeader(BufferedReader br) throws IOException {
         this.headerMap = new HashMap<>();
         this.br = br;
     }
 
-    public static HttpHeader from(BufferedReader br) throws IOException {
-        return new HttpHeader(br);
+    public static HttpRequestHeader from(BufferedReader br) throws IOException {
+        return new HttpRequestHeader(br);
     }
 
     public String getValue(String key) {
diff --git a/src/main/java/http/HttpStartLine.java b/src/main/java/http/request/HttpRequestStartLine.java
similarity index 80%
rename from src/main/java/http/HttpStartLine.java
rename to src/main/java/http/request/HttpRequestStartLine.java
index 78534c2..e42178a 100644
--- a/src/main/java/http/HttpStartLine.java
+++ b/src/main/java/http/request/HttpRequestStartLine.java
@@ -1,4 +1,4 @@
-package http;
+package http.request;
 
 import http.util.HttpRequestUtils;
 
@@ -7,7 +7,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class HttpStartLine {
+public class HttpRequestStartLine {
 
     private String method;
     private String url;
@@ -15,10 +15,7 @@ public class HttpStartLine {
 
     private Map<String, String> queryParamMap;
 
-    private BufferedReader br;
-
-    private HttpStartLine(BufferedReader br) throws IOException {
-        this.br = br;
+    private HttpRequestStartLine(BufferedReader br) throws IOException {
         queryParamMap = new HashMap<>();
 
         String requestLine = br.readLine();
@@ -35,8 +32,8 @@ private HttpStartLine(BufferedReader br) throws IOException {
         }
     }
 
-    public static HttpStartLine from(BufferedReader br) throws IOException {
-        return new HttpStartLine(br);
+    public static HttpRequestStartLine from(BufferedReader br) throws IOException {
+        return new HttpRequestStartLine(br);
     }
 
     public String getMethod() {
diff --git a/src/main/java/http/Body.java b/src/main/java/http/request/RequestBody.java
similarity index 76%
rename from src/main/java/http/Body.java
rename to src/main/java/http/request/RequestBody.java
index aa7d928..7b30724 100644
--- a/src/main/java/http/Body.java
+++ b/src/main/java/http/request/RequestBody.java
@@ -1,4 +1,4 @@
-package http;
+package http.request;
 
 import http.util.HttpRequestUtils;
 import http.util.IOUtils;
@@ -8,19 +8,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class Body {
+public class RequestBody {
 
     String body;
     Map<String, String> bodyMap;
     BufferedReader br;
 
-    private Body(BufferedReader br) throws IOException {
+    private RequestBody(BufferedReader br) throws IOException {
         this.br = br;
         bodyMap = new HashMap<>();
     }
 
-    public static Body from(BufferedReader br) throws IOException {
-        return new Body(br);
+    public static RequestBody from(BufferedReader br) throws IOException {
+        return new RequestBody(br);
     }
 
     public void setBody(int requestContentLength) throws IOException {
diff --git a/src/main/java/http/response/HttpResponse.java b/src/main/java/http/response/HttpResponse.java
new file mode 100644
index 0000000..95a7567
--- /dev/null
+++ b/src/main/java/http/response/HttpResponse.java
@@ -0,0 +1,91 @@
+package http.response;
+
+import constant.HttpHeaderTitle;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import static constant.HttpHeaderTitle.*;
+import static constant.StatusCode.*;
+import static constant.Url.WEBAPP;
+
+public class HttpResponse {
+
+    private HttpResponseStartLine httpResponseStartLine;
+    private HttpResponseHeader httpResponseHeader;
+    private ResponseBody responseBody;
+
+    private DataOutputStream dos;
+
+    public HttpResponse(OutputStream dos) {
+        this.dos = new DataOutputStream(dos);
+        httpResponseHeader = new HttpResponseHeader(new HashMap<>());
+    }
+
+    public void forward(String path) throws IOException {
+        // startline 설정
+        setStartLine(OK.getStatusCode(), OK.getMessage());
+
+        // body 설정
+        responseBody = new ResponseBody(Files.readAllBytes(Paths.get(WEBAPP.getUrl() + path)));
+
+        // forward 하는데 필요한 header 삽입
+        putHeader(CONTENT_LENGTH.getHeaderTitle(), String.valueOf(responseBody.getBodyLength()));
+
+        String type = "text/html";
+        if(path.contains(".css")){
+            type = "text/css";
+        }
+
+        // 파일 형식에 따른 헤더 삽입
+        putHeader(CONTENT_TYPE.getHeaderTitle(), type+";charset=utf-8");
+
+        // 헤더들을 outputStream에 적어주기
+        writeResponseHeader();
+
+        dos.write(responseBody.getBodyContent(), 0, responseBody.getBodyLength());
+        dos.flush();
+    }
+
+    public void redirect(String path) throws IOException {
+        // startLine 설정
+        setStartLine(Found.getStatusCode(), Found.getMessage());
+
+        // redirect에 필요한 헤더 삽입
+        putHeader("Location", path);
+
+        writeResponseHeader();
+    }
+
+    // startline 설정
+    private void setStartLine(String statusCode, String message) {
+        httpResponseStartLine = new HttpResponseStartLine(statusCode, message);
+    }
+
+    // 헤더를 맵에 삽입
+    public void putHeader(String key, String value) {
+        httpResponseHeader.putHeader(key, value);
+    }
+
+    private void writeResponseHeader() throws IOException {
+        // startline을 outputStream에 적어주기
+        dos.writeBytes( httpResponseStartLine.getVersion() + " " + httpResponseStartLine.getStatusCode() + " " + httpResponseStartLine.getMessage() + "\r\n");
+
+        // 헤더들을 outputStream에 적어주기
+        for(Map.Entry<String, String> entry : httpResponseHeader.getHeaderMap().entrySet()) {
+            dos.writeBytes(entry.getKey() + ": " + entry.getValue() + "\r\n");
+        }
+
+        dos.writeBytes("\r\n");
+    }
+
+
+
+
+
+}
diff --git a/src/main/java/http/response/HttpResponseHeader.java b/src/main/java/http/response/HttpResponseHeader.java
new file mode 100644
index 0000000..dfda65f
--- /dev/null
+++ b/src/main/java/http/response/HttpResponseHeader.java
@@ -0,0 +1,20 @@
+package http.response;
+
+import java.util.Map;
+
+public class HttpResponseHeader {
+
+    private Map<String, String> headerMap;
+
+    public HttpResponseHeader(Map<String, String> headerMap) {
+        this.headerMap = headerMap;
+    }
+
+    public Map<String, String> getHeaderMap() {
+        return headerMap;
+    }
+
+    public void putHeader(String key, String value) {
+        headerMap.put(key, value);
+    }
+}
diff --git a/src/main/java/http/response/HttpResponseStartLine.java b/src/main/java/http/response/HttpResponseStartLine.java
new file mode 100644
index 0000000..e1564f1
--- /dev/null
+++ b/src/main/java/http/response/HttpResponseStartLine.java
@@ -0,0 +1,29 @@
+package http.response;
+
+import java.io.DataOutputStream;
+
+public class HttpResponseStartLine {
+
+
+    private String statusCode;
+    private String message;
+
+    private static final String VERSION = "HTTP/1.1";
+
+    public HttpResponseStartLine(String statusCode, String message) {
+        this.statusCode = statusCode;
+        this.message = message;
+    }
+
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getVersion() {
+        return VERSION;
+    }
+}
diff --git a/src/main/java/http/response/ResponseBody.java b/src/main/java/http/response/ResponseBody.java
new file mode 100644
index 0000000..c5480c0
--- /dev/null
+++ b/src/main/java/http/response/ResponseBody.java
@@ -0,0 +1,18 @@
+package http.response;
+
+public class ResponseBody {
+
+    private byte[] bodyContent;
+
+    public ResponseBody(byte[] bodyContent) {
+        this.bodyContent = bodyContent;
+    }
+
+    public int getBodyLength() {
+        return bodyContent.length;
+    }
+
+    public byte[] getBodyContent() {
+        return bodyContent;
+    }
+}
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 1a1876f..2e96be3 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -2,15 +2,14 @@
 
 import db.MemoryUserRepository;
 import db.Repository;
-import http.HttpRequest;
-import http.util.HttpRequestUtils;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
 import model.User;
 
 import java.io.*;
 import java.net.Socket;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -37,20 +36,19 @@ public void run() {
             DataOutputStream dos = new DataOutputStream(out);
 
             HttpRequest httpRequest = HttpRequest.from(br);
+            HttpResponse httpResponse = new HttpResponse(dos);
 
             // 요구사항 1
             //80 포트로 들어오거나, index.html로 주소가 들어올 경우 index.html을 출력하도록 함
             if (httpRequest.getUrl().equals(ROOT.getUrl()) || httpRequest.getUrl().equals(INDEX_HTML.getUrl())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + INDEX_HTML.getUrl()));
-                response200Header(dos, body.length);
-                responseBody(dos, body);
+
+                httpResponse.forward(INDEX_HTML.getUrl());
             }
 
             // 요구사항 2
             if (httpRequest.getMethod().equals(GET.getMethod()) && httpRequest.getUrl().equals(USER_FORM_HTML.getUrl())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_FORM_HTML.getUrl()));
-                response200Header(dos, body.length);
-                responseBody(dos, body);
+
+                httpResponse.forward(USER_FORM_HTML.getUrl());
             }
 
             // 요구사항 2
@@ -68,7 +66,7 @@ public void run() {
                     repository.addUser(user);
 
                     // 요구사항 4 적용
-                    response302Header(dos);
+                    httpResponse.redirect(INDEX_HTML.getUrl());
                 }
             }
 
@@ -87,14 +85,13 @@ public void run() {
                 repository.addUser(user);
 
                 // 요구사항 4 적용
-                response302Header(dos);
+                httpResponse.redirect(INDEX_HTML.getUrl());
             }
 
             // 요구사항 5
             if (httpRequest.getUrl().equals(USER_LOGIN_HTML.getUrl())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_LOGIN_HTML.getUrl()));
-                response200Header(dos, body.length);
-                responseBody(dos, body);
+
+                httpResponse.forward(USER_LOGIN_HTML.getUrl());
             }
 
             // 요구사항 5
@@ -103,14 +100,14 @@ public void run() {
                 String userId = httpRequest.getBodyParamValue(USERID.getKey());
                 String password = httpRequest.getBodyParamValue(PASSWORD.getKey());
 
-
                 User findUser = repository.findUserById(userId);
 
                 // 입력한 ID에 대한 회원 자체가 존재하지 않는 경우
                 if (findUser == null) {
                     log.log(Level.INFO, "로그인에 실패했습니다.");
 
-                    response302LoginFailureHeader(dos);
+                    httpResponse.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
+                    httpResponse.redirect(USER_LOGIN_FAILED_HTML.getUrl());
                 } else { // 입력한 ID에 대한 회원은 존재하는 경우
 
                     String findUserPassword = findUser.getPassword();
@@ -118,11 +115,13 @@ public void run() {
                     if (findUserPassword.equals(password)) {  // repository에서 찾아온 회원의 정보와 로그인 시 넘긴 회원의 정보가 일치하는 경우
                         log.log(Level.INFO, "로그인에 성공했습니다.");
 
-                        response302LoginSuccessHeader(dos);
+                        httpResponse.putHeader(SET_COOKIE.getHeaderTitle(), "logined=true");
+                        httpResponse.redirect(INDEX_HTML.getUrl());
                     } else {  // repository에서 찾아온 회원의 정보와 로그인 시 넘긴 회원의 정보가 일치하지 않는 경우
                         log.log(Level.INFO, "로그인에 실패했습니다.");
 
-                        response302LoginFailureHeader(dos);
+                        httpResponse.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
+                        httpResponse.redirect(USER_LOGIN_FAILED_HTML.getUrl());
                     }
                 }
 
@@ -130,9 +129,8 @@ public void run() {
 
             // 요구사항 5
             if (httpRequest.getUrl().equals(USER_LOGIN_FAILED_HTML.getUrl())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_LOGIN_FAILED_HTML.getUrl()));
-                response200Header(dos, body.length);
-                responseBody(dos, body);
+
+                httpResponse.forward(USER_LOGIN_FAILED_HTML.getUrl());
             }
 
             // 요구사항 6
@@ -141,9 +139,9 @@ public void run() {
                 boolean login = httpRequest.checkLogin();
 
                 if (login) {
-                    response302UserListHeader(dos);
+                    httpResponse.redirect(USER_LIST_HTML.getUrl());
                 } else {
-                    response302LoginHeader(dos);
+                    httpResponse.redirect(USER_LOGIN_HTML.getUrl());
                 }
             }
 
@@ -153,20 +151,16 @@ public void run() {
                 boolean login = httpRequest.checkLogin();
 
                 if (login) {
-                    byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + USER_LIST_HTML.getUrl()));
-                    response200Header(dos, body.length);
-                    responseBody(dos, body);
+                    httpResponse.forward(USER_LIST_HTML.getUrl());
                 } else {
-                    response302LoginHeader(dos);
+                    httpResponse.redirect(USER_LOGIN_HTML.getUrl());
                 }
             }
 
             // 요구사항 7
             // .css 파일 요청 처리
             if (httpRequest.getUrl().endsWith(CSS_EXTENSION.getUrl())) {
-                byte[] body = Files.readAllBytes(Paths.get(WEBAPP.getUrl() + "/" + httpRequest.getUrl()));
-                responseCssHeader(dos, body.length);  // css 응답 헤더 설정
-                responseBody(dos, body);  // css 파일 내용 전송
+                httpResponse.forward(httpRequest.getUrl());
             }
 
 
@@ -175,99 +169,4 @@ public void run() {
         }
     }
 
-    private void response200Header(DataOutputStream dos, int lengthOfBodyContent) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + OK.getStatusCode() + " \r\n");
-            dos.writeBytes(CONTENT_TYPE.getHeaderTitle() + ": text/html;charset=utf-8\r\n");
-            dos.writeBytes(CONTENT_LENGTH.getHeaderTitle() + ": " + lengthOfBodyContent + "\r\n");
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    // 요구사항 4
-    // 그냥 index.html로 redirect
-    private void response302Header(DataOutputStream dos) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
-            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + INDEX_HTML.getUrl() + "\r\n");
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    // 요구사항 5
-    // 로그인 성공시 index.html로 redirect
-    private void response302LoginSuccessHeader(DataOutputStream dos) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
-            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + INDEX_HTML.getUrl() + "\r\n");
-            dos.writeBytes(SET_COOKIE.getHeaderTitle() + ": logined=true\r\n");  // 쿠키 설정
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    // 요구사항 5
-    // 로그인 실패 화면으로 redirect
-    private void response302LoginFailureHeader(DataOutputStream dos) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
-            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + USER_LOGIN_FAILED_HTML.getUrl() + "\r\n");
-            dos.writeBytes(SET_COOKIE.getHeaderTitle() + ": logined=false\r\n");  // 쿠키 설정
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    // 요구사항 6
-    // user list 화면으로 redirect
-    private void response302UserListHeader(DataOutputStream dos) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
-            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + USER_LIST_HTML.getUrl() + "\r\n");
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    // 요구사항 6
-    // 로그인 화면으로 redirect
-    private void response302LoginHeader(DataOutputStream dos) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + Found.getStatusCode() + " \r\n");
-            dos.writeBytes(LOCATION.getHeaderTitle() + ": " + USER_LOGIN_HTML.getUrl() + "\r\n");
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    // 요구사항 7
-    // css 화면 적용
-    private void responseCssHeader(DataOutputStream dos, int lengthOfBodyContent) {
-        try {
-            dos.writeBytes("HTTP/1.1 " + OK.getStatusCode() + " \r\n");
-            dos.writeBytes(CONTENT_TYPE.getHeaderTitle() + ": text/css;charset=utf-8\r\n");  // Content-Type을 text/css로 설정
-            dos.writeBytes(CONTENT_LENGTH.getHeaderTitle() + ": " + lengthOfBodyContent + "\r\n");
-            dos.writeBytes("\r\n");
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
-    private void responseBody(DataOutputStream dos, byte[] body) {
-        try {
-            dos.write(body, 0, body.length);
-            dos.flush();
-        } catch (IOException e) {
-            log.log(Level.SEVERE, e.getMessage());
-        }
-    }
-
 }
diff --git a/src/test/java/HttpRequestTest.java b/src/test/java/http/HttpRequestTest.java
similarity index 93%
rename from src/test/java/HttpRequestTest.java
rename to src/test/java/http/HttpRequestTest.java
index 72a97c1..0c0b572 100644
--- a/src/test/java/HttpRequestTest.java
+++ b/src/test/java/http/HttpRequestTest.java
@@ -1,5 +1,6 @@
-import constant.QueryKey;
-import http.HttpRequest;
+package http;
+
+import http.request.HttpRequest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -21,7 +22,7 @@ private BufferedReader bufferedReaderFromFile(String path) throws IOException {
     @Test
     @DisplayName("http 요청 받아오기 테스트")
     void http_request_test() throws IOException {
-        HttpRequest httpRequest = HttpRequest.from(bufferedReaderFromFile("src/test/resource/" + "test.txt"));
+        HttpRequest httpRequest = HttpRequest.from(bufferedReaderFromFile("src/test/resource/" + "requestTest.txt"));
 
         assertEquals("/user/create", httpRequest.getUrl());
         assertEquals("POST", httpRequest.getMethod());
diff --git a/src/test/java/http/HttpResponseTest.java b/src/test/java/http/HttpResponseTest.java
new file mode 100644
index 0000000..b6d3d5c
--- /dev/null
+++ b/src/test/java/http/HttpResponseTest.java
@@ -0,0 +1,27 @@
+package http;
+
+import http.response.HttpResponse;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class HttpResponseTest {
+
+    private OutputStream outputStreamToFile(String path) throws IOException {
+        return Files.newOutputStream(Paths.get(path));
+    }
+
+    @Test
+    @DisplayName("http 응답 출력하기 테스트")
+    void http_response_test() throws IOException {
+
+        HttpResponse httpResponse = new HttpResponse(outputStreamToFile("src/test/resource/" + "responseTest.txt"));
+
+        httpResponse.forward("/index.html");
+    }
+}
diff --git a/src/test/resource/test.txt b/src/test/resource/requestTest.txt
similarity index 100%
rename from src/test/resource/test.txt
rename to src/test/resource/requestTest.txt
diff --git a/src/test/resource/responseTest.txt b/src/test/resource/responseTest.txt
new file mode 100644
index 0000000..8f11d39
--- /dev/null
+++ b/src/test/resource/responseTest.txt
@@ -0,0 +1,127 @@
+HTTP/1.1 200 OK
+Content-Length: 5901
+Content-Type: text/html;charset=utf-8
+
+<!doctype html>
+<html lang="ko">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>KUIT</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="./css/styles.css" rel="stylesheet">
+</head>
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark" aria-label="Fourth navbar example">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="/"> KUIT </a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarsExample04" aria-controls="navbarsExample04" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse" id="navbarsExample04">
+            <ul class="navbar-nav me-auto mb-2 mb-md-0">
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="dropdown04" data-bs-toggle="dropdown" aria-expanded="false">Home</a>
+                    <ul class="dropdown-menu" aria-labelledby="dropdown04">
+                        <li><a class="dropdown-item" href="#">Profile</a></li>
+                        <li><a class="dropdown-item" href="#">Settings</a></li>
+                    </ul>
+                </li>
+            </ul>
+            <form>
+                <input class="form-control" type="text" placeholder="Search" aria-label="Search">
+            </form>
+        </div>
+    </div>
+</nav>
+<div class="navbar-default">
+    <header class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between py-3 mb-4 border-bottom">
+        <a href="/" class="d-flex align-items-center col-md-3 mb-2 mb-md-0 text-dark text-decoration-none">
+            <svg class="bi me-2" width="40" height="32" role="img" aria-label="Bootstrap"><use xlink:href="#bootstrap"/></svg>
+        </a>
+
+        <ul class="nav col-12 col-md-auto mb-2 justify-content-center mb-md-0">
+            <li><a href="/index.html" class="nav-link px-2 link-secondary">Q&A</a></li>
+            <li><a href="#" class="nav-link px-2 link-dark">FAQs</a></li>
+            <li><a href="/user/userList" class="nav-link px-2 link-dark">User List</a></li>
+            <li><a href="#" class="nav-link px-2 link-dark">About</a></li>
+        </ul>
+
+        <div class="col-md-3 text-end">
+            <a href="user/login.html" type="button" class="btn btn-outline-primary me-2">Login</a>
+            <a href="user/form.html" type="button" class="btn btn-primary">Sign-up</a>
+        </div>
+    </header>
+</div>
+<div class="container" id="main">
+    <h2>Q&A</h2>
+    <div class="qna-list">
+        <ul class="list">
+            <li>
+                <div class="wrap">
+                    <div class="main">
+                        <strong class="subject">
+                            <a href="./qna/show.html"> 객체지향에서 가장 중요하다고 생각하는 것이 무엇인가요? </a>
+                        </strong>
+                        <div class="auth-info">
+                            <i class="icon-add-comment"></i>
+                            <span class="time">2023-03-09 23:11</span>
+                            <span clas="author">이영선</span>
+                            <!-- <a href="./user/profile.html" class="author">이영선</a> -->
+                        </div>
+                        <div class="reply" title="댓글">
+                            <i class="icon-reply"></i>
+                            <span class="point">12</span>
+                        </div>
+                    </div>
+                </div>
+            </li>
+            <li>
+                <div class="wrap">
+                    <div class="main">
+                        <strong class="subject">
+                            <a href="./qna/show.html"> 동아리에 시간 얼마나 투자할 수 있는지? </a>
+                        </strong>
+                        <div class="auth-info">
+                            <i class="icon-add-comment"></i>
+                            <span class="time">2023-03-10 23:55</span>
+                            <span class="author">이영선</span>
+                            <!-- <a href="./user/profile.html" class="author">이영선</a> -->
+                        </div>
+                        <div class="reply" title="댓글">
+                            <i class="icon-reply"></i>
+                            <span class="point">8</span>
+                        </div>
+                    </div>
+                </div>
+            </li>
+        </ul>
+        <div class="row">
+            <div class="col-md-5"></div>
+            <div class="col-md-5">
+                <ul class="pagination" style="display:align-items-center;">
+                    <li class="page-item disabled">
+                        <a class="page-link" href="#" tabindex="-1" aria-disabled="true">Previous</a>
+                    </li>
+                    <li class="page-item"><a class="page-link" href="#">1</a></li>
+                    <li class="page-item active" aria-current="page">
+                        <a class="page-link" href="#">2</a>
+                    </li>
+                    <li class="page-item"><a class="page-link" href="#">3</a></li>
+                    <li class="page-item">
+                        <a class="page-link" href="#">Next</a>
+                    </li>
+                </ul>
+            </div>
+            <div class="col-md-2 qna-write">
+                <a href="./qna/form.html" class="btn btn-primary pull-right" role="button">질문하기</a>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+<script src="js/scripts.js"></script>
+</body>
+</html>
\ No newline at end of file

From 0dd80feb26806d9b3e1e81eecfb7059f045a586f Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Thu, 3 Oct 2024 01:38:16 +0900
Subject: [PATCH 11/15] =?UTF-8?q?refactor:=20=EC=9A=94=EA=B5=AC=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD4,=205=20=EC=99=84=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/controller/Controller.java      |  11 ++
 .../java/controller/ForwardController.java    |  31 ++++
 src/main/java/controller/HomeController.java  |  16 ++
 src/main/java/controller/ListController.java  |  22 +++
 src/main/java/controller/LoginController.java |  46 ++++++
 .../java/controller/SignUpController.java     |  50 +++++++
 src/main/java/mapper/RequestMapper.java       |  42 ++++++
 src/main/java/webserver/RequestHandler.java   | 139 +-----------------
 8 files changed, 223 insertions(+), 134 deletions(-)
 create mode 100644 src/main/java/controller/Controller.java
 create mode 100644 src/main/java/controller/ForwardController.java
 create mode 100644 src/main/java/controller/HomeController.java
 create mode 100644 src/main/java/controller/ListController.java
 create mode 100644 src/main/java/controller/LoginController.java
 create mode 100644 src/main/java/controller/SignUpController.java
 create mode 100644 src/main/java/mapper/RequestMapper.java

diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
new file mode 100644
index 0000000..3c5a9b9
--- /dev/null
+++ b/src/main/java/controller/Controller.java
@@ -0,0 +1,11 @@
+package controller;
+
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+
+import java.io.IOException;
+
+public interface Controller {
+
+    void execute(HttpRequest request, HttpResponse response) throws IOException;
+}
diff --git a/src/main/java/controller/ForwardController.java b/src/main/java/controller/ForwardController.java
new file mode 100644
index 0000000..506e1a6
--- /dev/null
+++ b/src/main/java/controller/ForwardController.java
@@ -0,0 +1,31 @@
+package controller;
+
+
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+
+import java.io.IOException;
+
+import static constant.Url.*;
+
+public class ForwardController implements Controller{
+
+    @Override
+    public void execute(HttpRequest request, HttpResponse response) throws IOException {
+
+        // form.html, login.html, login_failed.html 에서는 list.html 에 forward 방식으로 바로 접근한다. 따라서 검증 로직을
+        // 이 위치에도 한 번 더 적용해주었다.
+        if(request.getUrl().equals(USER_LIST_HTML.getUrl())){
+            boolean login = request.checkLogin();
+
+            if (login) {
+                response.forward(USER_LIST_HTML.getUrl());
+            } else {
+                response.redirect(USER_LOGIN_HTML.getUrl());
+            }
+        }
+
+        response.forward(request.getUrl());
+    }
+
+}
diff --git a/src/main/java/controller/HomeController.java b/src/main/java/controller/HomeController.java
new file mode 100644
index 0000000..6e71c35
--- /dev/null
+++ b/src/main/java/controller/HomeController.java
@@ -0,0 +1,16 @@
+package controller;
+
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+
+import java.io.IOException;
+
+import static constant.Url.INDEX_HTML;
+
+public class HomeController implements Controller{
+
+    @Override
+    public void execute(HttpRequest request, HttpResponse response) throws IOException {
+        response.forward(INDEX_HTML.getUrl());
+    }
+}
diff --git a/src/main/java/controller/ListController.java b/src/main/java/controller/ListController.java
new file mode 100644
index 0000000..c4b10e1
--- /dev/null
+++ b/src/main/java/controller/ListController.java
@@ -0,0 +1,22 @@
+package controller;
+
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+
+import java.io.IOException;
+
+import static constant.Url.USER_LIST_HTML;
+import static constant.Url.USER_LOGIN_HTML;
+
+public class ListController implements Controller {
+    @Override
+    public void execute(HttpRequest request, HttpResponse response) throws IOException {
+        boolean login = request.checkLogin();
+
+        if (login) {
+            response.redirect(USER_LIST_HTML.getUrl());
+        } else {
+            response.redirect(USER_LOGIN_HTML.getUrl());
+        }
+    }
+}
diff --git a/src/main/java/controller/LoginController.java b/src/main/java/controller/LoginController.java
new file mode 100644
index 0000000..b236aec
--- /dev/null
+++ b/src/main/java/controller/LoginController.java
@@ -0,0 +1,46 @@
+package controller;
+
+import db.MemoryUserRepository;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+import model.User;
+
+import java.io.IOException;
+import java.util.logging.Level;
+
+import static constant.HttpHeaderTitle.SET_COOKIE;
+import static constant.QueryKey.PASSWORD;
+import static constant.QueryKey.USERID;
+import static constant.Url.INDEX_HTML;
+import static constant.Url.USER_LOGIN_FAILED_HTML;
+
+public class LoginController implements Controller{
+
+    MemoryUserRepository repository = MemoryUserRepository.getInstance();
+
+    @Override
+    public void execute(HttpRequest request, HttpResponse response) throws IOException {
+        String userId = request.getBodyParamValue(USERID.getKey());
+        String password = request.getBodyParamValue(PASSWORD.getKey());
+
+        User findUser = repository.findUserById(userId);
+
+        // 입력한 ID에 대한 회원 자체가 존재하지 않는 경우
+        if (findUser == null) {
+
+            response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
+            response.redirect(USER_LOGIN_FAILED_HTML.getUrl());
+        } else { // 입력한 ID에 대한 회원은 존재하는 경우
+
+            String findUserPassword = findUser.getPassword();
+
+            if (findUserPassword.equals(password)) {
+                response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=true");
+                response.redirect(INDEX_HTML.getUrl());
+            } else {
+                response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
+                response.redirect(USER_LOGIN_FAILED_HTML.getUrl());
+            }
+        }
+    }
+}
diff --git a/src/main/java/controller/SignUpController.java b/src/main/java/controller/SignUpController.java
new file mode 100644
index 0000000..19ef3b4
--- /dev/null
+++ b/src/main/java/controller/SignUpController.java
@@ -0,0 +1,50 @@
+package controller;
+
+import db.MemoryUserRepository;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+import model.User;
+
+import java.io.IOException;
+
+import static constant.QueryKey.*;
+import static constant.QueryKey.EMAIL;
+import static constant.Url.INDEX_HTML;
+
+public class SignUpController implements Controller {
+
+    MemoryUserRepository repository = MemoryUserRepository.getInstance();
+
+    @Override
+    public void execute(HttpRequest request, HttpResponse response) throws IOException {
+
+        if (request.getMethod().equals("GET")) {
+            if (request.getUrl().contains("?")) {
+
+                String userId = request.getQueryParamValue(USERID.getKey());
+                String password = request.getQueryParamValue(PASSWORD.getKey());
+                String name = request.getQueryParamValue(NAME.getKey());
+                String email = request.getQueryParamValue(EMAIL.getKey());
+
+                User user = new User(userId, password, name, email);
+
+                repository.addUser(user);
+
+                response.redirect(INDEX_HTML.getUrl());
+            }
+        }
+
+        if (request.getMethod().equals("POST")) {
+            String userId = request.getBodyParamValue(USERID.getKey());
+            String password = request.getBodyParamValue(PASSWORD.getKey());
+            String name = request.getBodyParamValue(NAME.getKey());
+            String email = request.getBodyParamValue(EMAIL.getKey());
+
+            User user = new User(userId, password, name, email);
+
+            repository.addUser(user);
+
+            response.redirect(INDEX_HTML.getUrl());
+        }
+    }
+}
diff --git a/src/main/java/mapper/RequestMapper.java b/src/main/java/mapper/RequestMapper.java
new file mode 100644
index 0000000..71548c5
--- /dev/null
+++ b/src/main/java/mapper/RequestMapper.java
@@ -0,0 +1,42 @@
+package mapper;
+
+import controller.*;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static constant.Url.*;
+
+public class RequestMapper {
+
+    private Map<String, Controller> controllers;
+    private HttpRequest request;
+    private HttpResponse response;
+
+    public RequestMapper(HttpRequest request, HttpResponse response) {
+        this.request = request;
+        this.response = response;
+        this.controllers = new HashMap<>();
+
+        controllers.put(ROOT.getUrl(), new HomeController());
+        controllers.put(USER_SIGNUP.getUrl(), new SignUpController());
+        controllers.put(USER_LOGIN.getUrl(), new LoginController());
+        controllers.put(USER_USERLIST.getUrl(), new ListController());
+    }
+
+    public void proceed() throws IOException {
+        Controller controller = controllers.get(request.getUrl());
+        Controller forwardController = new ForwardController();
+
+        if(request.getMethod().equals("GET") && (request.getUrl().endsWith(".html") || request.getUrl().endsWith(".css"))){
+            forwardController.execute(request, response);
+        } else{
+            controller.execute(request, response);
+        }
+
+
+    }
+}
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 2e96be3..829552f 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -1,28 +1,22 @@
 package webserver;
 
+import controller.*;
 import db.MemoryUserRepository;
 import db.Repository;
 import http.request.HttpRequest;
 import http.response.HttpResponse;
-import model.User;
+import mapper.RequestMapper;
 
 import java.io.*;
 import java.net.Socket;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static constant.HttpHeaderTitle.*;
-import static constant.HttpMethod.*;
-import static constant.QueryKey.*;
-import static constant.StatusCode.*;
-import static constant.Url.*;
-
 public class RequestHandler implements Runnable {
     Socket connection;
     private static final Logger log = Logger.getLogger(RequestHandler.class.getName());
     Repository repository = MemoryUserRepository.getInstance();
+    private Controller controller = new ForwardController();
 
     public RequestHandler(Socket connection) {
         this.connection = connection;
@@ -38,131 +32,8 @@ public void run() {
             HttpRequest httpRequest = HttpRequest.from(br);
             HttpResponse httpResponse = new HttpResponse(dos);
 
-            // 요구사항 1
-            //80 포트로 들어오거나, index.html로 주소가 들어올 경우 index.html을 출력하도록 함
-            if (httpRequest.getUrl().equals(ROOT.getUrl()) || httpRequest.getUrl().equals(INDEX_HTML.getUrl())) {
-
-                httpResponse.forward(INDEX_HTML.getUrl());
-            }
-
-            // 요구사항 2
-            if (httpRequest.getMethod().equals(GET.getMethod()) && httpRequest.getUrl().equals(USER_FORM_HTML.getUrl())) {
-
-                httpResponse.forward(USER_FORM_HTML.getUrl());
-            }
-
-            // 요구사항 2
-            if (httpRequest.getMethod().equals(GET.getMethod()) && httpRequest.getUrl().contains(USER_SIGNUP.getUrl())) {
-
-                if (httpRequest.getUrl().contains("?")) {
-
-                    String userId = httpRequest.getQueryParamValue(USERID.getKey());
-                    String password = httpRequest.getQueryParamValue(PASSWORD.getKey());
-                    String name = httpRequest.getQueryParamValue(NAME.getKey());
-                    String email = httpRequest.getQueryParamValue(EMAIL.getKey());
-
-                    User user = new User(userId, password, name, email);
-
-                    repository.addUser(user);
-
-                    // 요구사항 4 적용
-                    httpResponse.redirect(INDEX_HTML.getUrl());
-                }
-            }
-
-            // 요구사항 3
-            // POST 방식으로 전송하면 쿼리 파라미터가 사라진다. 즉 parseQueryParameter를 통해서 값을 얻어올 수 없다.
-            // 대신 POST 방식에서는 이 쿼리 파라미터가 body 안에 들어간다.
-            if (httpRequest.getMethod().equals(POST.getMethod()) && httpRequest.getUrl().equals(USER_SIGNUP.getUrl())) {
-
-                String userId = httpRequest.getBodyParamValue(USERID.getKey());
-                String password = httpRequest.getBodyParamValue(PASSWORD.getKey());
-                String name = httpRequest.getBodyParamValue(NAME.getKey());
-                String email = httpRequest.getBodyParamValue(EMAIL.getKey());
-
-                User user = new User(userId, password, name, email);
-
-                repository.addUser(user);
-
-                // 요구사항 4 적용
-                httpResponse.redirect(INDEX_HTML.getUrl());
-            }
-
-            // 요구사항 5
-            if (httpRequest.getUrl().equals(USER_LOGIN_HTML.getUrl())) {
-
-                httpResponse.forward(USER_LOGIN_HTML.getUrl());
-            }
-
-            // 요구사항 5
-            if (httpRequest.getUrl().equals(USER_LOGIN.getUrl())) {
-
-                String userId = httpRequest.getBodyParamValue(USERID.getKey());
-                String password = httpRequest.getBodyParamValue(PASSWORD.getKey());
-
-                User findUser = repository.findUserById(userId);
-
-                // 입력한 ID에 대한 회원 자체가 존재하지 않는 경우
-                if (findUser == null) {
-                    log.log(Level.INFO, "로그인에 실패했습니다.");
-
-                    httpResponse.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
-                    httpResponse.redirect(USER_LOGIN_FAILED_HTML.getUrl());
-                } else { // 입력한 ID에 대한 회원은 존재하는 경우
-
-                    String findUserPassword = findUser.getPassword();
-
-                    if (findUserPassword.equals(password)) {  // repository에서 찾아온 회원의 정보와 로그인 시 넘긴 회원의 정보가 일치하는 경우
-                        log.log(Level.INFO, "로그인에 성공했습니다.");
-
-                        httpResponse.putHeader(SET_COOKIE.getHeaderTitle(), "logined=true");
-                        httpResponse.redirect(INDEX_HTML.getUrl());
-                    } else {  // repository에서 찾아온 회원의 정보와 로그인 시 넘긴 회원의 정보가 일치하지 않는 경우
-                        log.log(Level.INFO, "로그인에 실패했습니다.");
-
-                        httpResponse.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
-                        httpResponse.redirect(USER_LOGIN_FAILED_HTML.getUrl());
-                    }
-                }
-
-            }
-
-            // 요구사항 5
-            if (httpRequest.getUrl().equals(USER_LOGIN_FAILED_HTML.getUrl())) {
-
-                httpResponse.forward(USER_LOGIN_FAILED_HTML.getUrl());
-            }
-
-            // 요구사항 6
-            if (httpRequest.getUrl().equals(USER_USERLIST.getUrl())) {
-
-                boolean login = httpRequest.checkLogin();
-
-                if (login) {
-                    httpResponse.redirect(USER_LIST_HTML.getUrl());
-                } else {
-                    httpResponse.redirect(USER_LOGIN_HTML.getUrl());
-                }
-            }
-
-            // 요구사항 6
-            if (httpRequest.getUrl().equals(USER_LIST_HTML.getUrl())) {
-
-                boolean login = httpRequest.checkLogin();
-
-                if (login) {
-                    httpResponse.forward(USER_LIST_HTML.getUrl());
-                } else {
-                    httpResponse.redirect(USER_LOGIN_HTML.getUrl());
-                }
-            }
-
-            // 요구사항 7
-            // .css 파일 요청 처리
-            if (httpRequest.getUrl().endsWith(CSS_EXTENSION.getUrl())) {
-                httpResponse.forward(httpRequest.getUrl());
-            }
-
+            RequestMapper requestMapper = new RequestMapper(httpRequest, httpResponse);
+            requestMapper.proceed();
 
         } catch (IOException e) {
             log.log(Level.SEVERE, e.getMessage());

From bb9e9067f9765711036e4ef6c25505512d60296a Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Thu, 3 Oct 2024 12:51:54 +0900
Subject: [PATCH 12/15] =?UTF-8?q?refactor:=20Repository=20DI=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/uiDesigner.xml                          | 124 ++++++++++++++++++
 src/main/java/controller/LoginController.java |   7 +-
 .../java/controller/SignUpController.java     |   7 +-
 src/main/java/mapper/RequestMapper.java       |   6 +-
 src/main/java/webserver/RequestHandler.java   |   3 -
 5 files changed, 140 insertions(+), 7 deletions(-)
 create mode 100644 .idea/uiDesigner.xml

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/controller/LoginController.java b/src/main/java/controller/LoginController.java
index b236aec..e6fe267 100644
--- a/src/main/java/controller/LoginController.java
+++ b/src/main/java/controller/LoginController.java
@@ -1,6 +1,7 @@
 package controller;
 
 import db.MemoryUserRepository;
+import db.Repository;
 import http.request.HttpRequest;
 import http.response.HttpResponse;
 import model.User;
@@ -16,7 +17,11 @@
 
 public class LoginController implements Controller{
 
-    MemoryUserRepository repository = MemoryUserRepository.getInstance();
+    Repository repository;
+
+    public LoginController(Repository repository) {
+        this.repository = repository;
+    }
 
     @Override
     public void execute(HttpRequest request, HttpResponse response) throws IOException {
diff --git a/src/main/java/controller/SignUpController.java b/src/main/java/controller/SignUpController.java
index 19ef3b4..d4ee674 100644
--- a/src/main/java/controller/SignUpController.java
+++ b/src/main/java/controller/SignUpController.java
@@ -1,6 +1,7 @@
 package controller;
 
 import db.MemoryUserRepository;
+import db.Repository;
 import http.request.HttpRequest;
 import http.response.HttpResponse;
 import model.User;
@@ -13,7 +14,11 @@
 
 public class SignUpController implements Controller {
 
-    MemoryUserRepository repository = MemoryUserRepository.getInstance();
+    Repository repository;
+
+    public SignUpController(Repository repository) {
+        this.repository = repository;
+    }
 
     @Override
     public void execute(HttpRequest request, HttpResponse response) throws IOException {
diff --git a/src/main/java/mapper/RequestMapper.java b/src/main/java/mapper/RequestMapper.java
index 71548c5..564569b 100644
--- a/src/main/java/mapper/RequestMapper.java
+++ b/src/main/java/mapper/RequestMapper.java
@@ -1,6 +1,7 @@
 package mapper;
 
 import controller.*;
+import db.MemoryUserRepository;
 import http.request.HttpRequest;
 import http.response.HttpResponse;
 
@@ -22,8 +23,8 @@ public RequestMapper(HttpRequest request, HttpResponse response) {
         this.controllers = new HashMap<>();
 
         controllers.put(ROOT.getUrl(), new HomeController());
-        controllers.put(USER_SIGNUP.getUrl(), new SignUpController());
-        controllers.put(USER_LOGIN.getUrl(), new LoginController());
+        controllers.put(USER_SIGNUP.getUrl(), new SignUpController(MemoryUserRepository.getInstance()));
+        controllers.put(USER_LOGIN.getUrl(), new LoginController(MemoryUserRepository.getInstance()));
         controllers.put(USER_USERLIST.getUrl(), new ListController());
     }
 
@@ -31,6 +32,7 @@ public void proceed() throws IOException {
         Controller controller = controllers.get(request.getUrl());
         Controller forwardController = new ForwardController();
 
+        // .css 확장자로 들어오는 styles.css 파일을 인식해주기 위해 .css에 대한 코드도 추가
         if(request.getMethod().equals("GET") && (request.getUrl().endsWith(".html") || request.getUrl().endsWith(".css"))){
             forwardController.execute(request, response);
         } else{
diff --git a/src/main/java/webserver/RequestHandler.java b/src/main/java/webserver/RequestHandler.java
index 829552f..e1b0467 100644
--- a/src/main/java/webserver/RequestHandler.java
+++ b/src/main/java/webserver/RequestHandler.java
@@ -15,9 +15,6 @@
 public class RequestHandler implements Runnable {
     Socket connection;
     private static final Logger log = Logger.getLogger(RequestHandler.class.getName());
-    Repository repository = MemoryUserRepository.getInstance();
-    private Controller controller = new ForwardController();
-
     public RequestHandler(Socket connection) {
         this.connection = connection;
     }

From 4a15948b0d595883b8ad5f4707552e548cd68da0 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Thu, 3 Oct 2024 13:07:10 +0900
Subject: [PATCH 13/15] =?UTF-8?q?refactor:=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/constant/Url.java               |  3 ++-
 .../java/controller/SignUpController.java     |  6 ++++--
 src/main/java/http/request/HttpRequest.java   | 20 +++++++++++++++++++
 .../http/request/HttpRequestStartLine.java    |  3 ++-
 src/main/java/http/response/HttpResponse.java |  7 ++++---
 .../http/response/HttpResponseStartLine.java  |  4 ++++
 src/main/java/mapper/RequestMapper.java       |  4 +++-
 7 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/main/java/constant/Url.java b/src/main/java/constant/Url.java
index 8cc53b5..3313d47 100644
--- a/src/main/java/constant/Url.java
+++ b/src/main/java/constant/Url.java
@@ -12,7 +12,8 @@ public enum Url {
     USER_LOGIN_FAILED_HTML("/user/login_failed.html"),
     USER_USERLIST("/user/userList"),
     USER_LIST_HTML("/user/list.html"),
-    CSS_EXTENSION(".css");
+    CSS_EXTENSION(".css"),
+    HTML_EXTENSION(".html");
 
     final String url;
 
diff --git a/src/main/java/controller/SignUpController.java b/src/main/java/controller/SignUpController.java
index d4ee674..6d2cb72 100644
--- a/src/main/java/controller/SignUpController.java
+++ b/src/main/java/controller/SignUpController.java
@@ -1,5 +1,6 @@
 package controller;
 
+import constant.HttpMethod;
 import db.MemoryUserRepository;
 import db.Repository;
 import http.request.HttpRequest;
@@ -8,6 +9,7 @@
 
 import java.io.IOException;
 
+import static constant.HttpMethod.*;
 import static constant.QueryKey.*;
 import static constant.QueryKey.EMAIL;
 import static constant.Url.INDEX_HTML;
@@ -23,7 +25,7 @@ public SignUpController(Repository repository) {
     @Override
     public void execute(HttpRequest request, HttpResponse response) throws IOException {
 
-        if (request.getMethod().equals("GET")) {
+        if (request.getMethod().equals(GET.getMethod())) {
             if (request.getUrl().contains("?")) {
 
                 String userId = request.getQueryParamValue(USERID.getKey());
@@ -39,7 +41,7 @@ public void execute(HttpRequest request, HttpResponse response) throws IOExcepti
             }
         }
 
-        if (request.getMethod().equals("POST")) {
+        if (request.getMethod().equals(POST.getMethod())) {
             String userId = request.getBodyParamValue(USERID.getKey());
             String password = request.getBodyParamValue(PASSWORD.getKey());
             String name = request.getBodyParamValue(NAME.getKey());
diff --git a/src/main/java/http/request/HttpRequest.java b/src/main/java/http/request/HttpRequest.java
index 03ae89f..a574f86 100644
--- a/src/main/java/http/request/HttpRequest.java
+++ b/src/main/java/http/request/HttpRequest.java
@@ -1,10 +1,15 @@
 package http.request;
 
+import constant.HttpMethod;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 
 import static constant.HttpHeaderTitle.CONTENT_LENGTH;
 import static constant.HttpHeaderTitle.COOKIE;
+import static constant.HttpMethod.*;
+import static constant.Url.CSS_EXTENSION;
+import static constant.Url.HTML_EXTENSION;
 
 public class HttpRequest {
 
@@ -26,6 +31,21 @@ private HttpRequest(BufferedReader br) throws IOException {
 
     }
 
+    // GET 요청인지 확인
+    public boolean isGetMethod(){
+        return httpRequestStartLine.getMethod().equals(GET.getMethod());
+    }
+
+    // url이 .html로 끝나는지 확인
+    public boolean endsWithHtml(){
+        return httpRequestStartLine.getUrl().endsWith(HTML_EXTENSION.getUrl());
+    }
+
+    // url이 .css로 끝나는지 확인
+    public boolean endsWithCss() {
+        return httpRequestStartLine.getUrl().endsWith(CSS_EXTENSION.getUrl());
+    }
+
     public static HttpRequest from(BufferedReader br) throws IOException {
         return new HttpRequest(br);
     }
diff --git a/src/main/java/http/request/HttpRequestStartLine.java b/src/main/java/http/request/HttpRequestStartLine.java
index e42178a..f5e3bb4 100644
--- a/src/main/java/http/request/HttpRequestStartLine.java
+++ b/src/main/java/http/request/HttpRequestStartLine.java
@@ -48,9 +48,10 @@ public String getVersion() {
         return version;
     }
 
-
     // url에 연달아서 ?를 통해 표현되는 queryString을 parsing하여 만든 맵에서 key에 매핑되어있는 value값을 얻어옴
     public String getQueryParamValue(String key) {
         return queryParamMap.get(key);
     }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/http/response/HttpResponse.java b/src/main/java/http/response/HttpResponse.java
index 95a7567..bcd843f 100644
--- a/src/main/java/http/response/HttpResponse.java
+++ b/src/main/java/http/response/HttpResponse.java
@@ -12,6 +12,7 @@
 
 import static constant.HttpHeaderTitle.*;
 import static constant.StatusCode.*;
+import static constant.Url.CSS_EXTENSION;
 import static constant.Url.WEBAPP;
 
 public class HttpResponse {
@@ -38,7 +39,7 @@ public void forward(String path) throws IOException {
         putHeader(CONTENT_LENGTH.getHeaderTitle(), String.valueOf(responseBody.getBodyLength()));
 
         String type = "text/html";
-        if(path.contains(".css")){
+        if(path.contains(CSS_EXTENSION.getUrl())){
             type = "text/css";
         }
 
@@ -57,7 +58,7 @@ public void redirect(String path) throws IOException {
         setStartLine(Found.getStatusCode(), Found.getMessage());
 
         // redirect에 필요한 헤더 삽입
-        putHeader("Location", path);
+        putHeader(LOCATION.getHeaderTitle(), path);
 
         writeResponseHeader();
     }
@@ -74,7 +75,7 @@ public void putHeader(String key, String value) {
 
     private void writeResponseHeader() throws IOException {
         // startline을 outputStream에 적어주기
-        dos.writeBytes( httpResponseStartLine.getVersion() + " " + httpResponseStartLine.getStatusCode() + " " + httpResponseStartLine.getMessage() + "\r\n");
+        dos.writeBytes(httpResponseStartLine.getReponseStartLine());
 
         // 헤더들을 outputStream에 적어주기
         for(Map.Entry<String, String> entry : httpResponseHeader.getHeaderMap().entrySet()) {
diff --git a/src/main/java/http/response/HttpResponseStartLine.java b/src/main/java/http/response/HttpResponseStartLine.java
index e1564f1..a2dc742 100644
--- a/src/main/java/http/response/HttpResponseStartLine.java
+++ b/src/main/java/http/response/HttpResponseStartLine.java
@@ -26,4 +26,8 @@ public String getMessage() {
     public String getVersion() {
         return VERSION;
     }
+
+    public String getReponseStartLine(){
+        return VERSION + " " + statusCode + " " + message + "\r\n";
+    }
 }
diff --git a/src/main/java/mapper/RequestMapper.java b/src/main/java/mapper/RequestMapper.java
index 564569b..c3d36b6 100644
--- a/src/main/java/mapper/RequestMapper.java
+++ b/src/main/java/mapper/RequestMapper.java
@@ -1,5 +1,6 @@
 package mapper;
 
+import constant.HttpMethod;
 import controller.*;
 import db.MemoryUserRepository;
 import http.request.HttpRequest;
@@ -9,6 +10,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static constant.HttpMethod.*;
 import static constant.Url.*;
 
 public class RequestMapper {
@@ -33,7 +35,7 @@ public void proceed() throws IOException {
         Controller forwardController = new ForwardController();
 
         // .css 확장자로 들어오는 styles.css 파일을 인식해주기 위해 .css에 대한 코드도 추가
-        if(request.getMethod().equals("GET") && (request.getUrl().endsWith(".html") || request.getUrl().endsWith(".css"))){
+        if(request.isGetMethod() && (request.endsWithHtml()) || request.endsWithCss()){
             forwardController.execute(request, response);
         } else{
             controller.execute(request, response);

From 85795d0845d8d5578e593edb72bd1358194b5950 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Fri, 4 Oct 2024 14:15:45 +0900
Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=B5=9C=EC=A0=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/controller/ForwardController.java    | 11 +++++---
 src/main/java/controller/ListController.java  |  6 +++--
 src/main/java/controller/LoginController.java | 26 ++++++++++++-------
 .../java/controller/SignUpController.java     |  4 +--
 src/main/java/http/request/HttpRequest.java   |  5 ++++
 src/main/java/http/response/HttpResponse.java |  4 +--
 .../http/response/HttpResponseStartLine.java  | 16 +-----------
 src/main/java/mapper/RequestMapper.java       | 11 +++++---
 8 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/main/java/controller/ForwardController.java b/src/main/java/controller/ForwardController.java
index 506e1a6..18be5a9 100644
--- a/src/main/java/controller/ForwardController.java
+++ b/src/main/java/controller/ForwardController.java
@@ -8,21 +8,24 @@
 
 import static constant.Url.*;
 
-public class ForwardController implements Controller{
+public class ForwardController implements Controller {
 
     @Override
     public void execute(HttpRequest request, HttpResponse response) throws IOException {
 
         // form.html, login.html, login_failed.html 에서는 list.html 에 forward 방식으로 바로 접근한다. 따라서 검증 로직을
         // 이 위치에도 한 번 더 적용해주었다.
-        if(request.getUrl().equals(USER_LIST_HTML.getUrl())){
+        if (request.getUrl().equals(USER_LIST_HTML.getUrl())) {
             boolean login = request.checkLogin();
 
             if (login) {
                 response.forward(USER_LIST_HTML.getUrl());
-            } else {
-                response.redirect(USER_LOGIN_HTML.getUrl());
+                return;
             }
+
+            response.redirect(USER_LOGIN_HTML.getUrl());
+            return;
+
         }
 
         response.forward(request.getUrl());
diff --git a/src/main/java/controller/ListController.java b/src/main/java/controller/ListController.java
index c4b10e1..30d5e97 100644
--- a/src/main/java/controller/ListController.java
+++ b/src/main/java/controller/ListController.java
@@ -15,8 +15,10 @@ public void execute(HttpRequest request, HttpResponse response) throws IOExcepti
 
         if (login) {
             response.redirect(USER_LIST_HTML.getUrl());
-        } else {
-            response.redirect(USER_LOGIN_HTML.getUrl());
+            return;
         }
+
+        response.redirect(USER_LOGIN_HTML.getUrl());
+
     }
 }
diff --git a/src/main/java/controller/LoginController.java b/src/main/java/controller/LoginController.java
index e6fe267..861d6d7 100644
--- a/src/main/java/controller/LoginController.java
+++ b/src/main/java/controller/LoginController.java
@@ -15,7 +15,7 @@
 import static constant.Url.INDEX_HTML;
 import static constant.Url.USER_LOGIN_FAILED_HTML;
 
-public class LoginController implements Controller{
+public class LoginController implements Controller {
 
     Repository repository;
 
@@ -35,17 +35,23 @@ public void execute(HttpRequest request, HttpResponse response) throws IOExcepti
 
             response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
             response.redirect(USER_LOGIN_FAILED_HTML.getUrl());
-        } else { // 입력한 ID에 대한 회원은 존재하는 경우
 
-            String findUserPassword = findUser.getPassword();
+            return;
+        }
+
+        // 입력한 ID에 대한 회원은 존재하는 경우
+        String findUserPassword = findUser.getPassword();
+
+        if (findUserPassword.equals(password)) {
+            response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=true");
+            response.redirect(INDEX_HTML.getUrl());
 
-            if (findUserPassword.equals(password)) {
-                response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=true");
-                response.redirect(INDEX_HTML.getUrl());
-            } else {
-                response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
-                response.redirect(USER_LOGIN_FAILED_HTML.getUrl());
-            }
+            return;
         }
+
+        response.putHeader(SET_COOKIE.getHeaderTitle(), "logined=false");
+        response.redirect(USER_LOGIN_FAILED_HTML.getUrl());
+
+
     }
 }
diff --git a/src/main/java/controller/SignUpController.java b/src/main/java/controller/SignUpController.java
index 6d2cb72..e81da0d 100644
--- a/src/main/java/controller/SignUpController.java
+++ b/src/main/java/controller/SignUpController.java
@@ -25,7 +25,7 @@ public SignUpController(Repository repository) {
     @Override
     public void execute(HttpRequest request, HttpResponse response) throws IOException {
 
-        if (request.getMethod().equals(GET.getMethod())) {
+        if (request.isGetMethod()) {
             if (request.getUrl().contains("?")) {
 
                 String userId = request.getQueryParamValue(USERID.getKey());
@@ -41,7 +41,7 @@ public void execute(HttpRequest request, HttpResponse response) throws IOExcepti
             }
         }
 
-        if (request.getMethod().equals(POST.getMethod())) {
+        if (request.isPostMethod()) {
             String userId = request.getBodyParamValue(USERID.getKey());
             String password = request.getBodyParamValue(PASSWORD.getKey());
             String name = request.getBodyParamValue(NAME.getKey());
diff --git a/src/main/java/http/request/HttpRequest.java b/src/main/java/http/request/HttpRequest.java
index a574f86..b49c25e 100644
--- a/src/main/java/http/request/HttpRequest.java
+++ b/src/main/java/http/request/HttpRequest.java
@@ -36,6 +36,11 @@ public boolean isGetMethod(){
         return httpRequestStartLine.getMethod().equals(GET.getMethod());
     }
 
+    // GET 요청인지 확인
+    public boolean isPostMethod(){
+        return httpRequestStartLine.getMethod().equals(POST.getMethod());
+    }
+
     // url이 .html로 끝나는지 확인
     public boolean endsWithHtml(){
         return httpRequestStartLine.getUrl().endsWith(HTML_EXTENSION.getUrl());
diff --git a/src/main/java/http/response/HttpResponse.java b/src/main/java/http/response/HttpResponse.java
index bcd843f..81f8f9a 100644
--- a/src/main/java/http/response/HttpResponse.java
+++ b/src/main/java/http/response/HttpResponse.java
@@ -1,7 +1,5 @@
 package http.response;
 
-import constant.HttpHeaderTitle;
-
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -75,7 +73,7 @@ public void putHeader(String key, String value) {
 
     private void writeResponseHeader() throws IOException {
         // startline을 outputStream에 적어주기
-        dos.writeBytes(httpResponseStartLine.getReponseStartLine());
+        dos.writeBytes(httpResponseStartLine.getResponseStartLine());
 
         // 헤더들을 outputStream에 적어주기
         for(Map.Entry<String, String> entry : httpResponseHeader.getHeaderMap().entrySet()) {
diff --git a/src/main/java/http/response/HttpResponseStartLine.java b/src/main/java/http/response/HttpResponseStartLine.java
index a2dc742..76edd80 100644
--- a/src/main/java/http/response/HttpResponseStartLine.java
+++ b/src/main/java/http/response/HttpResponseStartLine.java
@@ -1,7 +1,5 @@
 package http.response;
 
-import java.io.DataOutputStream;
-
 public class HttpResponseStartLine {
 
 
@@ -15,19 +13,7 @@ public HttpResponseStartLine(String statusCode, String message) {
         this.message = message;
     }
 
-    public String getStatusCode() {
-        return statusCode;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public String getVersion() {
-        return VERSION;
-    }
-
-    public String getReponseStartLine(){
+    public String getResponseStartLine(){
         return VERSION + " " + statusCode + " " + message + "\r\n";
     }
 }
diff --git a/src/main/java/mapper/RequestMapper.java b/src/main/java/mapper/RequestMapper.java
index c3d36b6..f1f6be8 100644
--- a/src/main/java/mapper/RequestMapper.java
+++ b/src/main/java/mapper/RequestMapper.java
@@ -24,6 +24,11 @@ public RequestMapper(HttpRequest request, HttpResponse response) {
         this.response = response;
         this.controllers = new HashMap<>();
 
+        initControllers();
+
+    }
+
+    private void initControllers() {
         controllers.put(ROOT.getUrl(), new HomeController());
         controllers.put(USER_SIGNUP.getUrl(), new SignUpController(MemoryUserRepository.getInstance()));
         controllers.put(USER_LOGIN.getUrl(), new LoginController(MemoryUserRepository.getInstance()));
@@ -35,12 +40,12 @@ public void proceed() throws IOException {
         Controller forwardController = new ForwardController();
 
         // .css 확장자로 들어오는 styles.css 파일을 인식해주기 위해 .css에 대한 코드도 추가
-        if(request.isGetMethod() && (request.endsWithHtml()) || request.endsWithCss()){
+        if (request.isGetMethod() && (request.endsWithHtml()) || request.endsWithCss()) {
             forwardController.execute(request, response);
-        } else{
-            controller.execute(request, response);
+            return;
         }
 
+        controller.execute(request, response);
 
     }
 }

From d6430b073082b8fbfdf50f4cda93184979dd2a85 Mon Sep 17 00:00:00 2001
From: ksg <ksg001227@naver.com>
Date: Sat, 5 Oct 2024 16:54:30 +0900
Subject: [PATCH 15/15] =?UTF-8?q?refactor:=20=ED=94=BC=EB=93=9C=EB=B0=B1?=
 =?UTF-8?q?=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/http/request/HttpRequest.java   | 32 +++++++++++--------
 .../java/http/request/HttpRequestHeader.java  |  5 ---
 src/main/java/http/response/HttpResponse.java | 18 +++++++++--
 src/main/java/mapper/RequestMapper.java       |  4 +--
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/main/java/http/request/HttpRequest.java b/src/main/java/http/request/HttpRequest.java
index b49c25e..59b8be0 100644
--- a/src/main/java/http/request/HttpRequest.java
+++ b/src/main/java/http/request/HttpRequest.java
@@ -13,22 +13,30 @@
 
 public class HttpRequest {
 
-    private HttpRequestStartLine httpRequestStartLine;
-    private HttpRequestHeader httpRequestHeader;
-    private RequestBody requestBody;
+    private static HttpRequestStartLine httpRequestStartLine;
+    private static HttpRequestHeader httpRequestHeader;
+    private static RequestBody requestBody;
+
+    private HttpRequest(HttpRequestStartLine requestStartLine, HttpRequestHeader requestHeader, RequestBody requestBody) throws IOException {
+        this.httpRequestStartLine = requestStartLine;
+        this.httpRequestHeader = requestHeader;
+        this.requestBody = requestBody;
+    }
+
+    public static HttpRequest from(BufferedReader br) throws IOException {
 
-    private HttpRequest(BufferedReader br) throws IOException {
-        httpRequestStartLine = HttpRequestStartLine.from(br);
-        httpRequestHeader = HttpRequestHeader.from(br);
-        requestBody = RequestBody.from(br);
+        HttpRequestStartLine requestStartLine = HttpRequestStartLine.from(br);
+        HttpRequestHeader requestHeader = HttpRequestHeader.from(br);
+        RequestBody requestBody = RequestBody.from(br);
 
-        httpRequestHeader.parseHeader();
+        requestHeader.parseHeader();
 
-        if (httpRequestHeader.containsKey(CONTENT_LENGTH.getHeaderTitle())) {
-            requestBody.setBody(Integer.parseInt(httpRequestHeader.getValue(CONTENT_LENGTH.getHeaderTitle())));
+        if (requestHeader.containsKey(CONTENT_LENGTH.getHeaderTitle())) {
+            requestBody.setBody(Integer.parseInt(requestHeader.getValue(CONTENT_LENGTH.getHeaderTitle())));
             requestBody.parseBody();
         }
 
+        return new HttpRequest(requestStartLine, requestHeader, requestBody);
     }
 
     // GET 요청인지 확인
@@ -51,9 +59,7 @@ public boolean endsWithCss() {
         return httpRequestStartLine.getUrl().endsWith(CSS_EXTENSION.getUrl());
     }
 
-    public static HttpRequest from(BufferedReader br) throws IOException {
-        return new HttpRequest(br);
-    }
+
 
     public String getMethod() {
         return httpRequestStartLine.getMethod();
diff --git a/src/main/java/http/request/HttpRequestHeader.java b/src/main/java/http/request/HttpRequestHeader.java
index a89a77e..8f88bbf 100644
--- a/src/main/java/http/request/HttpRequestHeader.java
+++ b/src/main/java/http/request/HttpRequestHeader.java
@@ -31,11 +31,6 @@ public void parseHeader() throws IOException {
             String key = line.split(": ")[0];
             String value = line.split(": ")[1];
 
-            if (headerMap.containsKey(key)) {
-                headerMap.replace(key, value);
-                continue;
-            }
-
             headerMap.put(key, value);
         }
     }
diff --git a/src/main/java/http/response/HttpResponse.java b/src/main/java/http/response/HttpResponse.java
index 81f8f9a..9de4567 100644
--- a/src/main/java/http/response/HttpResponse.java
+++ b/src/main/java/http/response/HttpResponse.java
@@ -44,11 +44,18 @@ public void forward(String path) throws IOException {
         // 파일 형식에 따른 헤더 삽입
         putHeader(CONTENT_TYPE.getHeaderTitle(), type+";charset=utf-8");
 
+        // startline을 outputStream에 적어주기
+        writeResponseStartLine();
+
         // 헤더들을 outputStream에 적어주기
         writeResponseHeader();
 
-        dos.write(responseBody.getBodyContent(), 0, responseBody.getBodyLength());
+        // body를 outputStream에 적어주기
+        writeResponseBody(responseBody);
+
         dos.flush();
+
+        dos.close();
     }
 
     public void redirect(String path) throws IOException {
@@ -58,6 +65,7 @@ public void redirect(String path) throws IOException {
         // redirect에 필요한 헤더 삽입
         putHeader(LOCATION.getHeaderTitle(), path);
 
+        writeResponseStartLine();
         writeResponseHeader();
     }
 
@@ -71,10 +79,12 @@ public void putHeader(String key, String value) {
         httpResponseHeader.putHeader(key, value);
     }
 
-    private void writeResponseHeader() throws IOException {
+    private void writeResponseStartLine() throws IOException {
         // startline을 outputStream에 적어주기
         dos.writeBytes(httpResponseStartLine.getResponseStartLine());
+    }
 
+    private void writeResponseHeader() throws IOException {
         // 헤더들을 outputStream에 적어주기
         for(Map.Entry<String, String> entry : httpResponseHeader.getHeaderMap().entrySet()) {
             dos.writeBytes(entry.getKey() + ": " + entry.getValue() + "\r\n");
@@ -83,6 +93,10 @@ private void writeResponseHeader() throws IOException {
         dos.writeBytes("\r\n");
     }
 
+    private void writeResponseBody(ResponseBody body) throws IOException {
+        dos.write(body.getBodyContent(), 0, body.getBodyLength());
+    }
+
 
 
 
diff --git a/src/main/java/mapper/RequestMapper.java b/src/main/java/mapper/RequestMapper.java
index f1f6be8..045489c 100644
--- a/src/main/java/mapper/RequestMapper.java
+++ b/src/main/java/mapper/RequestMapper.java
@@ -15,7 +15,7 @@
 
 public class RequestMapper {
 
-    private Map<String, Controller> controllers;
+    private static Map<String, Controller> controllers;
     private HttpRequest request;
     private HttpResponse response;
 
@@ -40,7 +40,7 @@ public void proceed() throws IOException {
         Controller forwardController = new ForwardController();
 
         // .css 확장자로 들어오는 styles.css 파일을 인식해주기 위해 .css에 대한 코드도 추가
-        if (request.isGetMethod() && (request.endsWithHtml()) || request.endsWithCss()) {
+        if (request.isGetMethod() && (request.endsWithHtml() || request.endsWithCss())) {
             forwardController.execute(request, response);
             return;
         }