From 211e76b9784d12af60f65a26c46d7a52a0080a99 Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Fri, 11 Sep 2020 12:29:26 +0900
Subject: [PATCH 01/14] =?UTF-8?q?feature/196=20feat:=20=EB=B0=B1=EC=97=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=BD=94=EB=93=9C=EC=97=90=20Member=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EA=B8=80=EC=9E=90=20=EC=88=98=20=EC=A0=9C?=
 =?UTF-8?q?=ED=95=9C=20=EC=82=AC=ED=95=AD(=EC=B5=9C=EB=8C=80=2015=EC=9E=90?=
 =?UTF-8?q?)=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dorandoran/member/domain/Member.java      |  2 +
 .../repository/MemberRepositoryTest.java      | 53 +++++++++++++++++++
 .../member/service/MemberServiceTest.java     |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java

diff --git a/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java b/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java
index 2b19877a..cbef8b36 100644
--- a/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java
+++ b/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java
@@ -18,6 +18,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -34,6 +35,7 @@ public class Member {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Length(max = 15, message = "닉네임은 15자를 초과할 수 없습니다.")
     @NotBlank(message = "닉네임은 비어 있을 수 없습니다.")
     @Column(unique = true, nullable = false)
     private String nickname;
diff --git a/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java b/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
new file mode 100644
index 00000000..52dcbd9e
--- /dev/null
+++ b/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
@@ -0,0 +1,53 @@
+package com.grasshouse.dorandoran.member.repository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
+import com.grasshouse.dorandoran.member.domain.Member;
+import javax.validation.ConstraintViolationException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class MemberRepositoryTest {
+
+    @Autowired
+    private MemberRepository memberRepository;
+
+    @DisplayName("가능한 닉네임들로 Member를 생성한다.")
+    @Test
+    void possibleNicknameTest() {
+        Member member = Member.builder().nickname("일이삼사오육칠팔구십일이삼사오").oAuthId("oauthId").build();
+        Member member2 = Member.builder().nickname("ottffssentottff").oAuthId("oauthId2").build();
+        Member member3 = Member.builder().nickname("123456789012345").oAuthId("oauthId3").build();
+
+        assertAll(
+            () -> assertThat(memberRepository.save(member)).isNotNull(),
+            () -> assertThat(memberRepository.save(member2)).isNotNull(),
+            () -> assertThat(memberRepository.save(member3)).isNotNull()
+        );
+    }
+
+    @DisplayName("[예외] 가능하지 않은 닉네임들로 Member를 생성한다.")
+    @Test
+    void impossibleNicknameTest() {
+        Member member = Member.builder().nickname("일이삼사오육칠팔구십일이삼사오육").build();
+        Member member2 = Member.builder().nickname("ottffssentottffs").build();
+        Member member3 = Member.builder().nickname("1234567890123456").build();
+        assertThatThrownBy(() -> {
+            memberRepository.save(member);
+            memberRepository.save(member2);
+            memberRepository.save(member3);
+        }).isInstanceOf(ConstraintViolationException.class);
+    }
+
+    @AfterEach
+    void tearDown() {
+        memberRepository.deleteAll();
+    }
+
+}
diff --git a/src/test/java/com/grasshouse/dorandoran/member/service/MemberServiceTest.java b/src/test/java/com/grasshouse/dorandoran/member/service/MemberServiceTest.java
index 687f0f1f..90e0b68d 100644
--- a/src/test/java/com/grasshouse/dorandoran/member/service/MemberServiceTest.java
+++ b/src/test/java/com/grasshouse/dorandoran/member/service/MemberServiceTest.java
@@ -112,4 +112,4 @@ void deleteMemberWithComments() {
     void tearDown() {
         memberRepository.deleteAll();
     }
-}
\ No newline at end of file
+}

From bbe858fa5a4c786867607bc4338e2f16801f9fbb Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Fri, 11 Sep 2020 12:40:43 +0900
Subject: [PATCH 02/14] =?UTF-8?q?feature/196=20feat:=20=ED=94=84=EB=A1=A0?=
 =?UTF-8?q?=ED=8A=B8=EC=97=94=EB=93=9C=20=EC=BD=94=EB=93=9C=EC=97=90=20Mem?=
 =?UTF-8?q?ber=20=EB=8B=89=EB=84=A4=EC=9E=84=20=EA=B8=80=EC=9E=90=20?=
 =?UTF-8?q?=EC=88=98=20=EC=A0=9C=ED=95=9C=20=EC=82=AC=ED=95=AD(=EC=B5=9C?=
 =?UTF-8?q?=EB=8C=80=2015=EC=9E=90)=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  - 최대 글자 수(15자) 설정
  - 글자 수 세어주는 counter 기능 추가
