[김현지] 리팩토링 약간과 버그 찾기 데이

src/main/java/common/Config.java

@@ -4,6 +4,8 @@ public class Config {
     public static final String CRLF = "\r\n";
     public static final String REPLACE_PLACEHOLDER = "page";
 
+    public static final int MIN_USER_DATA_LENGTH = 4;
+
     public static final String DEFAULT_PAGE_PATH = "/index.html";
     public static final String MAIN_PAGE_PATH = "/main/index.html";
     public static final String REGISTRATION_PAGE_PATH = "/registration/index.html";
@@ -12,6 +14,8 @@ public class Config {
     public static final String COMMENT_PAGE_PATH = "/comment/index.html";
     public static final String ARTICLE_PAGE_PATH = "/article/index.html";
     public static final String NOPOST_PAGE_PATH = "/exception/nopost.html";
+    public static final String COMMENT_PAGE_PATH_PREFIX = "/comment";
+    public static final String POST_PAGE_PATH = "/post";
 
     public static final String HEADER_CONTENT_LENGTH = "content-length";
     public static final String HEADER_LOCATION = "location";
@@ -23,14 +27,27 @@ public class Config {
     public static final String IMAGE_BASE_PATH = "./src/main/resources/uploads";
     public static final String IMAGE_PROFILE_BASE_PATH = "./src/main/resources/uploads/profiles";
     public static final String IMAGE_DEFAULT_PROFILE_NAME = "default.png";
+    public static final String IMAGE_DEFAULT_PROFILE_API = "/image/profile/default.png";
+
+    public static final String POST_ID_QUERY_NAME = "postId";
+
+    public static final String REPEAT_FORMAT_PLACEHOLDER = "{{REPEAT}}";
+
+    public static final String NO_COMMENT = "댓글이 없습니다. 먼저 작성을 시작해주세요!";
+
+    public static final String IMAGE_TYPE_UNKNOWN = "unknown";
+    public static final String IMAGE_TYPE_PNG = "png";
+    public static final String IMAGE_TYPE_JPEG = "JPEG";
+
+    public static final int DEFAULT_COMMENT_COUNT = 3;
 
     public static final String PAGE_HEADER_LOGIN = "<div>" +
             "<ul class=\"header__menu\">" +
             "  <li class=\"header__menu__item\">" +
-            "    <img id=link_to_mypage class=\"post__account__img\" />" +
+            "    <img class=\"post__account__img link_to_mypage\" src=\"/image/profile/{{user.imagePath}}\" />" +
             "  </li>" +
             "  <li class=\"header__menu__item\">" +
-            "    <p id=link_to_mypage class=\"post__account__nickname\">안녕하세요, {{user.name}}님!</p>" +
+            "    <p class=\"post__account__nickname link_to_mypage\">안녕하세요, {{user.name}}님!</p>" +
             "  </li>" +
             "<li class=\"header__menu__item\">\n" +
             "<a class=\"btn btn_contained btn_size_s\" href=\"/write\">글쓰기</a>" +
@@ -50,4 +67,20 @@ public class Config {
             "    <a class=\"btn btn_ghost btn_size_s\" href=\"/registration\">회원 가입</a>" +
             "  </li>" +
             "</ul>";
+
+    public static final String COMMENT_REPEAT_FORMAT = "<li class=\"comment__item\">\n" +
+            "                <div class=\"comment__item__user\">\n" +
+            "                    <img class=\"comment__item__user__img\" src=\"/image/profile/{{{{REPEAT}}.authorImagePath}}\"/>\n" +
+            "                    <p class=\"comment__item__user__nickname\">{{{{REPEAT}}.authorName}}</p>\n" +
+            "                </div>\n" +
+            "                <p class=\"comment__item__article\">\n" +
+            "                    {{{{REPEAT}}.content}}\n" +
+            "                </p>\n" +
+            "            </li>";
+
+    public static final String COMMENT_WANT_TO_SEE_MORE = "<a id=\"show-all-btn\" " +
+            "class=\"btn btn_ghost btn_size_m\" " +
+            "href=\"/post/{{post.postId}}?expanded=true\">" +
+            "모든 댓글 보기({{post.commentNum}}개)" +
+            "</a>";
 }

src/main/java/common/Utils.java

@@ -2,10 +2,7 @@
 
 import webserver.http.RequestBody;
 
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class Utils {
     public static String getRestStr(String wholeStr, String splitParam, int idx) {
@@ -23,31 +20,26 @@ public static String getRestStr(String wholeStr, String splitParam, int idx) {
         return sb.toString();
     }
 
-    public static String parseMapToQueryString_RequestBody(Map<String, RequestBody> queryParam) {
+    public static <T> String parseGeneralMapToQueryString(Map<String, T> queryParam) {
         StringBuilder sb = new StringBuilder();
 
         boolean first = true;
-        for (Map.Entry<String, RequestBody> entry : queryParam.entrySet()) {
+        for (Map.Entry<String, T> entry : queryParam.entrySet()) {
             if (!first) sb.append("&");
             sb.append(entry.getKey())
                     .append("=")
-                    .append(entry.getValue().toString());
+                    .append(String.valueOf(entry.getValue()));
             first = false;
         }
         return sb.toString();
     }
-    public static String parseMapToQueryString(Map<String, String> queryParam) {
-        StringBuilder sb = new StringBuilder();
 
-        boolean first = true;
-        for (Map.Entry<String, String> entry : queryParam.entrySet()) {
-            if (!first) sb.append("&");
-            sb.append(entry.getKey())
-                    .append("=")
-                    .append(entry.getValue());
-            first = false;
-        }
-        return sb.toString();
+    public static String parseMapToQueryString_RequestBody(Map<String, RequestBody> queryParam) {
+        return parseGeneralMapToQueryString(queryParam);
+    }
+
+    public static String parseMapToQueryString(Map<String, String> queryParam) {
+        return parseGeneralMapToQueryString(queryParam);
     }
     public static void replaceAll(StringBuilder sb, String target, String replacement) {
         int index;
@@ -120,4 +112,23 @@ public static List<byte[]> getBothSplit (byte[] origin, byte[] splitter){
         }
         return null;
     }
+
+    public static String detectImageType(byte[] data) {
+        if (data.length < 4) return Config.IMAGE_TYPE_UNKNOWN;
+
+        if ((data[0] & 0xFF) == 0xFF &&
+                (data[1] & 0xFF) == 0xD8 &&
+                (data[2] & 0xFF) == 0xFF) {
+            return Config.IMAGE_TYPE_JPEG;
+        }
+
+        if ((data[0] & 0xFF) == 0x89 &&
+                (data[1] & 0xFF) == 0x50 &&
+                (data[2] & 0xFF) == 0x4E &&
+                (data[3] & 0x47) == 0x47) {
+            return Config.IMAGE_TYPE_PNG;
+        }
+        return Config.IMAGE_TYPE_UNKNOWN;
+    }
+
 }

src/main/java/customException/CommentExceptionConverter.java

@@ -0,0 +1,20 @@
+package customException;
+
+import common.Config;
+
+public class CommentExceptionConverter {
+    public static WebException noPostId() {
+        return new WebException(
+                WebException.HTTPStatus.MOVED_TEMPORALLY,
+                "댓글 작성 페이지에 대한 잘못된 접근입니다.",
+                Config.MAIN_PAGE_PATH
+        );
+    }
+
+    public static WebException badContentComment(){
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "댓글 내용이 비어있습니다."
+        );
+    }
+}

src/main/java/customException/DBExceptionConverter.java

@@ -22,6 +22,13 @@ public static WebException failToFindUser() {
         );
     }
 
+    public static WebException failToUpdatePost(){
+        return new WebException(
+                WebException.HTTPStatus.INTERNAL_SERVER_ERROR,
+                "포스트의 좋아요를 업데이트 하는 것에 실패했습니다."
+        );
+    }
+
 
     public static WebException failToAddPost() {
         return new WebException(
@@ -57,4 +64,11 @@ public static WebException failToFindComment() {
                 "댓글 데이터를 DB에서 탐색하는 과정에서 에러가 발생했습니다."
         );
     }
+
+    public static WebException notAppliedImageType() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "png 파일과 jpeg 파일만 지원합니다."
+        );
+    }
 }

src/main/java/customException/PostExceptionConverter.java

@@ -14,4 +14,18 @@ public static WebException badContentPost() {
                 "포스트의 내용이 존재하지 않습니다."
         );
     }
+
+    public static WebException badFileContentPost() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "포스트의 이미지가 존재하지 않습니다."
+        );
+    }
+
+    public static WebException badPostId() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "포스트 id가 형식에 맞지 않습니다."
+        );
+    }
 }