---
 front/src/components/member/MemberUpdateModal.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index 8e136a31..2771508b 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -6,6 +6,8 @@
         <VTextField
           label="새 닉네임을 입력하세요."
           color="grey darken-2"
+          maxlength="15"
+          :counter="15"
           v-model="newNickname"
           @keypress.enter="updateMember"
         />

From c3e7260f7d1ec91d6077dacd1855f6926fa9906b Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Fri, 11 Sep 2020 14:03:14 +0900
Subject: [PATCH 03/14] =?UTF-8?q?feature/196=20feat:=20=ED=94=84=EB=A1=A0?=
 =?UTF-8?q?=ED=8A=B8=EC=97=94=EB=93=9C=20=EB=8B=89=EB=84=A4=EC=9E=84=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20css=EB=93=A4=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 사이드바에서 닉네임 11글자까지만 보여주게 한다.
 - 글/댓글의 프로필사진과 닉네임 간 간격 미세 조정한다.
---
 front/src/components/member/MemberSidebar.vue | 28 ++++++++++++++++---
 front/src/components/post/PostModal.vue       |  2 +-
 front/src/components/timeline/PostItem.vue    |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/front/src/components/member/MemberSidebar.vue b/front/src/components/member/MemberSidebar.vue
index fc3579d1..b5ad5cdc 100644
--- a/front/src/components/member/MemberSidebar.vue
+++ b/front/src/components/member/MemberSidebar.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <v-navigation-drawer v-model="drawer" absolute temporary class="drawer">
-      <v-icon @click="hideSidebar" class="float-right ma-4">
+      <v-icon @click="hideSidebar" class="modal-close-btn">
         mdi-window-close
       </v-icon>
 
-      <div class="ma-5 mt-10 mb-5" @click="login">
+      <div class="ma-3 mt-10 mb-4" @click="login">
         <v-avatar>
           <v-icon size="36">mdi-account-circle</v-icon>
         </v-avatar>
-        <span class="mx-3 font-weight-bold">
-          {{ member.nickname }}
+        <span class="font-weight-bold">
+          {{ shortNickname }} {{ nicknameTail }}
         </span>
       </div>
 
@@ -53,6 +53,7 @@ const LOGOUT_SUCCESS_MESSAGE = "성공적으로 로그아웃 되었습니다.";
 const FAILED_TO_DELETE_MEMBER_MESSAGE =
   "탈퇴에 실패했습니다. 다시 요청해주세요.";
 const DELETE_MEMBER_SUCCESS = "성공적으로 탈퇴를 완료했습니다.";