src/main/java/customException/UserExceptionConverter.java

@@ -1,20 +1,55 @@
 package customException;
 
 public class UserExceptionConverter {
-    public static WebException conflictUser() {
+    public static WebException conflictUserID() {
         return new WebException(
                 WebException.HTTPStatus.CONFLICT,
                 "해당 아이디를 사용하는 회원이 존재합니다."
         );
     }
 
+    public static WebException conflictUserName() {
+        return new WebException(
+                WebException.HTTPStatus.CONFLICT,
+                "해당 이름을 사용하는 회원이 존재합니다."
+        );
+    }
+
     public static WebException needUserId() {
         return new WebException(
                 WebException.HTTPStatus.BAD_REQUEST,
                 "사용자 아이디를 요청에 포함해야 합니다."
         );
     }
 
+    public static WebException tooShortUserId() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "사용자 아이디는 4자 이상이어야 합니다."
+        );
+    }
+
+    public static WebException tooShortUserName() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "사용자명은 4자 이상이어야 합니다."
+        );
+    }
+
+    public static WebException tooShortUserPassword() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "비밀번호는 4자 이상이어야 합니다."
+        );
+    }
+
+    public static WebException needUserName() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "사용자 이름을 요청에 포함해야 합니다."
+        );
+    }
+
     public static WebException needUserData() {
         return new WebException(
                 WebException.HTTPStatus.BAD_REQUEST,
@@ -32,7 +67,7 @@ public static WebException notFoundUser() {
     public static WebException unAuthorized() {
         return new WebException(
                 WebException.HTTPStatus.UNAUTHORIZED,
-                "로그인에 실패했습니다."
+                "비밀번호가 틀렸습니다."
         );
     }
 
@@ -43,4 +78,19 @@ public static WebException needToLogin() {
                 "/login"
         );
     }
+
+
+    public static WebException passwordNotMatch() {
+        return new WebException(
+                WebException.HTTPStatus.BAD_REQUEST,
+                "비밀번호가 일치하지 않습니다."
+        );
+    }
+
+    public static WebException failedUserUpdate() {
+        return new WebException(
+                WebException.HTTPStatus.INTERNAL_SERVER_ERROR,
+                "DB 내 사용자 데이터를 업데이트하는 것을 실패했습니다."
+        );
+    }
 }