+const NICKNAME_LENGTH = 11;
 
 export default {
   name: "MemberSidebar",
@@ -83,6 +84,18 @@ export default {
     isGuest() {
       return this.$store.getters["member/isGuest"];
     },
+    shortNickname() {
+      return Array.from(this.member.nickname)
+        .slice(0, NICKNAME_LENGTH)
+        .join("")
+        .trim();
+    },
+    nicknameTail() {
+      if (Array.from(this.member.nickname).length > NICKNAME_LENGTH) {
+        return "...";
+      }
+      return "";
+    },
     drawer: {
       get() {
         return this.$store.getters["memberSidebar/visible"];
@@ -149,4 +162,11 @@ export default {
 .drawer {
   z-index: 9999;
 }
+
+.modal-close-btn {
+  position: absolute;
+  top: 12px;
+  right: 12px;
+  z-index: 1;
+}
 </style>
diff --git a/front/src/components/post/PostModal.vue b/front/src/components/post/PostModal.vue
index f958a617..09908b5e 100644
--- a/front/src/components/post/PostModal.vue
+++ b/front/src/components/post/PostModal.vue
@@ -3,7 +3,7 @@
     <DoranAppBar />
     <div v-if="existMember" class="pa-4">
       <div class="mb-3">
-        <v-icon x-large class="mr-3">mdi-account-circle</v-icon>
+        <v-icon x-large class="mr-2">mdi-account-circle</v-icon>
         <span class="font-weight-bold">{{ post.author.nickname }}</span>
         <div class="float-right mt-2">
           {{ postDate }}
diff --git a/front/src/components/timeline/PostItem.vue b/front/src/components/timeline/PostItem.vue
index b087d217..e86ba93e 100644
--- a/front/src/components/timeline/PostItem.vue
+++ b/front/src/components/timeline/PostItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mx-4 my-3" @click="openPostModal">
     <div class="my-2">
-      <v-icon large class="mr-3">mdi-account-circle</v-icon>
+      <v-icon large class="mr-2">mdi-account-circle</v-icon>
       <span class="font-weight-bold">{{ post.author.nickname }}</span>
       <div class="float-right mt-1">{{ postDate }}</div>
     </div>

From 198eb587ff3b3f9d9ce833e7c411ef28aa2da9ab Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sat, 12 Sep 2020 02:17:37 +0900
Subject: [PATCH 04/14] =?UTF-8?q?feature/196=20feat:=20=EB=8B=89=EB=84=A4?=
 =?UTF-8?q?=EC=9E=84=EC=97=90=20=ED=95=9C=EA=B8=80/=EC=88=AB=EC=9E=90/?=
 =?UTF-8?q?=EC=98=81=EC=96=B4=EB=A7=8C=20=EC=93=B0=EA=B2=8C=20=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EC=A0=9C=ED=95=9C=EC=82=AC=ED=95=AD=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - :rules 속성으로 밑에 위반 메세지 보여주기
 - 제한사항을 어겼을 시 저장 버튼 비활성화
---
 front/src/components/member/MemberUpdateModal.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index 2771508b..0908e314 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -9,6 +9,7 @@
           maxlength="15"
           :counter="15"
           v-model="newNickname"
+          :rules="[rules.violated, rules.unchanged]"
           @keypress.enter="updateMember"
         />
         <div class="button-box">
@@ -21,7 +22,7 @@
           </v-btn>
           <v-btn
             text
-            :disabled="nicknameNotChanged()"
+            :disabled="nicknameUpdateDisabled()"
             class="mb-2 text-subtitle-1 font-weight-bold amber--text text--accent-4"
             @click="updateMember"
           >
@@ -37,12 +38,18 @@
 <script>
 import api from "@/api/member";
 
+const NICKNAME_REGEX = "^[a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣0-9]+$";
+
 export default {
   name: "PostCreateModal",
   data() {
     return {
       rendered: false,
       newNickname: "",
+      rules: {
+        violated: (newVal) => !!newVal.match(NICKNAME_REGEX) || '닉네임은 숫자/한글/영어로 이루어져야 합니다.',
+        unchanged: (newNickname) => this.member.nickname !== newNickname || '새로운 닉네임을 입력해주세요.',
+      },
     };
   },
   computed: {
@@ -68,8 +75,8 @@ export default {
     closeModal() {
       this.$emit("close");
     },
-    nicknameNotChanged() {
-      return this.member.nickname === this.newNickname;
+    nicknameUpdateDisabled() {
+      return  this.member.nickname === this.newNickname || !this.newNickname.match(NICKNAME_REGEX);
     },
     bounceOut() {
       this.rendered = false;

From 3118da30f6e4e19764929b310ae432763d4062e9 Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sat, 12 Sep 2020 02:42:49 +0900
Subject: [PATCH 05/14] =?UTF-8?q?feature/196=20refactor:=20=ED=8F=AC?=
 =?UTF-8?q?=EB=A7=A4=ED=84=B0=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/member/MemberUpdateModal.vue | 13 ++++++++++---
 front/src/components/post/PostModal.vue           |  5 +----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index 0908e314..bdaf78c9 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -47,8 +47,12 @@ export default {
       rendered: false,
       newNickname: "",
       rules: {
-        violated: (newVal) => !!newVal.match(NICKNAME_REGEX) || '닉네임은 숫자/한글/영어로 이루어져야 합니다.',
-        unchanged: (newNickname) => this.member.nickname !== newNickname || '새로운 닉네임을 입력해주세요.',
+        violated: (newVal) =>
+          !!newVal.match(NICKNAME_REGEX) ||
+          "닉네임은 숫자/한글/영어로 이루어져야 합니다.",
+        unchanged: (newNickname) =>
+          this.member.nickname !== newNickname ||
+          "새로운 닉네임을 입력해주세요.",
       },
     };
   },
@@ -76,7 +80,10 @@ export default {
       this.$emit("close");
     },
     nicknameUpdateDisabled() {
-      return  this.member.nickname === this.newNickname || !this.newNickname.match(NICKNAME_REGEX);
+      return (
+        this.member.nickname === this.newNickname ||
+        !this.newNickname.match(NICKNAME_REGEX)
+      );
     },
     bounceOut() {
       this.rendered = false;
diff --git a/front/src/components/post/PostModal.vue b/front/src/components/post/PostModal.vue
index 09908b5e..542dd8b9 100644
--- a/front/src/components/post/PostModal.vue
+++ b/front/src/components/post/PostModal.vue
@@ -85,10 +85,7 @@ export default {
       return localStorage.getItem("accessToken");
     },
     isMine() {
-      return (
-        this.post.author.id ===
-        this.$store.getters["member/getMember"].id
-      );
+      return this.post.author.id === this.$store.getters["member/getMember"].id;
     },
     post: {
       get() {

From 9e865f94cb6c3d1ef5f410b40ac77fdd9c90f25c Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sun, 20 Sep 2020 18:26:30 +0900
Subject: [PATCH 06/14] =?UTF-8?q?feature/196=20refactor:=20css=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 오버라이드되는 ma 속성 mx로 수정
---
 front/src/components/member/MemberSidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/components/member/MemberSidebar.vue b/front/src/components/member/MemberSidebar.vue
index b5ad5cdc..8982f7d0 100644
--- a/front/src/components/member/MemberSidebar.vue
+++ b/front/src/components/member/MemberSidebar.vue
@@ -5,7 +5,7 @@
         mdi-window-close
       </v-icon>
 
-      <div class="ma-3 mt-10 mb-4" @click="login">
+      <div class="mx-3 mt-10 mb-4" @click="login">
         <v-avatar>
           <v-icon size="36">mdi-account-circle</v-icon>
         </v-avatar>

From b1b0ab76b9d5ca7fb6685dbe3ad780a755cd27fb Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sun, 20 Sep 2020 18:30:55 +0900
Subject: [PATCH 07/14] =?UTF-8?q?feature/196=20refactor:=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EA=B8=B8=EC=9D=B4=EC=A0=9C=ED=95=9C=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 최대 닉네임 글자 제한 상수명 MAX_NICKNAME_LENGTH 로 리팩토링
 - 배열로 변환하는 과정 삭제
 - 사이드바에서 잘려서 보여지는 닉네임 변수명 shortenedNickname으로 수정
---
 front/src/components/member/MemberSidebar.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/front/src/components/member/MemberSidebar.vue b/front/src/components/member/MemberSidebar.vue
index 8982f7d0..91c18cc8 100644
--- a/front/src/components/member/MemberSidebar.vue
+++ b/front/src/components/member/MemberSidebar.vue
@@ -10,7 +10,7 @@
           <v-icon size="36">mdi-account-circle</v-icon>
         </v-avatar>
         <span class="font-weight-bold">
-          {{ shortNickname }} {{ nicknameTail }}
+          {{ shortenedNickname }} {{ nicknameTail }}
         </span>
       </div>
 
@@ -53,7 +53,7 @@ const LOGOUT_SUCCESS_MESSAGE = "성공적으로 로그아웃 되었습니다.";
 const FAILED_TO_DELETE_MEMBER_MESSAGE =
   "탈퇴에 실패했습니다. 다시 요청해주세요.";
 const DELETE_MEMBER_SUCCESS = "성공적으로 탈퇴를 완료했습니다.";
-const NICKNAME_LENGTH = 11;
+const MAX_NICKNAME_LENGTH = 11;
 
 export default {
   name: "MemberSidebar",
@@ -84,17 +84,14 @@ export default {
     isGuest() {
       return this.$store.getters["member/isGuest"];
     },
-    shortNickname() {
+    shortenedNickname() {
       return Array.from(this.member.nickname)
-        .slice(0, NICKNAME_LENGTH)
+        .slice(0, MAX_NICKNAME_LENGTH)
         .join("")
         .trim();
     },
     nicknameTail() {
-      if (Array.from(this.member.nickname).length > NICKNAME_LENGTH) {
-        return "...";
-      }
-      return "";
+      return this.member.nickname.length > MAX_NICKNAME_LENGTH ? "..." : "";
     },
     drawer: {
       get() {

From 864a1e9752018c25aac35a062be7d84d1fb187c4 Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sun, 20 Sep 2020 18:33:54 +0900
Subject: [PATCH 08/14] =?UTF-8?q?feature/196=20refactor:=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EA=B4=80=EB=A0=A8=20=EC=A0=9C=ED=95=9C?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EA=B7=9C=EC=B9=99=EB=93=A4=EC=9D=84=20?=
 =?UTF-8?q?=ED=95=9C=EA=BA=BC=EB=B2=88=EC=97=90=20=EB=AC=B6=EC=96=B4?=
 =?UTF-8?q?=EC=84=9C=20=EA=B4=80=EB=A6=AC=ED=95=98=EA=B2=8C=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/member/MemberUpdateModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index bdaf78c9..b000a68d 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -9,7 +9,7 @@
           maxlength="15"
           :counter="15"
           v-model="newNickname"
-          :rules="[rules.violated, rules.unchanged]"
+          :rules="Object.values(rules)"
           @keypress.enter="updateMember"
         />
         <div class="button-box">
@@ -41,7 +41,7 @@ import api from "@/api/member";
 const NICKNAME_REGEX = "^[a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣0-9]+$";
 
 export default {
-  name: "PostCreateModal",
+  name: "MemberUpdateModal",
   data() {
     return {
       rendered: false,

From a6f04a7bcf67a3de8125df60c718ec82c2c70822 Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sun, 20 Sep 2020 22:08:06 +0900
Subject: [PATCH 09/14] =?UTF-8?q?feature/196=20refactor:=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=ED=95=9C=20=EB=8B=89=EB=84=A4=EC=9E=84=EC=9D=B4=20?=
 =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=EB=8B=89=EB=84=A4=EC=9E=84=EA=B3=BC=20?=
 =?UTF-8?q?=EA=B0=99=EC=9D=84=20=EB=95=8C=20=EB=A9=94=EC=84=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=97=86=EC=9D=B4=20=EC=A0=80=EC=9E=A5=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=EB=A7=8C=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=EB=90=98?=
 =?UTF-8?q?=EA=B2=8C=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/member/MemberUpdateModal.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index b000a68d..32388ff0 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -50,9 +50,6 @@ export default {
         violated: (newVal) =>
           !!newVal.match(NICKNAME_REGEX) ||
           "닉네임은 숫자/한글/영어로 이루어져야 합니다.",
-        unchanged: (newNickname) =>
-          this.member.nickname !== newNickname ||
-          "새로운 닉네임을 입력해주세요.",
       },
     };
   },

From 756597321b8d81481f4ea70e5bb1b012449a949d Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sun, 20 Sep 2020 22:38:43 +0900
Subject: [PATCH 10/14] =?UTF-8?q?feature/196=20refactor:=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EC=A0=9C=ED=95=9C=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20Test=EB=A5=BC=20ParameterizedTest=EB=A1=9C?=
 =?UTF-8?q?=20=EB=AC=B6=EC=96=B4=EC=84=9C=20=EA=B4=80=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/MemberRepositoryTest.java      | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java b/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
index 52dcbd9e..1f58ee5b 100644
--- a/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
+++ b/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
@@ -2,13 +2,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertAll;
 
 import com.grasshouse.dorandoran.member.domain.Member;
 import javax.validation.ConstraintViolationException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -19,30 +19,21 @@ public class MemberRepositoryTest {
     private MemberRepository memberRepository;
 
     @DisplayName("가능한 닉네임들로 Member를 생성한다.")
-    @Test
-    void possibleNicknameTest() {
-        Member member = Member.builder().nickname("일이삼사오육칠팔구십일이삼사오").oAuthId("oauthId").build();
-        Member member2 = Member.builder().nickname("ottffssentottff").oAuthId("oauthId2").build();
-        Member member3 = Member.builder().nickname("123456789012345").oAuthId("oauthId3").build();
-
-        assertAll(
-            () -> assertThat(memberRepository.save(member)).isNotNull(),
-            () -> assertThat(memberRepository.save(member2)).isNotNull(),
-            () -> assertThat(memberRepository.save(member3)).isNotNull()
-        );
+    @ParameterizedTest
+    @ValueSource(strings = {"일이삼사오육칠팔구십일이삼사오", "ottffssentottff", "123456789012345"})
+    void possibleNicknameTest(String nickname) {
+        Member member = Member.builder().nickname(nickname).oAuthId("oauthId").build();
+        assertThat(memberRepository.save(member)).isNotNull();
     }
 
     @DisplayName("[예외] 가능하지 않은 닉네임들로 Member를 생성한다.")
-    @Test
-    void impossibleNicknameTest() {
-        Member member = Member.builder().nickname("일이삼사오육칠팔구십일이삼사오육").build();
-        Member member2 = Member.builder().nickname("ottffssentottffs").build();
-        Member member3 = Member.builder().nickname("1234567890123456").build();
+    @ParameterizedTest
+    @ValueSource(strings = {"일이삼사오육칠팔구십일이삼사오육", "ottffssentottffs", "1234567890123456"})
+    void impossibleNicknameTest(String nickname) {
+        Member member = Member.builder().nickname(nickname).oAuthId("oauthId").build();
         assertThatThrownBy(() -> {
             memberRepository.save(member);
-            memberRepository.save(member2);
-            memberRepository.save(member3);
-        }).isInstanceOf(ConstraintViolationException.class);
+        }).isInstanceOf(ConstraintViolationException.class).hasMessageContaining("닉네임은 15자를");
     }
 
     @AfterEach

From 40f9c36c960640b3d1233b006f366c68ae75fd44 Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Sun, 20 Sep 2020 23:36:19 +0900
Subject: [PATCH 11/14] =?UTF-8?q?feature/196=20feat:=20Member=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EC=A0=95=EA=B7=9C=ED=91=9C=ED=98=84?=
 =?UTF-8?q?=EC=8B=9D=20=EA=B4=80=EB=A0=A8=20=EC=A0=9C=ED=95=9C=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/grasshouse/dorandoran/member/domain/Member.java  | 2 ++
 .../dorandoran/member/repository/MemberRepositoryTest.java    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java b/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java
index cbef8b36..8441d1c0 100644
--- a/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java
+++ b/src/main/java/com/grasshouse/dorandoran/member/domain/Member.java
@@ -14,6 +14,7 @@
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -36,6 +37,7 @@ public class Member {
     private Long id;
 
     @Length(max = 15, message = "닉네임은 15자를 초과할 수 없습니다.")
+    @Pattern(regexp = "^[a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣0-9]+$", message = "닉네임은 한글/영어/숫자로만 이루어져야 합니다.")
     @NotBlank(message = "닉네임은 비어 있을 수 없습니다.")
     @Column(unique = true, nullable = false)
     private String nickname;
diff --git a/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java b/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
index 1f58ee5b..5a277000 100644
--- a/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
+++ b/src/test/java/com/grasshouse/dorandoran/member/repository/MemberRepositoryTest.java
@@ -28,12 +28,12 @@ void possibleNicknameTest(String nickname) {
 
     @DisplayName("[예외] 가능하지 않은 닉네임들로 Member를 생성한다.")
     @ParameterizedTest
-    @ValueSource(strings = {"일이삼사오육칠팔구십일이삼사오육", "ottffssentottffs", "1234567890123456"})
+    @ValueSource(strings = {"일이삼사오육칠팔구십일이삼사오육", "ottffssentottffs", "1234567890123456", "d;", "-"})
     void impossibleNicknameTest(String nickname) {
         Member member = Member.builder().nickname(nickname).oAuthId("oauthId").build();
         assertThatThrownBy(() -> {
             memberRepository.save(member);
-        }).isInstanceOf(ConstraintViolationException.class).hasMessageContaining("닉네임은 15자를");
+        }).isInstanceOf(ConstraintViolationException.class);
     }
 
     @AfterEach

From 6ebd65b205e2f1634d83d125c4df2c57eb42b25a Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Mon, 21 Sep 2020 03:20:23 +0900
Subject: [PATCH 12/14] =?UTF-8?q?feature/196=20refactor:=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EB=B9=84=ED=99=9C?=
 =?UTF-8?q?=EC=84=B1=ED=99=94=EC=8B=9C=EC=BC=9C=EC=A3=BC=EB=8A=94=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=EC=9D=84=20methods=EC=97=90=EC=84=9C=20compu?=
 =?UTF-8?q?ted=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/member/MemberUpdateModal.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index 32388ff0..f841b98c 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -22,7 +22,7 @@
           </v-btn>
           <v-btn
             text
-            :disabled="nicknameUpdateDisabled()"
+            :disabled="isUpdateDisabled"
             class="mb-2 text-subtitle-1 font-weight-bold amber--text text--accent-4"
             @click="updateMember"
           >
@@ -57,6 +57,12 @@ export default {
     member() {
       return this.$store.getters["member/getMember"];
     },
+    isUpdateDisabled() {
+      return (
+          this.member.nickname === this.newNickname ||
+          !this.newNickname.match(NICKNAME_REGEX)
+      );
+    },
   },
   mounted() {
     this.rendered = true;
@@ -76,12 +82,6 @@ export default {
     closeModal() {
       this.$emit("close");
     },
-    nicknameUpdateDisabled() {
-      return (
-        this.member.nickname === this.newNickname ||
-        !this.newNickname.match(NICKNAME_REGEX)
-      );
-    },
     bounceOut() {
       this.rendered = false;
     },

From d862d2ce68b0d9672b822f29c1a296882ba5d547 Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Mon, 21 Sep 2020 10:55:05 +0900
Subject: [PATCH 13/14] =?UTF-8?q?feature/196=20refactor:=20=EC=9E=AC?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EB=90=98=EB=8A=94=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/member/MemberUpdateModal.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index f841b98c..f70f0099 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -39,6 +39,8 @@
 import api from "@/api/member";
 
 const NICKNAME_REGEX = "^[a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣0-9]+$";
+const VIOLATE_REGEX = (val) => !val.match(NICKNAME_REGEX);
+const IS_VALUE_SAME = (newVal, oldVal) => newVal === oldVal;
 
 export default {
   name: "MemberUpdateModal",
@@ -47,8 +49,8 @@ export default {
       rendered: false,
       newNickname: "",
       rules: {
-        violated: (newVal) =>
-          !!newVal.match(NICKNAME_REGEX) ||
+        regexViolation: (newVal) =>
+          !VIOLATE_REGEX(newVal) ||
           "닉네임은 숫자/한글/영어로 이루어져야 합니다.",
       },
     };
@@ -59,8 +61,8 @@ export default {
     },
     isUpdateDisabled() {
       return (
-          this.member.nickname === this.newNickname ||
-          !this.newNickname.match(NICKNAME_REGEX)
+        IS_VALUE_SAME(this.member.nickname, this.newNickname) ||
+        VIOLATE_REGEX(this.newNickname)
       );
     },
   },

From 4b9100f4616f89dffadae68f4f394ba13d4ea7ed Mon Sep 17 00:00:00 2001
From: yejiahn <yeppilisa@naver.com>
Date: Mon, 5 Oct 2020 14:17:44 +0900
Subject: [PATCH 14/14] =?UTF-8?q?feature/196=20feat:=20=EC=83=81=EC=88=98?=
 =?UTF-8?q?=EB=A1=9C=20=EC=93=B0=EC=9D=B4=EB=8D=98=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=EB=A5=BC=20methods=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/components/member/MemberUpdateModal.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/front/src/components/member/MemberUpdateModal.vue b/front/src/components/member/MemberUpdateModal.vue
index f70f0099..c3316d9a 100644
--- a/front/src/components/member/MemberUpdateModal.vue
+++ b/front/src/components/member/MemberUpdateModal.vue
@@ -39,8 +39,6 @@
 import api from "@/api/member";
 
 const NICKNAME_REGEX = "^[a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣0-9]+$";
-const VIOLATE_REGEX = (val) => !val.match(NICKNAME_REGEX);
-const IS_VALUE_SAME = (newVal, oldVal) => newVal === oldVal;
 
 export default {
   name: "MemberUpdateModal",
@@ -50,7 +48,7 @@ export default {
       newNickname: "",
       rules: {
         regexViolation: (newVal) =>
-          !VIOLATE_REGEX(newVal) ||
+          !this.violateRegex(newVal) ||
           "닉네임은 숫자/한글/영어로 이루어져야 합니다.",
       },
     };
@@ -61,8 +59,8 @@ export default {
     },
     isUpdateDisabled() {
       return (
-        IS_VALUE_SAME(this.member.nickname, this.newNickname) ||
-        VIOLATE_REGEX(this.newNickname)
+        this.isValueSame(this.member.nickname, this.newNickname) ||
+        this.violateRegex(this.newNickname)
       );
     },
   },
@@ -87,6 +85,12 @@ export default {
     bounceOut() {
       this.rendered = false;
     },
+    isValueSame(oldVal, newVal) {
+      return oldVal === newVal;
+    },
+    violateRegex(val) {
+      return !val.match(NICKNAME_REGEX);
+    },
   },
 };
 </script>