From 7d1e91a64b8b55df400a6a08602a7dbb63eacf2b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 13 Feb 2024 17:25:17 +0900
Subject: [PATCH 001/225] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=ED=95=84=20?=
 =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 취미 (Hobbies, Hobby) 정의
- 나의 스타일 (Styles, Style) 정의
- 프로필 사진 (Images, Image) 정의
---
 .../com/atwoz/member/domain/member/Member.java     | 13 +++++++++++++
 .../atwoz/member/domain/profile/hobby/Hobbies.java | 14 ++++++++++++++
 .../atwoz/member/domain/profile/hobby/Hobby.java   | 13 +++++++++++++
 .../atwoz/member/domain/profile/image/Image.java   | 13 +++++++++++++
 .../atwoz/member/domain/profile/image/Images.java  | 14 ++++++++++++++
 .../atwoz/member/domain/profile/style/Style.java   | 13 +++++++++++++
 .../atwoz/member/domain/profile/style/Styles.java  | 14 ++++++++++++++
 7 files changed, 94 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/image/Image.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/image/Images.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/style/Style.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/style/Styles.java

diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index fa30b5e7..8e0099fa 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -1,7 +1,11 @@
 package com.atwoz.member.domain.member;
 
 import com.atwoz.global.domain.BaseEntity;
+import com.atwoz.member.domain.profile.hobby.Hobbies;
+import com.atwoz.member.domain.profile.image.Images;
+import com.atwoz.member.domain.profile.style.Styles;
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -37,6 +41,15 @@ public class Member extends BaseEntity {
     @Column(nullable = false)
     private MemberRole memberRole;
 
+    @Embedded
+    private Hobbies hobbies;
+
+    @Embedded
+    private Styles styles;
+
+    @Embedded
+    private Images images;
+
     public boolean isAdmin() {
         return this.memberRole.isAdministrator();
     }
diff --git a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
new file mode 100644
index 00000000..b82132fb
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.domain.profile.hobby;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+@Embeddable
+public class Hobbies {
+
+    @ElementCollection
+    private List<Hobby> hobbies;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java
new file mode 100644
index 00000000..661b7cd4
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.profile.hobby;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+
+@Getter
+@Embeddable
+public class Hobby {
+
+    @Column(nullable = false)
+    private String hobby;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/image/Image.java b/src/main/java/com/atwoz/member/domain/profile/image/Image.java
new file mode 100644
index 00000000..2687f8a1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/image/Image.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.profile.image;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+
+@Getter
+@Embeddable
+public class Image {
+
+    @Column(nullable = false)
+    private String url;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/image/Images.java b/src/main/java/com/atwoz/member/domain/profile/image/Images.java
new file mode 100644
index 00000000..7c73c8c5
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/image/Images.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.domain.profile.image;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+@Embeddable
+public class Images {
+
+    @ElementCollection
+    private List<Image> images;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/style/Style.java b/src/main/java/com/atwoz/member/domain/profile/style/Style.java
new file mode 100644
index 00000000..1f036fc2
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/style/Style.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.profile.style;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+
+@Getter
+@Embeddable
+public class Style {
+
+    @Column(nullable = false)
+    private String style;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/style/Styles.java b/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
new file mode 100644
index 00000000..709fa9b5
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.domain.profile.style;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Embeddable;
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+@Embeddable
+public class Styles {
+
+    @ElementCollection
+    private List<Style> styles;
+}

From 41178091fd5c8d7ddd2cb27ee8ba323b7357e252 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 13 Feb 2024 17:26:03 +0900
Subject: [PATCH 002/225] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=ED=95=84=20?=
 =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 나이 (Age) 정의
- 키 (Height) 정의
- 직업 (Job) 정의
- 지역 (Location) 정의
- 최종학력 (Graduate) 정의
- 성별 (Gender) 정의
- 흡연 (Smoke) 정의
- 음주 (Drink) 정의
- 종교 (Religion) 정의
- MBTI (Mbti) 정의
---
 .../com/atwoz/member/domain/profile/Age.java  | 26 ++++++++++++++++
 .../atwoz/member/domain/profile/Height.java   | 26 ++++++++++++++++
 .../com/atwoz/member/domain/profile/Job.java  | 25 ++++++++++++++++
 .../atwoz/member/domain/profile/Location.java | 29 ++++++++++++++++++
 .../member/domain/profile/drink/Drink.java    | 13 ++++++++
 .../domain/profile/drink/MemberDrink.java     | 30 +++++++++++++++++++
 .../member/domain/profile/gender/Gender.java  | 10 +++++++
 .../domain/profile/gender/MemberGender.java   | 30 +++++++++++++++++++
 .../domain/profile/graduate/Graduate.java     | 17 +++++++++++
 .../profile/graduate/MemberGraduate.java      | 30 +++++++++++++++++++
 .../member/domain/profile/mbti/Mbti.java      | 21 +++++++++++++
 .../domain/profile/mbti/MemberMbti.java       | 30 +++++++++++++++++++
 .../profile/religion/MemberReligion.java      | 30 +++++++++++++++++++
 .../domain/profile/religion/Religion.java     | 13 ++++++++
 .../domain/profile/smoke/MemberSmoke.java     | 30 +++++++++++++++++++
 .../member/domain/profile/smoke/Smoke.java    | 13 ++++++++
 16 files changed, 373 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/Age.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/Height.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/Job.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/Location.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/drink/Drink.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/gender/Gender.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/religion/Religion.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java
 create mode 100644 src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java

diff --git a/src/main/java/com/atwoz/member/domain/profile/Age.java b/src/main/java/com/atwoz/member/domain/profile/Age.java
new file mode 100644
index 00000000..bb3eb786
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/Age.java
@@ -0,0 +1,26 @@
+package com.atwoz.member.domain.profile;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class Age {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Column(nullable = false)
+    private Integer age;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Height.java b/src/main/java/com/atwoz/member/domain/profile/Height.java
new file mode 100644
index 00000000..0dd60d7f
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/Height.java
@@ -0,0 +1,26 @@
+package com.atwoz.member.domain.profile;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class Height {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Column(nullable = false)
+    private Integer height;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Job.java b/src/main/java/com/atwoz/member/domain/profile/Job.java
new file mode 100644
index 00000000..a5e610d0
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/Job.java
@@ -0,0 +1,25 @@
+package com.atwoz.member.domain.profile;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@Entity
+public class Job {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Column(nullable = false)
+    private String job;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Location.java b/src/main/java/com/atwoz/member/domain/profile/Location.java
new file mode 100644
index 00000000..45757854
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/Location.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.domain.profile;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class Location {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Column(nullable = false)
+    private String city;
+
+    @Column(nullable = false)
+    private String sector;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/drink/Drink.java b/src/main/java/com/atwoz/member/domain/profile/drink/Drink.java
new file mode 100644
index 00000000..53d281fc
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/drink/Drink.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.profile.drink;
+
+public enum Drink {
+
+    NEVER("전혀 마시지 않음"),
+    SOCIETY("사회적 음주"),
+    OFTEN("가끔 마심"),
+    ENJOY("술자리를 즐김"),
+    NOT_NOW("금주 중");
+
+    Drink(final String name) {
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java b/src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java
new file mode 100644
index 00000000..339edb6c
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.profile.drink;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "drink")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class MemberDrink {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    private Drink drink;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/gender/Gender.java b/src/main/java/com/atwoz/member/domain/profile/gender/Gender.java
new file mode 100644
index 00000000..407c844d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/gender/Gender.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.domain.profile.gender;
+
+public enum Gender {
+
+    MALE("남성"),
+    FEMALE("여성");
+
+    Gender(final String name) {
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java b/src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java
new file mode 100644
index 00000000..0d1032ed
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.profile.gender;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "gender")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class MemberGender {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    private Gender gender;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java b/src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java
new file mode 100644
index 00000000..5f2a855b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java
@@ -0,0 +1,17 @@
+package com.atwoz.member.domain.profile.graduate;
+
+public enum Graduate {
+
+    SEOUL_FOURTH("서울 4년제"),
+    ETC_FOURTH("지방 4년제"),
+    PROFESSIONAL("전문대"),
+    FOREIGN("해외대"),
+    MASTER("석사"),
+    DOCTOR("박사"),
+    LAW_SCHOOL("로스쿨"),
+    HIGH_SCHOOL("고등학교 졸업"),
+    ETC("기타");
+
+    Graduate(final String name) {
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java b/src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java
new file mode 100644
index 00000000..a9c522c5
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.profile.graduate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "graduate")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class MemberGraduate {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    private Graduate graduate;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java b/src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java
new file mode 100644
index 00000000..1c75c392
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java
@@ -0,0 +1,21 @@
+package com.atwoz.member.domain.profile.mbti;
+
+public enum Mbti {
+
+    ISTJ,
+    ISFJ,
+    INFJ,
+    INTJ,
+    ISTP,
+    ISFP,
+    INFP,
+    INTP,
+    ESTP,
+    ESFP,
+    ENFP,
+    ENTP,
+    ESTJ,
+    ESFJ,
+    ENFJ,
+    ENTJ;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java b/src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java
new file mode 100644
index 00000000..d514ea0a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.profile.mbti;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "mbti")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class MemberMbti {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    private Mbti mbti;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java b/src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java
new file mode 100644
index 00000000..437dcf35
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.profile.religion;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "religion")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class MemberReligion {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    private Religion religion;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/religion/Religion.java b/src/main/java/com/atwoz/member/domain/profile/religion/Religion.java
new file mode 100644
index 00000000..61aadc1b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/religion/Religion.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.profile.religion;
+
+public enum Religion {
+
+    CATHOLIC("천주교"),
+    CHRIST("기독교"),
+    BUDDHA("불교"),
+    NONE("무교"),
+    ETC("기타");
+
+    Religion(final String name) {
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java b/src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java
new file mode 100644
index 00000000..f197bbfa
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.profile.smoke;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "smoke")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class MemberSmoke {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    private Smoke smoke;
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java b/src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java
new file mode 100644
index 00000000..c2d7acd8
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.profile.smoke;
+
+public enum Smoke {
+
+    NEVER("비흡연"),
+    NOT_NOW("금연 중"),
+    ELECTRONIC("전자담배"),
+    OFTEN("가끔 피움"),
+    EVERYDAY("매일 피움");
+
+    Smoke(final String name) {
+    }
+}

From 208fd0e34e65ed53b23cfa7db60e03da89b990aa Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 17 Feb 2024 18:19:06 +0900
Subject: [PATCH 003/225] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=ED=95=84?=
 =?UTF-8?q?=20=EC=86=8D=EC=84=B1=20=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 나이, 키, 성별을 MemberBody로 취합
- 선택 사항을 MemberOption으로 취합
- nullable false 조건 추가
---
 .../atwoz/member/domain/member/Member.java    | 13 ++++++++
 .../com/atwoz/member/domain/profile/Age.java  | 26 ----------------
 .../domain/profile/{drink => }/Drink.java     |  2 +-
 .../domain/profile/{gender => }/Gender.java   |  2 +-
 .../profile/{graduate => }/Graduate.java      |  2 +-
 .../atwoz/member/domain/profile/Height.java   | 26 ----------------
 .../com/atwoz/member/domain/profile/Job.java  | 16 ++--------
 .../atwoz/member/domain/profile/Location.java | 17 ++---------
 .../domain/profile/{mbti => }/Mbti.java       |  2 +-
 .../MemberGender.java => MemberBody.java}     | 13 +++++---
 .../MemberGraduate.java => MemberOption.java} | 23 +++++++++++---
 .../profile/{religion => }/Religion.java      |  2 +-
 .../domain/profile/{smoke => }/Smoke.java     |  2 +-
 .../domain/profile/drink/MemberDrink.java     | 30 -------------------
 .../domain/profile/mbti/MemberMbti.java       | 30 -------------------
 .../profile/religion/MemberReligion.java      | 30 -------------------
 .../domain/profile/smoke/MemberSmoke.java     | 30 -------------------
 17 files changed, 51 insertions(+), 215 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Age.java
 rename src/main/java/com/atwoz/member/domain/profile/{drink => }/Drink.java (82%)
 rename src/main/java/com/atwoz/member/domain/profile/{gender => }/Gender.java (68%)
 rename src/main/java/com/atwoz/member/domain/profile/{graduate => }/Graduate.java (86%)
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Height.java
 rename src/main/java/com/atwoz/member/domain/profile/{mbti => }/Mbti.java (79%)
 rename src/main/java/com/atwoz/member/domain/profile/{gender/MemberGender.java => MemberBody.java} (74%)
 rename src/main/java/com/atwoz/member/domain/profile/{graduate/MemberGraduate.java => MemberOption.java} (56%)
 rename src/main/java/com/atwoz/member/domain/profile/{religion => }/Religion.java (78%)
 rename src/main/java/com/atwoz/member/domain/profile/{smoke => }/Smoke.java (81%)
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java

diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index 8e0099fa..fcf14904 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -1,6 +1,8 @@
 package com.atwoz.member.domain.member;
 
 import com.atwoz.global.domain.BaseEntity;
+import com.atwoz.member.domain.profile.Job;
+import com.atwoz.member.domain.profile.Location;
 import com.atwoz.member.domain.profile.hobby.Hobbies;
 import com.atwoz.member.domain.profile.image.Images;
 import com.atwoz.member.domain.profile.style.Styles;
@@ -42,12 +44,23 @@ public class Member extends BaseEntity {
     private MemberRole memberRole;
 
     @Embedded
+    @Column(nullable = false)
+    private Location location;
+
+    @Embedded
+    @Column(nullable = false)
+    private Job job;
+
+    @Embedded
+    @Column(nullable = false)
     private Hobbies hobbies;
 
     @Embedded
+    @Column(nullable = false)
     private Styles styles;
 
     @Embedded
+    @Column(nullable = false)
     private Images images;
 
     public boolean isAdmin() {
diff --git a/src/main/java/com/atwoz/member/domain/profile/Age.java b/src/main/java/com/atwoz/member/domain/profile/Age.java
deleted file mode 100644
index bb3eb786..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Age.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
-public class Age {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Column(nullable = false)
-    private Integer age;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/drink/Drink.java b/src/main/java/com/atwoz/member/domain/profile/Drink.java
similarity index 82%
rename from src/main/java/com/atwoz/member/domain/profile/drink/Drink.java
rename to src/main/java/com/atwoz/member/domain/profile/Drink.java
index 53d281fc..0ee95242 100644
--- a/src/main/java/com/atwoz/member/domain/profile/drink/Drink.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Drink.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.drink;
+package com.atwoz.member.domain.profile;
 
 public enum Drink {
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/gender/Gender.java b/src/main/java/com/atwoz/member/domain/profile/Gender.java
similarity index 68%
rename from src/main/java/com/atwoz/member/domain/profile/gender/Gender.java
rename to src/main/java/com/atwoz/member/domain/profile/Gender.java
index 407c844d..fe694a93 100644
--- a/src/main/java/com/atwoz/member/domain/profile/gender/Gender.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Gender.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.gender;
+package com.atwoz.member.domain.profile;
 
 public enum Gender {
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java b/src/main/java/com/atwoz/member/domain/profile/Graduate.java
similarity index 86%
rename from src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java
rename to src/main/java/com/atwoz/member/domain/profile/Graduate.java
index 5f2a855b..ba3d3faa 100644
--- a/src/main/java/com/atwoz/member/domain/profile/graduate/Graduate.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Graduate.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.graduate;
+package com.atwoz.member.domain.profile;
 
 public enum Graduate {
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/Height.java b/src/main/java/com/atwoz/member/domain/profile/Height.java
deleted file mode 100644
index 0dd60d7f..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Height.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
-public class Height {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Column(nullable = false)
-    private Integer height;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Job.java b/src/main/java/com/atwoz/member/domain/profile/Job.java
index a5e610d0..6948c329 100644
--- a/src/main/java/com/atwoz/member/domain/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Job.java
@@ -1,25 +1,13 @@
 package com.atwoz.member.domain.profile;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.Embeddable;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
-@Entity
+@Embeddable
 public class Job {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
     @Column(nullable = false)
     private String job;
 }
diff --git a/src/main/java/com/atwoz/member/domain/profile/Location.java b/src/main/java/com/atwoz/member/domain/profile/Location.java
index 45757854..ff99025c 100644
--- a/src/main/java/com/atwoz/member/domain/profile/Location.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Location.java
@@ -1,26 +1,13 @@
 package com.atwoz.member.domain.profile;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.AccessLevel;
+import jakarta.persistence.Embeddable;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
+@Embeddable
 public class Location {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
     @Column(nullable = false)
     private String city;
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java b/src/main/java/com/atwoz/member/domain/profile/Mbti.java
similarity index 79%
rename from src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java
rename to src/main/java/com/atwoz/member/domain/profile/Mbti.java
index 1c75c392..f5c4ea4f 100644
--- a/src/main/java/com/atwoz/member/domain/profile/mbti/Mbti.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Mbti.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.mbti;
+package com.atwoz.member.domain.profile;
 
 public enum Mbti {
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java b/src/main/java/com/atwoz/member/domain/profile/MemberBody.java
similarity index 74%
rename from src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java
rename to src/main/java/com/atwoz/member/domain/profile/MemberBody.java
index 0d1032ed..7760bae6 100644
--- a/src/main/java/com/atwoz/member/domain/profile/gender/MemberGender.java
+++ b/src/main/java/com/atwoz/member/domain/profile/MemberBody.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.gender;
+package com.atwoz.member.domain.profile;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -7,16 +7,14 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@Table(name = "gender")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class MemberGender {
+public class MemberBody {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -25,6 +23,13 @@ public class MemberGender {
     @Column(nullable = false)
     private Long memberId;
 
+    @Column(nullable = false)
+    private Integer age;
+
+    @Column(nullable = false)
+    private Integer height;
+
+    @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
     private Gender gender;
 }
diff --git a/src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java b/src/main/java/com/atwoz/member/domain/profile/MemberOption.java
similarity index 56%
rename from src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java
rename to src/main/java/com/atwoz/member/domain/profile/MemberOption.java
index a9c522c5..d209eb4a 100644
--- a/src/main/java/com/atwoz/member/domain/profile/graduate/MemberGraduate.java
+++ b/src/main/java/com/atwoz/member/domain/profile/MemberOption.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.graduate;
+package com.atwoz.member.domain.profile;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -7,16 +7,14 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@Table(name = "graduate")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class MemberGraduate {
+public class MemberOption {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -25,6 +23,23 @@ public class MemberGraduate {
     @Column(nullable = false)
     private Long memberId;
 
+    @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Smoke smoke;
+
+    @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Religion religion;
+
+    @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Drink drink;
+
+    @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Mbti mbti;
+
+    @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
     private Graduate graduate;
 }
diff --git a/src/main/java/com/atwoz/member/domain/profile/religion/Religion.java b/src/main/java/com/atwoz/member/domain/profile/Religion.java
similarity index 78%
rename from src/main/java/com/atwoz/member/domain/profile/religion/Religion.java
rename to src/main/java/com/atwoz/member/domain/profile/Religion.java
index 61aadc1b..07e70e35 100644
--- a/src/main/java/com/atwoz/member/domain/profile/religion/Religion.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Religion.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.religion;
+package com.atwoz.member.domain.profile;
 
 public enum Religion {
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java b/src/main/java/com/atwoz/member/domain/profile/Smoke.java
similarity index 81%
rename from src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java
rename to src/main/java/com/atwoz/member/domain/profile/Smoke.java
index c2d7acd8..07b8f6c7 100644
--- a/src/main/java/com/atwoz/member/domain/profile/smoke/Smoke.java
+++ b/src/main/java/com/atwoz/member/domain/profile/Smoke.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.smoke;
+package com.atwoz.member.domain.profile;
 
 public enum Smoke {
 
diff --git a/src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java b/src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java
deleted file mode 100644
index 339edb6c..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/drink/MemberDrink.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.atwoz.member.domain.profile.drink;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@Table(name = "drink")
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
-public class MemberDrink {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Enumerated(value = EnumType.STRING)
-    private Drink drink;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java b/src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java
deleted file mode 100644
index d514ea0a..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/mbti/MemberMbti.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.atwoz.member.domain.profile.mbti;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@Table(name = "mbti")
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
-public class MemberMbti {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Enumerated(value = EnumType.STRING)
-    private Mbti mbti;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java b/src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java
deleted file mode 100644
index 437dcf35..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/religion/MemberReligion.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.atwoz.member.domain.profile.religion;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@Table(name = "religion")
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
-public class MemberReligion {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Enumerated(value = EnumType.STRING)
-    private Religion religion;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java b/src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java
deleted file mode 100644
index f197bbfa..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/smoke/MemberSmoke.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.atwoz.member.domain.profile.smoke;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@Table(name = "smoke")
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
-public class MemberSmoke {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Enumerated(value = EnumType.STRING)
-    private Smoke smoke;
-}

From 0d8e60b5a546a4e730899493905b578211a52501 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 17 Feb 2024 19:00:26 +0900
Subject: [PATCH 004/225] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=ED=95=84?=
 =?UTF-8?q?=20=EC=86=8D=EC=84=B1=20=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member 생성 시 Hobbies, Styles, Images 기본 객체 생성되도록 정의
- MemberBody를 MembrProfile로 이름 수정 (로그인에 쓰이지 않는 프로필 정보)
- Location, Job을 MemberProfile로 이동
---
 .../com/atwoz/member/domain/member/Member.java   | 16 +++-------------
 .../{MemberBody.java => MemberProfile.java}      | 11 ++++++++++-
 .../member/domain/profile/hobby/Hobbies.java     |  5 +++++
 .../member/domain/profile/image/Images.java      |  5 +++++
 .../member/domain/profile/style/Styles.java      |  5 +++++
 5 files changed, 28 insertions(+), 14 deletions(-)
 rename src/main/java/com/atwoz/member/domain/profile/{MemberBody.java => MemberProfile.java} (79%)

diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index fcf14904..e4b2e8f5 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -1,8 +1,6 @@
 package com.atwoz.member.domain.member;
 
 import com.atwoz.global.domain.BaseEntity;
-import com.atwoz.member.domain.profile.Job;
-import com.atwoz.member.domain.profile.Location;
 import com.atwoz.member.domain.profile.hobby.Hobbies;
 import com.atwoz.member.domain.profile.image.Images;
 import com.atwoz.member.domain.profile.style.Styles;
@@ -45,23 +43,15 @@ public class Member extends BaseEntity {
 
     @Embedded
     @Column(nullable = false)
-    private Location location;
+    private Hobbies hobbies = new Hobbies();
 
     @Embedded
     @Column(nullable = false)
-    private Job job;
+    private Styles styles = new Styles();
 
     @Embedded
     @Column(nullable = false)
-    private Hobbies hobbies;
-
-    @Embedded
-    @Column(nullable = false)
-    private Styles styles;
-
-    @Embedded
-    @Column(nullable = false)
-    private Images images;
+    private Images images = new Images();
 
     public boolean isAdmin() {
         return this.memberRole.isAdministrator();
diff --git a/src/main/java/com/atwoz/member/domain/profile/MemberBody.java b/src/main/java/com/atwoz/member/domain/profile/MemberProfile.java
similarity index 79%
rename from src/main/java/com/atwoz/member/domain/profile/MemberBody.java
rename to src/main/java/com/atwoz/member/domain/profile/MemberProfile.java
index 7760bae6..16503539 100644
--- a/src/main/java/com/atwoz/member/domain/profile/MemberBody.java
+++ b/src/main/java/com/atwoz/member/domain/profile/MemberProfile.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.domain.profile;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -14,7 +15,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class MemberBody {
+public class MemberProfile {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -32,4 +33,12 @@ public class MemberBody {
     @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
     private Gender gender;
+
+    @Embedded
+    @Column(nullable = false)
+    private Location location;
+
+    @Embedded
+    @Column(nullable = false)
+    private Job job;
 }
diff --git a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
index b82132fb..9f7a25a5 100644
--- a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
+++ b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
@@ -3,6 +3,7 @@
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
 import lombok.Getter;
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -11,4 +12,8 @@ public class Hobbies {
 
     @ElementCollection
     private List<Hobby> hobbies;
+
+    public Hobbies() {
+        this.hobbies = new ArrayList<>();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/profile/image/Images.java b/src/main/java/com/atwoz/member/domain/profile/image/Images.java
index 7c73c8c5..587ded08 100644
--- a/src/main/java/com/atwoz/member/domain/profile/image/Images.java
+++ b/src/main/java/com/atwoz/member/domain/profile/image/Images.java
@@ -3,6 +3,7 @@
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
 import lombok.Getter;
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -11,4 +12,8 @@ public class Images {
 
     @ElementCollection
     private List<Image> images;
+
+    public Images() {
+        this.images = new ArrayList<>();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/profile/style/Styles.java b/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
index 709fa9b5..28010195 100644
--- a/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
+++ b/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
@@ -3,6 +3,7 @@
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
 import lombok.Getter;
+import java.util.ArrayList;
 import java.util.List;
 
 @Getter
@@ -11,4 +12,8 @@ public class Styles {
 
     @ElementCollection
     private List<Style> styles;
+
+    public Styles() {
+        this.styles = new ArrayList<>();
+    }
 }

From 226ad3a6ae5643967fd3973b76f3462a7642d2e3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:39:09 +0900
Subject: [PATCH 005/225] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=8B=9D=EB=B3=84=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- TokenProvider의 extract를 이메일로 수정
- LoginValidCheckerInterceptor에서 TokenProvider의 이메일을 가진 회원의 id를 저장하도록 수정

Co-authored-by: eom-tae-in <eti0728@daum.net>
---
 .../com/atwoz/member/config/AuthConfig.java   |  9 +++----
 .../member/domain/auth/TokenProvider.java     |  2 +-
 .../infrastructure/auth/JwtTokenProvider.java | 10 ++++----
 .../LoginValidCheckerInterceptor.java         |  9 +++++--
 .../ui/auth/AuthControllerWebMvcTest.java     | 25 +++++++++++--------
 .../LoginValidCheckerInterceptorTest.java     | 12 +++++----
 6 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/atwoz/member/config/AuthConfig.java b/src/main/java/com/atwoz/member/config/AuthConfig.java
index 3ceec047..7f4a7358 100644
--- a/src/main/java/com/atwoz/member/config/AuthConfig.java
+++ b/src/main/java/com/atwoz/member/config/AuthConfig.java
@@ -1,5 +1,8 @@
 package com.atwoz.member.config;
 
+import static com.atwoz.member.ui.auth.interceptor.HttpMethod.ANY;
+import static com.atwoz.member.ui.auth.interceptor.HttpMethod.OPTIONS;
+
 import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
 import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
 import com.atwoz.member.ui.auth.interceptor.PathMatcherInterceptor;
@@ -10,12 +13,8 @@
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
 import java.util.List;
 
-import static com.atwoz.member.ui.auth.interceptor.HttpMethod.ANY;
-import static com.atwoz.member.ui.auth.interceptor.HttpMethod.OPTIONS;
-
 @RequiredArgsConstructor
 @Configuration
 public class AuthConfig implements WebMvcConfigurer {
@@ -33,7 +32,7 @@ public void addInterceptors(InterceptorRegistry registry) {
     private HandlerInterceptor parseMemberIdFromTokenInterceptor() {
         return new PathMatcherInterceptor(parseMemberIdFromTokenInterceptor)
                 .excludePathPattern("/**", OPTIONS)
-                .addPathPatterns("/admin/**", ANY);
+                .addPathPatterns("/**", ANY);
     }
 
     /**
diff --git a/src/main/java/com/atwoz/member/domain/auth/TokenProvider.java b/src/main/java/com/atwoz/member/domain/auth/TokenProvider.java
index e52f0488..e91a2b2c 100644
--- a/src/main/java/com/atwoz/member/domain/auth/TokenProvider.java
+++ b/src/main/java/com/atwoz/member/domain/auth/TokenProvider.java
@@ -4,5 +4,5 @@ public interface TokenProvider {
 
     String createTokenWith(final String email);
 
-    Long extract(final String token);
+    String extract(final String token);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/auth/JwtTokenProvider.java b/src/main/java/com/atwoz/member/infrastructure/auth/JwtTokenProvider.java
index 81995ad9..5bd39284 100644
--- a/src/main/java/com/atwoz/member/infrastructure/auth/JwtTokenProvider.java
+++ b/src/main/java/com/atwoz/member/infrastructure/auth/JwtTokenProvider.java
@@ -14,13 +14,13 @@
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
 import jakarta.annotation.PostConstruct;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import java.security.Key;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 
 @NoArgsConstructor
 @Component
@@ -71,13 +71,13 @@ private Date expiredAt() {
     }
 
     @Override
-    public Long extract(final String token) {
+    public String extract(final String token) {
         try {
             return Jwts.parser()
                     .setSigningKey(secret.getBytes())
                     .parseClaimsJws(token)
                     .getBody()
-                    .get("id", Long.class);
+                    .get("email", String.class);
         } catch (SecurityException e) {
             throw new SignatureInvalidException();
         } catch (MalformedJwtException e) {
diff --git a/src/main/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptor.java b/src/main/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptor.java
index 3d9ea30b..dd3585ae 100644
--- a/src/main/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptor.java
+++ b/src/main/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptor.java
@@ -1,6 +1,8 @@
 package com.atwoz.member.ui.auth.interceptor;
 
 import com.atwoz.member.domain.auth.TokenProvider;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.domain.member.MemberRepository;
 import com.atwoz.member.exception.exceptions.auth.LoginInvalidException;
 import com.atwoz.member.ui.auth.support.auth.AuthenticationContext;
 import com.atwoz.member.ui.auth.support.auth.AuthenticationExtractor;
@@ -16,6 +18,7 @@ public class LoginValidCheckerInterceptor implements HandlerInterceptor {
 
     private final TokenProvider tokenProvider;
     private final AuthenticationContext authenticationContext;
+    private final MemberRepository memberRepository;
 
     @Override
     public boolean preHandle(final HttpServletRequest request,
@@ -24,8 +27,10 @@ public boolean preHandle(final HttpServletRequest request,
         String token = AuthenticationExtractor.extract(request)
                 .orElseThrow(LoginInvalidException::new);
 
-        Long memberId = tokenProvider.extract(token);
-        authenticationContext.setAuthentication(memberId);
+        String memberEmail = tokenProvider.extract(token);
+        Member findMember = memberRepository.findByEmail(memberEmail)
+                .orElseThrow(RuntimeException::new);
+        authenticationContext.setAuthentication(findMember.getId());
 
         return true;
     }
diff --git a/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
index 1798892b..f28ebea6 100644
--- a/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
@@ -1,7 +1,18 @@
 package com.atwoz.member.ui.auth;
 
+import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static com.atwoz.member.fixture.auth.OAuthProviderFixture.인증_기관_생성;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.application.auth.dto.LoginRequest;
+import com.atwoz.member.domain.member.MemberRepository;
 import com.atwoz.member.infrastructure.auth.dto.OAuthProviderRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -10,19 +21,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.fixture.auth.OAuthProviderFixture.인증_기관_생성;
-import static org.mockito.Mockito.when;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @AutoConfigureRestDocs
@@ -35,6 +37,9 @@ class AuthControllerWebMvcTest extends MockBeanInjection {
     @Autowired
     private ObjectMapper objectMapper;
 
+    @MockBean
+    private MemberRepository memberRepository;
+
     @Test
     void 로그인을_진행한다() throws Exception {
         // given
diff --git a/src/test/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptorTest.java b/src/test/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptorTest.java
index 0e353323..5b176031 100644
--- a/src/test/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptorTest.java
+++ b/src/test/java/com/atwoz/member/ui/auth/interceptor/LoginValidCheckerInterceptorTest.java
@@ -1,7 +1,12 @@
 package com.atwoz.member.ui.auth.interceptor;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import com.atwoz.member.exception.exceptions.auth.LoginInvalidException;
 import com.atwoz.member.infrastructure.auth.JwtTokenProvider;
+import com.atwoz.member.infrastructure.member.MemberFakeRepository;
 import com.atwoz.member.ui.auth.support.auth.AuthenticationContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -9,10 +14,6 @@
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 class LoginValidCheckerInterceptorTest {
@@ -25,7 +26,8 @@ class LoginValidCheckerInterceptorTest {
         // given
         LoginValidCheckerInterceptor loginValidCheckerInterceptor = new LoginValidCheckerInterceptor(
                 new JwtTokenProvider(),
-                new AuthenticationContext()
+                new AuthenticationContext(),
+                new MemberFakeRepository()
         );
 
         when(req.getHeader("any")).thenReturn(null);

From bbd7b661c9bd217002d4d4de3fb6dfaec0f5d2db Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:50:29 +0900
Subject: [PATCH 006/225] =?UTF-8?q?refactor:=20=ED=81=B4=EB=9E=98=EC=8A=A4?=
 =?UTF-8?q?=20=EA=B2=BD=EB=A1=9C=20=EB=B0=8F=20=EA=B5=AC=EC=A1=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 도메인에 있던 클래스 파일의 패키지 변경
- Hobbies, Styles 엔티티화
- MemberOption, MemberProfile 대신 Option, Profile로 수정
- Option과 Profile을 담은 겉구조를 info로 변경
- Profile 안에 있는 나이, 키, 성별을 MemberBody에 담도록 수정
- Null 예외처리 추가
- 범위 예외처리 추가
- 속성값 조회 실패 예외처리 추가

Co-authored-by: eom-tae-in <eti0728@daum.net>
---
 .../exception/GlobalExceptionHandler.java     | 14 ++++
 .../exceptions/NullValueException.java        |  8 ++
 .../exceptions/PropertyNotFoundException.java |  8 ++
 .../member/domain/info/hobby/Hobbies.java     | 75 +++++++++++++++++++
 .../atwoz/member/domain/info/hobby/Hobby.java | 30 ++++++++
 .../domain/{profile => info}/image/Image.java |  2 +-
 .../{profile => info}/image/Images.java       |  2 +-
 .../member/domain/info/option/Drink.java      | 28 +++++++
 .../member/domain/info/option/Graduate.java   | 32 ++++++++
 .../atwoz/member/domain/info/option/Mbti.java | 31 ++++++++
 .../option/Option.java}                       | 16 +++-
 .../member/domain/info/option/Religion.java   | 28 +++++++
 .../member/domain/info/option/Smoke.java      | 28 +++++++
 .../member/domain/info/profile/Gender.java    | 25 +++++++
 .../atwoz/member/domain/info/profile/Job.java | 29 +++++++
 .../member/domain/info/profile/Location.java  | 33 ++++++++
 .../domain/info/profile/MemberBody.java       | 67 +++++++++++++++++
 .../profile/Profile.java}                     | 22 +++---
 .../atwoz/member/domain/info/style/Style.java | 30 ++++++++
 .../member/domain/info/style/Styles.java      | 75 +++++++++++++++++++
 .../atwoz/member/domain/member/Member.java    | 16 ----
 .../atwoz/member/domain/profile/Drink.java    | 13 ----
 .../atwoz/member/domain/profile/Gender.java   | 10 ---
 .../atwoz/member/domain/profile/Graduate.java | 17 -----
 .../com/atwoz/member/domain/profile/Job.java  | 13 ----
 .../atwoz/member/domain/profile/Location.java | 16 ----
 .../com/atwoz/member/domain/profile/Mbti.java | 21 ------
 .../atwoz/member/domain/profile/Religion.java | 13 ----
 .../atwoz/member/domain/profile/Smoke.java    | 13 ----
 .../member/domain/profile/hobby/Hobbies.java  | 19 -----
 .../member/domain/profile/hobby/Hobby.java    | 13 ----
 .../member/domain/profile/style/Style.java    | 13 ----
 .../member/domain/profile/style/Styles.java   | 19 -----
 .../info/profile/ProfileRangeException.java   |  8 ++
 34 files changed, 575 insertions(+), 212 deletions(-)
 create mode 100644 src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java
 create mode 100644 src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
 rename src/main/java/com/atwoz/member/domain/{profile => info}/image/Image.java (80%)
 rename src/main/java/com/atwoz/member/domain/{profile => info}/image/Images.java (87%)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/Drink.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/Graduate.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/Mbti.java
 rename src/main/java/com/atwoz/member/domain/{profile/MemberOption.java => info/option/Option.java} (64%)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/Religion.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/Smoke.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/Gender.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/Job.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/Location.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java
 rename src/main/java/com/atwoz/member/domain/{profile/MemberProfile.java => info/profile/Profile.java} (66%)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/style/Style.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/style/Styles.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Drink.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Gender.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Graduate.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Job.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Location.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Mbti.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Religion.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/Smoke.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/style/Style.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/profile/style/Styles.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java

diff --git a/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java b/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
index 7f90f742..5526550d 100644
--- a/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
@@ -1,5 +1,7 @@
 package com.atwoz.global.exception;
 
+import com.atwoz.global.exception.exceptions.NullValueException;
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -31,4 +33,16 @@ public ResponseEntity<String> handleIllegalArgumentException(final IllegalArgume
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body(INTERNAL_SERVER_ERROR_MESSAGE);
     }
+
+    @ExceptionHandler(NullValueException.class)
+    public ResponseEntity<String> handleNullException(final NullValueException exception) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(exception.getMessage());
+    }
+
+    @ExceptionHandler(PropertyNotFoundException.class)
+    public ResponseEntity<String> handlePropertyNotFoundException(final PropertyNotFoundException exception) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(exception.getMessage());
+    }
 }
diff --git a/src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java b/src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java
new file mode 100644
index 00000000..e44e748f
--- /dev/null
+++ b/src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java
@@ -0,0 +1,8 @@
+package com.atwoz.global.exception.exceptions;
+
+public class NullValueException extends RuntimeException {
+
+    public NullValueException() {
+        super("값에 null이 들어가면 안 됩니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java b/src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java
new file mode 100644
index 00000000..f34e780e
--- /dev/null
+++ b/src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.global.exception.exceptions;
+
+public class PropertyNotFoundException extends RuntimeException {
+
+    public PropertyNotFoundException() {
+        super("속성 값에 맞는 타입을 찾지 못했습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
new file mode 100644
index 00000000..af85032b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
@@ -0,0 +1,75 @@
+package com.atwoz.member.domain.info.hobby;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class Hobbies {
+
+    private static final int MINIMUM_SIZE = 1;
+    private static final int MAXIMUM_SIZE = 3;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @ElementCollection
+    private List<Hobby> hobbies;
+
+    public Hobbies(final Long memberId, final List<String> hobbies) {
+        validateIsNullMemberId(memberId);
+        validateHobbies(hobbies);
+        List<Hobby> newHobbies = hobbies.stream()
+                .map(Hobby::from)
+                .toList();
+
+        this.hobbies = newHobbies;
+    }
+
+    private void validateIsNullMemberId(final Long memberId) {
+        if (memberId == null) {
+            throw new NullValueException();
+        }
+    }
+
+    private void validateHobbies(final List<String> hobbies) {
+        validateIsNull(hobbies);
+        validateIsDuplicate(hobbies);
+        validateSize(hobbies);
+    }
+
+    private void validateIsNull(final List<String> hobbies) {
+        if (hobbies == null) {
+            throw new NullValueException();
+        }
+    }
+
+    private void validateIsDuplicate(final List<String> hobbies) {
+        Set<String> hobbySet = new HashSet<>(hobbies);
+        if (hobbies.size() != hobbySet.size()) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    private void validateSize(final List<String> hobbies) {
+        if (hobbies.size() < MINIMUM_SIZE || hobbies.size() > MAXIMUM_SIZE) {
+            throw new IllegalArgumentException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
new file mode 100644
index 00000000..7a647fd7
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.info.hobby;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@Embeddable
+public class Hobby {
+
+    @Column(nullable = false)
+    private String hobby;
+
+    public static Hobby from(final String hobby) {
+        validateIsNotNull(hobby);
+        return new Hobby(hobby);
+    }
+
+    private static void validateIsNotNull(final String hobby) {
+        if (hobby == null) {
+            throw new NullValueException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/image/Image.java b/src/main/java/com/atwoz/member/domain/info/image/Image.java
similarity index 80%
rename from src/main/java/com/atwoz/member/domain/profile/image/Image.java
rename to src/main/java/com/atwoz/member/domain/info/image/Image.java
index 2687f8a1..7b24316c 100644
--- a/src/main/java/com/atwoz/member/domain/profile/image/Image.java
+++ b/src/main/java/com/atwoz/member/domain/info/image/Image.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.image;
+package com.atwoz.member.domain.info.image;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
diff --git a/src/main/java/com/atwoz/member/domain/profile/image/Images.java b/src/main/java/com/atwoz/member/domain/info/image/Images.java
similarity index 87%
rename from src/main/java/com/atwoz/member/domain/profile/image/Images.java
rename to src/main/java/com/atwoz/member/domain/info/image/Images.java
index 587ded08..71cc8324 100644
--- a/src/main/java/com/atwoz/member/domain/profile/image/Images.java
+++ b/src/main/java/com/atwoz/member/domain/info/image/Images.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile.image;
+package com.atwoz.member.domain.info.image;
 
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embeddable;
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Drink.java b/src/main/java/com/atwoz/member/domain/info/option/Drink.java
new file mode 100644
index 00000000..0de01972
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/Drink.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.domain.info.option;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import lombok.Getter;
+import java.util.Arrays;
+
+@Getter
+public enum Drink {
+
+    NEVER("전혀 마시지 않음"),
+    SOCIETY("사회적 음주"),
+    OFTEN("가끔 마심"),
+    ENJOY("술자리를 즐김"),
+    NOT_NOW("금주 중");
+
+    private final String name;
+
+    Drink(final String name) {
+        this.name = name;
+    }
+
+    public static Drink findByName(final String name) {
+        return Arrays.stream(values())
+                .filter(drink -> name.equals(drink.getName()))
+                .findFirst()
+                .orElseThrow(PropertyNotFoundException::new);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Graduate.java b/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
new file mode 100644
index 00000000..459dbf3b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
@@ -0,0 +1,32 @@
+package com.atwoz.member.domain.info.option;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import lombok.Getter;
+import java.util.Arrays;
+
+@Getter
+public enum Graduate {
+
+    SEOUL_FOURTH("서울 4년제"),
+    ETC_FOURTH("지방 4년제"),
+    PROFESSIONAL("전문대"),
+    FOREIGN("해외대"),
+    MASTER("석사"),
+    DOCTOR("박사"),
+    LAW_SCHOOL("로스쿨"),
+    HIGH_SCHOOL("고등학교 졸업"),
+    ETC("기타");
+
+    private final String name;
+
+    Graduate(final String name) {
+        this.name = name;
+    }
+
+    public static Graduate findByName(final String name) {
+        return Arrays.stream(values())
+                .filter(graduate -> name.equals(graduate.getName()))
+                .findFirst()
+                .orElseThrow(PropertyNotFoundException::new);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Mbti.java b/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
new file mode 100644
index 00000000..b00ce56f
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
@@ -0,0 +1,31 @@
+package com.atwoz.member.domain.info.option;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import java.util.Arrays;
+
+public enum Mbti {
+
+    ISTJ,
+    ISFJ,
+    INFJ,
+    INTJ,
+    ISTP,
+    ISFP,
+    INFP,
+    INTP,
+    ESTP,
+    ESFP,
+    ENFP,
+    ENTP,
+    ESTJ,
+    ESFJ,
+    ENFJ,
+    ENTJ;
+
+    public static Mbti findByName(final String name) {
+        return Arrays.stream(values())
+                .filter(mbti -> name.equals(mbti.name()))
+                .findFirst()
+                .orElseThrow(PropertyNotFoundException::new);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/MemberOption.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
similarity index 64%
rename from src/main/java/com/atwoz/member/domain/profile/MemberOption.java
rename to src/main/java/com/atwoz/member/domain/info/option/Option.java
index d209eb4a..c41e6cbe 100644
--- a/src/main/java/com/atwoz/member/domain/profile/MemberOption.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.profile;
+package com.atwoz.member.domain.info.option;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -7,14 +7,16 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@Table(name = "member_option")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class MemberOption {
+public class Option {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -42,4 +44,14 @@ public class MemberOption {
     @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
     private Graduate graduate;
+
+    public Option(final Long memberId, final String smoke, final String religion,
+                  final String drink, final String mbti, final String graduate) {
+        this.memberId = memberId;
+        this.smoke = Smoke.findByName(smoke);
+        this.religion = Religion.findByName(religion);
+        this.drink = Drink.findByName(drink);
+        this.mbti = Mbti.findByName(mbti);
+        this.graduate = Graduate.findByName(graduate);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Religion.java b/src/main/java/com/atwoz/member/domain/info/option/Religion.java
new file mode 100644
index 00000000..0dbcde46
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/Religion.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.domain.info.option;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import lombok.Getter;
+import java.util.Arrays;
+
+@Getter
+public enum Religion {
+
+    CATHOLIC("천주교"),
+    CHRIST("기독교"),
+    BUDDHA("불교"),
+    NONE("무교"),
+    ETC("기타");
+
+    private final String name;
+
+    Religion(final String name) {
+        this.name = name;
+    }
+
+    public static Religion findByName(final String name) {
+        return Arrays.stream(values())
+                .filter(religion -> name.equals(religion.getName()))
+                .findFirst()
+                .orElseThrow(PropertyNotFoundException::new);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Smoke.java b/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
new file mode 100644
index 00000000..460fc41c
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.domain.info.option;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import lombok.Getter;
+import java.util.Arrays;
+
+@Getter
+public enum Smoke {
+
+    NEVER("비흡연"),
+    NOT_NOW("금연 중"),
+    ELECTRONIC("전자담배"),
+    OFTEN("가끔 피움"),
+    EVERYDAY("매일 피움");
+
+    private final String name;
+
+    Smoke(final String name) {
+        this.name = name;
+    }
+
+    public static Smoke findByName(final String name) {
+        return Arrays.stream(values())
+                .filter(smoke -> name.equals(smoke.getName()))
+                .findFirst()
+                .orElseThrow(PropertyNotFoundException::new);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java b/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
new file mode 100644
index 00000000..f0b0e459
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
@@ -0,0 +1,25 @@
+package com.atwoz.member.domain.info.profile;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import lombok.Getter;
+import java.util.Arrays;
+
+@Getter
+public enum Gender {
+
+    MALE("남성"),
+    FEMALE("여성");
+
+    private final String name;
+
+    Gender(final String name) {
+        this.name = name;
+    }
+
+    public static Gender findByName(final String name) {
+        return Arrays.stream(values())
+                .filter(gender -> name.equals(gender.getName()))
+                .findFirst()
+                .orElseThrow(PropertyNotFoundException::new);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
new file mode 100644
index 00000000..d4c03c50
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.domain.info.profile;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Embeddable
+public class Job {
+
+    @Column(nullable = false)
+    private String job;
+
+    public Job(final String job) {
+        validateNotNull(job);
+
+        this.job = job;
+    }
+
+    public void validateNotNull(final String job) {
+        if (job == null) {
+            throw new NullValueException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Location.java b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
new file mode 100644
index 00000000..18661bed
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.profile;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Embeddable
+public class Location {
+
+    @Column(nullable = false)
+    private String city;
+
+    @Column(nullable = false)
+    private String sector;
+
+    public Location(final String city, final String sector) {
+        validateValues(city, sector);
+
+        this.city = city;
+        this.sector = sector;
+    }
+
+    private void validateValues(final String city, final String sector) {
+        if (city == null || sector == null) {
+            throw new NullValueException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java b/src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java
new file mode 100644
index 00000000..62dcd197
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java
@@ -0,0 +1,67 @@
+package com.atwoz.member.domain.info.profile;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Embeddable
+public class MemberBody {
+
+    private static final int MIN_AGE = 20;
+    private static final int MAX_AGE = 45;
+    private static final int MIN_HEIGHT = 140;
+    private static final int MAX_HEIGHT = 199;
+
+    @Column(nullable = false)
+    private Integer age;
+
+    @Column(nullable = false)
+    private Integer height;
+
+    @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private Gender gender;
+
+    public MemberBody(final Integer age, final Integer height, final Gender gender) {
+        validateValues(age, height);
+
+        this.age = age;
+        this.height = height;
+        this.gender = gender;
+    }
+
+    public void validateValues(final Integer age, final Integer height) {
+        validateAge(age);
+        validateHeight(height);
+    }
+
+    private void validateAge(final Integer age) {
+        if (age == null) {
+            throw new NullValueException();
+        }
+        LocalDateTime nowTime = LocalDateTime.now();
+        int nowYear = nowTime.getYear();
+        int memberAge = Math.abs(nowYear - age);
+        if (memberAge < MIN_AGE|| MAX_AGE < memberAge) {
+            throw new ProfileRangeException();
+        }
+    }
+
+    private void validateHeight(final Integer height) {
+        if (height == null) {
+            throw new NullValueException();
+        }
+        if (height < MIN_HEIGHT || MAX_HEIGHT < height) {
+            throw new ProfileRangeException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/profile/MemberProfile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
similarity index 66%
rename from src/main/java/com/atwoz/member/domain/profile/MemberProfile.java
rename to src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 16503539..1d4de8ea 100644
--- a/src/main/java/com/atwoz/member/domain/profile/MemberProfile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -1,10 +1,8 @@
-package com.atwoz.member.domain.profile;
+package com.atwoz.member.domain.info.profile;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -15,7 +13,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class MemberProfile {
+public class Profile {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -25,14 +23,7 @@ public class MemberProfile {
     private Long memberId;
 
     @Column(nullable = false)
-    private Integer age;
-
-    @Column(nullable = false)
-    private Integer height;
-
-    @Column(nullable = false)
-    @Enumerated(value = EnumType.STRING)
-    private Gender gender;
+    private MemberBody memberBody;
 
     @Embedded
     @Column(nullable = false)
@@ -41,4 +32,11 @@ public class MemberProfile {
     @Embedded
     @Column(nullable = false)
     private Job job;
+
+    public Profile(final Long memberId, final MemberBody memberBody, final Location location, final Job job) {
+        this.memberId = memberId;
+        this.memberBody = memberBody;
+        this.location = location;
+        this.job = job;
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
new file mode 100644
index 00000000..27cdad6e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -0,0 +1,30 @@
+package com.atwoz.member.domain.info.style;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@Embeddable
+public class Style {
+
+    @Column(nullable = false)
+    private String style;
+
+    public static Style from(final String style) {
+        validateIsNotNull(style);
+        return new Style(style);
+    }
+
+    private static void validateIsNotNull(final String style) {
+        if (style == null) {
+            throw new NullValueException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
new file mode 100644
index 00000000..38d22f2e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
@@ -0,0 +1,75 @@
+package com.atwoz.member.domain.info.style;
+
+import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class Styles {
+
+    private static final int MINIMUM_SIZE = 1;
+    private static final int MAXIMUM_SIZE = 3;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @ElementCollection
+    private List<Style> styles;
+
+    public Styles(final Long memberId, final List<String> styles) {
+        validateIsNullMemberId(memberId);
+        validateStyles(styles);
+        List<Style> newStyles = styles.stream()
+                .map(Style::from)
+                .toList();
+
+        this.styles = newStyles;
+    }
+
+    private void validateIsNullMemberId(final Long memberId) {
+        if (memberId == null) {
+            throw new NullValueException();
+        }
+    }
+
+    private void validateStyles(final List<String> styles) {
+        validateIsNullStyles(styles);
+        validateIsDuplicate(styles);
+        validateSize(styles);
+    }
+
+    private void validateIsNullStyles(final List<String> styles) {
+        if (styles == null) {
+            throw new NullValueException();
+        }
+    }
+
+    private void validateIsDuplicate(final List<String> styles) {
+        Set<String> styleSet = new HashSet<>(styles);
+        if (styles.size() != styleSet.size()) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    private void validateSize(final List<String> styles) {
+        if (styles.size() < MINIMUM_SIZE || styles.size() > MAXIMUM_SIZE) {
+            throw new IllegalArgumentException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index e4b2e8f5..fa30b5e7 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -1,11 +1,7 @@
 package com.atwoz.member.domain.member;
 
 import com.atwoz.global.domain.BaseEntity;
-import com.atwoz.member.domain.profile.hobby.Hobbies;
-import com.atwoz.member.domain.profile.image.Images;
-import com.atwoz.member.domain.profile.style.Styles;
 import jakarta.persistence.Column;
-import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -41,18 +37,6 @@ public class Member extends BaseEntity {
     @Column(nullable = false)
     private MemberRole memberRole;
 
-    @Embedded
-    @Column(nullable = false)
-    private Hobbies hobbies = new Hobbies();
-
-    @Embedded
-    @Column(nullable = false)
-    private Styles styles = new Styles();
-
-    @Embedded
-    @Column(nullable = false)
-    private Images images = new Images();
-
     public boolean isAdmin() {
         return this.memberRole.isAdministrator();
     }
diff --git a/src/main/java/com/atwoz/member/domain/profile/Drink.java b/src/main/java/com/atwoz/member/domain/profile/Drink.java
deleted file mode 100644
index 0ee95242..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Drink.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-public enum Drink {
-
-    NEVER("전혀 마시지 않음"),
-    SOCIETY("사회적 음주"),
-    OFTEN("가끔 마심"),
-    ENJOY("술자리를 즐김"),
-    NOT_NOW("금주 중");
-
-    Drink(final String name) {
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Gender.java b/src/main/java/com/atwoz/member/domain/profile/Gender.java
deleted file mode 100644
index fe694a93..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Gender.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-public enum Gender {
-
-    MALE("남성"),
-    FEMALE("여성");
-
-    Gender(final String name) {
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Graduate.java b/src/main/java/com/atwoz/member/domain/profile/Graduate.java
deleted file mode 100644
index ba3d3faa..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Graduate.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-public enum Graduate {
-
-    SEOUL_FOURTH("서울 4년제"),
-    ETC_FOURTH("지방 4년제"),
-    PROFESSIONAL("전문대"),
-    FOREIGN("해외대"),
-    MASTER("석사"),
-    DOCTOR("박사"),
-    LAW_SCHOOL("로스쿨"),
-    HIGH_SCHOOL("고등학교 졸업"),
-    ETC("기타");
-
-    Graduate(final String name) {
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Job.java b/src/main/java/com/atwoz/member/domain/profile/Job.java
deleted file mode 100644
index 6948c329..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Job.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-
-@Getter
-@Embeddable
-public class Job {
-
-    @Column(nullable = false)
-    private String job;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Location.java b/src/main/java/com/atwoz/member/domain/profile/Location.java
deleted file mode 100644
index ff99025c..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Location.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-
-@Getter
-@Embeddable
-public class Location {
-
-    @Column(nullable = false)
-    private String city;
-
-    @Column(nullable = false)
-    private String sector;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Mbti.java b/src/main/java/com/atwoz/member/domain/profile/Mbti.java
deleted file mode 100644
index f5c4ea4f..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Mbti.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-public enum Mbti {
-
-    ISTJ,
-    ISFJ,
-    INFJ,
-    INTJ,
-    ISTP,
-    ISFP,
-    INFP,
-    INTP,
-    ESTP,
-    ESFP,
-    ENFP,
-    ENTP,
-    ESTJ,
-    ESFJ,
-    ENFJ,
-    ENTJ;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Religion.java b/src/main/java/com/atwoz/member/domain/profile/Religion.java
deleted file mode 100644
index 07e70e35..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Religion.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-public enum Religion {
-
-    CATHOLIC("천주교"),
-    CHRIST("기독교"),
-    BUDDHA("불교"),
-    NONE("무교"),
-    ETC("기타");
-
-    Religion(final String name) {
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/Smoke.java b/src/main/java/com/atwoz/member/domain/profile/Smoke.java
deleted file mode 100644
index 07b8f6c7..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/Smoke.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.profile;
-
-public enum Smoke {
-
-    NEVER("비흡연"),
-    NOT_NOW("금연 중"),
-    ELECTRONIC("전자담배"),
-    OFTEN("가끔 피움"),
-    EVERYDAY("매일 피움");
-
-    Smoke(final String name) {
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
deleted file mode 100644
index 9f7a25a5..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobbies.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.atwoz.member.domain.profile.hobby;
-
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-import java.util.ArrayList;
-import java.util.List;
-
-@Getter
-@Embeddable
-public class Hobbies {
-
-    @ElementCollection
-    private List<Hobby> hobbies;
-
-    public Hobbies() {
-        this.hobbies = new ArrayList<>();
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java
deleted file mode 100644
index 661b7cd4..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/hobby/Hobby.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.profile.hobby;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-
-@Getter
-@Embeddable
-public class Hobby {
-
-    @Column(nullable = false)
-    private String hobby;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/style/Style.java b/src/main/java/com/atwoz/member/domain/profile/style/Style.java
deleted file mode 100644
index 1f036fc2..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/style/Style.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.profile.style;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-
-@Getter
-@Embeddable
-public class Style {
-
-    @Column(nullable = false)
-    private String style;
-}
diff --git a/src/main/java/com/atwoz/member/domain/profile/style/Styles.java b/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
deleted file mode 100644
index 28010195..00000000
--- a/src/main/java/com/atwoz/member/domain/profile/style/Styles.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.atwoz.member.domain.profile.style;
-
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-import java.util.ArrayList;
-import java.util.List;
-
-@Getter
-@Embeddable
-public class Styles {
-
-    @ElementCollection
-    private List<Style> styles;
-
-    public Styles() {
-        this.styles = new ArrayList<>();
-    }
-}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java
new file mode 100644
index 00000000..f9a4bc78
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile;
+
+public class ProfileRangeException extends RuntimeException {
+
+    public ProfileRangeException() {
+        super("값 범위가 잘못되었습니다.");
+    }
+}

From 4a84e31e24361513df327b9f434ed3d418f3e083 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:53:51 +0900
Subject: [PATCH 007/225] =?UTF-8?q?feat:=20Repository=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Styles 리포지터리 정의
- Hobbies 리포지터리 정의
- Option 리포지터리 정의
- Profile 리포지터리 정의

Co-authored-by: eom-tae-in <eti0728@daum.net>
---
 .../info/hobby/HobbiesJpaRepository.java        |  7 +++++++
 .../info/hobby/HobbiesRepository.java           |  8 ++++++++
 .../info/hobby/HobbiesRepositoryImpl.java       | 17 +++++++++++++++++
 .../info/option/OptionJpaRepository.java        |  7 +++++++
 .../info/option/OptionRepository.java           |  8 ++++++++
 .../info/option/OptionRepositoryImpl.java       | 17 +++++++++++++++++
 .../info/profile/ProfileJpaRepository.java      |  7 +++++++
 .../info/profile/ProfileRepository.java         |  8 ++++++++
 .../info/profile/ProfileRepositoryImpl.java     | 17 +++++++++++++++++
 .../info/style/StylesJpaRepository.java         |  7 +++++++
 .../info/style/StylesRepository.java            |  8 ++++++++
 .../info/style/StylesRepositoryImpl.java        | 17 +++++++++++++++++
 12 files changed, 128 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java
new file mode 100644
index 00000000..b8fce5a4
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.infrastructure.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobbies;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface HobbiesJpaRepository extends JpaRepository<Hobbies, Long> {
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java
new file mode 100644
index 00000000..5403cbb7
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.infrastructure.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobbies;
+
+public interface HobbiesRepository {
+
+    void save(final Hobbies hobbies);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java
new file mode 100644
index 00000000..f84628ee
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java
@@ -0,0 +1,17 @@
+package com.atwoz.member.infrastructure.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobbies;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class HobbiesRepositoryImpl implements HobbiesRepository {
+
+    private final HobbiesJpaRepository hobbiesJpaRepository;
+
+    @Override
+    public void save(final Hobbies hobbies) {
+        hobbiesJpaRepository.save(hobbies);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
new file mode 100644
index 00000000..4dc5049e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.infrastructure.info.option;
+
+import com.atwoz.member.domain.info.option.Option;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OptionJpaRepository extends JpaRepository<Option, Long> {
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
new file mode 100644
index 00000000..8ee11025
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.infrastructure.info.option;
+
+import com.atwoz.member.domain.info.option.Option;
+
+public interface OptionRepository {
+
+    void save(final Option option);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
new file mode 100644
index 00000000..a9b3f22e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
@@ -0,0 +1,17 @@
+package com.atwoz.member.infrastructure.info.option;
+
+import com.atwoz.member.domain.info.option.Option;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class OptionRepositoryImpl implements OptionRepository{
+
+    private final OptionJpaRepository optionJpaRepository;
+
+    @Override
+    public void save(final Option option) {
+        optionJpaRepository.save(option);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
new file mode 100644
index 00000000..15317ab1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.infrastructure.info.profile;
+
+import com.atwoz.member.domain.info.profile.Profile;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProfileJpaRepository extends JpaRepository<Profile, Long> {
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
new file mode 100644
index 00000000..f8356ef5
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.infrastructure.info.profile;
+
+import com.atwoz.member.domain.info.profile.Profile;
+
+public interface ProfileRepository {
+
+    void save(final Profile profile);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
new file mode 100644
index 00000000..a213f3e2
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
@@ -0,0 +1,17 @@
+package com.atwoz.member.infrastructure.info.profile;
+
+import com.atwoz.member.domain.info.profile.Profile;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class ProfileRepositoryImpl implements ProfileRepository{
+
+    private final ProfileJpaRepository profileJpaRepository;
+
+    @Override
+    public void save(final Profile profile) {
+        profileJpaRepository.save(profile);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java
new file mode 100644
index 00000000..88baf34a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.Styles;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface StylesJpaRepository extends JpaRepository<Styles, Long> {
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java
new file mode 100644
index 00000000..a546f4dc
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.Styles;
+
+public interface StylesRepository {
+
+    void save(final Styles styles);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java
new file mode 100644
index 00000000..e254bd73
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java
@@ -0,0 +1,17 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.Styles;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@RequiredArgsConstructor
+@Repository
+public class StylesRepositoryImpl implements StylesRepository {
+
+    private final StylesJpaRepository stylesJpaRepository;
+
+    @Override
+    public void save(final Styles styles) {
+        stylesJpaRepository.save(styles);
+    }
+}

From 5e7cd52f208708dcd63a26fb7f72dc30d922efc0 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:55:30 +0900
Subject: [PATCH 008/225] =?UTF-8?q?feat:=20DTO=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile, Option, Hobbies, Styles가 포함된 요청을 가지는 InfoWriteRequest 정의
- 그 외 필요한 세부 DTO 정의

Co-authored-by: eom-tae-in <eti0728@daum.net>
---
 .../info/dto/HobbyWriteRequest.java           | 10 +++++++++
 .../info/dto/InfoWriteRequest.java            | 17 ++++++++++++++
 .../info/dto/StyleWriteRequest.java           | 10 +++++++++
 .../info/dto/option/OptionWriteRequest.java   | 22 +++++++++++++++++++
 .../dto/profile/LocationWriteRequest.java     | 13 +++++++++++
 .../info/dto/profile/ProfileWriteRequest.java | 22 +++++++++++++++++++
 6 files changed, 94 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java

diff --git a/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
new file mode 100644
index 00000000..e860e756
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.application.info.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record HobbyWriteRequest(
+
+        @NotBlank(message = "취미가 작성되어야 합니다.")
+        String hobby
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
new file mode 100644
index 00000000..b36d1732
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
@@ -0,0 +1,17 @@
+package com.atwoz.member.application.info.dto;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import java.util.List;
+
+public record InfoWriteRequest(
+
+        ProfileWriteRequest profile,
+
+        OptionWriteRequest option,
+
+        List<HobbyWriteRequest> hobbies,
+
+        List<StyleWriteRequest> styles
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
new file mode 100644
index 00000000..915ed002
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.application.info.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record StyleWriteRequest(
+
+        @NotBlank(message = "스타일이 작성되어야 합니다.")
+        String style
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
new file mode 100644
index 00000000..194331f1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.application.info.dto.option;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record OptionWriteRequest(
+
+        @NotBlank(message = "음주가 작성되어야 합니다.")
+        String drink,
+
+        @NotBlank(message = "최종학력이 작성되어야 합니다.")
+        String graduate,
+
+        @NotBlank(message = "종교가 작성되어야 합니다.")
+        String religion,
+
+        @NotBlank(message = "흡연이 작성되어야 합니다.")
+        String smoke,
+
+        @NotBlank(message = "MBTI가 작성되어야 합니다.")
+        String mbti
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
new file mode 100644
index 00000000..be4858f8
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record LocationWriteRequest(
+
+        @NotBlank(message = "시/도가 작성되어야 합니다.")
+        String city,
+
+        @NotBlank(message = "구가 작성되어야 합니다.")
+        String sector
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
new file mode 100644
index 00000000..0957cf3a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record ProfileWriteRequest(
+
+        @NotNull(message = "나이가 작성되어야 합니다.")
+        Integer age,
+
+        @NotNull(message = "키가 작성되어야 합니다.")
+        Integer height,
+
+        @NotBlank(message = "성별이 작성되어야 합니다.")
+        String gender,
+
+        LocationWriteRequest location,
+
+        @NotBlank(message = "직업이 작성되어야 합니다.")
+        String job
+){
+}

From 02a0cea4de571aa8d5ee65d69452e0aee44eb9fb Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:57:35 +0900
Subject: [PATCH 009/225] =?UTF-8?q?feat:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile, Option 작성 이벤트 처리 및 Factory 구현
- Hobby, Style 작성 이벤트 처리 구현

Co-authored-by: eom-tae-in <eti0728@daum.net>
---
 .../application/event/HobbyWriteEvent.java    | 19 ++++++++++
 .../application/event/OptionWriteEvent.java   | 18 +++++++++
 .../application/event/ProfileWriteEvent.java  | 18 +++++++++
 .../application/event/StyleWriteEvent.java    | 19 ++++++++++
 .../member/application/info/InfoService.java  | 36 ++++++++++++++++++
 .../application/info/hobby/HobbyService.java  | 22 +++++++++++
 .../info/hobby/HobbyWriteEventHandler.java    | 23 ++++++++++++
 .../info/option/OptionFactory.java            | 14 +++++++
 .../info/option/OptionService.java            | 23 ++++++++++++
 .../info/option/OptionWriteEventHandler.java  | 21 +++++++++++
 .../info/profile/ProfileFactory.java          | 37 +++++++++++++++++++
 .../info/profile/ProfileService.java          | 24 ++++++++++++
 .../profile/ProfileWriteEventHandler.java     | 22 +++++++++++
 .../application/info/style/StyleService.java  | 21 +++++++++++
 .../info/style/StyleWriteEventHandler.java    | 23 ++++++++++++
 15 files changed, 340 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java
 create mode 100644 src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java
 create mode 100644 src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java
 create mode 100644 src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/InfoService.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/option/OptionService.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/style/StyleService.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java

diff --git a/src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java b/src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java
new file mode 100644
index 00000000..32a47b3f
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java
@@ -0,0 +1,19 @@
+package com.atwoz.member.application.event;
+
+import com.atwoz.global.event.Event;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+public class HobbyWriteEvent extends Event {
+
+    private final Long memberId;
+    private final List<HobbyWriteRequest> hobbies;
+
+    public HobbyWriteEvent(final Long memberId, final List<HobbyWriteRequest> hobbies) {
+        super();
+        this.memberId = memberId;
+        this.hobbies = hobbies;
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java b/src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java
new file mode 100644
index 00000000..f9182338
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java
@@ -0,0 +1,18 @@
+package com.atwoz.member.application.event;
+
+import com.atwoz.global.event.Event;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import lombok.Getter;
+
+@Getter
+public class OptionWriteEvent extends Event {
+
+    private final Long memberId;
+    private final OptionWriteRequest request;
+
+    public OptionWriteEvent(final Long memberId, final OptionWriteRequest request) {
+        super();
+        this.memberId = memberId;
+        this.request = request;
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java b/src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java
new file mode 100644
index 00000000..57f07511
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java
@@ -0,0 +1,18 @@
+package com.atwoz.member.application.event;
+
+import com.atwoz.global.event.Event;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import lombok.Getter;
+
+@Getter
+public class ProfileWriteEvent extends Event {
+
+    private final Long memberId;
+    private final ProfileWriteRequest request;
+
+    public ProfileWriteEvent(final Long memberId, final ProfileWriteRequest request) {
+        super();
+        this.memberId = memberId;
+        this.request = request;
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java b/src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java
new file mode 100644
index 00000000..114d6d0c
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java
@@ -0,0 +1,19 @@
+package com.atwoz.member.application.event;
+
+import com.atwoz.global.event.Event;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+public class StyleWriteEvent extends Event {
+
+    private final Long memberId;
+    private final List<StyleWriteRequest> styles;
+
+    public StyleWriteEvent(final Long memberId, final List<StyleWriteRequest> styles) {
+        super();
+        this.memberId = memberId;
+        this.styles = styles;
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
new file mode 100644
index 00000000..7ec9cbaf
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -0,0 +1,36 @@
+package com.atwoz.member.application.info;
+
+import com.atwoz.global.event.Events;
+import com.atwoz.member.application.event.HobbyWriteEvent;
+import com.atwoz.member.application.event.OptionWriteEvent;
+import com.atwoz.member.application.event.ProfileWriteEvent;
+import com.atwoz.member.application.event.StyleWriteEvent;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class InfoService {
+
+    @Transactional
+    public void writeProfile(final Long memberId, final InfoWriteRequest request) {
+        ProfileWriteRequest profileWriteRequest = request.profile();
+        OptionWriteRequest optionWriteRequest = request.option();
+        List<HobbyWriteRequest> hobbies = request.hobbies();
+        List<StyleWriteRequest> styles = request.styles();
+
+        Events.raise(new ProfileWriteEvent(memberId, profileWriteRequest));
+        Events.raise(new OptionWriteEvent(memberId, optionWriteRequest));
+
+        Events.raise(new HobbyWriteEvent(memberId, hobbies));
+        Events.raise(new StyleWriteEvent(memberId, styles));
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
new file mode 100644
index 00000000..1ef70093
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.application.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobbies;
+import com.atwoz.member.infrastructure.info.hobby.HobbiesRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class HobbyService {
+
+    private final HobbiesRepository hobbiesRepository;
+
+    @Transactional
+    public void writeHobbies(final Long memberId, final List<String> hobbies) {
+
+        hobbiesRepository.save(new Hobbies(memberId, hobbies));
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
new file mode 100644
index 00000000..640cbbab
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
@@ -0,0 +1,23 @@
+package com.atwoz.member.application.info.hobby;
+
+import com.atwoz.member.application.event.HobbyWriteEvent;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import java.util.List;
+
+@RequiredArgsConstructor
+public class HobbyWriteEventHandler {
+
+    private final HobbyService hobbyService;
+
+    @EventListener
+    public void writeHobbies(final HobbyWriteEvent event) {
+        List<String> hobbies = event.getHobbies()
+                .stream()
+                .map(HobbyWriteRequest::hobby)
+                .toList();
+
+        hobbyService.writeHobbies(event.getMemberId(), hobbies);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
new file mode 100644
index 00000000..e26dbe37
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.application.info.option;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.domain.info.option.Option;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OptionFactory {
+
+    public Option fromRequest(final Long memberId, final OptionWriteRequest request) {
+
+        return new Option(memberId, request.smoke(), request.religion(), request.drink(), request.mbti(), request.graduate());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
new file mode 100644
index 00000000..6b7b4e16
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -0,0 +1,23 @@
+package com.atwoz.member.application.info.option;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.infrastructure.info.option.OptionRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class OptionService {
+
+    private final OptionFactory optionFactory;
+    private final OptionRepository optionRepository;
+
+    @Transactional
+    public void writeOption(final Long memberId, final OptionWriteRequest request) {
+        Option option = optionFactory.fromRequest(memberId, request);
+        optionRepository.save(option);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java
new file mode 100644
index 00000000..9a8e6030
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java
@@ -0,0 +1,21 @@
+package com.atwoz.member.application.info.option;
+
+import com.atwoz.member.application.event.OptionWriteEvent;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class OptionWriteEventHandler {
+
+    private final OptionService optionService;
+
+    @EventListener
+    public void writeOption(final OptionWriteEvent event) {
+        Long memberId = event.getMemberId();
+        OptionWriteRequest request = event.getRequest();
+        optionService.writeOption(memberId, request);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
new file mode 100644
index 00000000..29cf9a4d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -0,0 +1,37 @@
+package com.atwoz.member.application.info.profile;
+
+import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.MemberBody;
+import com.atwoz.member.domain.info.profile.Profile;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProfileFactory {
+
+    public Profile fromRequest(final Long memberId, final ProfileWriteRequest request) {
+        MemberBody memberBody = createMemberBody(request);
+        Location location = createLocation(request.location());
+        Job job = createJob(request.job());
+        return new Profile(memberId, memberBody, location, job);
+    }
+
+    private MemberBody createMemberBody(final ProfileWriteRequest request) {
+        Integer age = request.age();
+        Integer height = request.height();
+        Gender gender = Gender.findByName(request.gender());
+
+        return new MemberBody(age, height, gender);
+    }
+
+    private Location createLocation(final LocationWriteRequest request) {
+        return new Location(request.city(), request.sector());
+    }
+
+    private Job createJob(final String job) {
+        return new Job(job);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
new file mode 100644
index 00000000..4e156411
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -0,0 +1,24 @@
+package com.atwoz.member.application.info.profile;
+
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.infrastructure.info.profile.ProfileRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class ProfileService {
+
+    private final ProfileRepository profileRepository;
+    private final ProfileFactory profileFactory;
+
+    @Transactional
+    public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
+
+        Profile profile = profileFactory.fromRequest(memberId, request);
+        profileRepository.save(profile);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java
new file mode 100644
index 00000000..fa3b2d3d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.application.info.profile;
+
+import com.atwoz.member.application.event.ProfileWriteEvent;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Component
+public class ProfileWriteEventHandler {
+
+    private final ProfileService profileService;
+
+    @EventListener
+    public void writeProfile(final ProfileWriteEvent event) {
+        Long memberId = event.getMemberId();
+        ProfileWriteRequest request = event.getRequest();
+
+        profileService.writeProfile(memberId, request);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
new file mode 100644
index 00000000..ea7a0c59
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -0,0 +1,21 @@
+package com.atwoz.member.application.info.style;
+
+import com.atwoz.member.domain.info.style.Styles;
+import com.atwoz.member.infrastructure.info.style.StylesRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class StyleService {
+
+    private final StylesRepository stylesRepository;
+
+    @Transactional
+    public void writeStyles(final Long memberId, final List<String> styles) {
+        stylesRepository.save(new Styles(memberId, styles));
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
new file mode 100644
index 00000000..2de52bba
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
@@ -0,0 +1,23 @@
+package com.atwoz.member.application.info.style;
+
+import com.atwoz.member.application.event.StyleWriteEvent;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import java.util.List;
+
+@RequiredArgsConstructor
+public class StyleWriteEventHandler {
+
+    private final StyleService styleService;
+
+    @EventListener
+    public void writeStyle(final StyleWriteEvent event) {
+        List<String> styles = event.getStyles()
+                .stream()
+                .map(StyleWriteRequest::style)
+                .toList();
+
+        styleService.writeStyles(event.getMemberId(), styles);
+    }
+}

From f4392120cf698a0cf27cb162aef59e98a23504c5 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:58:17 +0900
Subject: [PATCH 010/225] =?UTF-8?q?feat:=20InfoController=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AuthMember와 InfoWriteRequest를 이용한 컨트롤러 메서드 작성
---
 .../atwoz/member/ui/info/InfoController.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/ui/info/InfoController.java

diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
new file mode 100644
index 00000000..921f0b1d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.ui.info;
+
+import com.atwoz.member.application.info.InfoService;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/info")
+@RestController
+public class InfoController {
+
+    private final InfoService infoService;
+
+    @PostMapping
+    public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
+                                          @Valid @RequestBody final InfoWriteRequest request) {
+        infoService.writeProfile(memberId, request);
+        return ResponseEntity.ok()
+                .build();
+    }
+
+}

From 7b2af5373de50d7c528531e4a869cd427a0b9ad7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 12:58:17 +0900
Subject: [PATCH 011/225] =?UTF-8?q?feat:=20InfoController=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AuthMember와 InfoWriteRequest를 이용한 컨트롤러 메서드 작성

Co-authored-by: eom-tae-in <eti0728@daum.net>
---
 .../atwoz/member/ui/info/InfoController.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/ui/info/InfoController.java

diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
new file mode 100644
index 00000000..921f0b1d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.ui.info;
+
+import com.atwoz.member.application.info.InfoService;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/info")
+@RestController
+public class InfoController {
+
+    private final InfoService infoService;
+
+    @PostMapping
+    public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
+                                          @Valid @RequestBody final InfoWriteRequest request) {
+        infoService.writeProfile(memberId, request);
+        return ResponseEntity.ok()
+                .build();
+    }
+
+}

From d01bc01b73b1e132173dd8a3a368e53761141421 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 20:03:10 +0900
Subject: [PATCH 012/225] =?UTF-8?q?fix:=20Hobbies,=20Styles=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- EventHandler들을 컴포넌트 등록하여 저장되도록 수정
---
 .../member/application/info/hobby/HobbyWriteEventHandler.java   | 2 ++
 .../member/application/info/style/StyleWriteEventHandler.java   | 2 ++
 src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java   | 1 +
 src/main/java/com/atwoz/member/domain/info/style/Styles.java    | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
index 640cbbab..b4fc38b3 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
@@ -4,9 +4,11 @@
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
 import java.util.List;
 
 @RequiredArgsConstructor
+@Component
 public class HobbyWriteEventHandler {
 
     private final HobbyService hobbyService;
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
index 2de52bba..3a2803b3 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
@@ -4,9 +4,11 @@
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
 import java.util.List;
 
 @RequiredArgsConstructor
+@Component
 public class StyleWriteEventHandler {
 
     private final StyleService styleService;
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
index af85032b..8e3bd400 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
@@ -39,6 +39,7 @@ public Hobbies(final Long memberId, final List<String> hobbies) {
                 .map(Hobby::from)
                 .toList();
 
+        this.memberId = memberId;
         this.hobbies = newHobbies;
     }
 
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
index 38d22f2e..4a780415 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Styles.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
@@ -38,7 +38,7 @@ public Styles(final Long memberId, final List<String> styles) {
         List<Style> newStyles = styles.stream()
                 .map(Style::from)
                 .toList();
-
+        this.memberId = memberId;
         this.styles = newStyles;
     }
 

From 741d8aa160f303e7f266c0fa926b730b046f3cc1 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 20:03:55 +0900
Subject: [PATCH 013/225] =?UTF-8?q?refactor:=20=EA=B3=B5=EB=B0=B1=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Styles 생성자 공백 추가
---
 src/main/java/com/atwoz/member/domain/info/style/Styles.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
index 4a780415..d65e4f59 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Styles.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
@@ -38,6 +38,7 @@ public Styles(final Long memberId, final List<String> styles) {
         List<Style> newStyles = styles.stream()
                 .map(Style::from)
                 .toList();
+        
         this.memberId = memberId;
         this.styles = newStyles;
     }

From b206757c9c91ce7b9c3aa800327100389c7c7d4d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 20:46:18 +0900
Subject: [PATCH 014/225] =?UTF-8?q?refactor:=20Hobbies,=20Styles=20?=
 =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=ED=99=94=20=ED=95=B4=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hobbies, Styles 엔티티 대신 밸류 타입으로 변경
- 관련 Repository 및 이벤트 핸들러 삭제
- Member에서 등록되도록 수정
---
 .../application/info/hobby/HobbyService.java  | 22 --------------
 .../info/hobby/HobbyWriteEventHandler.java    | 25 ----------------
 .../application/info/style/StyleService.java  | 21 --------------
 .../info/style/StyleWriteEventHandler.java    | 25 ----------------
 .../member/MemberEventHandler.java            | 29 +++++++++++++++++++
 .../application/member/MemberService.java     | 17 +++++++++++
 .../member/domain/info/hobby/Hobbies.java     | 16 ++++------
 .../member/domain/info/style/Styles.java      | 18 +++++-------
 .../atwoz/member/domain/member/Member.java    | 18 ++++++++++++
 .../info/hobby/HobbiesJpaRepository.java      |  7 -----
 .../info/hobby/HobbiesRepository.java         |  8 -----
 .../info/hobby/HobbiesRepositoryImpl.java     | 17 -----------
 .../info/style/StylesJpaRepository.java       |  7 -----
 .../info/style/StylesRepository.java          |  8 -----
 .../info/style/StylesRepositoryImpl.java      | 17 -----------
 15 files changed, 77 insertions(+), 178 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/style/StyleService.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
deleted file mode 100644
index 1ef70093..00000000
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.atwoz.member.application.info.hobby;
-
-import com.atwoz.member.domain.info.hobby.Hobbies;
-import com.atwoz.member.infrastructure.info.hobby.HobbiesRepository;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Service
-public class HobbyService {
-
-    private final HobbiesRepository hobbiesRepository;
-
-    @Transactional
-    public void writeHobbies(final Long memberId, final List<String> hobbies) {
-
-        hobbiesRepository.save(new Hobbies(memberId, hobbies));
-    }
-}
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
deleted file mode 100644
index b4fc38b3..00000000
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyWriteEventHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.atwoz.member.application.info.hobby;
-
-import com.atwoz.member.application.event.HobbyWriteEvent;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Component
-public class HobbyWriteEventHandler {
-
-    private final HobbyService hobbyService;
-
-    @EventListener
-    public void writeHobbies(final HobbyWriteEvent event) {
-        List<String> hobbies = event.getHobbies()
-                .stream()
-                .map(HobbyWriteRequest::hobby)
-                .toList();
-
-        hobbyService.writeHobbies(event.getMemberId(), hobbies);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
deleted file mode 100644
index ea7a0c59..00000000
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.atwoz.member.application.info.style;
-
-import com.atwoz.member.domain.info.style.Styles;
-import com.atwoz.member.infrastructure.info.style.StylesRepository;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Service
-public class StyleService {
-
-    private final StylesRepository stylesRepository;
-
-    @Transactional
-    public void writeStyles(final Long memberId, final List<String> styles) {
-        stylesRepository.save(new Styles(memberId, styles));
-    }
-}
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
deleted file mode 100644
index 3a2803b3..00000000
--- a/src/main/java/com/atwoz/member/application/info/style/StyleWriteEventHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.atwoz.member.application.info.style;
-
-import com.atwoz.member.application.event.StyleWriteEvent;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Component
-public class StyleWriteEventHandler {
-
-    private final StyleService styleService;
-
-    @EventListener
-    public void writeStyle(final StyleWriteEvent event) {
-        List<String> styles = event.getStyles()
-                .stream()
-                .map(StyleWriteRequest::style)
-                .toList();
-
-        styleService.writeStyles(event.getMemberId(), styles);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
index da7186f9..738c1a55 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
@@ -1,9 +1,16 @@
 package com.atwoz.member.application.member;
 
+import com.atwoz.member.application.event.HobbyWriteEvent;
+import com.atwoz.member.application.event.StyleWriteEvent;
 import com.atwoz.member.application.event.ValidatedLoginEvent;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.domain.info.hobby.Hobbies;
+import com.atwoz.member.domain.info.style.Styles;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+import java.util.List;
 
 @RequiredArgsConstructor
 @Component
@@ -15,4 +22,26 @@ public class MemberEventHandler {
     public void registerIfNotMemberExist(final ValidatedLoginEvent event) {
         memberService.create(event.getEmail(), event.getNickname());
     }
+
+    @EventListener
+    public void updateMemberHobbies(final HobbyWriteEvent event) {
+        Long memberId = event.getMemberId();
+        List<String> hobbyNames = event.getHobbies()
+                .stream()
+                .map(HobbyWriteRequest::hobby)
+                .toList();
+        Hobbies hobbies = new Hobbies(memberId, hobbyNames);
+        memberService.updateHobbies(memberId, hobbies);
+    }
+
+    @EventListener
+    public void updateMemberStyles(final StyleWriteEvent event) {
+        Long memberId = event.getMemberId();
+        List<String> styleNames = event.getStyles()
+                .stream()
+                .map(StyleWriteRequest::style)
+                .toList();
+        Styles styles = new Styles(memberId, styleNames);
+        memberService.updateStyles(memberId, styles);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/application/member/MemberService.java b/src/main/java/com/atwoz/member/application/member/MemberService.java
index 3e1115ea..89bce9fd 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberService.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberService.java
@@ -1,7 +1,10 @@
 package com.atwoz.member.application.member;
 
+import com.atwoz.member.domain.info.hobby.Hobbies;
+import com.atwoz.member.domain.info.style.Styles;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.domain.member.MemberRepository;
+import com.atwoz.member.exception.exceptions.member.MemberNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,4 +21,18 @@ public void create(final String email, final String nickname) {
             memberRepository.save(Member.createWithOAuthLogin(email, nickname));
         }
     }
+
+    @Transactional
+    public void updateHobbies(final Long memberId, final Hobbies hobbies) {
+        Member member = memberRepository.findById(memberId)
+                        .orElseThrow(MemberNotFoundException::new);
+        member.updateHobbies(hobbies);
+    }
+
+    @Transactional
+    public void updateStyles(final Long memberId, final Styles styles) {
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(MemberNotFoundException::new);
+        member.updateStyles(styles);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
index 8e3bd400..aaf3af54 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
@@ -1,12 +1,11 @@
 package com.atwoz.member.domain.info.hobby;
 
 import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,20 +15,17 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
+@Embeddable
 public class Hobbies {
 
     private static final int MINIMUM_SIZE = 1;
     private static final int MAXIMUM_SIZE = 3;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
+    @Column(name = "member_id", insertable = false, updatable = false)
     private Long memberId;
 
     @ElementCollection
+    @CollectionTable(name = "member_hobbies", joinColumns = @JoinColumn(name = "member_id"))
     private List<Hobby> hobbies;
 
     public Hobbies(final Long memberId, final List<String> hobbies) {
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
index d65e4f59..9bcafe19 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Styles.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
@@ -1,12 +1,11 @@
 package com.atwoz.member.domain.info.style;
 
 import com.atwoz.global.exception.exceptions.NullValueException;
+import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.JoinColumn;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,20 +15,17 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity
+@Embeddable
 public class Styles {
 
     private static final int MINIMUM_SIZE = 1;
     private static final int MAXIMUM_SIZE = 3;
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
+    @Column(name = "member_id", insertable = false, updatable = false)
     private Long memberId;
 
     @ElementCollection
+    @CollectionTable(name = "member_styles", joinColumns = @JoinColumn(name = "member_id"))
     private List<Style> styles;
 
     public Styles(final Long memberId, final List<String> styles) {
@@ -38,7 +34,7 @@ public Styles(final Long memberId, final List<String> styles) {
         List<Style> newStyles = styles.stream()
                 .map(Style::from)
                 .toList();
-        
+
         this.memberId = memberId;
         this.styles = newStyles;
     }
diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index fa30b5e7..b3ab0a74 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -1,7 +1,10 @@
 package com.atwoz.member.domain.member;
 
 import com.atwoz.global.domain.BaseEntity;
+import com.atwoz.member.domain.info.hobby.Hobbies;
+import com.atwoz.member.domain.info.style.Styles;
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -23,6 +26,7 @@
 @Entity
 public class Member extends BaseEntity {
 
+    @Column(name = "member_id")
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -37,10 +41,24 @@ public class Member extends BaseEntity {
     @Column(nullable = false)
     private MemberRole memberRole;
 
+    @Embedded
+    private Hobbies hobbies;
+
+    @Embedded
+    private Styles styles;
+
     public boolean isAdmin() {
         return this.memberRole.isAdministrator();
     }
 
+    public void updateHobbies(final Hobbies hobbies) {
+        this.hobbies = hobbies;
+    }
+
+    public void updateStyles(final Styles styles) {
+        this.styles = styles;
+    }
+
     public static Member createDefaultRole(final String email,
                                            final NicknameGenerator nicknameGenerator) {
         return Member.builder()
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java
deleted file mode 100644
index b8fce5a4..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesJpaRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.atwoz.member.infrastructure.info.hobby;
-
-import com.atwoz.member.domain.info.hobby.Hobbies;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface HobbiesJpaRepository extends JpaRepository<Hobbies, Long> {
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java
deleted file mode 100644
index 5403cbb7..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.member.infrastructure.info.hobby;
-
-import com.atwoz.member.domain.info.hobby.Hobbies;
-
-public interface HobbiesRepository {
-
-    void save(final Hobbies hobbies);
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java
deleted file mode 100644
index f84628ee..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbiesRepositoryImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.atwoz.member.infrastructure.info.hobby;
-
-import com.atwoz.member.domain.info.hobby.Hobbies;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
-
-@RequiredArgsConstructor
-@Repository
-public class HobbiesRepositoryImpl implements HobbiesRepository {
-
-    private final HobbiesJpaRepository hobbiesJpaRepository;
-
-    @Override
-    public void save(final Hobbies hobbies) {
-        hobbiesJpaRepository.save(hobbies);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java
deleted file mode 100644
index 88baf34a..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesJpaRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.atwoz.member.infrastructure.info.style;
-
-import com.atwoz.member.domain.info.style.Styles;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface StylesJpaRepository extends JpaRepository<Styles, Long> {
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java
deleted file mode 100644
index a546f4dc..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.member.infrastructure.info.style;
-
-import com.atwoz.member.domain.info.style.Styles;
-
-public interface StylesRepository {
-
-    void save(final Styles styles);
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java
deleted file mode 100644
index e254bd73..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StylesRepositoryImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.atwoz.member.infrastructure.info.style;
-
-import com.atwoz.member.domain.info.style.Styles;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
-
-@RequiredArgsConstructor
-@Repository
-public class StylesRepositoryImpl implements StylesRepository {
-
-    private final StylesJpaRepository stylesJpaRepository;
-
-    @Override
-    public void save(final Styles styles) {
-        stylesJpaRepository.save(styles);
-    }
-}

From 6fd0553491eb461a2ce5bc6df8cf76da407fc1ee Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 21:47:15 +0900
Subject: [PATCH 015/225] =?UTF-8?q?fix:=20Option,=20Profile=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=20=EC=A0=80=EC=9E=A5=20=EC=98=A4=EB=A5=98=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Option, Profile 저장 시 이미 저장된 객체면 내용을 수정하도록 변경
---
 .../info/option/OptionFactory.java            | 13 +++++++++++-
 .../info/option/OptionService.java            | 21 +++++++++++++++++--
 .../info/profile/ProfileService.java          | 15 +++++++++++--
 .../member/domain/info/option/Option.java     | 21 ++++++++++++-------
 .../member/domain/info/profile/Profile.java   |  6 ++++++
 .../info/option/OptionJpaRepository.java      |  3 +++
 .../info/option/OptionRepository.java         |  2 ++
 .../info/option/OptionRepositoryImpl.java     |  8 ++++++-
 .../info/profile/ProfileJpaRepository.java    |  3 +++
 .../info/profile/ProfileRepository.java       |  2 ++
 .../info/profile/ProfileRepositoryImpl.java   |  8 ++++++-
 11 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index e26dbe37..66668c2b 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -1,7 +1,12 @@
 package com.atwoz.member.application.info.option;
 
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -9,6 +14,12 @@ public class OptionFactory {
 
     public Option fromRequest(final Long memberId, final OptionWriteRequest request) {
 
-        return new Option(memberId, request.smoke(), request.religion(), request.drink(), request.mbti(), request.graduate());
+        Smoke smoke = Smoke.findByName(request.smoke());
+        Religion religion = Religion.findByName(request.religion());
+        Drink drink = Drink.findByName(request.drink());
+        Mbti mbti = Mbti.findByName(request.mbti());
+        Graduate graduate = Graduate.findByName(request.graduate());
+
+        return new Option(memberId, smoke, religion, drink, mbti, graduate);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 6b7b4e16..b5ca40fb 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -6,6 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -17,7 +18,23 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option option = optionFactory.fromRequest(memberId, request);
-        optionRepository.save(option);
+        Optional<Option> findOption = findByMemberId(memberId);
+        Option newOption = optionFactory.fromRequest(memberId, request);
+        if (findOption.isEmpty()) {
+            optionRepository.save(newOption);
+            return;
+        }
+        Option existOption = findOption.get();
+        existOption.updateContents(
+                existOption.getSmoke(),
+                existOption.getReligion(),
+                existOption.getDrink(),
+                existOption.getMbti(),
+                existOption.getGraduate()
+        );
+    }
+
+    private Optional<Option> findByMemberId(final Long memberId) {
+        return optionRepository.findByMemberId(memberId);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 4e156411..b61a9f6a 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -6,6 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -18,7 +19,17 @@ public class ProfileService {
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
 
-        Profile profile = profileFactory.fromRequest(memberId, request);
-        profileRepository.save(profile);
+        Optional<Profile> findProfile = findByMemberId(memberId);
+        Profile newProfile = profileFactory.fromRequest(memberId, request);
+        if (findProfile.isEmpty()) {
+            profileRepository.save(newProfile);
+            return;
+        }
+        Profile existProfile = findProfile.get();
+        existProfile.updateContents(newProfile.getMemberBody(), newProfile.getLocation(), newProfile.getJob());
+    }
+
+    private Optional<Profile> findByMemberId(final Long memberId) {
+        return profileRepository.findByMemberId(memberId);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index c41e6cbe..e4fe1084 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -13,8 +13,8 @@
 import lombok.NoArgsConstructor;
 
 @Getter
-@Table(name = "member_option")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "member_option")
 @Entity
 public class Option {
 
@@ -45,13 +45,18 @@ public class Option {
     @Enumerated(value = EnumType.STRING)
     private Graduate graduate;
 
-    public Option(final Long memberId, final String smoke, final String religion,
-                  final String drink, final String mbti, final String graduate) {
+    public Option(final Long memberId, final Smoke smoke, final Religion religion,
+                  final Drink drink, final Mbti mbti, final Graduate graduate) {
         this.memberId = memberId;
-        this.smoke = Smoke.findByName(smoke);
-        this.religion = Religion.findByName(religion);
-        this.drink = Drink.findByName(drink);
-        this.mbti = Mbti.findByName(mbti);
-        this.graduate = Graduate.findByName(graduate);
+        updateContents(smoke, religion, drink, mbti, graduate);
+    }
+
+    public void updateContents(final Smoke smoke, final Religion religion, final Drink drink,
+                               final Mbti mbti, final Graduate graduate) {
+        this.smoke = smoke;
+        this.religion = religion;
+        this.drink = drink;
+        this.mbti = mbti;
+        this.graduate = graduate;
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 1d4de8ea..dacaa131 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -6,12 +6,14 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "member_profile")
 @Entity
 public class Profile {
 
@@ -35,6 +37,10 @@ public class Profile {
 
     public Profile(final Long memberId, final MemberBody memberBody, final Location location, final Job job) {
         this.memberId = memberId;
+        updateContents(memberBody, location, job);
+    }
+
+    public void updateContents(final MemberBody memberBody, final Location location, final Job job) {
         this.memberBody = memberBody;
         this.location = location;
         this.job = job;
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
index 4dc5049e..1542e23f 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
@@ -2,6 +2,9 @@
 
 import com.atwoz.member.domain.info.option.Option;
 import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.Optional;
 
 public interface OptionJpaRepository extends JpaRepository<Option, Long> {
+
+    Optional<Option> findByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
index 8ee11025..8b80bb47 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
@@ -1,8 +1,10 @@
 package com.atwoz.member.infrastructure.info.option;
 
 import com.atwoz.member.domain.info.option.Option;
+import java.util.Optional;
 
 public interface OptionRepository {
 
     void save(final Option option);
+    Optional<Option> findByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
index a9b3f22e..cf318f30 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
@@ -3,10 +3,11 @@
 import com.atwoz.member.domain.info.option.Option;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Repository
-public class OptionRepositoryImpl implements OptionRepository{
+public class OptionRepositoryImpl implements OptionRepository {
 
     private final OptionJpaRepository optionJpaRepository;
 
@@ -14,4 +15,9 @@ public class OptionRepositoryImpl implements OptionRepository{
     public void save(final Option option) {
         optionJpaRepository.save(option);
     }
+
+    @Override
+    public Optional<Option> findByMemberId(final Long memberId) {
+        return optionJpaRepository.findByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
index 15317ab1..e9c19424 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
@@ -2,6 +2,9 @@
 
 import com.atwoz.member.domain.info.profile.Profile;
 import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.Optional;
 
 public interface ProfileJpaRepository extends JpaRepository<Profile, Long> {
+
+    Optional<Profile> findByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
index f8356ef5..60217df4 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
@@ -1,8 +1,10 @@
 package com.atwoz.member.infrastructure.info.profile;
 
 import com.atwoz.member.domain.info.profile.Profile;
+import java.util.Optional;
 
 public interface ProfileRepository {
 
     void save(final Profile profile);
+    Optional<Profile> findByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
index a213f3e2..372fd605 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
@@ -3,10 +3,11 @@
 import com.atwoz.member.domain.info.profile.Profile;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Repository
-public class ProfileRepositoryImpl implements ProfileRepository{
+public class ProfileRepositoryImpl implements ProfileRepository {
 
     private final ProfileJpaRepository profileJpaRepository;
 
@@ -14,4 +15,9 @@ public class ProfileRepositoryImpl implements ProfileRepository{
     public void save(final Profile profile) {
         profileJpaRepository.save(profile);
     }
+
+    @Override
+    public Optional<Profile> findByMemberId(final Long memberId) {
+        return profileJpaRepository.findByMemberId(memberId);
+    }
 }

From 18123be9438fa94ed494ac42dc206bc2f58b0e4d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 21:59:01 +0900
Subject: [PATCH 016/225] =?UTF-8?q?refactor:=20MemberService=20=EA=B3=B5?=
 =?UTF-8?q?=ED=86=B5=20=EC=B6=95=EC=95=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 멤버 조회 메서드화하여 중복 제거
---
 .../member/application/member/MemberService.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/member/MemberService.java b/src/main/java/com/atwoz/member/application/member/MemberService.java
index 89bce9fd..59ba9e26 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberService.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberService.java
@@ -24,15 +24,18 @@ public void create(final String email, final String nickname) {
 
     @Transactional
     public void updateHobbies(final Long memberId, final Hobbies hobbies) {
-        Member member = memberRepository.findById(memberId)
-                        .orElseThrow(MemberNotFoundException::new);
+        Member member = findById(memberId);
         member.updateHobbies(hobbies);
     }
 
+    private Member findById(final Long memberId) {
+        return memberRepository.findById(memberId)
+                .orElseThrow(MemberNotFoundException::new);
+    }
+
     @Transactional
     public void updateStyles(final Long memberId, final Styles styles) {
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(MemberNotFoundException::new);
+        Member member = findById(memberId);
         member.updateStyles(styles);
     }
 }

From 4e3d4d1d1dff08b863f3c838aeb353a84d027723 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 23:48:21 +0900
Subject: [PATCH 017/225] =?UTF-8?q?refactor:=20Member=20id=20Column=20?=
 =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member id 이름 원상복구 진행
---
 src/main/java/com/atwoz/member/domain/member/Member.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index b3ab0a74..75f93b28 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -26,7 +26,6 @@
 @Entity
 public class Member extends BaseEntity {
 
-    @Column(name = "member_id")
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

From db4e702a7361281f96088c7d2ae12ba9943de5b2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 20 Feb 2024 23:51:26 +0900
Subject: [PATCH 018/225] =?UTF-8?q?refactor:=20Member=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?Hobbies,=20Styles=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member에서 Hobbies, Styles에 대한 의존 삭제
---
 .../member/MemberEventHandler.java            | 29 -------------------
 .../application/member/MemberService.java     | 20 -------------
 .../atwoz/member/domain/member/Member.java    | 17 -----------
 3 files changed, 66 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
index 738c1a55..da7186f9 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
@@ -1,16 +1,9 @@
 package com.atwoz.member.application.member;
 
-import com.atwoz.member.application.event.HobbyWriteEvent;
-import com.atwoz.member.application.event.StyleWriteEvent;
 import com.atwoz.member.application.event.ValidatedLoginEvent;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import com.atwoz.member.domain.info.hobby.Hobbies;
-import com.atwoz.member.domain.info.style.Styles;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
-import java.util.List;
 
 @RequiredArgsConstructor
 @Component
@@ -22,26 +15,4 @@ public class MemberEventHandler {
     public void registerIfNotMemberExist(final ValidatedLoginEvent event) {
         memberService.create(event.getEmail(), event.getNickname());
     }
-
-    @EventListener
-    public void updateMemberHobbies(final HobbyWriteEvent event) {
-        Long memberId = event.getMemberId();
-        List<String> hobbyNames = event.getHobbies()
-                .stream()
-                .map(HobbyWriteRequest::hobby)
-                .toList();
-        Hobbies hobbies = new Hobbies(memberId, hobbyNames);
-        memberService.updateHobbies(memberId, hobbies);
-    }
-
-    @EventListener
-    public void updateMemberStyles(final StyleWriteEvent event) {
-        Long memberId = event.getMemberId();
-        List<String> styleNames = event.getStyles()
-                .stream()
-                .map(StyleWriteRequest::style)
-                .toList();
-        Styles styles = new Styles(memberId, styleNames);
-        memberService.updateStyles(memberId, styles);
-    }
 }
diff --git a/src/main/java/com/atwoz/member/application/member/MemberService.java b/src/main/java/com/atwoz/member/application/member/MemberService.java
index 59ba9e26..3e1115ea 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberService.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberService.java
@@ -1,10 +1,7 @@
 package com.atwoz.member.application.member;
 
-import com.atwoz.member.domain.info.hobby.Hobbies;
-import com.atwoz.member.domain.info.style.Styles;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.domain.member.MemberRepository;
-import com.atwoz.member.exception.exceptions.member.MemberNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,21 +18,4 @@ public void create(final String email, final String nickname) {
             memberRepository.save(Member.createWithOAuthLogin(email, nickname));
         }
     }
-
-    @Transactional
-    public void updateHobbies(final Long memberId, final Hobbies hobbies) {
-        Member member = findById(memberId);
-        member.updateHobbies(hobbies);
-    }
-
-    private Member findById(final Long memberId) {
-        return memberRepository.findById(memberId)
-                .orElseThrow(MemberNotFoundException::new);
-    }
-
-    @Transactional
-    public void updateStyles(final Long memberId, final Styles styles) {
-        Member member = findById(memberId);
-        member.updateStyles(styles);
-    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/member/Member.java b/src/main/java/com/atwoz/member/domain/member/Member.java
index 75f93b28..fa30b5e7 100644
--- a/src/main/java/com/atwoz/member/domain/member/Member.java
+++ b/src/main/java/com/atwoz/member/domain/member/Member.java
@@ -1,10 +1,7 @@
 package com.atwoz.member.domain.member;
 
 import com.atwoz.global.domain.BaseEntity;
-import com.atwoz.member.domain.info.hobby.Hobbies;
-import com.atwoz.member.domain.info.style.Styles;
 import jakarta.persistence.Column;
-import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -40,24 +37,10 @@ public class Member extends BaseEntity {
     @Column(nullable = false)
     private MemberRole memberRole;
 
-    @Embedded
-    private Hobbies hobbies;
-
-    @Embedded
-    private Styles styles;
-
     public boolean isAdmin() {
         return this.memberRole.isAdministrator();
     }
 
-    public void updateHobbies(final Hobbies hobbies) {
-        this.hobbies = hobbies;
-    }
-
-    public void updateStyles(final Styles styles) {
-        this.styles = styles;
-    }
-
     public static Member createDefaultRole(final String email,
                                            final NicknameGenerator nicknameGenerator) {
         return Member.builder()

From d7f3f93775c1cdb1741b29722914637722d2ddbd Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 21 Feb 2024 00:10:47 +0900
Subject: [PATCH 019/225] =?UTF-8?q?refactor:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=8B=9C=EC=A0=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이벤트 과거시제로 수정
---
 ...HobbyWriteEvent.java => HobbyWroteEvent.java} |  4 ++--
 ...tionWriteEvent.java => OptionWroteEvent.java} |  4 ++--
 ...ileWriteEvent.java => ProfileWroteEvent.java} |  4 ++--
 ...StyleWriteEvent.java => StyleWroteEvent.java} |  4 ++--
 .../member/application/info/InfoService.java     | 16 ++++++++--------
 ...Handler.java => OptionWroteEventHandler.java} |  6 +++---
 ...andler.java => ProfileWroteEventHandler.java} |  6 +++---
 7 files changed, 22 insertions(+), 22 deletions(-)
 rename src/main/java/com/atwoz/member/application/event/{HobbyWriteEvent.java => HobbyWroteEvent.java} (78%)
 rename src/main/java/com/atwoz/member/application/event/{OptionWriteEvent.java => OptionWroteEvent.java} (77%)
 rename src/main/java/com/atwoz/member/application/event/{ProfileWriteEvent.java => ProfileWroteEvent.java} (77%)
 rename src/main/java/com/atwoz/member/application/event/{StyleWriteEvent.java => StyleWroteEvent.java} (78%)
 rename src/main/java/com/atwoz/member/application/info/option/{OptionWriteEventHandler.java => OptionWroteEventHandler.java} (77%)
 rename src/main/java/com/atwoz/member/application/info/profile/{ProfileWriteEventHandler.java => ProfileWroteEventHandler.java} (76%)

diff --git a/src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java b/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
similarity index 78%
rename from src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java
rename to src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
index 32a47b3f..7c8b9137 100644
--- a/src/main/java/com/atwoz/member/application/event/HobbyWriteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
@@ -6,12 +6,12 @@
 import java.util.List;
 
 @Getter
-public class HobbyWriteEvent extends Event {
+public class HobbyWroteEvent extends Event {
 
     private final Long memberId;
     private final List<HobbyWriteRequest> hobbies;
 
-    public HobbyWriteEvent(final Long memberId, final List<HobbyWriteRequest> hobbies) {
+    public HobbyWroteEvent(final Long memberId, final List<HobbyWriteRequest> hobbies) {
         super();
         this.memberId = memberId;
         this.hobbies = hobbies;
diff --git a/src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java b/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java
rename to src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
index f9182338..c17f728b 100644
--- a/src/main/java/com/atwoz/member/application/event/OptionWriteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
@@ -5,12 +5,12 @@
 import lombok.Getter;
 
 @Getter
-public class OptionWriteEvent extends Event {
+public class OptionWroteEvent extends Event {
 
     private final Long memberId;
     private final OptionWriteRequest request;
 
-    public OptionWriteEvent(final Long memberId, final OptionWriteRequest request) {
+    public OptionWroteEvent(final Long memberId, final OptionWriteRequest request) {
         super();
         this.memberId = memberId;
         this.request = request;
diff --git a/src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java b/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java
rename to src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
index 57f07511..ee53158a 100644
--- a/src/main/java/com/atwoz/member/application/event/ProfileWriteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
@@ -5,12 +5,12 @@
 import lombok.Getter;
 
 @Getter
-public class ProfileWriteEvent extends Event {
+public class ProfileWroteEvent extends Event {
 
     private final Long memberId;
     private final ProfileWriteRequest request;
 
-    public ProfileWriteEvent(final Long memberId, final ProfileWriteRequest request) {
+    public ProfileWroteEvent(final Long memberId, final ProfileWriteRequest request) {
         super();
         this.memberId = memberId;
         this.request = request;
diff --git a/src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java b/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
similarity index 78%
rename from src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java
rename to src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
index 114d6d0c..67383c52 100644
--- a/src/main/java/com/atwoz/member/application/event/StyleWriteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
@@ -6,12 +6,12 @@
 import java.util.List;
 
 @Getter
-public class StyleWriteEvent extends Event {
+public class StyleWroteEvent extends Event {
 
     private final Long memberId;
     private final List<StyleWriteRequest> styles;
 
-    public StyleWriteEvent(final Long memberId, final List<StyleWriteRequest> styles) {
+    public StyleWroteEvent(final Long memberId, final List<StyleWriteRequest> styles) {
         super();
         this.memberId = memberId;
         this.styles = styles;
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 7ec9cbaf..d9b8551b 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -1,10 +1,10 @@
 package com.atwoz.member.application.info;
 
 import com.atwoz.global.event.Events;
-import com.atwoz.member.application.event.HobbyWriteEvent;
-import com.atwoz.member.application.event.OptionWriteEvent;
-import com.atwoz.member.application.event.ProfileWriteEvent;
-import com.atwoz.member.application.event.StyleWriteEvent;
+import com.atwoz.member.application.event.HobbyWroteEvent;
+import com.atwoz.member.application.event.OptionWroteEvent;
+import com.atwoz.member.application.event.ProfileWroteEvent;
+import com.atwoz.member.application.event.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
@@ -27,10 +27,10 @@ public void writeProfile(final Long memberId, final InfoWriteRequest request) {
         List<HobbyWriteRequest> hobbies = request.hobbies();
         List<StyleWriteRequest> styles = request.styles();
 
-        Events.raise(new ProfileWriteEvent(memberId, profileWriteRequest));
-        Events.raise(new OptionWriteEvent(memberId, optionWriteRequest));
+        Events.raise(new ProfileWroteEvent(memberId, profileWriteRequest));
+        Events.raise(new OptionWroteEvent(memberId, optionWriteRequest));
 
-        Events.raise(new HobbyWriteEvent(memberId, hobbies));
-        Events.raise(new StyleWriteEvent(memberId, styles));
+        Events.raise(new HobbyWroteEvent(memberId, hobbies));
+        Events.raise(new StyleWroteEvent(memberId, styles));
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionWroteEventHandler.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java
rename to src/main/java/com/atwoz/member/application/info/option/OptionWroteEventHandler.java
index 9a8e6030..851066c9 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionWriteEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionWroteEventHandler.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.application.event.OptionWriteEvent;
+import com.atwoz.member.application.event.OptionWroteEvent;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
@@ -8,12 +8,12 @@
 
 @RequiredArgsConstructor
 @Component
-public class OptionWriteEventHandler {
+public class OptionWroteEventHandler {
 
     private final OptionService optionService;
 
     @EventListener
-    public void writeOption(final OptionWriteEvent event) {
+    public void writeOption(final OptionWroteEvent event) {
         Long memberId = event.getMemberId();
         OptionWriteRequest request = event.getRequest();
         optionService.writeOption(memberId, request);
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileWroteEventHandler.java
similarity index 76%
rename from src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java
rename to src/main/java/com/atwoz/member/application/info/profile/ProfileWroteEventHandler.java
index fa3b2d3d..3e3f8d53 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileWriteEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileWroteEventHandler.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.application.event.ProfileWriteEvent;
+import com.atwoz.member.application.event.ProfileWroteEvent;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
@@ -8,12 +8,12 @@
 
 @RequiredArgsConstructor
 @Component
-public class ProfileWriteEventHandler {
+public class ProfileWroteEventHandler {
 
     private final ProfileService profileService;
 
     @EventListener
-    public void writeProfile(final ProfileWriteEvent event) {
+    public void writeProfile(final ProfileWroteEvent event) {
         Long memberId = event.getMemberId();
         ProfileWriteRequest request = event.getRequest();
 

From 5ee2eba4a6ebd54cc5c66f4e0abd7cdbecdc1005 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 21 Feb 2024 00:15:53 +0900
Subject: [PATCH 020/225] =?UTF-8?q?refactor:=20MemberBody=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberBody에서 Body로 이름 변경
- 나이 필드를 birthYear로 변경
- birthYear, height 타입 int로 변경
- int 변경에 따라 Null 검증 삭제
---
 .../info/profile/ProfileFactory.java          | 10 +++---
 .../info/profile/ProfileService.java          |  2 +-
 .../profile/{MemberBody.java => Body.java}    | 31 +++++++------------
 .../member/domain/info/profile/Profile.java   | 10 +++---
 4 files changed, 23 insertions(+), 30 deletions(-)
 rename src/main/java/com/atwoz/member/domain/info/profile/{MemberBody.java => Body.java} (63%)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 29cf9a4d..d1841f61 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -2,10 +2,10 @@
 
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
 import com.atwoz.member.domain.info.profile.Location;
-import com.atwoz.member.domain.info.profile.MemberBody;
 import com.atwoz.member.domain.info.profile.Profile;
 import org.springframework.stereotype.Component;
 
@@ -13,18 +13,18 @@
 public class ProfileFactory {
 
     public Profile fromRequest(final Long memberId, final ProfileWriteRequest request) {
-        MemberBody memberBody = createMemberBody(request);
+        Body body = createMemberBody(request);
         Location location = createLocation(request.location());
         Job job = createJob(request.job());
-        return new Profile(memberId, memberBody, location, job);
+        return new Profile(memberId, body, location, job);
     }
 
-    private MemberBody createMemberBody(final ProfileWriteRequest request) {
+    private Body createMemberBody(final ProfileWriteRequest request) {
         Integer age = request.age();
         Integer height = request.height();
         Gender gender = Gender.findByName(request.gender());
 
-        return new MemberBody(age, height, gender);
+        return new Body(age, height, gender);
     }
 
     private Location createLocation(final LocationWriteRequest request) {
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index b61a9f6a..c455546e 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -26,7 +26,7 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
             return;
         }
         Profile existProfile = findProfile.get();
-        existProfile.updateContents(newProfile.getMemberBody(), newProfile.getLocation(), newProfile.getJob());
+        existProfile.updateContents(newProfile.getBody(), newProfile.getLocation(), newProfile.getJob());
     }
 
     private Optional<Profile> findByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
similarity index 63%
rename from src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java
rename to src/main/java/com/atwoz/member/domain/info/profile/Body.java
index 62dcd197..5a2f5e89 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/MemberBody.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
@@ -14,40 +13,37 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable
-public class MemberBody {
+public class Body {
 
     private static final int MIN_AGE = 20;
     private static final int MAX_AGE = 45;
     private static final int MIN_HEIGHT = 140;
     private static final int MAX_HEIGHT = 199;
 
-    @Column(nullable = false)
-    private Integer age;
+    @Column
+    private int birthYear;
 
-    @Column(nullable = false)
-    private Integer height;
+    @Column
+    private int height;
 
     @Column(nullable = false)
     @Enumerated(value = EnumType.STRING)
     private Gender gender;
 
-    public MemberBody(final Integer age, final Integer height, final Gender gender) {
-        validateValues(age, height);
+    public Body(final int birthYear, final int height, final Gender gender) {
+        validateValues(birthYear, height);
 
-        this.age = age;
+        this.birthYear = birthYear;
         this.height = height;
         this.gender = gender;
     }
 
-    public void validateValues(final Integer age, final Integer height) {
-        validateAge(age);
+    public void validateValues(final int birthYear, final int height) {
+        validateAgeFromBirthYear(birthYear);
         validateHeight(height);
     }
 
-    private void validateAge(final Integer age) {
-        if (age == null) {
-            throw new NullValueException();
-        }
+    private void validateAgeFromBirthYear(final int age) {
         LocalDateTime nowTime = LocalDateTime.now();
         int nowYear = nowTime.getYear();
         int memberAge = Math.abs(nowYear - age);
@@ -56,10 +52,7 @@ private void validateAge(final Integer age) {
         }
     }
 
-    private void validateHeight(final Integer height) {
-        if (height == null) {
-            throw new NullValueException();
-        }
+    private void validateHeight(final int height) {
         if (height < MIN_HEIGHT || MAX_HEIGHT < height) {
             throw new ProfileRangeException();
         }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index dacaa131..b69df9d4 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -25,7 +25,7 @@ public class Profile {
     private Long memberId;
 
     @Column(nullable = false)
-    private MemberBody memberBody;
+    private Body body;
 
     @Embedded
     @Column(nullable = false)
@@ -35,13 +35,13 @@ public class Profile {
     @Column(nullable = false)
     private Job job;
 
-    public Profile(final Long memberId, final MemberBody memberBody, final Location location, final Job job) {
+    public Profile(final Long memberId, final Body body, final Location location, final Job job) {
         this.memberId = memberId;
-        updateContents(memberBody, location, job);
+        updateContents(body, location, job);
     }
 
-    public void updateContents(final MemberBody memberBody, final Location location, final Job job) {
-        this.memberBody = memberBody;
+    public void updateContents(final Body body, final Location location, final Job job) {
+        this.body = body;
         this.location = location;
         this.job = job;
     }

From 1a7a8ff754cb4c04b6d2129ecca02788b3116abf Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 21 Feb 2024 00:23:42 +0900
Subject: [PATCH 021/225] =?UTF-8?q?refactor:=20Profile,=20Option=20?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=95=B8=EB=93=A4=EB=9F=AC=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 메서드에 따라 세부 이벤트가 달라지는 것이므로 이벤트 핸들러 이름에서 Wrote 삭제
---
 .../{OptionWroteEventHandler.java => OptionEventHandler.java}   | 2 +-
 .../{ProfileWroteEventHandler.java => ProfileEventHandler.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/java/com/atwoz/member/application/info/option/{OptionWroteEventHandler.java => OptionEventHandler.java} (94%)
 rename src/main/java/com/atwoz/member/application/info/profile/{ProfileWroteEventHandler.java => ProfileEventHandler.java} (94%)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionWroteEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
similarity index 94%
rename from src/main/java/com/atwoz/member/application/info/option/OptionWroteEventHandler.java
rename to src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index 851066c9..2e84b53b 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionWroteEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -8,7 +8,7 @@
 
 @RequiredArgsConstructor
 @Component
-public class OptionWroteEventHandler {
+public class OptionEventHandler {
 
     private final OptionService optionService;
 
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileWroteEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
similarity index 94%
rename from src/main/java/com/atwoz/member/application/info/profile/ProfileWroteEventHandler.java
rename to src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
index 3e3f8d53..8d91be79 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileWroteEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
@@ -8,7 +8,7 @@
 
 @RequiredArgsConstructor
 @Component
-public class ProfileWroteEventHandler {
+public class ProfileEventHandler {
 
     private final ProfileService profileService;
 

From 8481b08928a4821b6476beab2af85db817114dde Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 21 Feb 2024 14:50:06 +0900
Subject: [PATCH 022/225] =?UTF-8?q?refactor:=20NullValueException=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- NullValueException 예외 삭제
---
 .../global/exception/GlobalExceptionHandler.java  |  8 --------
 .../exception/exceptions/NullValueException.java  |  8 --------
 .../atwoz/member/domain/info/hobby/Hobbies.java   | 15 ---------------
 .../com/atwoz/member/domain/info/hobby/Hobby.java |  8 --------
 .../com/atwoz/member/domain/info/profile/Job.java |  9 ---------
 .../member/domain/info/profile/Location.java      |  9 ---------
 .../com/atwoz/member/domain/info/style/Style.java |  8 --------
 .../atwoz/member/domain/info/style/Styles.java    | 15 ---------------
 8 files changed, 80 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java

diff --git a/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java b/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
index 5526550d..c5a7d7fc 100644
--- a/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
@@ -1,6 +1,5 @@
 package com.atwoz.global.exception;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -8,7 +7,6 @@
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-
 import java.util.Objects;
 
 @Slf4j
@@ -34,12 +32,6 @@ public ResponseEntity<String> handleIllegalArgumentException(final IllegalArgume
                 .body(INTERNAL_SERVER_ERROR_MESSAGE);
     }
 
-    @ExceptionHandler(NullValueException.class)
-    public ResponseEntity<String> handleNullException(final NullValueException exception) {
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                .body(exception.getMessage());
-    }
-
     @ExceptionHandler(PropertyNotFoundException.class)
     public ResponseEntity<String> handlePropertyNotFoundException(final PropertyNotFoundException exception) {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)
diff --git a/src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java b/src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java
deleted file mode 100644
index e44e748f..00000000
--- a/src/main/java/com/atwoz/global/exception/exceptions/NullValueException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.global.exception.exceptions;
-
-public class NullValueException extends RuntimeException {
-
-    public NullValueException() {
-        super("값에 null이 들어가면 안 됩니다.");
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
index aaf3af54..8ec58ccb 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.hobby;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -29,7 +28,6 @@ public class Hobbies {
     private List<Hobby> hobbies;
 
     public Hobbies(final Long memberId, final List<String> hobbies) {
-        validateIsNullMemberId(memberId);
         validateHobbies(hobbies);
         List<Hobby> newHobbies = hobbies.stream()
                 .map(Hobby::from)
@@ -39,24 +37,11 @@ public Hobbies(final Long memberId, final List<String> hobbies) {
         this.hobbies = newHobbies;
     }
 
-    private void validateIsNullMemberId(final Long memberId) {
-        if (memberId == null) {
-            throw new NullValueException();
-        }
-    }
-
     private void validateHobbies(final List<String> hobbies) {
-        validateIsNull(hobbies);
         validateIsDuplicate(hobbies);
         validateSize(hobbies);
     }
 
-    private void validateIsNull(final List<String> hobbies) {
-        if (hobbies == null) {
-            throw new NullValueException();
-        }
-    }
-
     private void validateIsDuplicate(final List<String> hobbies) {
         Set<String> hobbySet = new HashSet<>(hobbies);
         if (hobbies.size() != hobbySet.size()) {
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index 7a647fd7..f3f9ad3f 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.hobby;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
@@ -18,13 +17,6 @@ public class Hobby {
     private String hobby;
 
     public static Hobby from(final String hobby) {
-        validateIsNotNull(hobby);
         return new Hobby(hobby);
     }
-
-    private static void validateIsNotNull(final String hobby) {
-        if (hobby == null) {
-            throw new NullValueException();
-        }
-    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
index d4c03c50..d95845f4 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
@@ -16,14 +15,6 @@ public class Job {
     private String job;
 
     public Job(final String job) {
-        validateNotNull(job);
-
         this.job = job;
     }
-
-    public void validateNotNull(final String job) {
-        if (job == null) {
-            throw new NullValueException();
-        }
-    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Location.java b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
index 18661bed..0a62aa5e 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Location.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
@@ -19,15 +18,7 @@ public class Location {
     private String sector;
 
     public Location(final String city, final String sector) {
-        validateValues(city, sector);
-
         this.city = city;
         this.sector = sector;
     }
-
-    private void validateValues(final String city, final String sector) {
-        if (city == null || sector == null) {
-            throw new NullValueException();
-        }
-    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index 27cdad6e..ec72743f 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.style;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
@@ -18,13 +17,6 @@ public class Style {
     private String style;
 
     public static Style from(final String style) {
-        validateIsNotNull(style);
         return new Style(style);
     }
-
-    private static void validateIsNotNull(final String style) {
-        if (style == null) {
-            throw new NullValueException();
-        }
-    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
index 9bcafe19..1a7c361e 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Styles.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.style;
 
-import com.atwoz.global.exception.exceptions.NullValueException;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -29,7 +28,6 @@ public class Styles {
     private List<Style> styles;
 
     public Styles(final Long memberId, final List<String> styles) {
-        validateIsNullMemberId(memberId);
         validateStyles(styles);
         List<Style> newStyles = styles.stream()
                 .map(Style::from)
@@ -39,24 +37,11 @@ public Styles(final Long memberId, final List<String> styles) {
         this.styles = newStyles;
     }
 
-    private void validateIsNullMemberId(final Long memberId) {
-        if (memberId == null) {
-            throw new NullValueException();
-        }
-    }
-
     private void validateStyles(final List<String> styles) {
-        validateIsNullStyles(styles);
         validateIsDuplicate(styles);
         validateSize(styles);
     }
 
-    private void validateIsNullStyles(final List<String> styles) {
-        if (styles == null) {
-            throw new NullValueException();
-        }
-    }
-
     private void validateIsDuplicate(final List<String> styles) {
         Set<String> styleSet = new HashSet<>(styles);
         if (styles.size() != styleSet.size()) {

From 8cb873b8bdf6ab2b3603c7392f20b11e9a5733b6 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 21 Feb 2024 14:50:58 +0900
Subject: [PATCH 023/225] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9D=B4=EC=A6=88?=
 =?UTF-8?q?=200=EC=9D=BC=20=EC=8B=9C=20isEmpty=20=EC=82=AC=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 리스트 사이즈 검증 시 0일 경우 isEmpty로 교체
---
 src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java | 2 +-
 src/main/java/com/atwoz/member/domain/info/style/Styles.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
index 8ec58ccb..1a008933 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
@@ -50,7 +50,7 @@ private void validateIsDuplicate(final List<String> hobbies) {
     }
 
     private void validateSize(final List<String> hobbies) {
-        if (hobbies.size() < MINIMUM_SIZE || hobbies.size() > MAXIMUM_SIZE) {
+        if (hobbies.isEmpty() || hobbies.size() > MAXIMUM_SIZE) {
             throw new IllegalArgumentException();
         }
     }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
index 1a7c361e..bab2e6e8 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Styles.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
@@ -50,7 +50,7 @@ private void validateIsDuplicate(final List<String> styles) {
     }
 
     private void validateSize(final List<String> styles) {
-        if (styles.size() < MINIMUM_SIZE || styles.size() > MAXIMUM_SIZE) {
+        if (styles.isEmpty() || styles.size() > MAXIMUM_SIZE) {
             throw new IllegalArgumentException();
         }
     }

From 0b7d094cb7ea5416339ecd3c236f81c9b9e27909 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 21 Feb 2024 15:13:03 +0900
Subject: [PATCH 024/225] =?UTF-8?q?refactor:=20Repository=20=EC=9D=B8?=
 =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Repository 인터페이스 위치를 domain으로 수정
---
 .../atwoz/member/application/info/option/OptionService.java    | 2 +-
 .../atwoz/member/application/info/profile/ProfileService.java  | 2 +-
 .../info/option/OptionRepository.java                          | 3 +--
 .../info/profile/ProfileRepository.java                        | 3 +--
 .../infrastructure/info/option/OptionRepositoryImpl.java       | 1 +
 .../infrastructure/info/profile/ProfileRepositoryImpl.java     | 1 +
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/main/java/com/atwoz/member/{infrastructure => domain}/info/option/OptionRepository.java (60%)
 rename src/main/java/com/atwoz/member/{infrastructure => domain}/info/profile/ProfileRepository.java (60%)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index b5ca40fb..e3040eb3 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -2,7 +2,7 @@
 
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.infrastructure.info.option.OptionRepository;
+import com.atwoz.member.domain.info.option.OptionRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index c455546e..111128f2 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -2,7 +2,7 @@
 
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.infrastructure.info.profile.ProfileRepository;
+import com.atwoz.member.domain.info.profile.ProfileRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java b/src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java
similarity index 60%
rename from src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
rename to src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java
index 8b80bb47..53610596 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java
@@ -1,6 +1,5 @@
-package com.atwoz.member.infrastructure.info.option;
+package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.domain.info.option.Option;
 import java.util.Optional;
 
 public interface OptionRepository {
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java b/src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java
similarity index 60%
rename from src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
rename to src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java
index 60217df4..4453a929 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java
@@ -1,6 +1,5 @@
-package com.atwoz.member.infrastructure.info.profile;
+package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.domain.info.profile.Profile;
 import java.util.Optional;
 
 public interface ProfileRepository {
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
index cf318f30..7609954a 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.infrastructure.info.option;
 
 import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.OptionRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import java.util.Optional;
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
index 372fd605..ce599048 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.infrastructure.info.profile;
 
 import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.ProfileRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import java.util.Optional;

From e615cd4dc4af443285c473f11d0c73c97895566b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 01:11:22 +0900
Subject: [PATCH 025/225] =?UTF-8?q?refactor:=20Member=20-=20Hobby=20?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member와 Hobby를 M:N 구조로 수정
- Hobby의 이름을 enum으로 관리, 데이터베이스 테이블에서 삭제
- 관련 예외 등록
---
 .../application/event/HobbyWroteEvent.java    | 11 +--
 .../member/application/info/InfoService.java  | 10 ++-
 .../info/hobby/HobbyEventHandler.java         | 22 +++++
 .../application/info/hobby/HobbyService.java  | 33 ++++++++
 .../member/domain/info/hobby/Hobbies.java     | 57 -------------
 .../atwoz/member/domain/info/hobby/Hobby.java | 28 +++++--
 .../member/domain/info/hobby/HobbyName.java   | 81 +++++++++++++++++++
 .../domain/info/hobby/HobbyRepository.java    | 10 +++
 .../exception/MemberExceptionHandler.java     | 13 +++
 .../info/hobby/HobbyNotFoundException.java    |  8 ++
 .../info/hobby/HobbySizeException.java        |  8 ++
 .../info/hobby/HobbyJpaRepository.java        |  9 +++
 .../info/hobby/HobbyRepositoryImpl.java       | 29 +++++++
 13 files changed, 244 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbySizeException.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java

diff --git a/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java b/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
index 7c8b9137..32610858 100644
--- a/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
@@ -1,19 +1,14 @@
 package com.atwoz.member.application.event;
 
 import com.atwoz.global.event.Event;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import java.util.List;
 
 @Getter
+@RequiredArgsConstructor
 public class HobbyWroteEvent extends Event {
 
     private final Long memberId;
-    private final List<HobbyWriteRequest> hobbies;
-
-    public HobbyWroteEvent(final Long memberId, final List<HobbyWriteRequest> hobbies) {
-        super();
-        this.memberId = memberId;
-        this.hobbies = hobbies;
-    }
+    private final List<String> hobbyNames;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index d9b8551b..5182ebb6 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -5,9 +5,9 @@
 import com.atwoz.member.application.event.OptionWroteEvent;
 import com.atwoz.member.application.event.ProfileWroteEvent;
 import com.atwoz.member.application.event.StyleWroteEvent;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
@@ -24,13 +24,17 @@ public class InfoService {
     public void writeProfile(final Long memberId, final InfoWriteRequest request) {
         ProfileWriteRequest profileWriteRequest = request.profile();
         OptionWriteRequest optionWriteRequest = request.option();
-        List<HobbyWriteRequest> hobbies = request.hobbies();
+        List<String> hobbyNames = request.hobbies()
+                .stream()
+                .map(HobbyWriteRequest::hobby)
+                .toList();
+
         List<StyleWriteRequest> styles = request.styles();
 
         Events.raise(new ProfileWroteEvent(memberId, profileWriteRequest));
         Events.raise(new OptionWroteEvent(memberId, optionWriteRequest));
 
-        Events.raise(new HobbyWroteEvent(memberId, hobbies));
+        Events.raise(new HobbyWroteEvent(memberId, hobbyNames));
         Events.raise(new StyleWroteEvent(memberId, styles));
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
new file mode 100644
index 00000000..a121f0af
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.application.info.hobby;
+
+import com.atwoz.member.application.event.HobbyWroteEvent;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Component
+public class HobbyEventHandler {
+
+    private final HobbyService hobbyService;
+
+    @EventListener
+    public void writeHobbies(final HobbyWroteEvent event) {
+        Long memberId = event.getMemberId();
+        List<String> hobbyNames = event.getHobbyNames();
+
+        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
new file mode 100644
index 00000000..9af14e5a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.application.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyName;
+import com.atwoz.member.domain.info.hobby.HobbyRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class HobbyService {
+
+    private final HobbyRepository hobbyRepository;
+
+    @Transactional
+    public void saveMemberHobbies(final Long memberId, final List<String> hobbyNames) {
+        deleteBeforeMemberHobbies(memberId);
+        List<Hobby> memberHobbies = HobbyName.findAllByNames(hobbyNames)
+                .stream()
+                .map(hobbyName -> new Hobby(memberId, hobbyName))
+                .toList();
+
+        hobbyRepository.saveAll(memberHobbies);
+    }
+
+    @Transactional
+    public void deleteBeforeMemberHobbies(final Long memberId) {
+        hobbyRepository.deleteHobbiesByMemberId(memberId);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
deleted file mode 100644
index 1a008933..00000000
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobbies.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.atwoz.member.domain.info.hobby;
-
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.JoinColumn;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Embeddable
-public class Hobbies {
-
-    private static final int MINIMUM_SIZE = 1;
-    private static final int MAXIMUM_SIZE = 3;
-
-    @Column(name = "member_id", insertable = false, updatable = false)
-    private Long memberId;
-
-    @ElementCollection
-    @CollectionTable(name = "member_hobbies", joinColumns = @JoinColumn(name = "member_id"))
-    private List<Hobby> hobbies;
-
-    public Hobbies(final Long memberId, final List<String> hobbies) {
-        validateHobbies(hobbies);
-        List<Hobby> newHobbies = hobbies.stream()
-                .map(Hobby::from)
-                .toList();
-
-        this.memberId = memberId;
-        this.hobbies = newHobbies;
-    }
-
-    private void validateHobbies(final List<String> hobbies) {
-        validateIsDuplicate(hobbies);
-        validateSize(hobbies);
-    }
-
-    private void validateIsDuplicate(final List<String> hobbies) {
-        Set<String> hobbySet = new HashSet<>(hobbies);
-        if (hobbies.size() != hobbySet.size()) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    private void validateSize(final List<String> hobbies) {
-        if (hobbies.isEmpty() || hobbies.size() > MAXIMUM_SIZE) {
-            throw new IllegalArgumentException();
-        }
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index f3f9ad3f..fd35766e 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -1,22 +1,36 @@
 package com.atwoz.member.domain.info.hobby;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor(access = AccessLevel.PROTECTED)
-@Embeddable
+@Table(name = "member_hobbies")
+@Entity
 public class Hobby {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
     @Column(nullable = false)
-    private String hobby;
+    private HobbyName hobbyName;
 
-    public static Hobby from(final String hobby) {
-        return new Hobby(hobby);
+    public Hobby(final Long memberId, final HobbyName hobbyName) {
+        this.memberId = memberId;
+        this.hobbyName = hobbyName;
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
new file mode 100644
index 00000000..b662551e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
@@ -0,0 +1,81 @@
+package com.atwoz.member.domain.info.hobby;
+
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
+import lombok.Getter;
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+public enum HobbyName {
+
+    TRIP("국내여행 · 해외여행"),
+    GOLF("골프"),
+    THEATER("공연 · 전시회관람"),
+    WRITE("글쓰기"),
+    GAME("PC · 모바일 게임"),
+    SING("노래"),
+    DANCE("댄스"),
+    DRAMA("드라마 · 예능보기"),
+    DRIVE("드라이브"),
+    CLIMB("등산 · 클라이밍"),
+    RUNNING("러닝"),
+    EAT("맛집탐방"),
+    TENNIS("배드민턴 · 테니스"),
+    BOARD_GAME("보드게임"),
+    PHOTO("사진촬영"),
+    WALK("산책"),
+    SHOPPING("쇼핑"),
+    SKI("스키 · 스노우보드"),
+    INSTRUMENT("악기연주"),
+    ANIMATION("애니메이션"),
+    MOVIE("연극 · 영화"),
+    WINE("와인"),
+    HEALTH("운동 · 헬스"),
+    YOGA("요가 · 필라테스"),
+    COOK("요리"),
+    CARTOON("웹툰 · 만화"),
+    INTERIOR("인테리어"),
+    BICYCLE("자전거"),
+    CAMP("캠핑");
+
+    private static final int MAX_SIZE = 3;
+
+    private final String name;
+
+    HobbyName(final String name) {
+        this.name = name;
+    }
+
+    public static List<HobbyName> findAllByNames(final List<String> names) {
+        validateSize(names);
+        return names.stream()
+                .map(HobbyName::from)
+                .toList();
+    }
+
+    public static void validateSize(final List<String> names) {
+        if (names.isEmpty()) {
+            throw new HobbySizeException();
+        }
+
+        int validSize = Arrays.stream(values())
+                .filter(hobbyName -> names.contains(hobbyName.getName()))
+                .toList()
+                .size();
+        if (validSize > MAX_SIZE) {
+            throw new HobbySizeException();
+        }
+    }
+
+    private static HobbyName from(final String name) {
+        return Arrays.stream(values())
+                .filter(hobbyName -> hobbyName.isSame(name))
+                .findFirst()
+                .orElseThrow(HobbyNotFoundException::new);
+    }
+
+    private boolean isSame(final String name) {
+        return this.name.equals(name);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
new file mode 100644
index 00000000..a91634da
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.domain.info.hobby;
+
+import java.util.List;
+
+public interface HobbyRepository {
+
+    void save(final Hobby hobby);
+    void saveAll(final List<Hobby> memberHobbies);
+    void deleteHobbiesByMemberId(final Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 86a0a0e1..038054c4 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -8,6 +8,8 @@
 import com.atwoz.member.exception.exceptions.auth.TokenFormInvalidException;
 import com.atwoz.member.exception.exceptions.auth.TokenInvalidException;
 import com.atwoz.member.exception.exceptions.auth.UnsupportedTokenException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.member.MemberAlreadyExistedException;
 import com.atwoz.member.exception.exceptions.member.MemberNotFoundException;
 import com.atwoz.member.exception.exceptions.member.PasswordNotMatchedException;
@@ -82,6 +84,17 @@ public ResponseEntity<String> handleOAuthPlatformNotFountException(final OAuthPl
         return getNotFoundResponse(e);
     }
 
+    // info - hobby
+    @ExceptionHandler(HobbyNotFoundException.class)
+    public ResponseEntity<String> handleHobbyNotFoundException(final HobbyNotFoundException e) {
+        return getNotFoundResponse(e);
+    }
+
+    @ExceptionHandler(HobbySizeException.class)
+    public ResponseEntity<String> handleHobbySizeException(final HobbySizeException e) {
+        return getBadRequest(e);
+    }
+
     private ResponseEntity<String> getNotFoundResponse(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(e.getMessage());
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java
new file mode 100644
index 00000000..813716cd
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.hobby;
+
+public class HobbyNotFoundException extends RuntimeException {
+
+    public HobbyNotFoundException() {
+        super("취미를 찾을 수 없습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbySizeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbySizeException.java
new file mode 100644
index 00000000..e53d4364
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbySizeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.hobby;
+
+public class HobbySizeException extends RuntimeException {
+
+    public HobbySizeException() {
+        super("선택할 수 있는 취미 갯수와 맞지 않습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
new file mode 100644
index 00000000..2c41bcd9
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
@@ -0,0 +1,9 @@
+package com.atwoz.member.infrastructure.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobby;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface HobbyJpaRepository extends JpaRepository<Hobby, Long> {
+
+    void deleteByMemberId(final Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
new file mode 100644
index 00000000..bae506fd
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.infrastructure.info.hobby;
+
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Repository
+public class HobbyRepositoryImpl implements HobbyRepository {
+
+    private final HobbyJpaRepository hobbyJpaRepository;
+
+    @Override
+    public void save(final Hobby hobby) {
+        hobbyJpaRepository.save(hobby);
+    }
+
+    @Override
+    public void saveAll(final List<Hobby> memberHobbies) {
+        hobbyJpaRepository.saveAll(memberHobbies);
+    }
+
+    @Override
+    public void deleteHobbiesByMemberId(final Long memberId) {
+        hobbyJpaRepository.deleteByMemberId(memberId);
+    }
+}

From a77c05f03e3b4cf7f1c535b621515c611db9f028 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 01:43:12 +0900
Subject: [PATCH 026/225] =?UTF-8?q?refactor:=20Member=20-=20Style=20?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member와 Style을 M:N 구조로 수정
- Style의 이름을 enum으로 관리, 데이터베이스 테이블에서 삭제
- 관련 예외 등록
---
 .../application/event/StyleWroteEvent.java    | 11 +--
 .../member/application/info/InfoService.java  |  8 +-
 .../info/style/StyleEventHandler.java         | 22 +++++
 .../application/info/style/StyleService.java  | 33 ++++++++
 .../atwoz/member/domain/info/style/Style.java | 28 +++++--
 .../member/domain/info/style/StyleName.java   | 82 +++++++++++++++++++
 .../domain/info/style/StyleRepository.java    | 10 +++
 .../member/domain/info/style/Styles.java      | 57 -------------
 .../exception/MemberExceptionHandler.java     | 13 +++
 .../info/style/StyleNotFoundException.java    |  8 ++
 .../info/style/StyleSizeException.java        |  8 ++
 .../info/style/StyleJpaRepository.java        |  9 ++
 .../info/style/StyleRepositoryImpl.java       | 29 +++++++
 13 files changed, 243 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/style/StyleService.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/style/StyleName.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/style/Styles.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleSizeException.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java

diff --git a/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java b/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
index 67383c52..a499e128 100644
--- a/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
@@ -1,19 +1,14 @@
 package com.atwoz.member.application.event;
 
 import com.atwoz.global.event.Event;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import java.util.List;
 
 @Getter
+@RequiredArgsConstructor
 public class StyleWroteEvent extends Event {
 
     private final Long memberId;
-    private final List<StyleWriteRequest> styles;
-
-    public StyleWroteEvent(final Long memberId, final List<StyleWriteRequest> styles) {
-        super();
-        this.memberId = memberId;
-        this.styles = styles;
-    }
+    private final List<String> styleNames;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 5182ebb6..623e81fa 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -28,13 +28,15 @@ public void writeProfile(final Long memberId, final InfoWriteRequest request) {
                 .stream()
                 .map(HobbyWriteRequest::hobby)
                 .toList();
-
-        List<StyleWriteRequest> styles = request.styles();
+        List<String> styleNames = request.styles()
+                .stream()
+                .map(StyleWriteRequest::style)
+                .toList();
 
         Events.raise(new ProfileWroteEvent(memberId, profileWriteRequest));
         Events.raise(new OptionWroteEvent(memberId, optionWriteRequest));
 
         Events.raise(new HobbyWroteEvent(memberId, hobbyNames));
-        Events.raise(new StyleWroteEvent(memberId, styles));
+        Events.raise(new StyleWroteEvent(memberId, styleNames));
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
new file mode 100644
index 00000000..5652e80e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.application.info.style;
+
+import com.atwoz.member.application.event.StyleWroteEvent;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Component
+public class StyleEventHandler {
+
+    private final StyleService styleService;
+
+    @EventListener
+    public void writeHobbies(final StyleWroteEvent event) {
+        Long memberId = event.getMemberId();
+        List<String> styleNames = event.getStyleNames();
+
+        styleService.saveMemberStyles(memberId, styleNames);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
new file mode 100644
index 00000000..ca521165
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.application.info.style;
+
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleName;
+import com.atwoz.member.domain.info.style.StyleRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class StyleService {
+
+    private final StyleRepository styleRepository;
+
+    @Transactional
+    public void saveMemberStyles(final Long memberId, final List<String> styleNames) {
+        deleteBeforeMemberStyles(memberId);
+        List<Style> memberStyles = StyleName.findAllByNames(styleNames)
+                .stream()
+                .map(styleName -> new Style(memberId, styleName))
+                .toList();
+
+        styleRepository.saveAll(memberStyles);
+    }
+
+    @Transactional
+    public void deleteBeforeMemberStyles(final Long memberId) {
+        styleRepository.deleteStylesByMemberId(memberId);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index ec72743f..8312a248 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,22 +1,36 @@
 package com.atwoz.member.domain.info.style;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor(access = AccessLevel.PROTECTED)
-@Embeddable
+@Table(name = "member_styles")
+@Entity
 public class Style {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
     @Column(nullable = false)
-    private String style;
+    private StyleName styleName;
 
-    public static Style from(final String style) {
-        return new Style(style);
+    public Style(final Long memberId, final StyleName styleName) {
+        this.memberId = memberId;
+        this.styleName = styleName;
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
new file mode 100644
index 00000000..544443d0
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
@@ -0,0 +1,82 @@
+package com.atwoz.member.domain.info.style;
+
+import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
+import lombok.Getter;
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+public enum StyleName {
+
+    FASHION("패션 센스"),
+    FRIENDLY("다정다감"),
+    FUNNY("유머 감각"),
+    GOOD_RATIO("좋은 비율"),
+    PRETTY_SMILE("웃는 미소가 예쁨"),
+    LOW_VOICE("저음 목소리"),
+    CONSIDERABLE("넓은 배려심"),
+    EXTROVERT("외향형"),
+    INTROVERT("내향형"),
+    ATTRACTIVE("애교쟁이"),
+    GOOD_SKIN("좋은 피부"),
+    POSITIVE("긍정적"),
+    CUTE("귀여움"),
+    RELIABLE("듬직함"),
+    PRETTY_HAND("예쁜 손"),
+    LOVELY("사랑스러움"),
+    MOOD("분위기 있음"),
+    REAL_BETTER("실물이 더 좋음"),
+    INNOCENT("천진난만"),
+    INTELLECTUAL("지적 섹시"),
+    POLITE("예의 바름"),
+    GENTLE("진중함"),
+    GOOD_SPEECH("나긋나긋한 말투"),
+    ONE_LOVE("순정파"),
+    PURE("청순함"),
+    BOLD_DOUBLE_EYELID("짙은 쌍꺼풀"),
+    NONE_DOUBLE_EYELID("무쌍꺼풀"),
+    INNER_DOUBLE_EYELID("속쌍꺼풀"),
+    PROUD("도도함"),
+    MAKER("분위기 메이커");
+
+    private static final int MAX_SIZE = 3;
+
+    private final String name;
+
+    StyleName(final String name) {
+        this.name = name;
+    }
+
+    public static List<StyleName> findAllByNames(final List<String> names) {
+        validateSize(names);
+        return names.stream()
+                .map(StyleName::from)
+                .toList();
+    }
+
+    public static void validateSize(final List<String> names) {
+        if (names.isEmpty()) {
+            throw new StyleSizeException();
+        }
+
+        int validSize = Arrays.stream(values())
+                .filter(hobbyName -> names.contains(hobbyName.getName()))
+                .toList()
+                .size();
+        if (validSize > MAX_SIZE) {
+            throw new StyleSizeException();
+        }
+    }
+
+    private static StyleName from(final String name) {
+        return Arrays.stream(values())
+                .filter(styleName -> styleName.isSame(name))
+                .findFirst()
+                .orElseThrow(StyleNotFoundException::new);
+    }
+
+    private boolean isSame(final String name) {
+        return this.name.equals(name);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java b/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
new file mode 100644
index 00000000..f49caf1f
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.domain.info.style;
+
+import java.util.List;
+
+public interface StyleRepository {
+
+    void save(final Style style);
+    void saveAll(final List<Style> styles);
+    void deleteStylesByMemberId(final Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Styles.java b/src/main/java/com/atwoz/member/domain/info/style/Styles.java
deleted file mode 100644
index bab2e6e8..00000000
--- a/src/main/java/com/atwoz/member/domain/info/style/Styles.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.atwoz.member.domain.info.style;
-
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.JoinColumn;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Embeddable
-public class Styles {
-
-    private static final int MINIMUM_SIZE = 1;
-    private static final int MAXIMUM_SIZE = 3;
-
-    @Column(name = "member_id", insertable = false, updatable = false)
-    private Long memberId;
-
-    @ElementCollection
-    @CollectionTable(name = "member_styles", joinColumns = @JoinColumn(name = "member_id"))
-    private List<Style> styles;
-
-    public Styles(final Long memberId, final List<String> styles) {
-        validateStyles(styles);
-        List<Style> newStyles = styles.stream()
-                .map(Style::from)
-                .toList();
-
-        this.memberId = memberId;
-        this.styles = newStyles;
-    }
-
-    private void validateStyles(final List<String> styles) {
-        validateIsDuplicate(styles);
-        validateSize(styles);
-    }
-
-    private void validateIsDuplicate(final List<String> styles) {
-        Set<String> styleSet = new HashSet<>(styles);
-        if (styles.size() != styleSet.size()) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    private void validateSize(final List<String> styles) {
-        if (styles.isEmpty() || styles.size() > MAXIMUM_SIZE) {
-            throw new IllegalArgumentException();
-        }
-    }
-}
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 038054c4..7047a72f 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -10,6 +10,8 @@
 import com.atwoz.member.exception.exceptions.auth.UnsupportedTokenException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
+import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import com.atwoz.member.exception.exceptions.member.MemberAlreadyExistedException;
 import com.atwoz.member.exception.exceptions.member.MemberNotFoundException;
 import com.atwoz.member.exception.exceptions.member.PasswordNotMatchedException;
@@ -95,6 +97,17 @@ public ResponseEntity<String> handleHobbySizeException(final HobbySizeException
         return getBadRequest(e);
     }
 
+    // info - style
+    @ExceptionHandler(StyleNotFoundException.class)
+    public ResponseEntity<String> handleStyleNotFoundException(final StyleNotFoundException e) {
+        return getNotFoundResponse(e);
+    }
+
+    @ExceptionHandler(StyleSizeException.class)
+    public ResponseEntity<String> handleStyleSizeException(final StyleSizeException e) {
+        return getBadRequest(e);
+    }
+
     private ResponseEntity<String> getNotFoundResponse(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(e.getMessage());
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java
new file mode 100644
index 00000000..409683ad
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.style;
+
+public class StyleNotFoundException extends RuntimeException {
+
+    public StyleNotFoundException() {
+        super("스타일을 찾을 수 없습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleSizeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleSizeException.java
new file mode 100644
index 00000000..3832a2da
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleSizeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.style;
+
+public class StyleSizeException extends RuntimeException {
+
+    public StyleSizeException() {
+        super("선택할 수 있는 스타일 갯수와 맞지 않습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
new file mode 100644
index 00000000..465d6f13
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
@@ -0,0 +1,9 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.Style;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface StyleJpaRepository extends JpaRepository<Style, Long> {
+
+    void deleteByMemberId(final Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
new file mode 100644
index 00000000..5d1a6aea
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Repository
+public class StyleRepositoryImpl implements StyleRepository {
+
+    private final StyleJpaRepository styleJpaRepository;
+
+    @Override
+    public void save(final Style style) {
+        styleJpaRepository.save(style);
+    }
+
+    @Override
+    public void saveAll(final List<Style> styles) {
+        styleJpaRepository.saveAll(styles);
+    }
+
+    @Override
+    public void deleteStylesByMemberId(final Long memberId) {
+        styleJpaRepository.deleteByMemberId(memberId);
+    }
+}

From 014751aef380419887a217ac73eb65fbd49e648a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 12:52:23 +0900
Subject: [PATCH 027/225] =?UTF-8?q?fix:=20Option=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Option 내용 수정 시 반영 안되는 오류 수정
---
 .../member/application/info/option/OptionService.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index e3040eb3..79227a67 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -26,11 +26,11 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
         }
         Option existOption = findOption.get();
         existOption.updateContents(
-                existOption.getSmoke(),
-                existOption.getReligion(),
-                existOption.getDrink(),
-                existOption.getMbti(),
-                existOption.getGraduate()
+                newOption.getSmoke(),
+                newOption.getReligion(),
+                newOption.getDrink(),
+                newOption.getMbti(),
+                newOption.getGraduate()
         );
     }
 

From 7e29a6d545d5ae573222f802bf32bd2bfd68a683 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 13:16:51 +0900
Subject: [PATCH 028/225] =?UTF-8?q?feat:=20Position=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Position 속성 정의
- 관련 검증 로직 추가
---
 .../dto/profile/PositionWriteRequest.java     | 13 ++++++
 .../info/dto/profile/ProfileWriteRequest.java |  2 +
 .../info/profile/ProfileFactory.java          |  9 +++-
 .../info/profile/ProfileService.java          |  7 +++-
 .../member/domain/info/profile/Position.java  | 41 +++++++++++++++++++
 .../member/domain/info/profile/Profile.java   | 11 +++--
 6 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/Position.java

diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
new file mode 100644
index 00000000..3aa315c5
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import jakarta.validation.constraints.NotNull;
+
+public record PositionWriteRequest(
+
+        @NotNull(message = "위도가 있어야 합니다.")
+        Double latitude,
+
+        @NotNull(message = "경도가 있어야 합니다.")
+        Double longitude
+){
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index 0957cf3a..216ca346 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -16,6 +16,8 @@ public record ProfileWriteRequest(
 
         LocationWriteRequest location,
 
+        PositionWriteRequest position,
+
         @NotBlank(message = "직업이 작성되어야 합니다.")
         String job
 ){
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index d1841f61..8ef30184 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -1,11 +1,13 @@
 package com.atwoz.member.application.info.profile;
 
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
 import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 import org.springframework.stereotype.Component;
 
@@ -15,8 +17,9 @@ public class ProfileFactory {
     public Profile fromRequest(final Long memberId, final ProfileWriteRequest request) {
         Body body = createMemberBody(request);
         Location location = createLocation(request.location());
+        Position position = createPosition(request.position());
         Job job = createJob(request.job());
-        return new Profile(memberId, body, location, job);
+        return new Profile(memberId, body, location, position, job);
     }
 
     private Body createMemberBody(final ProfileWriteRequest request) {
@@ -31,6 +34,10 @@ private Location createLocation(final LocationWriteRequest request) {
         return new Location(request.city(), request.sector());
     }
 
+    private Position createPosition(final PositionWriteRequest request) {
+        return new Position(request.latitude(), request.longitude());
+    }
+
     private Job createJob(final String job) {
         return new Job(job);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 111128f2..0ac66a63 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -26,7 +26,12 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
             return;
         }
         Profile existProfile = findProfile.get();
-        existProfile.updateContents(newProfile.getBody(), newProfile.getLocation(), newProfile.getJob());
+        existProfile.updateContents(
+                newProfile.getBody(),
+                newProfile.getLocation(),
+                newProfile.getPosition(),
+                newProfile.getJob()
+        );
     }
 
     private Optional<Profile> findByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Position.java b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
new file mode 100644
index 00000000..54a5c75e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
@@ -0,0 +1,41 @@
+package com.atwoz.member.domain.info.profile;
+
+import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Embeddable
+public class Position {
+
+    private static final int MIN_LATITUDE = -90;
+    private static final int MAX_LATITUDE = 90;
+    private static final int MIN_LONGITUDE = -180;
+    private static final int MAX_LONGITUDE = 180;
+
+    private double latitude;
+    private double longitude;
+
+    public Position(final double latitude, final double longitude) {
+        validateLatitude(latitude);
+        validateLongitude(longitude);
+
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    private static void validateLatitude(final double latitude) {
+        if (latitude < MIN_LATITUDE || latitude > MAX_LATITUDE) {
+            throw new ProfileRangeException();
+        }
+    }
+
+    private static void validateLongitude(final double longitude) {
+        if (longitude < MIN_LONGITUDE || longitude > MAX_LONGITUDE) {
+            throw new ProfileRangeException();
+        }
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index b69df9d4..bf92eefe 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -31,18 +31,23 @@ public class Profile {
     @Column(nullable = false)
     private Location location;
 
+    @Embedded
+    @Column(nullable = false)
+    private Position position;
+
     @Embedded
     @Column(nullable = false)
     private Job job;
 
-    public Profile(final Long memberId, final Body body, final Location location, final Job job) {
+    public Profile(final Long memberId, final Body body, final Location location, final Position position, final Job job) {
         this.memberId = memberId;
-        updateContents(body, location, job);
+        updateContents(body, location, position, job);
     }
 
-    public void updateContents(final Body body, final Location location, final Job job) {
+    public void updateContents(final Body body, final Location location, final Position position, final Job job) {
         this.body = body;
         this.location = location;
+        this.position = position;
         this.job = job;
     }
 }

From 504e59df22a6c93ec65b133175d2958bdfaad43b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 16:58:11 +0900
Subject: [PATCH 029/225] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=ED=95=84=20(?=
 =?UTF-8?q?Profile)=20=EC=A1=B0=ED=9A=8C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileController를 통해 작성한 Profile 조회 개발
- 응답 DTO 정의
- Repository 메서드를 추가하여 Optional 방지
---
 .../info/profile/ProfileService.java          | 19 +++++---
 .../info/profile/ProfileRepository.java       |  1 +
 .../profile/ProfileNotFoundException.java     |  8 ++++
 .../info/profile/ProfileRepositoryImpl.java   |  5 +++
 .../member/ui/info/ProfileController.java     | 28 ++++++++++++
 .../dto/profile/LocationSearchResponse.java   | 14 ++++++
 .../dto/profile/PositionSearchResponse.java   | 14 ++++++
 .../dto/profile/ProfileSearchResponse.java    | 43 +++++++++++++++++++
 8 files changed, 125 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/ProfileController.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 0ac66a63..25dc1272 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -3,10 +3,10 @@
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.Optional;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -18,14 +18,14 @@ public class ProfileService {
 
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
-
-        Optional<Profile> findProfile = findByMemberId(memberId);
         Profile newProfile = profileFactory.fromRequest(memberId, request);
-        if (findProfile.isEmpty()) {
+
+        if (!isMemberProfileExist(memberId)) {
             profileRepository.save(newProfile);
             return;
         }
-        Profile existProfile = findProfile.get();
+
+        Profile existProfile = findByMemberId(memberId);
         existProfile.updateContents(
                 newProfile.getBody(),
                 newProfile.getLocation(),
@@ -34,7 +34,12 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
         );
     }
 
-    private Optional<Profile> findByMemberId(final Long memberId) {
-        return profileRepository.findByMemberId(memberId);
+    private boolean isMemberProfileExist(final Long memberId) {
+        return profileRepository.isExistMemberProfile(memberId);
+    }
+
+    public Profile findByMemberId(final Long memberId) {
+        return profileRepository.findByMemberId(memberId)
+                .orElseThrow(ProfileNotFoundException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java b/src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java
index 4453a929..d47a5027 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/ProfileRepository.java
@@ -6,4 +6,5 @@ public interface ProfileRepository {
 
     void save(final Profile profile);
     Optional<Profile> findByMemberId(final Long memberId);
+    boolean isExistMemberProfile(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileNotFoundException.java
new file mode 100644
index 00000000..32ec4aee
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile;
+
+public class ProfileNotFoundException extends RuntimeException {
+
+    public ProfileNotFoundException() {
+        super("Profile이 저장되지 않았습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
index ce599048..419c6846 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
@@ -21,4 +21,9 @@ public void save(final Profile profile) {
     public Optional<Profile> findByMemberId(final Long memberId) {
         return profileJpaRepository.findByMemberId(memberId);
     }
+
+    @Override
+    public boolean isExistMemberProfile(final Long memberId) {
+        return findByMemberId(memberId).isPresent();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/ProfileController.java b/src/main/java/com/atwoz/member/ui/info/ProfileController.java
new file mode 100644
index 00000000..812056f4
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/ProfileController.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.ui.info;
+
+import com.atwoz.member.application.info.profile.ProfileService;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/info/profile")
+@RestController
+public class ProfileController {
+
+    private final ProfileService profileService;
+
+    @GetMapping
+    public ResponseEntity<ProfileSearchResponse> findProfile(@AuthMember Long memberId) {
+        Profile profile = profileService.findByMemberId(memberId);
+        ProfileSearchResponse response = ProfileSearchResponse.from(profile);
+
+        return ResponseEntity.ok()
+                .body(response);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
new file mode 100644
index 00000000..c871b64d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.ui.info.dto.profile;
+
+import com.atwoz.member.domain.info.profile.Location;
+
+public record LocationSearchResponse(
+
+        String city,
+
+        String sector
+) {
+    public static LocationSearchResponse from(final Location location) {
+        return new LocationSearchResponse(location.getCity(), location.getSector());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
new file mode 100644
index 00000000..44611037
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.ui.info.dto.profile;
+
+import com.atwoz.member.domain.info.profile.Position;
+
+public record PositionSearchResponse(
+
+        double latitude,
+
+        double longitude
+) {
+    public static PositionSearchResponse from(final Position position) {
+        return new PositionSearchResponse(position.getLatitude(), position.getLongitude());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
new file mode 100644
index 00000000..4a1fec75
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -0,0 +1,43 @@
+package com.atwoz.member.ui.info.dto.profile;
+
+import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.Profile;
+
+public record ProfileSearchResponse(
+
+        int age,
+
+        int height,
+
+        String gender,
+
+        LocationSearchResponse location,
+
+        PositionSearchResponse position,
+
+        String job
+) {
+    public static ProfileSearchResponse from(final Profile profile) {
+        Body body = profile.getBody();
+        int year = body.getBirthYear();
+        int height = body.getHeight();
+        Gender gender = body.getGender();
+
+        Location location = profile.getLocation();
+        Position position = profile.getPosition();
+        Job job = profile.getJob();
+
+        return new ProfileSearchResponse(
+                year,
+                height,
+                gender.getName(),
+                LocationSearchResponse.from(location),
+                PositionSearchResponse.from(position),
+                job.getJob()
+        );
+    }
+}

From d3b3ea93856bbfc25fe30b2a35b83f0154293f41 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 16:58:43 +0900
Subject: [PATCH 030/225] =?UTF-8?q?feat:=20=EC=98=B5=EC=85=98=20(Option)?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionController를 통해 작성한 Option 조회 개발
- 응답 DTO 정의
- Repository 메서드를 추가하여 Optional 방지
---
 .../info/option/OptionService.java            | 16 +++++---
 .../domain/info/option/OptionRepository.java  |  1 +
 .../info/option/OptionNotFoundException.java  |  8 ++++
 .../info/option/OptionRepositoryImpl.java     |  5 +++
 .../member/ui/info/dto/OptionController.java  | 28 ++++++++++++++
 .../info/dto/option/OptionSearchResponse.java | 37 +++++++++++++++++++
 6 files changed, 89 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/option/OptionNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/OptionController.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 79227a67..edef4532 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -3,10 +3,10 @@
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
+import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.Optional;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -18,13 +18,12 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Optional<Option> findOption = findByMemberId(memberId);
         Option newOption = optionFactory.fromRequest(memberId, request);
-        if (findOption.isEmpty()) {
+        if (!isMemberOptionExist(memberId)) {
             optionRepository.save(newOption);
             return;
         }
-        Option existOption = findOption.get();
+        Option existOption = findByMemberId(memberId);
         existOption.updateContents(
                 newOption.getSmoke(),
                 newOption.getReligion(),
@@ -34,7 +33,12 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
         );
     }
 
-    private Optional<Option> findByMemberId(final Long memberId) {
-        return optionRepository.findByMemberId(memberId);
+    private boolean isMemberOptionExist(final Long memberId) {
+        return optionRepository.isExistMemberOption(memberId);
+    }
+
+    public Option findByMemberId(final Long memberId) {
+        return optionRepository.findByMemberId(memberId)
+                .orElseThrow(OptionNotFoundException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java b/src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java
index 53610596..6d337de8 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/OptionRepository.java
@@ -6,4 +6,5 @@ public interface OptionRepository {
 
     void save(final Option option);
     Optional<Option> findByMemberId(final Long memberId);
+    boolean isExistMemberOption(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/OptionNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/OptionNotFoundException.java
new file mode 100644
index 00000000..78b9b464
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/OptionNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.option;
+
+public class OptionNotFoundException extends RuntimeException {
+
+    public OptionNotFoundException() {
+        super("Option이 저장되지 않았습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
index 7609954a..b64c2340 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
@@ -21,4 +21,9 @@ public void save(final Option option) {
     public Optional<Option> findByMemberId(final Long memberId) {
         return optionJpaRepository.findByMemberId(memberId);
     }
+
+    @Override
+    public boolean isExistMemberOption(final Long memberId) {
+        return findByMemberId(memberId).isPresent();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/OptionController.java b/src/main/java/com/atwoz/member/ui/info/dto/OptionController.java
new file mode 100644
index 00000000..5df964e7
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/OptionController.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.ui.info.dto;
+
+import com.atwoz.member.application.info.option.OptionService;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/info/option")
+@RestController
+public class OptionController {
+
+    private final OptionService optionService;
+
+    @GetMapping
+    public ResponseEntity<OptionSearchResponse> findOption(@AuthMember Long memberId) {
+        Option option = optionService.findByMemberId(memberId);
+        OptionSearchResponse response = OptionSearchResponse.from(option);
+
+        return ResponseEntity.ok()
+                .body(response);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
new file mode 100644
index 00000000..8e6da532
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
@@ -0,0 +1,37 @@
+package com.atwoz.member.ui.info.dto.option;
+
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+
+public record OptionSearchResponse(
+
+        String drink,
+
+        String graduate,
+
+        String religion,
+
+        String smoke,
+
+        String mbti
+) {
+    public static OptionSearchResponse from(final Option option) {
+        Drink drink = option.getDrink();
+        Graduate graduate = option.getGraduate();
+        Religion religion = option.getReligion();
+        Smoke smoke = option.getSmoke();
+        Mbti mbti = option.getMbti();
+
+        return new OptionSearchResponse(
+                drink.getName(),
+                graduate.getName(),
+                religion.getName(),
+                smoke.getName(),
+                mbti.name()
+        );
+    }
+}

From a5705eb4458829d6fa84755a52b3f74db18d1adf Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 17:04:46 +0900
Subject: [PATCH 031/225] =?UTF-8?q?refactor:=20OptionController=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionController 위치 수정
---
 .../com/atwoz/member/ui/info/{dto => }/OptionController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/com/atwoz/member/ui/info/{dto => }/OptionController.java (96%)

diff --git a/src/main/java/com/atwoz/member/ui/info/dto/OptionController.java b/src/main/java/com/atwoz/member/ui/info/OptionController.java
similarity index 96%
rename from src/main/java/com/atwoz/member/ui/info/dto/OptionController.java
rename to src/main/java/com/atwoz/member/ui/info/OptionController.java
index 5df964e7..91ccb272 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/OptionController.java
+++ b/src/main/java/com/atwoz/member/ui/info/OptionController.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto;
+package com.atwoz.member.ui.info;
 
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;

From fb283878fe01694507135511bbe0ba41b8a73f75 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 17:14:10 +0900
Subject: [PATCH 032/225] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=EC=B7=A8?=
 =?UTF-8?q?=EB=AF=B8=20=EC=A1=B0=ED=9A=8C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyController를 통해 작성한 Hobby 조회 개발
- 응답 DTO 정의
---
 .../application/info/hobby/HobbyService.java  |  4 +++
 .../domain/info/hobby/HobbyRepository.java    |  1 +
 .../info/hobby/HobbyJpaRepository.java        |  3 ++
 .../info/hobby/HobbyRepositoryImpl.java       |  5 +++
 .../atwoz/member/ui/info/HobbyController.java | 32 +++++++++++++++++++
 .../ui/info/dto/HobbySearchResponse.java      |  7 ++++
 6 files changed, 52 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/ui/info/HobbyController.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
index 9af14e5a..dff75747 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -30,4 +30,8 @@ public void saveMemberHobbies(final Long memberId, final List<String> hobbyNames
     public void deleteBeforeMemberHobbies(final Long memberId) {
         hobbyRepository.deleteHobbiesByMemberId(memberId);
     }
+
+    public List<Hobby> findMemberHobbies(final Long memberId) {
+        return hobbyRepository.findAllByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
index a91634da..23da2464 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
@@ -7,4 +7,5 @@ public interface HobbyRepository {
     void save(final Hobby hobby);
     void saveAll(final List<Hobby> memberHobbies);
     void deleteHobbiesByMemberId(final Long memberId);
+    List<Hobby> findAllByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
index 2c41bcd9..2439fb8e 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
@@ -2,8 +2,11 @@
 
 import com.atwoz.member.domain.info.hobby.Hobby;
 import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.List;
 
 public interface HobbyJpaRepository extends JpaRepository<Hobby, Long> {
 
     void deleteByMemberId(final Long memberId);
+
+    List<Hobby> findAllByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
index bae506fd..63d092cb 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
@@ -26,4 +26,9 @@ public void saveAll(final List<Hobby> memberHobbies) {
     public void deleteHobbiesByMemberId(final Long memberId) {
         hobbyJpaRepository.deleteByMemberId(memberId);
     }
+
+    @Override
+    public List<Hobby> findAllByMemberId(final Long memberId) {
+        return hobbyJpaRepository.findAllByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/HobbyController.java b/src/main/java/com/atwoz/member/ui/info/HobbyController.java
new file mode 100644
index 00000000..141297f2
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/HobbyController.java
@@ -0,0 +1,32 @@
+package com.atwoz.member.ui.info;
+
+import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/info/hobby")
+@RestController
+public class HobbyController {
+
+    private final HobbyService hobbyService;
+
+    @GetMapping
+    public ResponseEntity<List<HobbySearchResponse>> findMemberHobbies(@AuthMember final Long memberId) {
+        List<HobbySearchResponse> hobbies = hobbyService.findMemberHobbies(memberId)
+                .stream()
+                .map(Hobby::getHobbyName)
+                .map(hobbyName -> new HobbySearchResponse(hobbyName.getName()))
+                .toList();
+
+        return ResponseEntity.ok()
+                .body(hobbies);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
new file mode 100644
index 00000000..7206f532
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.ui.info.dto;
+
+public record HobbySearchResponse(
+
+        String hobby
+) {
+}

From 47fa1a072225e9f3792a6d91d886aefde0c989d4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 17:29:53 +0900
Subject: [PATCH 033/225] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleController를 통해 작성한 Style 조회 개발
- 응답 DTO 정의
---
 .../application/info/style/StyleService.java  |  4 +++
 .../domain/info/style/StyleRepository.java    |  1 +
 .../info/style/StyleJpaRepository.java        |  2 ++
 .../info/style/StyleRepositoryImpl.java       |  5 +++
 .../atwoz/member/ui/info/StyleController.java | 32 +++++++++++++++++++
 .../ui/info/dto/StyleSearchResponse.java      |  7 ++++
 6 files changed, 51 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/ui/info/StyleController.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java

diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
index ca521165..487604ad 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -30,4 +30,8 @@ public void saveMemberStyles(final Long memberId, final List<String> styleNames)
     public void deleteBeforeMemberStyles(final Long memberId) {
         styleRepository.deleteStylesByMemberId(memberId);
     }
+
+    public List<Style> findMemberStyles(final Long memberId) {
+        return styleRepository.findAllByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java b/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
index f49caf1f..3b696de4 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
@@ -7,4 +7,5 @@ public interface StyleRepository {
     void save(final Style style);
     void saveAll(final List<Style> styles);
     void deleteStylesByMemberId(final Long memberId);
+    List<Style> findAllByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
index 465d6f13..19fd2e03 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
@@ -2,8 +2,10 @@
 
 import com.atwoz.member.domain.info.style.Style;
 import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.List;
 
 public interface StyleJpaRepository extends JpaRepository<Style, Long> {
 
     void deleteByMemberId(final Long memberId);
+    List<Style> findAllByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
index 5d1a6aea..1af49a70 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
@@ -26,4 +26,9 @@ public void saveAll(final List<Style> styles) {
     public void deleteStylesByMemberId(final Long memberId) {
         styleJpaRepository.deleteByMemberId(memberId);
     }
+
+    @Override
+    public List<Style> findAllByMemberId(final Long memberId) {
+        return styleJpaRepository.findAllByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/StyleController.java b/src/main/java/com/atwoz/member/ui/info/StyleController.java
new file mode 100644
index 00000000..c9350cfe
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/StyleController.java
@@ -0,0 +1,32 @@
+package com.atwoz.member.ui.info;
+
+import com.atwoz.member.application.info.style.StyleService;
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/info/style")
+@RestController
+public class StyleController {
+
+    private final StyleService styleService;
+
+    @GetMapping
+    public ResponseEntity<List<StyleSearchResponse>> findMemberStyles(@AuthMember Long memberId) {
+        List<StyleSearchResponse> styles = styleService.findMemberStyles(memberId)
+                .stream()
+                .map(Style::getStyleName)
+                .map(styleName -> new StyleSearchResponse(styleName.getName()))
+                .toList();
+
+        return ResponseEntity.ok()
+                .body(styles);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
new file mode 100644
index 00000000..f8932809
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.ui.info.dto;
+
+public record StyleSearchResponse(
+
+        String style
+) {
+}

From f6e5215621fe67e38600fcb2dba5427660185464 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 17:49:08 +0900
Subject: [PATCH 034/225] =?UTF-8?q?refactor:=20Body=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member의 Body에 출생년도가 들어가도록 수정
- 나이 최저 계산 기준 수정
- createMemberBody의 내부 타입 Integer에서 int로 변경
---
 .../info/dto/profile/ProfileWriteRequest.java |  4 +--
 .../info/profile/ProfileFactory.java          |  6 ++--
 .../member/domain/info/profile/Body.java      | 28 ++++++++-----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index 216ca346..e3b42fc9 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -5,8 +5,8 @@
 
 public record ProfileWriteRequest(
 
-        @NotNull(message = "나이가 작성되어야 합니다.")
-        Integer age,
+        @NotNull(message = "출생년도가 작성되어야 합니다.")
+        Integer birthYear,
 
         @NotNull(message = "키가 작성되어야 합니다.")
         Integer height,
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 8ef30184..2fbae858 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -23,11 +23,11 @@ public Profile fromRequest(final Long memberId, final ProfileWriteRequest reques
     }
 
     private Body createMemberBody(final ProfileWriteRequest request) {
-        Integer age = request.age();
-        Integer height = request.height();
+        int birthYear = request.birthYear();
+        int height = request.height();
         Gender gender = Gender.findByName(request.gender());
 
-        return new Body(age, height, gender);
+        return new Body(birthYear, height, gender);
     }
 
     private Location createLocation(final LocationWriteRequest request) {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index 5a2f5e89..b7931282 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -15,13 +15,13 @@
 @Embeddable
 public class Body {
 
-    private static final int MIN_AGE = 20;
+    private static final int MIN_AGE = 19;
     private static final int MAX_AGE = 45;
     private static final int MIN_HEIGHT = 140;
     private static final int MAX_HEIGHT = 199;
 
     @Column
-    private int birthYear;
+    private int age;
 
     @Column
     private int height;
@@ -31,30 +31,26 @@ public class Body {
     private Gender gender;
 
     public Body(final int birthYear, final int height, final Gender gender) {
-        validateValues(birthYear, height);
+        validateHeight(height);
 
-        this.birthYear = birthYear;
+        this.age = calculateAgeFromYear(birthYear);
         this.height = height;
         this.gender = gender;
     }
 
-    public void validateValues(final int birthYear, final int height) {
-        validateAgeFromBirthYear(birthYear);
-        validateHeight(height);
-    }
-
-    private void validateAgeFromBirthYear(final int age) {
-        LocalDateTime nowTime = LocalDateTime.now();
-        int nowYear = nowTime.getYear();
-        int memberAge = Math.abs(nowYear - age);
-        if (memberAge < MIN_AGE|| MAX_AGE < memberAge) {
+    private void validateHeight(final int height) {
+        if (height < MIN_HEIGHT || MAX_HEIGHT < height) {
             throw new ProfileRangeException();
         }
     }
 
-    private void validateHeight(final int height) {
-        if (height < MIN_HEIGHT || MAX_HEIGHT < height) {
+    private int calculateAgeFromYear(final int year) {
+        LocalDateTime nowTime = LocalDateTime.now();
+        int nowYear = nowTime.getYear();
+        int memberAge = Math.abs(nowYear - year);
+        if (memberAge < MIN_AGE || MAX_AGE < memberAge) {
             throw new ProfileRangeException();
         }
+        return memberAge;
     }
 }

From 07f60d053c05ca501b55337e5914f412672b094b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 17:49:49 +0900
Subject: [PATCH 035/225] =?UTF-8?q?refactor:=20Profile=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- year 대신 age로 나오도록 수정
---
 .../member/ui/info/dto/profile/ProfileSearchResponse.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index 4a1fec75..626d3f26 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -23,7 +23,7 @@ public record ProfileSearchResponse(
 ) {
     public static ProfileSearchResponse from(final Profile profile) {
         Body body = profile.getBody();
-        int year = body.getBirthYear();
+        int age = body.getAge();
         int height = body.getHeight();
         Gender gender = body.getGender();
 
@@ -32,7 +32,7 @@ public static ProfileSearchResponse from(final Profile profile) {
         Job job = profile.getJob();
 
         return new ProfileSearchResponse(
-                year,
+                age,
                 height,
                 gender.getName(),
                 LocationSearchResponse.from(location),

From fdfb4d228ebbe84aff55f947136a84de727a0c2b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 19:35:30 +0900
Subject: [PATCH 036/225] =?UTF-8?q?refactor:=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hobby, Style 중복 선택 시 예외처리 추가
---
 .../com/atwoz/member/domain/info/hobby/HobbyName.java  | 10 +++++++++-
 .../com/atwoz/member/domain/info/style/StyleName.java  | 10 +++++++++-
 .../exceptions/info/hobby/HobbyDuplicateException.java |  8 ++++++++
 .../exceptions/info/style/StyleDuplicateException.java |  8 ++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyDuplicateException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleDuplicateException.java

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
index b662551e..d57df97c 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
@@ -1,10 +1,13 @@
 package com.atwoz.member.domain.info.hobby;
 
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import lombok.Getter;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Getter
 public enum HobbyName {
@@ -59,8 +62,13 @@ public static void validateSize(final List<String> names) {
             throw new HobbySizeException();
         }
 
+        Set<String> uniqueNames = new HashSet<>(names);
+        if (uniqueNames.size() != names.size()) {
+            throw new HobbyDuplicateException();
+        }
+
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> names.contains(hobbyName.getName()))
+                .filter(hobbyName -> uniqueNames.contains(hobbyName.getName()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
index 544443d0..223cddac 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
@@ -1,10 +1,13 @@
 package com.atwoz.member.domain.info.style;
 
+import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
 import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import lombok.Getter;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Getter
 public enum StyleName {
@@ -60,8 +63,13 @@ public static void validateSize(final List<String> names) {
             throw new StyleSizeException();
         }
 
+        Set<String> uniqueNames = new HashSet<>(names);
+        if (uniqueNames.size() != names.size()) {
+            throw new StyleDuplicateException();
+        }
+
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> names.contains(hobbyName.getName()))
+                .filter(hobbyName -> uniqueNames.contains(hobbyName.getName()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyDuplicateException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyDuplicateException.java
new file mode 100644
index 00000000..65da9ddb
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyDuplicateException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.hobby;
+
+public class HobbyDuplicateException extends RuntimeException {
+
+    public HobbyDuplicateException() {
+        super("취미를 중복 선택하면 안 됩니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleDuplicateException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleDuplicateException.java
new file mode 100644
index 00000000..326d36ae
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleDuplicateException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.style;
+
+public class StyleDuplicateException extends RuntimeException {
+
+    public StyleDuplicateException() {
+        super("스타일을 중복 선택하면 안 됩니다.");
+    }
+}

From 28e0570d128cd99fabf3799261947e738ae3910b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 19:40:28 +0900
Subject: [PATCH 037/225] =?UTF-8?q?test:=20HobbyName=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyName 테스트 작성
---
 .../domain/info/hobby/HobbyNameTest.java      | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
new file mode 100644
index 00000000..f9055069
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
@@ -0,0 +1,73 @@
+package com.atwoz.member.domain.info.hobby;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class HobbyNameTest {
+
+    @Test
+    void 취미가_존재하면_정상적으로_가져온다() {
+        // given
+        List<String> hobbyNames = List.of("국내여행 · 해외여행", "골프", "댄스");
+        List<HobbyName> expectedHobbyNames = List.of(HobbyName.TRIP, HobbyName.GOLF, HobbyName.DANCE);
+
+        // when
+        List<HobbyName> findHobbyNames = HobbyName.findAllByNames(hobbyNames);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findHobbyNames.size()).isEqualTo(hobbyNames.size());
+            softly.assertThat(findHobbyNames).containsAll(expectedHobbyNames);
+        });
+    }
+
+    @Test
+    void 취미_갯수가_초과되면_예외가_발생한다() {
+        // given
+        List<String> hobbyNames = List.of("국내여행 · 해외여행", "골프", "댄스", "쇼핑");
+
+        // when & then
+        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+                .isInstanceOf(HobbySizeException.class);
+    }
+
+    @Test
+    void 아예_선택하지_않으면_예외가_발생한다() {
+        // given
+        List<String> hobbyNames = List.of();
+
+        // when & then
+        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+                .isInstanceOf(HobbySizeException.class);
+    }
+
+    @Test
+    void 없는_취미를_선택하면_예외가_발생한다() {
+        // given
+        List<String> hobbyNames = List.of("hello");
+
+        // when & then
+        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+                .isInstanceOf(HobbyNotFoundException.class);
+    }
+
+    @Test
+    void 중복_선택하면_예외가_발생한다() {
+        // given
+        List<String> hobbyNames = List.of("댄스", "댄스");
+
+        // when & then
+        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+                .isInstanceOf(HobbyDuplicateException.class);
+    }
+}

From 1f61cf09b7c95377956bb8215871b4bc0624305d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 19:50:48 +0900
Subject: [PATCH 038/225] =?UTF-8?q?test:=20StyleName=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleName 테스트 작성
---
 .../domain/info/style/StyleNameTest.java      | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java b/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
new file mode 100644
index 00000000..69ef552f
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
@@ -0,0 +1,73 @@
+package com.atwoz.member.domain.info.style;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
+import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class StyleNameTest {
+
+    @Test
+    void 스타일이_존재하면_정상적으로_가져온다() {
+        // given
+        List<String> styleNames = List.of("패션 센스", "다정다감", "유머 감각");
+        List<StyleName> expectedStyleNames = List.of(StyleName.FASHION, StyleName.FRIENDLY, StyleName.FUNNY);
+
+        // when
+        List<StyleName> findStyleNames = StyleName.findAllByNames(styleNames);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findStyleNames.size()).isEqualTo(styleNames.size());
+            softly.assertThat(findStyleNames).containsAll(expectedStyleNames);
+        });
+    }
+
+    @Test
+    void 스타일_갯수가_초과되면_예외가_발생한다() {
+        // given
+        List<String> styleNames = List.of("패션 센스", "다정다감", "유머 감각", "좋은 비율");
+
+        // when & then
+        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+                .isInstanceOf(StyleSizeException.class);
+    }
+
+    @Test
+    void 아예_선택하지_않으면_예외가_발생한다() {
+        // given
+        List<String> styleNames = List.of();
+
+        // when & then
+        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+                .isInstanceOf(StyleSizeException.class);
+    }
+
+    @Test
+    void 없는_스타일을_선택하면_예외가_발생한다() {
+        // given
+        List<String> styleNames = List.of("hello");
+
+        // when & then
+        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+                .isInstanceOf(StyleNotFoundException.class);
+    }
+
+    @Test
+    void 중복_선택하면_예외가_발생한다() {
+        // given
+        List<String> styleNames = List.of("패션 센스", "패션 센스");
+
+        // when & then
+        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+                .isInstanceOf(StyleDuplicateException.class);
+    }
+}

From be7ce4dfa64b4b6fb5dac3b3a3884836b02bee7c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 22:01:09 +0900
Subject: [PATCH 039/225] =?UTF-8?q?test:=20Gender=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Gender 테스트 작성
---
 .../domain/info/profile/GenderTest.java       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
new file mode 100644
index 00000000..ca3ff270
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.profile;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class GenderTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String genderName = "남성";
+
+        // when & then
+        assertDoesNotThrow(() -> Gender.findByName(genderName));
+    }
+
+    @Test
+    void 올바른_성별이_아니면_예외가_발생한다() {
+        // given
+        String genderName = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Gender.findByName(genderName))
+                .isInstanceOf(PropertyNotFoundException.class);
+    }
+}

From d7d79abbfa4d7f28b5d77536106d1e0f0a6e845a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 22:24:58 +0900
Subject: [PATCH 040/225] =?UTF-8?q?test:=20BodyTest=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 정상 케이스 테스트 작성
- 키에 대한 예외 검증 테스트 작성
- 몸무게에 대한 예외 검증 테스트 작성
- 기존 연도 계산을 인터페이스화하여 테스트 용이하게 설정
---
 .../info/profile/ProfileFactory.java          |  8 ++-
 .../member/domain/info/profile/Body.java      | 11 ++--
 .../domain/info/profile/year/YearManager.java |  6 +++
 .../info/profile/year/YearManagerImpl.java    | 14 +++++
 .../member/domain/info/profile/BodyTest.java  | 51 +++++++++++++++++++
 5 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java
 create mode 100644 src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 2fbae858..c5c56630 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -9,11 +9,16 @@
 import com.atwoz.member.domain.info.profile.Location;
 import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.year.YearManager;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+@RequiredArgsConstructor
 @Component
 public class ProfileFactory {
 
+    private final YearManager yearManager;
+
     public Profile fromRequest(final Long memberId, final ProfileWriteRequest request) {
         Body body = createMemberBody(request);
         Location location = createLocation(request.location());
@@ -23,11 +28,12 @@ public Profile fromRequest(final Long memberId, final ProfileWriteRequest reques
     }
 
     private Body createMemberBody(final ProfileWriteRequest request) {
+        int currentYear = yearManager.getCurrentYear();
         int birthYear = request.birthYear();
         int height = request.height();
         Gender gender = Gender.findByName(request.gender());
 
-        return new Body(birthYear, height, gender);
+        return new Body(currentYear, birthYear, height, gender);
     }
 
     private Location createLocation(final LocationWriteRequest request) {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index b7931282..d6de2b8f 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -8,7 +8,6 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import java.time.LocalDateTime;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -30,10 +29,10 @@ public class Body {
     @Enumerated(value = EnumType.STRING)
     private Gender gender;
 
-    public Body(final int birthYear, final int height, final Gender gender) {
+    public Body(final int currentYear, final int birthYear, final int height, final Gender gender) {
         validateHeight(height);
 
-        this.age = calculateAgeFromYear(birthYear);
+        this.age = calculateAgeFromYear(currentYear, birthYear);
         this.height = height;
         this.gender = gender;
     }
@@ -44,10 +43,8 @@ private void validateHeight(final int height) {
         }
     }
 
-    private int calculateAgeFromYear(final int year) {
-        LocalDateTime nowTime = LocalDateTime.now();
-        int nowYear = nowTime.getYear();
-        int memberAge = Math.abs(nowYear - year);
+    private int calculateAgeFromYear(final int currentYear, final int birthYear) {
+        int memberAge = Math.abs(currentYear - birthYear);
         if (memberAge < MIN_AGE || MAX_AGE < memberAge) {
             throw new ProfileRangeException();
         }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java b/src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java
new file mode 100644
index 00000000..2bf3b783
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java
@@ -0,0 +1,6 @@
+package com.atwoz.member.domain.info.profile.year;
+
+public interface YearManager {
+
+    int getCurrentYear();
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java b/src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java
new file mode 100644
index 00000000..aa35f8e2
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.domain.info.profile.year;
+
+import org.springframework.stereotype.Component;
+import java.time.LocalDateTime;
+
+@Component
+public class YearManagerImpl implements YearManager {
+
+    @Override
+    public int getCurrentYear() {
+        LocalDateTime now = LocalDateTime.now();
+        return now.getYear();
+    }
+}
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
new file mode 100644
index 00000000..51f17a8c
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
@@ -0,0 +1,51 @@
+package com.atwoz.member.domain.info.profile;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import java.util.stream.Stream;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class BodyTest {
+
+    @Test
+    void 입력값이_올바른_경우_생성된다() {
+        // given
+        int currentYear = 2024;
+        int birthYear = 2000;
+        int height = 171;
+        Gender gender = Gender.MALE;
+
+        // when & then
+        assertDoesNotThrow(() -> new Body(currentYear, birthYear, height, gender));
+    }
+
+    @ParameterizedTest(name = "출생년도 {0}, 키 {1}인 경우")
+    @MethodSource("birthYearAndHeight")
+    void 키_또는_출생년도_제한을_벗어나면_예외가_발생한다(final int birthYear, final int height) {
+        // given
+        int currentYear = 2024;
+        Gender gender = Gender.MALE;
+
+        // when & then
+        assertThatThrownBy(() -> new Body(currentYear, birthYear, height, gender))
+                .isInstanceOf(ProfileRangeException.class);
+    }
+
+    static Stream<Arguments> birthYearAndHeight() {
+        return Stream.of(
+                Arguments.arguments(2010, 171),
+                Arguments.arguments(1978, 171),
+                Arguments.arguments(2000, 130),
+                Arguments.arguments(2000, 200)
+        );
+    }
+}

From 9f7904d4161ee506c3ce40a660932c644618d6d9 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 22 Feb 2024 22:37:07 +0900
Subject: [PATCH 041/225] =?UTF-8?q?test:=20Position=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Position 테스트 작성
---
 .../domain/info/profile/PositionTest.java     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
new file mode 100644
index 00000000..ec865967
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
@@ -0,0 +1,45 @@
+package com.atwoz.member.domain.info.profile;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import java.util.stream.Stream;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class PositionTest {
+
+    @Test
+    void 입력값이_올바른_경우_생성된다() {
+        // given
+        double latitude = 40;
+        double longitude = 130;
+
+        // when & then
+        assertDoesNotThrow(() -> new Position(latitude, longitude));
+    }
+
+    @ParameterizedTest(name = "위도 {0}, 경도 {1}인 경우")
+    @MethodSource("latitudeAndLongitude")
+    void 위도_또는_경도_제한을_벗어나면_예외가_발생한다(final double latitude, final double longitude) {
+        // when & then
+        assertThatThrownBy(() -> new Position(latitude, longitude))
+                .isInstanceOf(ProfileRangeException.class);
+    }
+
+    static Stream<Arguments> latitudeAndLongitude() {
+        return Stream.of(
+                Arguments.of(-100, 130),
+                Arguments.of(100, 130),
+                Arguments.of(40, -200),
+                Arguments.of(40, 200)
+        );
+    }
+}

From 7a63627a69b07afd4661117dec348d15fa767013 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 00:06:59 +0900
Subject: [PATCH 042/225] =?UTF-8?q?test:=20ProfileJpaRepository=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileJpaRepository 테스트 작성
- Body, Job, Location, Position Equals&HashCode 정의
- Body, Job, Location, Position Fixture 생성
---
 .../member/domain/info/profile/Body.java      |  2 +
 .../atwoz/member/domain/info/profile/Job.java |  2 +
 .../member/domain/info/profile/Location.java  |  2 +
 .../member/domain/info/profile/Position.java  |  2 +
 .../member/fixture/info/BodyFixture.java      | 15 ++++
 .../atwoz/member/fixture/info/JobFixture.java | 10 +++
 .../member/fixture/info/LocationFixture.java  | 13 +++
 .../member/fixture/info/PositionFixture.java  | 13 +++
 .../info/ProfileJpaRepositoryTest.java        | 89 +++++++++++++++++++
 9 files changed, 148 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/JobFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index d6de2b8f..7bbe23ff 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -6,10 +6,12 @@
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable
 public class Body {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
index d95845f4..e9d601d7 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -3,10 +3,12 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable
 public class Job {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Location.java b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
index 0a62aa5e..bf613e0c 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Location.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
@@ -3,10 +3,12 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable
 public class Location {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Position.java b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
index 54a5c75e..14aa5712 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Position.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
@@ -3,10 +3,12 @@
 import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Embeddable
 public class Position {
diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
new file mode 100644
index 00000000..693b0229
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
@@ -0,0 +1,15 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.Gender;
+
+public class BodyFixture {
+
+    private static final int CURRENT_YEAR = 2024;
+    private static final int BIRTH_YEAR = 2000;
+    private static final int HEIGHT = 171;
+
+    public static Body 일반_body_생성() {
+        return new Body(CURRENT_YEAR, BIRTH_YEAR, HEIGHT, Gender.MALE);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
new file mode 100644
index 00000000..23a9bc23
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.profile.Job;
+
+public class JobFixture {
+
+    public static Job 일반_직업_생성() {
+        return new Job("개발자");
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
new file mode 100644
index 00000000..9c5e39ae
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.profile.Location;
+
+public class LocationFixture {
+
+    public static Location 일반_위치_생성() {
+        String city = "서울시";
+        String sector = "강남구";
+
+        return new Location(city, sector);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
new file mode 100644
index 00000000..205098f0
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.profile.Position;
+
+public class PositionFixture {
+
+    public static Position 일반_좌표_생성() {
+        double latitude = 40;
+        double longitude = 170;
+
+        return new Position(latitude, longitude);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
new file mode 100644
index 00000000..0b9c831b
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
@@ -0,0 +1,89 @@
+package com.atwoz.member.infrastructure.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.fixture.info.BodyFixture;
+import com.atwoz.member.fixture.info.JobFixture;
+import com.atwoz.member.fixture.info.LocationFixture;
+import com.atwoz.member.fixture.info.PositionFixture;
+import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.infrastructure.info.profile.ProfileJpaRepository;
+import com.atwoz.member.infrastructure.member.MemberJpaRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import java.util.Optional;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@DataJpaTest
+public class ProfileJpaRepositoryTest {
+
+    @Autowired
+    private ProfileJpaRepository profileJpaRepository;
+
+    @Autowired
+    private MemberJpaRepository memberJpaRepository;
+
+    private Member member;
+
+    @BeforeEach
+    void init() {
+        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+    }
+
+    @Test
+    void profile을_저장한다() {
+        // given
+        Long memberId = member.getId();
+        Body body = BodyFixture.일반_body_생성();
+        Location location = LocationFixture.일반_위치_생성();
+        Position position = PositionFixture.일반_좌표_생성();
+        Job job = JobFixture.일반_직업_생성();
+
+        Profile newProfile = new Profile(memberId, body, location, position, job);
+
+        // when
+        Profile saveProfile = profileJpaRepository.save(newProfile);
+
+        // then
+        assertThat(saveProfile)
+                .usingRecursiveComparison()
+                .ignoringFields("id")
+                .isEqualTo(newProfile);
+    }
+
+    @Test
+    void profile을_조회한다() {
+        // given
+        Long memberId = member.getId();
+        Body body = BodyFixture.일반_body_생성();
+        Location location = LocationFixture.일반_위치_생성();
+        Position position = PositionFixture.일반_좌표_생성();
+        Job job = JobFixture.일반_직업_생성();
+
+        Profile newProfile = new Profile(memberId, body, location, position, job);
+        Profile saveProfile = profileJpaRepository.save(newProfile);
+
+        // when
+        Optional<Profile> findProfile = profileJpaRepository.findByMemberId(memberId);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findProfile).isPresent();
+            softly.assertThat(findProfile.get())
+                    .usingRecursiveComparison()
+                    .isEqualTo(saveProfile);
+        });
+    }
+}

From a2ef0d975c972df44b891fdb1604acdfab8775da Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 02:40:13 +0900
Subject: [PATCH 043/225] =?UTF-8?q?test:=20OptionJpaRepository=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionJpaRepository 테스트 작성
- Option Equals&HashCode 정의
---
 .../member/domain/info/option/Option.java     |  2 +
 .../info/OptionJpaRepositoryTest.java         | 88 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java

diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index e4fe1084..2a18436b 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -9,10 +9,12 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode(exclude = "id")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "member_option")
 @Entity
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
new file mode 100644
index 00000000..41f348ee
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
@@ -0,0 +1,88 @@
+package com.atwoz.member.infrastructure.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.infrastructure.info.option.OptionJpaRepository;
+import com.atwoz.member.infrastructure.member.MemberJpaRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import java.util.Optional;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@DataJpaTest
+public class OptionJpaRepositoryTest {
+
+    @Autowired
+    private OptionJpaRepository optionJpaRepository;
+
+    @Autowired
+    private MemberJpaRepository memberJpaRepository;
+
+    private Member member;
+
+    @BeforeEach
+    void init() {
+        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+    }
+
+    @Test
+    void option을_저장한다() {
+        // given
+        long memberId = member.getId();
+        Smoke smoke = Smoke.NEVER;
+        Religion religion = Religion.CHRIST;
+        Drink drink = Drink.NEVER;
+        Mbti mbti = Mbti.INFJ;
+        Graduate graduate = Graduate.SEOUL_FOURTH;
+
+        Option newOption = new Option(memberId, smoke, religion, drink, mbti, graduate);
+
+        // when
+        Option saveOption = optionJpaRepository.save(newOption);
+
+        // then
+        assertThat(saveOption)
+                .usingRecursiveComparison()
+                .ignoringFields("id")
+                .isEqualTo(newOption);
+    }
+
+    @Test
+    void option을_조회한다() {
+        // given
+        long memberId = member.getId();
+        Smoke smoke = Smoke.NEVER;
+        Religion religion = Religion.CHRIST;
+        Drink drink = Drink.NEVER;
+        Mbti mbti = Mbti.INFJ;
+        Graduate graduate = Graduate.SEOUL_FOURTH;
+
+        Option newOption = new Option(memberId, smoke, religion, drink, mbti, graduate);
+        Option saveOption = optionJpaRepository.save(newOption);
+
+        // when
+        Optional<Option> findOption = optionJpaRepository.findByMemberId(memberId);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findOption).isPresent();
+            softly.assertThat(findOption.get())
+                    .usingRecursiveComparison()
+                    .isEqualTo(saveOption);
+        });
+    }
+}

From d9a5089b440f770c3295a8b290d4f280fa660889 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 10:25:22 +0900
Subject: [PATCH 044/225] =?UTF-8?q?test:=20HobbyJpaRepository=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyJpaRepository 테스트 작성
---
 .../info/HobbyJpaRepositoryTest.java          | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
new file mode 100644
index 00000000..686a650f
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
@@ -0,0 +1,91 @@
+package com.atwoz.member.infrastructure.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyName;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.infrastructure.info.hobby.HobbyJpaRepository;
+import com.atwoz.member.infrastructure.member.MemberJpaRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import java.util.List;
+import java.util.stream.Stream;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@DataJpaTest
+public class HobbyJpaRepositoryTest {
+
+    @Autowired
+    private HobbyJpaRepository hobbyJpaRepository;
+
+    @Autowired
+    private MemberJpaRepository memberJpaRepository;
+
+    private Member member;
+
+    @BeforeEach
+    void init() {
+        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+    }
+
+    @Test
+    void 회원_취미를_저장한다() {
+        // given
+        HobbyName hobbyName = HobbyName.ANIMATION;
+        Long memberId = member.getId();
+        Hobby memberHobby = new Hobby(memberId, hobbyName);
+
+        // when
+        Hobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
+
+        // then
+        assertThat(saveMemberHobby)
+                .usingRecursiveComparison()
+                .isEqualTo(memberHobby);
+    }
+
+    @Test
+    void 회원_취미를_조회한다() {
+        // given
+        HobbyName hobbyName = HobbyName.ANIMATION;
+        Long memberId = member.getId();
+        Hobby memberHobby = new Hobby(memberId, hobbyName);
+        Hobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
+
+        // when
+        List<Hobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findMemberHobbies.size()).isEqualTo(1);
+            softly.assertThat(findMemberHobbies).contains(saveMemberHobby);
+        });
+    }
+
+    @Test
+    void 회원_취미_목록을_저장_및_조회한다() {
+        // given
+        Long memberId = member.getId();
+        List<Hobby> memberHobbies = Stream.of(HobbyName.BICYCLE, HobbyName.DANCE)
+                .map(hobbyName -> new Hobby(memberId, hobbyName))
+                .map(hobby -> hobbyJpaRepository.save(hobby))
+                .toList();
+
+        // when
+        List<Hobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findMemberHobbies.size()).isEqualTo(2);
+            softly.assertThat(findMemberHobbies.containsAll(memberHobbies)).isTrue();
+        });
+    }
+}

From f66f1f47c953365753a93f049e177ea1a599ddc9 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 10:30:31 +0900
Subject: [PATCH 045/225] =?UTF-8?q?test:=20StyleJpaRepository=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleJpaRepository 테스트 작성
---
 .../info/StyleJpaRepositoryTest.java          | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
new file mode 100644
index 00000000..441cc2be
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
@@ -0,0 +1,91 @@
+package com.atwoz.member.infrastructure.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleName;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.infrastructure.info.style.StyleJpaRepository;
+import com.atwoz.member.infrastructure.member.MemberJpaRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import java.util.List;
+import java.util.stream.Stream;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@DataJpaTest
+public class StyleJpaRepositoryTest {
+
+    @Autowired
+    private StyleJpaRepository styleJpaRepository;
+
+    @Autowired
+    private MemberJpaRepository memberJpaRepository;
+
+    private Member member;
+
+    @BeforeEach
+    void init() {
+        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+    }
+
+    @Test
+    void 회원_스타일을_저장한다() {
+        // given
+        StyleName styleName = StyleName.POSITIVE;
+        Long memberId = member.getId();
+        Style memberStyle = new Style(memberId, styleName);
+
+        // when
+        Style saveStyle = styleJpaRepository.save(memberStyle);
+
+        // then
+        assertThat(saveStyle)
+                .usingRecursiveComparison()
+                .isEqualTo(memberStyle);
+    }
+
+    @Test
+    void 회원_스타일을_조회한다() {
+        // given
+        StyleName styleName = StyleName.POSITIVE;
+        Long memberId = member.getId();
+        Style memberStyle = new Style(memberId, styleName);
+        Style saveStyle = styleJpaRepository.save(memberStyle);
+
+        // when
+        List<Style> findMemberStyles = styleJpaRepository.findAllByMemberId(memberId);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findMemberStyles.size()).isEqualTo(1);
+            softly.assertThat(findMemberStyles).contains(saveStyle);
+        });
+    }
+
+    @Test
+    void 회원_스타일_목록을_저장_및_조회한다() {
+        // given
+        Long memberId = member.getId();
+        List<Style> memberStyles = Stream.of(StyleName.POSITIVE, StyleName.GENTLE)
+                .map(styleName -> new Style(memberId, styleName))
+                .map(style -> styleJpaRepository.save(style))
+                .toList();
+
+        // when
+        List<Style> findMemberStyles = styleJpaRepository.findAllByMemberId(memberId);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(findMemberStyles.size()).isEqualTo(2);
+            softly.assertThat(findMemberStyles.containsAll(memberStyles)).isTrue();
+        });
+    }
+}

From 18db8dfbb168cd6705f2de49481c4662e8a262c3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 10:59:02 +0900
Subject: [PATCH 046/225] =?UTF-8?q?test:=20HobbyService=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyService 테스트 작성
- HobbyFakeRepository 작성
- HobbyService 메서드 이름 수정
---
 .../application/info/hobby/HobbyService.java  |  4 +-
 .../application/info/HobbyServiceTest.java    | 72 +++++++++++++++++++
 .../info/HobbyFakeRepository.java             | 40 +++++++++++
 3 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
index dff75747..23bcaf34 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -17,7 +17,7 @@ public class HobbyService {
 
     @Transactional
     public void saveMemberHobbies(final Long memberId, final List<String> hobbyNames) {
-        deleteBeforeMemberHobbies(memberId);
+        deleteMemberHobbies(memberId);
         List<Hobby> memberHobbies = HobbyName.findAllByNames(hobbyNames)
                 .stream()
                 .map(hobbyName -> new Hobby(memberId, hobbyName))
@@ -27,7 +27,7 @@ public void saveMemberHobbies(final Long memberId, final List<String> hobbyNames
     }
 
     @Transactional
-    public void deleteBeforeMemberHobbies(final Long memberId) {
+    public void deleteMemberHobbies(final Long memberId) {
         hobbyRepository.deleteHobbiesByMemberId(memberId);
     }
 
diff --git a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
new file mode 100644
index 00000000..02cbd576
--- /dev/null
+++ b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
@@ -0,0 +1,72 @@
+package com.atwoz.member.application.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyRepository;
+import com.atwoz.member.infrastructure.info.HobbyFakeRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@ExtendWith(MockitoExtension.class)
+public class HobbyServiceTest {
+
+    private HobbyService hobbyService;
+    private HobbyRepository hobbyRepository;
+
+    @BeforeEach
+    void init() {
+        hobbyRepository = new HobbyFakeRepository();
+        hobbyService = new HobbyService(hobbyRepository);
+    }
+
+    @Test
+    void 회원의_모든_취미를_저장한다() {
+        // given
+        Long memberId = 1L;
+        List<String> hobbyNames = List.of("자전거", "애니메이션");
+
+        // when
+        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+
+        // then
+        List<Hobby> saveHobbies = hobbyRepository.findAllByMemberId(memberId);
+        assertThat(saveHobbies.size()).isEqualTo(2);
+    }
+
+    @Test
+    void 회원의_모든_취미를_삭제한다() {
+        // given
+        Long memberId = 1L;
+        List<String> hobbyNames = List.of("자전거", "애니메이션");
+        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+
+        // when
+        hobbyService.deleteMemberHobbies(memberId);
+
+        // then
+        assertThat(hobbyRepository.findAllByMemberId(memberId)).isEmpty();
+    }
+
+    @Test
+    void 회원의_모든_취미를_조회한다() {
+        // given
+        Long memberId = 1L;
+        List<String> hobbyNames = List.of("자전거", "애니메이션");
+        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+
+        // when
+        List<Hobby> memberHobbies = hobbyService.findMemberHobbies(memberId);
+
+        // then
+        assertThat(memberHobbies.size()).isEqualTo(2);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
new file mode 100644
index 00000000..983a006a
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
@@ -0,0 +1,40 @@
+package com.atwoz.member.infrastructure.info;
+
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyRepository;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class HobbyFakeRepository implements HobbyRepository {
+
+    private final Map<Long, Hobby> map = new HashMap<>();
+    private long id = 1L;
+
+    @Override
+    public void save(final Hobby hobby) {
+        Hobby newHobby = new Hobby(hobby.getMemberId(), hobby.getHobbyName());
+        map.put(id, newHobby);
+        id++;
+    }
+
+    @Override
+    public void saveAll(final List<Hobby> memberHobbies) {
+        memberHobbies.stream()
+                .map(hobby -> new Hobby(hobby.getMemberId(), hobby.getHobbyName()))
+                .forEach(hobby -> map.put(id++, hobby));
+    }
+
+    @Override
+    public void deleteHobbiesByMemberId(final Long memberId) {
+        map.values().removeIf(hobby -> memberId.equals(hobby.getMemberId()));
+    }
+
+    @Override
+    public List<Hobby> findAllByMemberId(final Long memberId) {
+        return map.values()
+                .stream()
+                .filter(hobby -> memberId.equals(hobby.getMemberId()))
+                .toList();
+    }
+}

From e58e6b2a60d60e48bf831adcdd4adfe0a6e77bc3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 11:10:31 +0900
Subject: [PATCH 047/225] =?UTF-8?q?test:=20StyleService=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleService 테스트 작성
- StyleFakeRepository 작성
- StyleService 메서드 이름 수정
---
 .../application/info/style/StyleService.java  |  4 +-
 .../application/info/StyleServiceTest.java    | 72 +++++++++++++++++++
 .../info/StyleFakeRepository.java             | 40 +++++++++++
 3 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java

diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
index 487604ad..9ad4608c 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -17,7 +17,7 @@ public class StyleService {
 
     @Transactional
     public void saveMemberStyles(final Long memberId, final List<String> styleNames) {
-        deleteBeforeMemberStyles(memberId);
+        deleteMemberStyles(memberId);
         List<Style> memberStyles = StyleName.findAllByNames(styleNames)
                 .stream()
                 .map(styleName -> new Style(memberId, styleName))
@@ -27,7 +27,7 @@ public void saveMemberStyles(final Long memberId, final List<String> styleNames)
     }
 
     @Transactional
-    public void deleteBeforeMemberStyles(final Long memberId) {
+    public void deleteMemberStyles(final Long memberId) {
         styleRepository.deleteStylesByMemberId(memberId);
     }
 
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
new file mode 100644
index 00000000..e1cf761f
--- /dev/null
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -0,0 +1,72 @@
+package com.atwoz.member.application.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.atwoz.member.application.info.style.StyleService;
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleRepository;
+import com.atwoz.member.infrastructure.info.StyleFakeRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@ExtendWith(MockitoExtension.class)
+public class StyleServiceTest {
+
+    private StyleService styleService;
+    private StyleRepository styleRepository;
+
+    @BeforeEach
+    void init() {
+        styleRepository = new StyleFakeRepository();
+        styleService = new StyleService(styleRepository);
+    }
+
+    @Test
+    void 회원의_모든_스타일을_저장한다() {
+        // given
+        Long memberId = 1L;
+        List<String> styleNames = List.of("긍정적", "유머 감각");
+
+        // when
+        styleService.saveMemberStyles(memberId, styleNames);
+
+        // then
+        List<Style> saveStyles = styleRepository.findAllByMemberId(memberId);
+        assertThat(saveStyles.size()).isEqualTo(2);
+    }
+
+    @Test
+    void 회원의_모든_스타일을_삭제한다() {
+        // given
+        Long memberId = 1L;
+        List<String> styleNames = List.of("긍정적", "유머 감각");
+        styleService.saveMemberStyles(memberId, styleNames);
+
+        // when
+        styleService.deleteMemberStyles(memberId);
+
+        // then
+        assertThat(styleRepository.findAllByMemberId(memberId)).isEmpty();
+    }
+
+    @Test
+    void 회원의_모든_스타일을_조회한다() {
+        // given
+        Long memberId = 1L;
+        List<String> styleNames = List.of("긍정적", "유머 감각");
+        styleService.saveMemberStyles(memberId, styleNames);
+
+        // when
+        List<Style> memberStyles = styleService.findMemberStyles(memberId);
+
+        // then
+        assertThat(memberStyles.size()).isEqualTo(2);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
new file mode 100644
index 00000000..c94656ea
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
@@ -0,0 +1,40 @@
+package com.atwoz.member.infrastructure.info;
+
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleRepository;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class StyleFakeRepository implements StyleRepository {
+
+    private final Map<Long, Style> map = new HashMap<>();
+    private long id = 1L;
+
+    @Override
+    public void save(final Style style) {
+        Style newStyle = new Style(style.getMemberId(), style.getStyleName());
+        map.put(id, newStyle);
+        id++;
+    }
+
+    @Override
+    public void saveAll(final List<Style> styles) {
+        styles.stream()
+                .map(style -> new Style(style.getMemberId(), style.getStyleName()))
+                .forEach(style -> map.put(id++, style));
+    }
+
+    @Override
+    public void deleteStylesByMemberId(final Long memberId) {
+        map.values().removeIf(style -> memberId.equals(style.getMemberId()));
+    }
+
+    @Override
+    public List<Style> findAllByMemberId(final Long memberId) {
+        return map.values()
+                .stream()
+                .filter(style -> memberId.equals(style.getMemberId()))
+                .toList();
+    }
+}

From 7e62fb83dd203ad226fa8f84e60d64a1fe626df8 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 11:35:55 +0900
Subject: [PATCH 048/225] =?UTF-8?q?test:=20OptionService=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionService 테스트 작성
- OptionFakeRepository 작성
- OptionFactory 정적 클래스로 변경
---
 .../info/option/OptionFactory.java            |  4 +-
 .../info/option/OptionService.java            |  3 +-
 .../application/info/OptionServiceTest.java   | 85 +++++++++++++++++++
 .../info/OptionFakeRepository.java            | 38 +++++++++
 4 files changed, 125 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index 66668c2b..f0ded63a 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -7,12 +7,10 @@
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import org.springframework.stereotype.Component;
 
-@Component
 public class OptionFactory {
 
-    public Option fromRequest(final Long memberId, final OptionWriteRequest request) {
+    public static Option fromRequest(final Long memberId, final OptionWriteRequest request) {
 
         Smoke smoke = Smoke.findByName(request.smoke());
         Religion religion = Religion.findByName(request.religion());
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index edef4532..a27eb4cb 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -13,12 +13,11 @@
 @Service
 public class OptionService {
 
-    private final OptionFactory optionFactory;
     private final OptionRepository optionRepository;
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = optionFactory.fromRequest(memberId, request);
+        Option newOption = OptionFactory.fromRequest(memberId, request);
         if (!isMemberOptionExist(memberId)) {
             optionRepository.save(newOption);
             return;
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
new file mode 100644
index 00000000..01a948e9
--- /dev/null
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -0,0 +1,85 @@
+package com.atwoz.member.application.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.OptionFactory;
+import com.atwoz.member.application.info.option.OptionService;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.OptionRepository;
+import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
+import com.atwoz.member.infrastructure.info.OptionFakeRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import java.util.Optional;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@ExtendWith(MockitoExtension.class)
+public class OptionServiceTest {
+
+    private OptionService optionService;
+    private OptionRepository optionRepository;
+
+    @BeforeEach
+    void init() {
+        optionRepository = new OptionFakeRepository();
+        optionService = new OptionService(optionRepository);
+    }
+
+    @Test
+    void option을_저장한다() {
+        // given
+        Long memberId = 1L;
+        String drink = "전혀 마시지 않음";
+        String graduate = "서울 4년제";
+        String religion = "기독교";
+        String smoke = "비흡연";
+        String mbti = "INFJ";
+
+        OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
+
+        // when
+        optionService.writeOption(memberId, request);
+
+        // then
+        Optional<Option> memberOption = optionRepository.findByMemberId(memberId);
+        assertThat(memberOption).isPresent();
+    }
+
+    @Test
+    void option을_조회한다() {
+        // given
+        Long memberId = 1L;
+        String drink = "전혀 마시지 않음";
+        String graduate = "서울 4년제";
+        String religion = "기독교";
+        String smoke = "비흡연";
+        String mbti = "INFJ";
+
+        OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
+        Option expectedOption = OptionFactory.fromRequest(memberId, request);
+        optionService.writeOption(memberId, request);
+
+        // when
+        Option memberOption = optionService.findByMemberId(memberId);
+
+        // then
+        assertThat(memberOption).isEqualTo(expectedOption);
+    }
+
+    @Test
+    void 처음에는_option이_존재하지_않는다() {
+        // given
+        Long memberId = 1L;
+
+        // when & then
+        assertThatThrownBy(() -> optionService.findByMemberId(memberId))
+                .isInstanceOf(OptionNotFoundException.class);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java
new file mode 100644
index 00000000..b943c764
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java
@@ -0,0 +1,38 @@
+package com.atwoz.member.infrastructure.info;
+
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.OptionRepository;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class OptionFakeRepository implements OptionRepository {
+
+    private final Map<Long, Option> map = new HashMap<>();
+    private long id = 1L;
+
+    @Override
+    public void save(final Option option) {
+        Option newOption = new Option(
+                option.getMemberId(),
+                option.getSmoke(),
+                option.getReligion(),
+                option.getDrink(),
+                option.getMbti(),
+                option.getGraduate()
+        );
+
+        map.put(id, newOption);
+        id++;
+    }
+
+    @Override
+    public Optional<Option> findByMemberId(final Long memberId) {
+        return Optional.ofNullable(map.get(memberId));
+    }
+
+    @Override
+    public boolean isExistMemberOption(final Long memberId) {
+        return findByMemberId(memberId).isPresent();
+    }
+}

From 5b70292ecd4474730341d36f5018d5c91f805aa0 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 12:13:01 +0900
Subject: [PATCH 049/225] =?UTF-8?q?test:=20ProfileService=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileService 테스트 작성
- ProfileFakeRepository 작성
- FakeYearManager 작성
- Profile Equals&HashCode 정의
---
 .../member/domain/info/profile/Profile.java   |   2 +
 .../application/info/FakeYearManager.java     |  13 +++
 .../application/info/ProfileServiceTest.java  | 102 ++++++++++++++++++
 .../info/ProfileFakeRepository.java           |  37 +++++++
 4 files changed, 154 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/application/info/FakeYearManager.java
 create mode 100644 src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index bf92eefe..fe3e98be 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -8,10 +8,12 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode(exclude = "id")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "member_profile")
 @Entity
diff --git a/src/test/java/com/atwoz/member/application/info/FakeYearManager.java b/src/test/java/com/atwoz/member/application/info/FakeYearManager.java
new file mode 100644
index 00000000..247875d0
--- /dev/null
+++ b/src/test/java/com/atwoz/member/application/info/FakeYearManager.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.application.info;
+
+import com.atwoz.member.domain.info.profile.year.YearManager;
+
+public class FakeYearManager implements YearManager {
+
+    private static final int YEAR = 2024;
+
+    @Override
+    public int getCurrentYear() {
+        return YEAR;
+    }
+}
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
new file mode 100644
index 00000000..7721ee16
--- /dev/null
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -0,0 +1,102 @@
+package com.atwoz.member.application.info;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.profile.ProfileFactory;
+import com.atwoz.member.application.info.profile.ProfileService;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.ProfileRepository;
+import com.atwoz.member.domain.info.profile.year.YearManager;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
+import com.atwoz.member.infrastructure.info.ProfileFakeRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@ExtendWith(MockitoExtension.class)
+public class ProfileServiceTest {
+
+    private ProfileService profileService;
+    private ProfileRepository profileRepository;
+    private ProfileFactory profileFactory;
+    private YearManager yearManager;
+
+    @BeforeEach
+    void init() {
+        profileRepository = new ProfileFakeRepository();
+        yearManager = new FakeYearManager();
+        profileFactory = new ProfileFactory(yearManager);
+        profileService = new ProfileService(profileRepository, profileFactory);
+    }
+
+    @Test
+    void profile을_저장한다() {
+        // given
+        Long memberId = 1L;
+        int birthYear = 2000;
+        int height = 171;
+        String gender = "남성";
+        double latitude = 70.5;
+        double longitude = 140.3;
+        String job = "개발자";
+        LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
+        PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
+        ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
+
+        Profile expectedProfile = profileFactory.fromRequest(memberId, request);
+
+        // when
+        profileService.writeProfile(memberId, request);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(profileRepository.isExistMemberProfile(memberId)).isTrue();
+            softly.assertThat(profileRepository.findByMemberId(memberId)).isPresent();
+            softly.assertThat(profileRepository.findByMemberId(memberId).get()).isEqualTo(expectedProfile);
+        });
+    }
+
+    @Test
+    void profile을_조회한다() {
+        // given
+        Long memberId = 1L;
+        int birthYear = 2000;
+        int height = 171;
+        String gender = "남성";
+        double latitude = 70.5;
+        double longitude = 140.3;
+        String job = "개발자";
+        LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
+        PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
+        ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
+
+        profileService.writeProfile(memberId, request);
+        Profile expectedProfile = profileFactory.fromRequest(memberId, request);
+
+        // when
+        Profile findProfile = profileService.findByMemberId(memberId);
+
+        // then
+        assertThat(findProfile).isEqualTo(expectedProfile);
+    }
+
+    @Test
+    void 처음에는_profile이_존재하지_않는다() {
+        // given
+        Long memberId = 1L;
+
+        // when & then
+        assertThatThrownBy(() -> profileService.findByMemberId(memberId))
+                .isInstanceOf(ProfileNotFoundException.class);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java
new file mode 100644
index 00000000..87fecae8
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java
@@ -0,0 +1,37 @@
+package com.atwoz.member.infrastructure.info;
+
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.ProfileRepository;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class ProfileFakeRepository implements ProfileRepository {
+
+    private final Map<Long, Profile> map = new HashMap<>();
+    private long id = 1L;
+
+    @Override
+    public void save(final Profile profile) {
+        Profile newProfile = new Profile(
+                profile.getMemberId(),
+                profile.getBody(),
+                profile.getLocation(),
+                profile.getPosition(),
+                profile.getJob()
+        );
+
+        map.put(id, newProfile);
+        id++;
+    }
+
+    @Override
+    public Optional<Profile> findByMemberId(final Long memberId) {
+        return Optional.ofNullable(map.get(memberId));
+    }
+
+    @Override
+    public boolean isExistMemberProfile(final Long memberId) {
+        return findByMemberId(memberId).isPresent();
+    }
+}

From 1e5830905fcba1704e733caf1e2ff30ad7b06c41 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 12:17:45 +0900
Subject: [PATCH 050/225] =?UTF-8?q?test:=20OptionServiceTest=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionFactory 컴포넌트화
- OptionServiceTest save 검증 수정
---
 .../application/info/option/OptionFactory.java  |  4 +++-
 .../application/info/option/OptionService.java  |  3 ++-
 .../application/info/OptionServiceTest.java     | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index f0ded63a..66668c2b 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -7,10 +7,12 @@
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
+import org.springframework.stereotype.Component;
 
+@Component
 public class OptionFactory {
 
-    public static Option fromRequest(final Long memberId, final OptionWriteRequest request) {
+    public Option fromRequest(final Long memberId, final OptionWriteRequest request) {
 
         Smoke smoke = Smoke.findByName(request.smoke());
         Religion religion = Religion.findByName(request.religion());
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index a27eb4cb..40cdcea4 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -14,10 +14,11 @@
 public class OptionService {
 
     private final OptionRepository optionRepository;
+    private final OptionFactory optionFactory;
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = OptionFactory.fromRequest(memberId, request);
+        Option newOption = optionFactory.fromRequest(memberId, request);
         if (!isMemberOptionExist(memberId)) {
             optionRepository.save(newOption);
             return;
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 01a948e9..0402385e 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.option.OptionFactory;
@@ -16,7 +17,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
-import java.util.Optional;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -25,11 +25,13 @@ public class OptionServiceTest {
 
     private OptionService optionService;
     private OptionRepository optionRepository;
+    private OptionFactory optionFactory;
 
     @BeforeEach
     void init() {
+        optionFactory = new OptionFactory();
         optionRepository = new OptionFakeRepository();
-        optionService = new OptionService(optionRepository);
+        optionService = new OptionService(optionRepository, optionFactory);
     }
 
     @Test
@@ -43,13 +45,17 @@ void init() {
         String mbti = "INFJ";
 
         OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
+        Option expectedOption = optionFactory.fromRequest(memberId, request);
 
         // when
         optionService.writeOption(memberId, request);
 
         // then
-        Optional<Option> memberOption = optionRepository.findByMemberId(memberId);
-        assertThat(memberOption).isPresent();
+        assertSoftly(softly -> {
+            softly.assertThat(optionRepository.isExistMemberOption(memberId)).isTrue();
+            softly.assertThat(optionRepository.findByMemberId(memberId)).isPresent();
+            softly.assertThat(optionRepository.findByMemberId(memberId).get()).isEqualTo(expectedOption);
+        });
     }
 
     @Test
@@ -63,8 +69,9 @@ void init() {
         String mbti = "INFJ";
 
         OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
-        Option expectedOption = OptionFactory.fromRequest(memberId, request);
+        
         optionService.writeOption(memberId, request);
+        Option expectedOption = optionFactory.fromRequest(memberId, request);
 
         // when
         Option memberOption = optionService.findByMemberId(memberId);

From 00da0bab0bdccaf4cf86b78441d1fb0fb2c33c2e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 14:29:52 +0900
Subject: [PATCH 051/225] =?UTF-8?q?test:=20InfoService=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoService 테스트 작성
- 이벤트 발생 여부로 검증 진행
---
 .../application/info/InfoServiceTest.java     | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/application/info/InfoServiceTest.java

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
new file mode 100644
index 00000000..365b8e52
--- /dev/null
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -0,0 +1,115 @@
+package com.atwoz.member.application.info;
+
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.member.application.event.HobbyWroteEvent;
+import com.atwoz.member.application.event.OptionWroteEvent;
+import com.atwoz.member.application.event.ProfileWroteEvent;
+import com.atwoz.member.application.event.StyleWroteEvent;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.event.ApplicationEvents;
+import org.springframework.test.context.event.RecordApplicationEvents;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@SpringBootTest
+@RecordApplicationEvents
+@ExtendWith(MockitoExtension.class)
+public class InfoServiceTest {
+
+    @Autowired
+    private InfoService infoService;
+
+    @Autowired
+    ApplicationEvents events;
+
+    @BeforeEach
+    void init() {
+        infoService = new InfoService();
+    }
+
+    @Test
+    void 모든_정보를_저장한다() {
+        // given
+        Long memberId = 1L;
+
+        int birthYear = 2000;
+        int height = 171;
+        String gender = "남성";
+        LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
+        double latitude = 70.5;
+        double longitude = 140.3;
+        PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
+        String job = "개발자";
+        ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(
+                birthYear,
+                height,
+                gender,
+                location,
+                position,
+                job
+        );
+
+        String drink = "전혀 마시지 않음";
+        String graduate = "서울 4년제";
+        String religion = "기독교";
+        String smoke = "비흡연";
+        String mbti = "INFJ";
+        OptionWriteRequest optionWriteRequest = new OptionWriteRequest(
+                drink,
+                graduate,
+                religion,
+                smoke,
+                mbti
+        );
+
+        List<HobbyWriteRequest> hobbyWriteRequests = List.of(
+            new HobbyWriteRequest("노래"),
+            new HobbyWriteRequest("댄스")
+        );
+
+        List<StyleWriteRequest> styleWriteRequests = List.of(
+            new StyleWriteRequest("긍정적"),
+            new StyleWriteRequest("예의 바름")
+        );
+
+        InfoWriteRequest request = new InfoWriteRequest(
+                profileWriteRequest,
+                optionWriteRequest,
+                hobbyWriteRequests,
+                styleWriteRequests
+        );
+
+
+        // when
+        infoService.writeProfile(memberId, request);
+
+        // then
+        int profileWroteEventCount = (int) events.stream(ProfileWroteEvent.class).count();
+        int optionWroteEventCount = (int) events.stream(OptionWroteEvent.class).count();
+        int hobbyWroteEventCount = (int) events.stream(HobbyWroteEvent.class).count();
+        int styleWroteEventCount = (int) events.stream(StyleWroteEvent.class).count();
+
+        assertSoftly(softly -> {
+            softly.assertThat(profileWroteEventCount).isEqualTo(1);
+            softly.assertThat(optionWroteEventCount).isEqualTo(1);
+            softly.assertThat(hobbyWroteEventCount).isEqualTo(1);
+            softly.assertThat(styleWroteEventCount).isEqualTo(1);
+        });
+    }
+}

From ec7cde9b21cc40bff7d44e9a8fc2652aaa68c9b2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 15:10:23 +0900
Subject: [PATCH 052/225] =?UTF-8?q?test:=20HobbyControllerWebMvc=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyControllerWebMvc 테스트 작성
- REST Docs 연결 작성
---
 src/docs/asciidoc/hobby.adoc                  | 15 ++++
 .../ui/info/HobbyControllerWebMvcTest.java    | 90 +++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 src/docs/asciidoc/hobby.adoc
 create mode 100644 src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java

diff --git a/src/docs/asciidoc/hobby.adoc b/src/docs/asciidoc/hobby.adoc
new file mode 100644
index 00000000..26be60a7
--- /dev/null
+++ b/src/docs/asciidoc/hobby.adoc
@@ -0,0 +1,15 @@
+:toc: left
+:source-highlighter: highlightjs
+:sectlinks:
+:toclevels: 2
+:sectlinks:
+:sectnums:
+
+== Hobby
+
+=== 취미 조회
+
+==== 요청
+==== 응답
+include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-response.adoc[]
+include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
new file mode 100644
index 00000000..a89fc63c
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -0,0 +1,90 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyName;
+import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
+import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
+import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
+import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
+import org.springframework.test.web.servlet.MockMvc;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@AutoConfigureRestDocs
+@MockBean(JpaMetamodelMappingContext.class)
+@WebMvcTest(HobbyController.class)
+public class HobbyControllerWebMvcTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @MockBean
+    private HobbyService hobbyService;
+
+    @MockBean
+    private AuthArgumentResolver authArgumentResolver;
+
+    @MockBean
+    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
+
+    @MockBean
+    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
+
+    @MockBean
+    private OAuthArgumentResolver oAuthArgumentResolver;
+
+    @Test
+    void 회원의_취미를_조회한다() throws Exception {
+        // given
+        Long memberId = 1L;
+
+        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+
+        List<Hobby> savedHobbies = List.of(
+                new Hobby(memberId, HobbyName.DANCE),
+                new Hobby(memberId, HobbyName.ANIMATION)
+        );
+        when(hobbyService.findMemberHobbies(memberId)).thenReturn(savedHobbies);
+
+        // when & then
+        mockMvc.perform(get("/api/info/hobby"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.length()").value(2))
+                .andExpect(jsonPath("$[0].hobby").value("댄스"))
+                .andExpect(jsonPath("$[1].hobby").value("애니메이션"))
+                .andDo(print())
+                .andDo(customDocument("search_hobbies",
+                        responseFields(
+                                fieldWithPath("[].hobby").description("취미 이름")
+                        )
+                ));
+    }
+}

From c8c05a7db313f16351a3c15c385d687501d5e275 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 15:11:28 +0900
Subject: [PATCH 053/225] =?UTF-8?q?test:=20HobbyControllerWebMvc=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ObjectMapper 삭제
---
 .../com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
index a89fc63c..1a821ca6 100644
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -17,7 +17,6 @@
 import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
 import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
 import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -39,9 +38,6 @@ public class HobbyControllerWebMvcTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @Autowired
-    private ObjectMapper objectMapper;
-
     @MockBean
     private HobbyService hobbyService;
 

From f35e9c6f8f34385f4bc9d2621f65f84374c27855 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 15:18:43 +0900
Subject: [PATCH 054/225] =?UTF-8?q?test:=20StyleControllerWebMvc=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleControllerWebMvc 테스트 작성
- REST Docs 연결 작성
---
 src/docs/asciidoc/style.adoc                  | 15 ++++
 .../ui/info/StyleControllerWebMvcTest.java    | 86 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 src/docs/asciidoc/style.adoc
 create mode 100644 src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java

diff --git a/src/docs/asciidoc/style.adoc b/src/docs/asciidoc/style.adoc
new file mode 100644
index 00000000..3f4558ec
--- /dev/null
+++ b/src/docs/asciidoc/style.adoc
@@ -0,0 +1,15 @@
+:toc: left
+:source-highlighter: highlightjs
+:sectlinks:
+:toclevels: 2
+:sectlinks:
+:sectnums:
+
+== Style
+
+=== 스타일 조회
+
+==== 요청
+==== 응답
+include::{snippets}/style-controller-web-mvc-test/search_styles/http-response.adoc[]
+include::{snippets}/style-controller-web-mvc-test/search_styles/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
new file mode 100644
index 00000000..f46a10d5
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
@@ -0,0 +1,86 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.atwoz.member.application.info.style.StyleService;
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleName;
+import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
+import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
+import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
+import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
+import org.springframework.test.web.servlet.MockMvc;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@AutoConfigureRestDocs
+@MockBean(JpaMetamodelMappingContext.class)
+@WebMvcTest(StyleController.class)
+public class StyleControllerWebMvcTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private StyleService styleService;
+
+    @MockBean
+    private AuthArgumentResolver authArgumentResolver;
+
+    @MockBean
+    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
+
+    @MockBean
+    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
+
+    @MockBean
+    private OAuthArgumentResolver oAuthArgumentResolver;
+
+    @Test
+    void 회원의_스타일을_조회한다() throws Exception {
+        // given
+        Long memberId = 1L;
+
+        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+
+        List<Style> savedStyles = List.of(
+                new Style(memberId, StyleName.POSITIVE),
+                new Style(memberId, StyleName.GENTLE)
+        );
+        when(styleService.findMemberStyles(memberId)).thenReturn(savedStyles);
+
+        // when & then
+        mockMvc.perform(get("/api/info/style"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.length()").value(2))
+                .andExpect(jsonPath("$[0].style").value("긍정적"))
+                .andExpect(jsonPath("$[1].style").value("진중함"))
+                .andDo(print())
+                .andDo(customDocument("search_styles",
+                        responseFields(
+                                fieldWithPath("[].style").description("스타일 이름")
+                        )
+                ));
+    }
+}

From d1c3cb187ecfff49e95e53830f51a746aad7028f Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 15:29:00 +0900
Subject: [PATCH 055/225] =?UTF-8?q?test:=20OptionControllerWebMvc=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionControllerWebMvc 테스트 작성
- REST Docs 연결 작성
---
 src/docs/asciidoc/option.adoc                 | 15 +++
 .../ui/info/OptionControllerWebMvcTest.java   | 98 +++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 src/docs/asciidoc/option.adoc
 create mode 100644 src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java

diff --git a/src/docs/asciidoc/option.adoc b/src/docs/asciidoc/option.adoc
new file mode 100644
index 00000000..ecc54870
--- /dev/null
+++ b/src/docs/asciidoc/option.adoc
@@ -0,0 +1,15 @@
+:toc: left
+:source-highlighter: highlightjs
+:sectlinks:
+:toclevels: 2
+:sectlinks:
+:sectnums:
+
+== Option
+
+=== Option 조회
+
+==== 요청
+==== 응답
+include::{snippets}/option-controller-web-mvc-test/search_option/http-response.adoc[]
+include::{snippets}/option-controller-web-mvc-test/search_option/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
new file mode 100644
index 00000000..7723badb
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
@@ -0,0 +1,98 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.atwoz.member.application.info.option.OptionService;
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
+import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
+import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
+import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
+import org.springframework.test.web.servlet.MockMvc;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@AutoConfigureRestDocs
+@MockBean(JpaMetamodelMappingContext.class)
+@WebMvcTest(OptionController.class)
+public class OptionControllerWebMvcTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private OptionService optionService;
+
+    @MockBean
+    private AuthArgumentResolver authArgumentResolver;
+
+    @MockBean
+    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
+
+    @MockBean
+    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
+
+    @MockBean
+    private OAuthArgumentResolver oAuthArgumentResolver;
+
+    @Test
+    void 회원의_option을_조회한다() throws Exception {
+        // given
+        Long memberId = 1L;
+
+        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+
+        Smoke smoke = Smoke.NEVER;
+        Religion religion = Religion.CHRIST;
+        Drink drink = Drink.NEVER;
+        Mbti mbti = Mbti.INFJ;
+        Graduate graduate = Graduate.SEOUL_FOURTH;
+        Option savedOption = new Option(memberId, smoke, religion, drink, mbti, graduate);
+
+        when(optionService.findByMemberId(memberId)).thenReturn(savedOption);
+
+        // when & then
+        mockMvc.perform(get("/api/info/option"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.drink").value("전혀 마시지 않음"))
+                .andExpect(jsonPath("$.graduate").value("서울 4년제"))
+                .andExpect(jsonPath("$.religion").value("기독교"))
+                .andExpect(jsonPath("$.smoke").value("비흡연"))
+                .andExpect(jsonPath("$.mbti").value("INFJ"))
+                .andDo(print())
+                .andDo(customDocument("search_option",
+                        responseFields(
+                                fieldWithPath("drink").description("음주 단계"),
+                                fieldWithPath("graduate").description("최종 학력"),
+                                fieldWithPath("religion").description("종교"),
+                                fieldWithPath("smoke").description("흡연 단계"),
+                                fieldWithPath("mbti").description("MBTI")
+                        )
+                ));
+    }
+}

From 153bcb1af9bf2b84f52e1d1d754c08f82807f164 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 15:39:12 +0900
Subject: [PATCH 056/225] =?UTF-8?q?test:=20ProfileControllerWebMvc=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileControllerWebMvc 테스트 작성
- REST Docs 연결 작성
---
 src/docs/asciidoc/profile.adoc                |  15 +++
 .../ui/info/ProfileControllerWebMvcTest.java  | 107 ++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 src/docs/asciidoc/profile.adoc
 create mode 100644 src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java

diff --git a/src/docs/asciidoc/profile.adoc b/src/docs/asciidoc/profile.adoc
new file mode 100644
index 00000000..c48d490a
--- /dev/null
+++ b/src/docs/asciidoc/profile.adoc
@@ -0,0 +1,15 @@
+:toc: left
+:source-highlighter: highlightjs
+:sectlinks:
+:toclevels: 2
+:sectlinks:
+:sectnums:
+
+== Profile
+
+=== Profile 조회
+
+==== 요청
+==== 응답
+include::{snippets}/profile-controller-web-mvc-test/search_profile/http-response.adoc[]
+include::{snippets}/profile-controller-web-mvc-test/search_profile/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
new file mode 100644
index 00000000..b5977955
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -0,0 +1,107 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.atwoz.member.application.info.profile.ProfileService;
+import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.fixture.info.BodyFixture;
+import com.atwoz.member.fixture.info.JobFixture;
+import com.atwoz.member.fixture.info.LocationFixture;
+import com.atwoz.member.fixture.info.PositionFixture;
+import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
+import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
+import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
+import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
+import org.springframework.test.web.servlet.MockMvc;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@AutoConfigureRestDocs
+@MockBean(JpaMetamodelMappingContext.class)
+@WebMvcTest(ProfileController.class)
+public class ProfileControllerWebMvcTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private ProfileService profileService;
+
+    @MockBean
+    private AuthArgumentResolver authArgumentResolver;
+
+    @MockBean
+    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
+
+    @MockBean
+    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
+
+    @MockBean
+    private OAuthArgumentResolver oAuthArgumentResolver;
+
+    @Test
+    void 회원의_profile을_조회한다() throws Exception {
+        // given
+        Long memberId = 1L;
+
+        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+
+        Body body = BodyFixture.일반_body_생성();
+        Location location = LocationFixture.일반_위치_생성();
+        Position position = PositionFixture.일반_좌표_생성();
+        Job job = JobFixture.일반_직업_생성();
+
+        Profile savedProfile = new Profile(memberId, body, location, position, job);
+
+        when(profileService.findByMemberId(memberId)).thenReturn(savedProfile);
+
+        // when & then
+        mockMvc.perform(get("/api/info/profile"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.age").value(body.getAge()))
+                .andExpect(jsonPath("$.height").value(body.getHeight()))
+                .andExpect(jsonPath("$.gender").value(body.getGender().getName()))
+                .andExpect(jsonPath("$.location.city").value(location.getCity()))
+                .andExpect(jsonPath("$.location.sector").value(location.getSector()))
+                .andExpect(jsonPath("$.position.latitude").value(position.getLatitude()))
+                .andExpect(jsonPath("$.position.longitude").value(position.getLongitude()))
+                .andExpect(jsonPath("$.job").value(job.getJob()))
+                .andDo(print())
+                .andDo(customDocument("search_profile",
+                        responseFields(
+                                fieldWithPath("age").description("나이"),
+                                fieldWithPath("height").description("키"),
+                                fieldWithPath("gender").description("성별"),
+                                fieldWithPath("location.city").description("위치 (시/도)"),
+                                fieldWithPath("location.sector").description("위치 (구)"),
+                                fieldWithPath("position.latitude").description("위도"),
+                                fieldWithPath("position.longitude").description("경도"),
+                                fieldWithPath("job").description("직업")
+                        )
+                ));
+    }
+}

From 8e53aef5523dda6c3127f650522ac1abde50a58e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 16:04:14 +0900
Subject: [PATCH 057/225] =?UTF-8?q?test:=20InfoControllerWebMvc=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoControllerWebMvc 테스트 작성
- REST Docs 연결 작성
---
 src/docs/asciidoc/info.adoc                   |  17 ++
 .../ui/info/InfoControllerWebMvcTest.java     | 146 ++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 src/docs/asciidoc/info.adoc
 create mode 100644 src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java

diff --git a/src/docs/asciidoc/info.adoc b/src/docs/asciidoc/info.adoc
new file mode 100644
index 00000000..a5f1bf0b
--- /dev/null
+++ b/src/docs/asciidoc/info.adoc
@@ -0,0 +1,17 @@
+:toc: left
+:source-highlighter: highlightjs
+:sectlinks:
+:toclevels: 2
+:sectlinks:
+:sectnums:
+
+== Info
+
+=== 회원 정보 작성
+
+==== 요청
+include::{snippets}/info-controller-web-mvc-test/write_info/http-request.adoc[]
+include::{snippets}/info-controller-web-mvc-test/write_info/request-fields.adoc[]
+
+==== 응답
+include::{snippets}/info-controller-web-mvc-test/write_info/http-response.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
new file mode 100644
index 00000000..4e637185
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -0,0 +1,146 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
+import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.atwoz.member.application.info.InfoService;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
+import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
+import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
+import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import java.util.List;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@AutoConfigureRestDocs
+@MockBean(JpaMetamodelMappingContext.class)
+@WebMvcTest(InfoController.class)
+public class InfoControllerWebMvcTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private InfoService infoService;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @MockBean
+    private AuthArgumentResolver authArgumentResolver;
+
+    @MockBean
+    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
+
+    @MockBean
+    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
+
+    @MockBean
+    private OAuthArgumentResolver oAuthArgumentResolver;
+
+    @Test
+    void 회원_정보를_작성한다() throws Exception {
+        // given
+        Long memberId = 1L;
+
+        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
+        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
+        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+
+        int birthYear = 2000;
+        int height = 171;
+        String gender = "남성";
+        LocationWriteRequest locationWriteRequest = new LocationWriteRequest("서울시", "강남구");
+        double latitude = 70.3;
+        double longitude = 140.3;
+        PositionWriteRequest positionWriteRequest = new PositionWriteRequest(latitude, longitude);
+        String job = "개발자";
+        ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(
+                birthYear,
+                height,
+                gender,
+                locationWriteRequest,
+                positionWriteRequest,
+                job
+        );
+
+        String drink = "전혀 마시지 않음";
+        String graduate = "서울 4년제";
+        String religion = "기독교";
+        String smoke = "비흡연";
+        String mbti = "INFJ";
+        OptionWriteRequest optionWriteRequest = new OptionWriteRequest(
+                drink,
+                graduate,
+                religion,
+                smoke,
+                mbti
+        );
+
+        List<HobbyWriteRequest> hobbies = List.of(
+                new HobbyWriteRequest("와인"),
+                new HobbyWriteRequest("요리")
+        );
+
+        List<StyleWriteRequest> styles = List.of(
+                new StyleWriteRequest("긍정적"),
+                new StyleWriteRequest("진중함")
+        );
+
+        InfoWriteRequest infoWriteRequest = new InfoWriteRequest(profileWriteRequest, optionWriteRequest, hobbies, styles);
+
+        // when & then
+        mockMvc.perform(post("/api/info")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(infoWriteRequest)))
+                .andExpect(status().isOk())
+                .andDo(print())
+                .andDo(customDocument("write_info",
+                        requestFields(
+                                fieldWithPath("profile.birthYear").description("출생년도"),
+                                fieldWithPath("profile.height").description("키"),
+                                fieldWithPath("profile.gender").description("성별"),
+                                fieldWithPath("profile.location.city").description("위치 (시/도)"),
+                                fieldWithPath("profile.location.sector").description("위치 (구)"),
+                                fieldWithPath("profile.position.latitude").description("위도"),
+                                fieldWithPath("profile.position.longitude").description("경도"),
+                                fieldWithPath("profile.job").description("직업"),
+                                fieldWithPath("option.drink").description("음주 단계"),
+                                fieldWithPath("option.graduate").description("최종 학력"),
+                                fieldWithPath("option.religion").description("종교"),
+                                fieldWithPath("option.smoke").description("흡연 단계"),
+                                fieldWithPath("option.mbti").description("MBTI"),
+                                fieldWithPath("hobbies").description("취미 목록"),
+                                fieldWithPath("hobbies[].hobby").description("취미 이름"),
+                                fieldWithPath("styles").description("스타일 목록"),
+                                fieldWithPath("styles[].style").description("스타일 이름")
+                        )
+                ));
+    }
+}

From 381d8b54ae652c29bb92798c6a77a840c9761667 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 16:50:57 +0900
Subject: [PATCH 058/225] =?UTF-8?q?refactor:=20=EC=98=88=EC=99=B8=20?=
 =?UTF-8?q?=ED=95=B8=EB=93=A4=EB=9F=AC=EC=97=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- info 내부 예외들을 MemberExceptionHandler에 등록
---
 .../exception/MemberExceptionHandler.java     | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 7047a72f..e6939236 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.exception;
 
+import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
 import com.atwoz.member.exception.exceptions.auth.ExpiredTokenException;
 import com.atwoz.member.exception.exceptions.auth.JsonDataInvalidException;
 import com.atwoz.member.exception.exceptions.auth.LoginInvalidException;
@@ -8,8 +9,13 @@
 import com.atwoz.member.exception.exceptions.auth.TokenFormInvalidException;
 import com.atwoz.member.exception.exceptions.auth.TokenInvalidException;
 import com.atwoz.member.exception.exceptions.auth.UnsupportedTokenException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
+import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
 import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import com.atwoz.member.exception.exceptions.member.MemberAlreadyExistedException;
@@ -86,6 +92,12 @@ public ResponseEntity<String> handleOAuthPlatformNotFountException(final OAuthPl
         return getNotFoundResponse(e);
     }
 
+    // info - enum
+    @ExceptionHandler(PropertyNotFoundException.class)
+    public ResponseEntity<String> handlePropertyNotFoundException(final PropertyNotFoundException e) {
+        return getNotFoundResponse(e);
+    }
+
     // info - hobby
     @ExceptionHandler(HobbyNotFoundException.class)
     public ResponseEntity<String> handleHobbyNotFoundException(final HobbyNotFoundException e) {
@@ -97,6 +109,11 @@ public ResponseEntity<String> handleHobbySizeException(final HobbySizeException
         return getBadRequest(e);
     }
 
+    @ExceptionHandler(HobbyDuplicateException.class)
+    public ResponseEntity<String> handleHobbyDuplicationException(final HobbyDuplicateException e) {
+        return getBadRequest(e);
+    }
+
     // info - style
     @ExceptionHandler(StyleNotFoundException.class)
     public ResponseEntity<String> handleStyleNotFoundException(final StyleNotFoundException e) {
@@ -108,6 +125,28 @@ public ResponseEntity<String> handleStyleSizeException(final StyleSizeException
         return getBadRequest(e);
     }
 
+    @ExceptionHandler(StyleDuplicateException.class)
+    public ResponseEntity<String> handleStyleDuplicateException(final StyleDuplicateException e) {
+        return getBadRequest(e);
+    }
+
+    // info - profile
+    @ExceptionHandler(ProfileNotFoundException.class)
+    public ResponseEntity<String> handleProfileNotFoundException(ProfileNotFoundException e) {
+        return getNotFoundResponse(e);
+    }
+
+    @ExceptionHandler(ProfileRangeException.class)
+    public ResponseEntity<String> handleProfileRangeException(final ProfileRangeException e) {
+        return getBadRequest(e);
+    }
+
+    // info - option
+    @ExceptionHandler(OptionNotFoundException.class)
+    public ResponseEntity<String> handleOptionNotFoundException(final OptionNotFoundException e) {
+        return getNotFoundResponse(e);
+    }
+
     private ResponseEntity<String> getNotFoundResponse(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(e.getMessage());

From f0fa2a9e4f16458cf3fa726441d79e280182e927 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:03:16 +0900
Subject: [PATCH 059/225] =?UTF-8?q?docs:=20API=20=EB=AC=B8=EC=84=9C?=
 =?UTF-8?q?=EB=93=A4=EC=97=90=20HTTP=20request=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- API 문서들에 HTTP request 추가
---
 src/docs/asciidoc/hobby.adoc   | 2 ++
 src/docs/asciidoc/option.adoc  | 2 ++
 src/docs/asciidoc/profile.adoc | 2 ++
 src/docs/asciidoc/style.adoc   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/docs/asciidoc/hobby.adoc b/src/docs/asciidoc/hobby.adoc
index 26be60a7..01450e9b 100644
--- a/src/docs/asciidoc/hobby.adoc
+++ b/src/docs/asciidoc/hobby.adoc
@@ -10,6 +10,8 @@
 === 취미 조회
 
 ==== 요청
+include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-request.adoc[]
+
 ==== 응답
 include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-response.adoc[]
 include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/response-fields.adoc[]
diff --git a/src/docs/asciidoc/option.adoc b/src/docs/asciidoc/option.adoc
index ecc54870..f49c6801 100644
--- a/src/docs/asciidoc/option.adoc
+++ b/src/docs/asciidoc/option.adoc
@@ -10,6 +10,8 @@
 === Option 조회
 
 ==== 요청
+include::{snippets}/option-controller-web-mvc-test/search_option/http-request.adoc[]
+
 ==== 응답
 include::{snippets}/option-controller-web-mvc-test/search_option/http-response.adoc[]
 include::{snippets}/option-controller-web-mvc-test/search_option/response-fields.adoc[]
diff --git a/src/docs/asciidoc/profile.adoc b/src/docs/asciidoc/profile.adoc
index c48d490a..80e5997f 100644
--- a/src/docs/asciidoc/profile.adoc
+++ b/src/docs/asciidoc/profile.adoc
@@ -10,6 +10,8 @@
 === Profile 조회
 
 ==== 요청
+include::{snippets}/profile-controller-web-mvc-test/search_profile/http-request.adoc[]
+
 ==== 응답
 include::{snippets}/profile-controller-web-mvc-test/search_profile/http-response.adoc[]
 include::{snippets}/profile-controller-web-mvc-test/search_profile/response-fields.adoc[]
diff --git a/src/docs/asciidoc/style.adoc b/src/docs/asciidoc/style.adoc
index 3f4558ec..7a468290 100644
--- a/src/docs/asciidoc/style.adoc
+++ b/src/docs/asciidoc/style.adoc
@@ -10,6 +10,8 @@
 === 스타일 조회
 
 ==== 요청
+include::{snippets}/style-controller-web-mvc-test/search_styles/http-request.adoc[]
+
 ==== 응답
 include::{snippets}/style-controller-web-mvc-test/search_styles/http-response.adoc[]
 include::{snippets}/style-controller-web-mvc-test/search_styles/response-fields.adoc[]

From d1a4d0c7b98edebee1f5b1c4978119c364a8ed5c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:09:41 +0900
Subject: [PATCH 060/225] =?UTF-8?q?refactor:=20DTO=20=EC=9D=B8=EC=9E=90=20?=
 =?UTF-8?q?=EA=B3=B5=EB=B0=B1=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- DTO 인자 선언 시의 첫 공백 삭제
---
 .../com/atwoz/member/application/info/dto/HobbyWriteRequest.java | 1 -
 .../com/atwoz/member/application/info/dto/InfoWriteRequest.java  | 1 -
 .../com/atwoz/member/application/info/dto/StyleWriteRequest.java | 1 -
 .../member/application/info/dto/option/OptionWriteRequest.java   | 1 -
 .../application/info/dto/profile/LocationWriteRequest.java       | 1 -
 .../application/info/dto/profile/PositionWriteRequest.java       | 1 -
 .../member/application/info/dto/profile/ProfileWriteRequest.java | 1 -
 7 files changed, 7 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
index e860e756..008bb48b 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record HobbyWriteRequest(
-
         @NotBlank(message = "취미가 작성되어야 합니다.")
         String hobby
 ) {
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
index b36d1732..45aaedf6 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
@@ -5,7 +5,6 @@
 import java.util.List;
 
 public record InfoWriteRequest(
-
         ProfileWriteRequest profile,
 
         OptionWriteRequest option,
diff --git a/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
index 915ed002..f5c6e054 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record StyleWriteRequest(
-
         @NotBlank(message = "스타일이 작성되어야 합니다.")
         String style
 ) {
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
index 194331f1..056d909c 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record OptionWriteRequest(
-
         @NotBlank(message = "음주가 작성되어야 합니다.")
         String drink,
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
index be4858f8..3e553b48 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotBlank;
 
 public record LocationWriteRequest(
-
         @NotBlank(message = "시/도가 작성되어야 합니다.")
         String city,
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
index 3aa315c5..a6d818fd 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotNull;
 
 public record PositionWriteRequest(
-
         @NotNull(message = "위도가 있어야 합니다.")
         Double latitude,
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index e3b42fc9..76484ce1 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -4,7 +4,6 @@
 import jakarta.validation.constraints.NotNull;
 
 public record ProfileWriteRequest(
-
         @NotNull(message = "출생년도가 작성되어야 합니다.")
         Integer birthYear,
 

From e0370d79064380e7fa3304771107622949ea557a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:18:57 +0900
Subject: [PATCH 061/225] =?UTF-8?q?refactor:=20HobbyName=20=EA=B2=80?=
 =?UTF-8?q?=EC=A6=9D=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=B6=84=ED=95=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 검증 방식에 따른 세부 메서드 분할
---
 .../member/domain/info/hobby/HobbyName.java      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
index d57df97c..fd34e5e3 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
@@ -51,24 +51,34 @@ public enum HobbyName {
     }
 
     public static List<HobbyName> findAllByNames(final List<String> names) {
-        validateSize(names);
+        validateNames(names);
         return names.stream()
                 .map(HobbyName::from)
                 .toList();
     }
 
-    public static void validateSize(final List<String> names) {
+    private static void validateNames(final List<String> names) {
+        validateIsNotEmptyNames(names);
+        validateIsUniqueNames(names);
+        validateIsNotOverMaxSizeOfHobby(names);
+    }
+
+    private static void validateIsNotEmptyNames(final List<String> names) {
         if (names.isEmpty()) {
             throw new HobbySizeException();
         }
+    }
 
+    private static void validateIsUniqueNames(final List<String> names) {
         Set<String> uniqueNames = new HashSet<>(names);
         if (uniqueNames.size() != names.size()) {
             throw new HobbyDuplicateException();
         }
+    }
 
+    private static void validateIsNotOverMaxSizeOfHobby(final List<String> names) {
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> uniqueNames.contains(hobbyName.getName()))
+                .filter(hobbyName -> names.contains(hobbyName.getName()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {

From 5d70f1aa483a79e5ed23cc2be6be5aa255191a51 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:21:42 +0900
Subject: [PATCH 062/225] =?UTF-8?q?refactor:=20HobbyRepository=20final=20?=
 =?UTF-8?q?=EC=9D=B8=EC=9E=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 모든 메서드 인자에 final 속성이 붙도록 수정
---
 .../com/atwoz/member/domain/info/hobby/HobbyRepository.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
index 23da2464..f03c1598 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
@@ -7,5 +7,5 @@ public interface HobbyRepository {
     void save(final Hobby hobby);
     void saveAll(final List<Hobby> memberHobbies);
     void deleteHobbiesByMemberId(final Long memberId);
-    List<Hobby> findAllByMemberId(Long memberId);
+    List<Hobby> findAllByMemberId(final Long memberId);
 }

From aabc02137763487dc6b9bfd6a650b7aee0720b17 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:35:16 +0900
Subject: [PATCH 063/225] =?UTF-8?q?refactor:=20OptionFactory=20=EA=B3=B5?=
 =?UTF-8?q?=EB=B0=B1=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionFactory 불필요한 공백 삭제
---
 .../com/atwoz/member/application/info/option/OptionFactory.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index 66668c2b..8666a89b 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -13,7 +13,6 @@
 public class OptionFactory {
 
     public Option fromRequest(final Long memberId, final OptionWriteRequest request) {
-
         Smoke smoke = Smoke.findByName(request.smoke());
         Religion religion = Religion.findByName(request.religion());
         Drink drink = Drink.findByName(request.drink());

From 050ce6c3925f3e4fbad95dce78822d68395ab556 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:35:31 +0900
Subject: [PATCH 064/225] =?UTF-8?q?refactor:=20InfoController=20=EA=B3=B5?=
 =?UTF-8?q?=EB=B0=B1=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoController 공백 삭제
---
 src/main/java/com/atwoz/member/ui/info/InfoController.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
index 921f0b1d..96b07e5e 100644
--- a/src/main/java/com/atwoz/member/ui/info/InfoController.java
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -25,5 +25,4 @@ public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
         return ResponseEntity.ok()
                 .build();
     }
-
 }

From 1cc1470cfe7df1eeaa3133a61e53ce40b3f42a95 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:41:10 +0900
Subject: [PATCH 065/225] =?UTF-8?q?refactor:=20HobbyJpaRepository=20final?=
 =?UTF-8?q?=20=EC=9D=B8=EC=9E=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 모든 메서드 인자에 final 속성이 붙도록 수정
---
 .../member/infrastructure/info/hobby/HobbyJpaRepository.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
index 2439fb8e..fdb54a2d 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
@@ -8,5 +8,5 @@ public interface HobbyJpaRepository extends JpaRepository<Hobby, Long> {
 
     void deleteByMemberId(final Long memberId);
 
-    List<Hobby> findAllByMemberId(Long memberId);
+    List<Hobby> findAllByMemberId(final Long memberId);
 }

From 9e7c033b51236dc2425b2550824726e040aa8b9a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:43:12 +0900
Subject: [PATCH 066/225] =?UTF-8?q?refactor:=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?=
 =?UTF-8?q?=EB=9F=AC=20memberId=20final=20=EC=9D=B8=EC=9E=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 컨트롤러들에 있는 memberId들에 final 속성이 붙도록 수정
---
 src/main/java/com/atwoz/member/ui/info/OptionController.java  | 2 +-
 src/main/java/com/atwoz/member/ui/info/ProfileController.java | 2 +-
 src/main/java/com/atwoz/member/ui/info/StyleController.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/OptionController.java b/src/main/java/com/atwoz/member/ui/info/OptionController.java
index 91ccb272..7f37f649 100644
--- a/src/main/java/com/atwoz/member/ui/info/OptionController.java
+++ b/src/main/java/com/atwoz/member/ui/info/OptionController.java
@@ -18,7 +18,7 @@ public class OptionController {
     private final OptionService optionService;
 
     @GetMapping
-    public ResponseEntity<OptionSearchResponse> findOption(@AuthMember Long memberId) {
+    public ResponseEntity<OptionSearchResponse> findOption(@AuthMember final Long memberId) {
         Option option = optionService.findByMemberId(memberId);
         OptionSearchResponse response = OptionSearchResponse.from(option);
 
diff --git a/src/main/java/com/atwoz/member/ui/info/ProfileController.java b/src/main/java/com/atwoz/member/ui/info/ProfileController.java
index 812056f4..cff0d1ba 100644
--- a/src/main/java/com/atwoz/member/ui/info/ProfileController.java
+++ b/src/main/java/com/atwoz/member/ui/info/ProfileController.java
@@ -18,7 +18,7 @@ public class ProfileController {
     private final ProfileService profileService;
 
     @GetMapping
-    public ResponseEntity<ProfileSearchResponse> findProfile(@AuthMember Long memberId) {
+    public ResponseEntity<ProfileSearchResponse> findProfile(@AuthMember final Long memberId) {
         Profile profile = profileService.findByMemberId(memberId);
         ProfileSearchResponse response = ProfileSearchResponse.from(profile);
 
diff --git a/src/main/java/com/atwoz/member/ui/info/StyleController.java b/src/main/java/com/atwoz/member/ui/info/StyleController.java
index c9350cfe..90f567b8 100644
--- a/src/main/java/com/atwoz/member/ui/info/StyleController.java
+++ b/src/main/java/com/atwoz/member/ui/info/StyleController.java
@@ -19,7 +19,7 @@ public class StyleController {
     private final StyleService styleService;
 
     @GetMapping
-    public ResponseEntity<List<StyleSearchResponse>> findMemberStyles(@AuthMember Long memberId) {
+    public ResponseEntity<List<StyleSearchResponse>> findMemberStyles(@AuthMember final Long memberId) {
         List<StyleSearchResponse> styles = styleService.findMemberStyles(memberId)
                 .stream()
                 .map(Style::getStyleName)

From 4bde57028767d4d934d00a2f9a2092ae1adc0874 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:49:47 +0900
Subject: [PATCH 067/225] =?UTF-8?q?refactor:=20Body=20=EB=82=98=EC=9D=B4?=
 =?UTF-8?q?=20=EA=B3=84=EC=82=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 계산 시 절댓값 연산 삭제
---
 src/main/java/com/atwoz/member/domain/info/profile/Body.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index 7bbe23ff..dc8c8abd 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -46,7 +46,7 @@ private void validateHeight(final int height) {
     }
 
     private int calculateAgeFromYear(final int currentYear, final int birthYear) {
-        int memberAge = Math.abs(currentYear - birthYear);
+        int memberAge = currentYear - birthYear;
         if (memberAge < MIN_AGE || MAX_AGE < memberAge) {
             throw new ProfileRangeException();
         }

From cb9188d01f5189ae98e6d563ef5a0ab735dc8df4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 20:56:45 +0900
Subject: [PATCH 068/225] =?UTF-8?q?refactor:=20Option,=20Profile=20?=
 =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=9D=B8=EC=9E=90=20=EC=A4=84?=
 =?UTF-8?q?=EB=82=B4=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Option, Profile 메서드 인자 줄내림 적용
---
 .../atwoz/member/domain/info/option/Option.java   | 15 +++++++++++----
 .../atwoz/member/domain/info/profile/Profile.java |  6 +++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index 2a18436b..b4a2ebd3 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -47,14 +47,21 @@ public class Option {
     @Enumerated(value = EnumType.STRING)
     private Graduate graduate;
 
-    public Option(final Long memberId, final Smoke smoke, final Religion religion,
-                  final Drink drink, final Mbti mbti, final Graduate graduate) {
+    public Option(final Long memberId,
+                  final Smoke smoke,
+                  final Religion religion,
+                  final Drink drink,
+                  final Mbti mbti,
+                  final Graduate graduate) {
         this.memberId = memberId;
         updateContents(smoke, religion, drink, mbti, graduate);
     }
 
-    public void updateContents(final Smoke smoke, final Religion religion, final Drink drink,
-                               final Mbti mbti, final Graduate graduate) {
+    public void updateContents(final Smoke smoke,
+                               final Religion religion,
+                               final Drink drink,
+                               final Mbti mbti,
+                               final Graduate graduate) {
         this.smoke = smoke;
         this.religion = religion;
         this.drink = drink;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index fe3e98be..df074095 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -41,7 +41,11 @@ public class Profile {
     @Column(nullable = false)
     private Job job;
 
-    public Profile(final Long memberId, final Body body, final Location location, final Position position, final Job job) {
+    public Profile(final Long memberId,
+                   final Body body,
+                   final Location location,
+                   final Position position,
+                   final Job job) {
         this.memberId = memberId;
         updateContents(body, location, position, job);
     }

From 8310c831d027189124e1b34f08146c4900ebf0e1 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 21:25:54 +0900
Subject: [PATCH 069/225] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20public=20=EC=A0=9C=EC=96=B4=EC=9E=90=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 테스트 파일의 public 제어자 삭제
---
 .../com/atwoz/member/application/info/HobbyServiceTest.java     | 2 +-
 .../java/com/atwoz/member/application/info/InfoServiceTest.java | 2 +-
 .../com/atwoz/member/application/info/OptionServiceTest.java    | 2 +-
 .../com/atwoz/member/application/info/ProfileServiceTest.java   | 2 +-
 .../com/atwoz/member/application/info/StyleServiceTest.java     | 2 +-
 .../java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java  | 2 +-
 .../java/com/atwoz/member/domain/info/profile/BodyTest.java     | 2 +-
 .../java/com/atwoz/member/domain/info/profile/GenderTest.java   | 2 +-
 .../java/com/atwoz/member/domain/info/profile/PositionTest.java | 2 +-
 .../java/com/atwoz/member/domain/info/style/StyleNameTest.java  | 2 +-
 .../member/infrastructure/info/HobbyJpaRepositoryTest.java      | 2 +-
 .../member/infrastructure/info/OptionJpaRepositoryTest.java     | 2 +-
 .../member/infrastructure/info/ProfileJpaRepositoryTest.java    | 2 +-
 .../member/infrastructure/info/StyleJpaRepositoryTest.java      | 2 +-
 .../com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java     | 2 +-
 .../java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java | 2 +-
 .../com/atwoz/member/ui/info/OptionControllerWebMvcTest.java    | 2 +-
 .../com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java   | 2 +-
 .../com/atwoz/member/ui/info/StyleControllerWebMvcTest.java     | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
index 02cbd576..32ed6980 100644
--- a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
@@ -17,7 +17,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @ExtendWith(MockitoExtension.class)
-public class HobbyServiceTest {
+class HobbyServiceTest {
 
     private HobbyService hobbyService;
     private HobbyRepository hobbyRepository;
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 365b8e52..63b40385 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -30,7 +30,7 @@
 @SpringBootTest
 @RecordApplicationEvents
 @ExtendWith(MockitoExtension.class)
-public class InfoServiceTest {
+class InfoServiceTest {
 
     @Autowired
     private InfoService infoService;
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 0402385e..6158bd66 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -21,7 +21,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @ExtendWith(MockitoExtension.class)
-public class OptionServiceTest {
+class OptionServiceTest {
 
     private OptionService optionService;
     private OptionRepository optionRepository;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 7721ee16..6fadb60f 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -24,7 +24,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @ExtendWith(MockitoExtension.class)
-public class ProfileServiceTest {
+class ProfileServiceTest {
 
     private ProfileService profileService;
     private ProfileRepository profileRepository;
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
index e1cf761f..b70a8bc3 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -17,7 +17,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @ExtendWith(MockitoExtension.class)
-public class StyleServiceTest {
+class StyleServiceTest {
 
     private StyleService styleService;
     private StyleRepository styleRepository;
diff --git a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
index f9055069..c7156274 100644
--- a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
@@ -13,7 +13,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-public class HobbyNameTest {
+class HobbyNameTest {
 
     @Test
     void 취미가_존재하면_정상적으로_가져온다() {
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
index 51f17a8c..06d69661 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
@@ -14,7 +14,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-public class BodyTest {
+class BodyTest {
 
     @Test
     void 입력값이_올바른_경우_생성된다() {
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
index ca3ff270..57f6bba8 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
@@ -10,7 +10,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-public class GenderTest {
+class GenderTest {
 
     @Test
     void 올바른_선택_시_조회된다() {
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
index ec865967..16ecdecb 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
@@ -14,7 +14,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-public class PositionTest {
+class PositionTest {
 
     @Test
     void 입력값이_올바른_경우_생성된다() {
diff --git a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java b/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
index 69ef552f..e138aa22 100644
--- a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
@@ -13,7 +13,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-public class StyleNameTest {
+class StyleNameTest {
 
     @Test
     void 스타일이_존재하면_정상적으로_가져온다() {
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
index 686a650f..c8743ab3 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
@@ -21,7 +21,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-public class HobbyJpaRepositoryTest {
+class HobbyJpaRepositoryTest {
 
     @Autowired
     private HobbyJpaRepository hobbyJpaRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
index 41f348ee..0998bab8 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
@@ -24,7 +24,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-public class OptionJpaRepositoryTest {
+class OptionJpaRepositoryTest {
 
     @Autowired
     private OptionJpaRepository optionJpaRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
index 0b9c831b..080163ec 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
@@ -27,7 +27,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-public class ProfileJpaRepositoryTest {
+class ProfileJpaRepositoryTest {
 
     @Autowired
     private ProfileJpaRepository profileJpaRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
index 441cc2be..37255191 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
@@ -21,7 +21,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-public class StyleJpaRepositoryTest {
+class StyleJpaRepositoryTest {
 
     @Autowired
     private StyleJpaRepository styleJpaRepository;
diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
index 1a821ca6..202474bc 100644
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -33,7 +33,7 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(HobbyController.class)
-public class HobbyControllerWebMvcTest {
+class HobbyControllerWebMvcTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 4e637185..fe86acad 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -39,7 +39,7 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(InfoController.class)
-public class InfoControllerWebMvcTest {
+class InfoControllerWebMvcTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
index 7723badb..996b5984 100644
--- a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
@@ -36,7 +36,7 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(OptionController.class)
-public class OptionControllerWebMvcTest {
+class OptionControllerWebMvcTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
index b5977955..bb0f37ee 100644
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -39,7 +39,7 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(ProfileController.class)
-public class ProfileControllerWebMvcTest {
+class ProfileControllerWebMvcTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
index f46a10d5..38c503fa 100644
--- a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
@@ -33,7 +33,7 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(StyleController.class)
-public class StyleControllerWebMvcTest {
+class StyleControllerWebMvcTest {
 
     @Autowired
     private MockMvc mockMvc;

From dd7cd0b5bb62ed47ad21cf70b0a74da4f2411d99 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 21:30:25 +0900
Subject: [PATCH 070/225] =?UTF-8?q?refactor:=20=EC=84=9C=EB=B9=84=EC=8A=A4?=
 =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9D=98=20MockitoExtension=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 서비스 테스트에서의 MockitoExtension 어노테이션 제거
---
 .../com/atwoz/member/application/info/HobbyServiceTest.java    | 3 ---
 .../com/atwoz/member/application/info/InfoServiceTest.java     | 3 ---
 .../com/atwoz/member/application/info/OptionServiceTest.java   | 3 ---
 .../com/atwoz/member/application/info/ProfileServiceTest.java  | 3 ---
 .../com/atwoz/member/application/info/StyleServiceTest.java    | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
index 32ed6980..f7728e1d 100644
--- a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
@@ -10,13 +10,10 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-@ExtendWith(MockitoExtension.class)
 class HobbyServiceTest {
 
     private HobbyService hobbyService;
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 63b40385..850a4780 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -17,8 +17,6 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.event.ApplicationEvents;
@@ -29,7 +27,6 @@
 @SuppressWarnings("NonAsciiCharacters")
 @SpringBootTest
 @RecordApplicationEvents
-@ExtendWith(MockitoExtension.class)
 class InfoServiceTest {
 
     @Autowired
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 6158bd66..eaa78dfa 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -15,12 +15,9 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-@ExtendWith(MockitoExtension.class)
 class OptionServiceTest {
 
     private OptionService optionService;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 6fadb60f..5ecd817c 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -18,12 +18,9 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-@ExtendWith(MockitoExtension.class)
 class ProfileServiceTest {
 
     private ProfileService profileService;
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
index b70a8bc3..25759084 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -10,13 +10,10 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-@ExtendWith(MockitoExtension.class)
 class StyleServiceTest {
 
     private StyleService styleService;

From 91465b06166808de80734ce133710b2512c4b8c3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 21:43:27 +0900
Subject: [PATCH 071/225] =?UTF-8?q?refactor:=20InfoServiceTest=20=ED=95=84?=
 =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EC=96=B4=EC=9E=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoServiceTest의 ApplicationEvents 접근 제어자 추가
---
 .../java/com/atwoz/member/application/info/InfoServiceTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 850a4780..3805960f 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -33,7 +33,7 @@ class InfoServiceTest {
     private InfoService infoService;
 
     @Autowired
-    ApplicationEvents events;
+    private ApplicationEvents events;
 
     @BeforeEach
     void init() {

From 34817bb73f2ded70da925fb0438522f56f31da55 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 21:55:01 +0900
Subject: [PATCH 072/225] =?UTF-8?q?refactor:=20ProfileServiceTest=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EA=B2=80=EC=A6=9D=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- isTrue 대신 isPresent로만 검증하도록 수정
---
 .../com/atwoz/member/application/info/ProfileServiceTest.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 5ecd817c..96304473 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -57,7 +57,6 @@ void init() {
 
         // then
         assertSoftly(softly -> {
-            softly.assertThat(profileRepository.isExistMemberProfile(memberId)).isTrue();
             softly.assertThat(profileRepository.findByMemberId(memberId)).isPresent();
             softly.assertThat(profileRepository.findByMemberId(memberId).get()).isEqualTo(expectedProfile);
         });

From 5ca32b29a5e8c64495fd69a3907e408d8e2c97c7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 23 Feb 2024 22:05:07 +0900
Subject: [PATCH 073/225] =?UTF-8?q?refactor:=20YearManager=20=ED=8C=A8?=
 =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- YearManager 구현체는 infrastructure에 관리되도록 수정
- YearManager 인터페이스만 domain에 관리되도록 수정
---
 .../atwoz/member/application/info/profile/ProfileFactory.java | 2 +-
 .../member/domain/info/profile/{year => }/YearManager.java    | 2 +-
 .../profile/year => infrastructure/info}/YearManagerImpl.java | 3 ++-
 .../com/atwoz/member/application/info/ProfileServiceTest.java | 3 ++-
 .../{application => infrastructure}/info/FakeYearManager.java | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename src/main/java/com/atwoz/member/domain/info/profile/{year => }/YearManager.java (54%)
 rename src/main/java/com/atwoz/member/{domain/info/profile/year => infrastructure/info}/YearManagerImpl.java (73%)
 rename src/test/java/com/atwoz/member/{application => infrastructure}/info/FakeYearManager.java (62%)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index c5c56630..756f55c0 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -9,7 +9,7 @@
 import com.atwoz.member.domain.info.profile.Location;
 import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.domain.info.profile.year.YearManager;
+import com.atwoz.member.domain.info.profile.YearManager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java b/src/main/java/com/atwoz/member/domain/info/profile/YearManager.java
similarity index 54%
rename from src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java
rename to src/main/java/com/atwoz/member/domain/info/profile/YearManager.java
index 2bf3b783..e9a2b302 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/year/YearManager.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/YearManager.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile.year;
+package com.atwoz.member.domain.info.profile;
 
 public interface YearManager {
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/YearManagerImpl.java
similarity index 73%
rename from src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java
rename to src/main/java/com/atwoz/member/infrastructure/info/YearManagerImpl.java
index aa35f8e2..cdfc5a5b 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/year/YearManagerImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/YearManagerImpl.java
@@ -1,5 +1,6 @@
-package com.atwoz.member.domain.info.profile.year;
+package com.atwoz.member.infrastructure.info;
 
+import com.atwoz.member.domain.info.profile.YearManager;
 import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 96304473..887fbe67 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -11,8 +11,9 @@
 import com.atwoz.member.application.info.profile.ProfileService;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
-import com.atwoz.member.domain.info.profile.year.YearManager;
+import com.atwoz.member.domain.info.profile.YearManager;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
+import com.atwoz.member.infrastructure.info.FakeYearManager;
 import com.atwoz.member.infrastructure.info.ProfileFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
diff --git a/src/test/java/com/atwoz/member/application/info/FakeYearManager.java b/src/test/java/com/atwoz/member/infrastructure/info/FakeYearManager.java
similarity index 62%
rename from src/test/java/com/atwoz/member/application/info/FakeYearManager.java
rename to src/test/java/com/atwoz/member/infrastructure/info/FakeYearManager.java
index 247875d0..1eb26538 100644
--- a/src/test/java/com/atwoz/member/application/info/FakeYearManager.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/FakeYearManager.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.application.info;
+package com.atwoz.member.infrastructure.info;
 
-import com.atwoz.member.domain.info.profile.year.YearManager;
+import com.atwoz.member.domain.info.profile.YearManager;
 
 public class FakeYearManager implements YearManager {
 

From 9dd50e93da6b9e5ea35559fd69545527b9bd27bc Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 01:11:37 +0900
Subject: [PATCH 074/225] =?UTF-8?q?refactor:=20HobbyName=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 메서드의 기능을 더 잘 파악하기 위해 from 대신 findBy로 변경
---
 .../java/com/atwoz/member/domain/info/hobby/HobbyName.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
index fd34e5e3..de1a2a8f 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
@@ -53,7 +53,7 @@ public enum HobbyName {
     public static List<HobbyName> findAllByNames(final List<String> names) {
         validateNames(names);
         return names.stream()
-                .map(HobbyName::from)
+                .map(HobbyName::findBy)
                 .toList();
     }
 
@@ -86,7 +86,7 @@ private static void validateIsNotOverMaxSizeOfHobby(final List<String> names) {
         }
     }
 
-    private static HobbyName from(final String name) {
+    private static HobbyName findBy(final String name) {
         return Arrays.stream(values())
                 .filter(hobbyName -> hobbyName.isSame(name))
                 .findFirst()

From c39a9f24002bcaa03653b5d59b68dc9554382ff7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 01:18:13 +0900
Subject: [PATCH 075/225] =?UTF-8?q?refactor:=20StyleName=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 메서드의 기능을 더 잘 파악하기 위해 from 대신 findBy로 변경
---
 .../java/com/atwoz/member/domain/info/style/StyleName.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
index 223cddac..36b94b45 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
@@ -54,7 +54,7 @@ public enum StyleName {
     public static List<StyleName> findAllByNames(final List<String> names) {
         validateSize(names);
         return names.stream()
-                .map(StyleName::from)
+                .map(StyleName::findBy)
                 .toList();
     }
 
@@ -77,7 +77,7 @@ public static void validateSize(final List<String> names) {
         }
     }
 
-    private static StyleName from(final String name) {
+    private static StyleName findBy(final String name) {
         return Arrays.stream(values())
                 .filter(styleName -> styleName.isSame(name))
                 .findFirst()

From abeb3ef37b405df122a35419d778beba90e2c947 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 01:32:37 +0900
Subject: [PATCH 076/225] =?UTF-8?q?refactor:=20Position=20BigDecimal=20?=
 =?UTF-8?q?=EA=B5=90=EC=B2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Position의 double 속성을 BigDecimal로 교체
- 관련 테스트 및 코드 수정
---
 .../dto/profile/PositionWriteRequest.java     |  5 ++--
 .../member/domain/info/profile/Position.java  | 23 ++++++++++---------
 .../dto/profile/PositionSearchResponse.java   |  5 ++--
 .../application/info/InfoServiceTest.java     |  5 ++--
 .../application/info/ProfileServiceTest.java  |  9 ++++----
 .../domain/info/profile/PositionTest.java     | 15 ++++++------
 .../member/fixture/info/PositionFixture.java  |  5 ++--
 .../ui/info/InfoControllerWebMvcTest.java     |  5 ++--
 8 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
index a6d818fd..00a2f658 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
@@ -1,12 +1,13 @@
 package com.atwoz.member.application.info.dto.profile;
 
 import jakarta.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 public record PositionWriteRequest(
         @NotNull(message = "위도가 있어야 합니다.")
-        Double latitude,
+        BigDecimal latitude,
 
         @NotNull(message = "경도가 있어야 합니다.")
-        Double longitude
+        BigDecimal longitude
 ){
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Position.java b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
index 14aa5712..fab2e642 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Position.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
@@ -6,6 +6,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
 
 @Getter
 @EqualsAndHashCode
@@ -13,15 +14,15 @@
 @Embeddable
 public class Position {
 
-    private static final int MIN_LATITUDE = -90;
-    private static final int MAX_LATITUDE = 90;
-    private static final int MIN_LONGITUDE = -180;
-    private static final int MAX_LONGITUDE = 180;
+    private static final BigDecimal MIN_LATITUDE = BigDecimal.valueOf(-90);
+    private static final BigDecimal MAX_LATITUDE = BigDecimal.valueOf(90);
+    private static final BigDecimal MIN_LONGITUDE = BigDecimal.valueOf(-180);
+    private static final BigDecimal MAX_LONGITUDE = BigDecimal.valueOf(180);
 
-    private double latitude;
-    private double longitude;
+    private BigDecimal latitude;
+    private BigDecimal longitude;
 
-    public Position(final double latitude, final double longitude) {
+    public Position(final BigDecimal latitude, final BigDecimal longitude) {
         validateLatitude(latitude);
         validateLongitude(longitude);
 
@@ -29,14 +30,14 @@ public Position(final double latitude, final double longitude) {
         this.longitude = longitude;
     }
 
-    private static void validateLatitude(final double latitude) {
-        if (latitude < MIN_LATITUDE || latitude > MAX_LATITUDE) {
+    private static void validateLatitude(final BigDecimal latitude) {
+        if (latitude.compareTo(MIN_LATITUDE) < 0 || latitude.compareTo(MAX_LATITUDE) > 0) {
             throw new ProfileRangeException();
         }
     }
 
-    private static void validateLongitude(final double longitude) {
-        if (longitude < MIN_LONGITUDE || longitude > MAX_LONGITUDE) {
+    private static void validateLongitude(final BigDecimal longitude) {
+        if (longitude.compareTo(MIN_LONGITUDE) < 0 || longitude.compareTo(MAX_LONGITUDE) > 0) {
             throw new ProfileRangeException();
         }
     }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
index 44611037..6d7b8ef1 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
@@ -1,12 +1,13 @@
 package com.atwoz.member.ui.info.dto.profile;
 
 import com.atwoz.member.domain.info.profile.Position;
+import java.math.BigDecimal;
 
 public record PositionSearchResponse(
 
-        double latitude,
+        BigDecimal latitude,
 
-        double longitude
+        BigDecimal longitude
 ) {
     public static PositionSearchResponse from(final Position position) {
         return new PositionSearchResponse(position.getLatitude(), position.getLongitude());
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 3805960f..f473b267 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -21,6 +21,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.event.ApplicationEvents;
 import org.springframework.test.context.event.RecordApplicationEvents;
+import java.math.BigDecimal;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -49,8 +50,8 @@ void init() {
         int height = 171;
         String gender = "남성";
         LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
-        double latitude = 70.5;
-        double longitude = 140.3;
+        BigDecimal latitude = BigDecimal.valueOf(70.5);
+        BigDecimal longitude = BigDecimal.valueOf(140.3);
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
         String job = "개발자";
         ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 887fbe67..29d0d105 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
+import java.math.BigDecimal;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -44,8 +45,8 @@ void init() {
         int birthYear = 2000;
         int height = 171;
         String gender = "남성";
-        double latitude = 70.5;
-        double longitude = 140.3;
+        BigDecimal latitude = BigDecimal.valueOf(70.5);
+        BigDecimal longitude = BigDecimal.valueOf(140.3);
         String job = "개발자";
         LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
@@ -70,8 +71,8 @@ void init() {
         int birthYear = 2000;
         int height = 171;
         String gender = "남성";
-        double latitude = 70.5;
-        double longitude = 140.3;
+        BigDecimal latitude = BigDecimal.valueOf(70.5);
+        BigDecimal longitude = BigDecimal.valueOf(140.3);
         String job = "개발자";
         LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
index 16ecdecb..d801c873 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import java.math.BigDecimal;
 import java.util.stream.Stream;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -19,8 +20,8 @@ class PositionTest {
     @Test
     void 입력값이_올바른_경우_생성된다() {
         // given
-        double latitude = 40;
-        double longitude = 130;
+        BigDecimal latitude = BigDecimal.valueOf(40);
+        BigDecimal longitude = BigDecimal.valueOf(130);
 
         // when & then
         assertDoesNotThrow(() -> new Position(latitude, longitude));
@@ -28,7 +29,7 @@ class PositionTest {
 
     @ParameterizedTest(name = "위도 {0}, 경도 {1}인 경우")
     @MethodSource("latitudeAndLongitude")
-    void 위도_또는_경도_제한을_벗어나면_예외가_발생한다(final double latitude, final double longitude) {
+    void 위도_또는_경도_제한을_벗어나면_예외가_발생한다(final BigDecimal latitude, final BigDecimal longitude) {
         // when & then
         assertThatThrownBy(() -> new Position(latitude, longitude))
                 .isInstanceOf(ProfileRangeException.class);
@@ -36,10 +37,10 @@ class PositionTest {
 
     static Stream<Arguments> latitudeAndLongitude() {
         return Stream.of(
-                Arguments.of(-100, 130),
-                Arguments.of(100, 130),
-                Arguments.of(40, -200),
-                Arguments.of(40, 200)
+                Arguments.of(BigDecimal.valueOf(-100), BigDecimal.valueOf(130)),
+                Arguments.of(BigDecimal.valueOf(100), BigDecimal.valueOf(130)),
+                Arguments.of(BigDecimal.valueOf(40), BigDecimal.valueOf(-200)),
+                Arguments.of(BigDecimal.valueOf(40), BigDecimal.valueOf(200))
         );
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
index 205098f0..357748db 100644
--- a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
@@ -1,12 +1,13 @@
 package com.atwoz.member.fixture.info;
 
 import com.atwoz.member.domain.info.profile.Position;
+import java.math.BigDecimal;
 
 public class PositionFixture {
 
     public static Position 일반_좌표_생성() {
-        double latitude = 40;
-        double longitude = 170;
+        BigDecimal latitude = BigDecimal.valueOf(40);
+        BigDecimal longitude = BigDecimal.valueOf(170);
 
         return new Position(latitude, longitude);
     }
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index fe86acad..bc789116 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -32,6 +32,7 @@
 import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
+import java.math.BigDecimal;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -77,8 +78,8 @@ class InfoControllerWebMvcTest {
         int height = 171;
         String gender = "남성";
         LocationWriteRequest locationWriteRequest = new LocationWriteRequest("서울시", "강남구");
-        double latitude = 70.3;
-        double longitude = 140.3;
+        BigDecimal latitude = BigDecimal.valueOf(70.3);
+        BigDecimal longitude = BigDecimal.valueOf(140.3);
         PositionWriteRequest positionWriteRequest = new PositionWriteRequest(latitude, longitude);
         String job = "개발자";
         ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(

From b5e945b15b2c07c3c903195cc4980faef2d1ac1a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 01:44:55 +0900
Subject: [PATCH 077/225] =?UTF-8?q?refactor:=20ParseMemberIdFromTokenInter?=
 =?UTF-8?q?ceptor=20url=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ParseMemberIdFromTokenInterceptor 적용 url 수정
---
 src/main/java/com/atwoz/member/config/AuthConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/config/AuthConfig.java b/src/main/java/com/atwoz/member/config/AuthConfig.java
index 7f4a7358..917b6f65 100644
--- a/src/main/java/com/atwoz/member/config/AuthConfig.java
+++ b/src/main/java/com/atwoz/member/config/AuthConfig.java
@@ -32,7 +32,7 @@ public void addInterceptors(InterceptorRegistry registry) {
     private HandlerInterceptor parseMemberIdFromTokenInterceptor() {
         return new PathMatcherInterceptor(parseMemberIdFromTokenInterceptor)
                 .excludePathPattern("/**", OPTIONS)
-                .addPathPatterns("/**", ANY);
+                .addPathPatterns("/api/info/**", ANY);
     }
 
     /**

From 88777a5b792dd2fdae81853caac6bd966a2e68d8 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 03:30:50 +0900
Subject: [PATCH 078/225] =?UTF-8?q?refactor:=20Option=20=EC=A1=B4=EC=9E=AC?=
 =?UTF-8?q?=20=EC=97=AC=EB=B6=80=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=84=B1?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionRepository의 isExistMemberOption을 쿼리로 개선
---
 .../infrastructure/info/option/OptionJpaRepository.java       | 4 ++++
 .../infrastructure/info/option/OptionRepositoryImpl.java      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
index 1542e23f..cdc894a4 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
@@ -2,9 +2,13 @@
 
 import com.atwoz.member.domain.info.option.Option;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import java.util.Optional;
 
 public interface OptionJpaRepository extends JpaRepository<Option, Long> {
 
     Optional<Option> findByMemberId(Long memberId);
+
+    @Query("select count(*) > 0 from Option o where o.memberId = :memberId")
+    boolean isExistMemberOption(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
index b64c2340..5e84eff0 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
@@ -24,6 +24,6 @@ public Optional<Option> findByMemberId(final Long memberId) {
 
     @Override
     public boolean isExistMemberOption(final Long memberId) {
-        return findByMemberId(memberId).isPresent();
+        return optionJpaRepository.isExistMemberOption(memberId);
     }
 }

From 5194b38eac77fa770d369b7a9b270339913bcd09 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 03:31:12 +0900
Subject: [PATCH 079/225] =?UTF-8?q?refactor:=20Profile=20=EC=A1=B4?=
 =?UTF-8?q?=EC=9E=AC=20=EC=97=AC=EB=B6=80=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=84=B1=EB=8A=A5=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileRepository의 isExistMemberOption을 쿼리로 개선
---
 .../infrastructure/info/profile/ProfileJpaRepository.java     | 4 ++++
 .../infrastructure/info/profile/ProfileRepositoryImpl.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
index e9c19424..793beab4 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
@@ -2,9 +2,13 @@
 
 import com.atwoz.member.domain.info.profile.Profile;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import java.util.Optional;
 
 public interface ProfileJpaRepository extends JpaRepository<Profile, Long> {
 
     Optional<Profile> findByMemberId(final Long memberId);
+
+    @Query("select count(*) > 0 from Profile p where p.memberId = :memberId")
+    boolean isExistMemberOption(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
index 419c6846..d302b365 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
@@ -24,6 +24,6 @@ public Optional<Profile> findByMemberId(final Long memberId) {
 
     @Override
     public boolean isExistMemberProfile(final Long memberId) {
-        return findByMemberId(memberId).isPresent();
+        return profileJpaRepository.isExistMemberOption(memberId);
     }
 }

From cf4c7e67bb6091243aa4a28267e82a641a2b239d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 11:28:30 +0900
Subject: [PATCH 080/225] =?UTF-8?q?refactor:=20HobbyFakeRepository=20id=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyFakeRepository 저장 시 id도 저장되도록 빌더 패턴 이용
---
 src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java | 6 +++++-
 .../member/infrastructure/info/HobbyFakeRepository.java     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index fd35766e..1a33220c 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -9,12 +9,16 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "member_hobbies")
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
 @Entity
 public class Hobby {
 
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
index 983a006a..1675523d 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
@@ -13,7 +13,11 @@ public class HobbyFakeRepository implements HobbyRepository {
 
     @Override
     public void save(final Hobby hobby) {
-        Hobby newHobby = new Hobby(hobby.getMemberId(), hobby.getHobbyName());
+        Hobby newHobby = Hobby.builder()
+                .id(id)
+                .memberId(hobby.getMemberId())
+                .hobbyName(hobby.getHobbyName())
+                .build();
         map.put(id, newHobby);
         id++;
     }

From 79c79c56f3bf4ca3e9183b2e65b02417aeb7ef39 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 11:28:49 +0900
Subject: [PATCH 081/225] =?UTF-8?q?refactor:=20StyleFakeRepository=20id=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleFakeRepository 저장 시 id도 저장되도록 빌더 패턴 이용
---
 src/main/java/com/atwoz/member/domain/info/style/Style.java | 6 +++++-
 .../member/infrastructure/info/StyleFakeRepository.java     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index 8312a248..3e0b9c58 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -9,12 +9,16 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "member_styles")
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
 @Entity
 public class Style {
 
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
index c94656ea..7b53e078 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
@@ -13,7 +13,11 @@ public class StyleFakeRepository implements StyleRepository {
 
     @Override
     public void save(final Style style) {
-        Style newStyle = new Style(style.getMemberId(), style.getStyleName());
+        Style newStyle = Style.builder()
+                .id(id)
+                .memberId(style.getMemberId())
+                .styleName(style.getStyleName())
+                .build();
         map.put(id, newStyle);
         id++;
     }

From c16341a54784cb49728e286745dc53cbbc33e9ff Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 11:59:33 +0900
Subject: [PATCH 082/225] =?UTF-8?q?refactor:=20DTO=20=EC=A0=95=EC=A0=81=20?=
 =?UTF-8?q?=ED=8C=A9=ED=84=B0=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbySearchResponse에서 엔티티를 변환하도록 수정
---
 .../java/com/atwoz/member/ui/info/HobbyController.java    | 4 +---
 .../com/atwoz/member/ui/info/dto/HobbySearchResponse.java | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/HobbyController.java b/src/main/java/com/atwoz/member/ui/info/HobbyController.java
index 141297f2..f59f0227 100644
--- a/src/main/java/com/atwoz/member/ui/info/HobbyController.java
+++ b/src/main/java/com/atwoz/member/ui/info/HobbyController.java
@@ -1,7 +1,6 @@
 package com.atwoz.member.ui.info;
 
 import com.atwoz.member.application.info.hobby.HobbyService;
-import com.atwoz.member.domain.info.hobby.Hobby;
 import com.atwoz.member.ui.auth.support.auth.AuthMember;
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import lombok.RequiredArgsConstructor;
@@ -22,8 +21,7 @@ public class HobbyController {
     public ResponseEntity<List<HobbySearchResponse>> findMemberHobbies(@AuthMember final Long memberId) {
         List<HobbySearchResponse> hobbies = hobbyService.findMemberHobbies(memberId)
                 .stream()
-                .map(Hobby::getHobbyName)
-                .map(hobbyName -> new HobbySearchResponse(hobbyName.getName()))
+                .map(HobbySearchResponse::from)
                 .toList();
 
         return ResponseEntity.ok()
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
index 7206f532..0cd64214 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
@@ -1,7 +1,15 @@
 package com.atwoz.member.ui.info.dto;
 
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.HobbyName;
+
 public record HobbySearchResponse(
 
         String hobby
 ) {
+
+    public static HobbySearchResponse from(final Hobby hobby) {
+        HobbyName hobbyName = hobby.getHobbyName();
+        return new HobbySearchResponse(hobbyName.getName());
+    }
 }

From 84f3006e283876a14a24d5a0b747dc3a790304f2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 11:59:55 +0900
Subject: [PATCH 083/225] =?UTF-8?q?refactor:=20DTO=20=EC=A0=95=EC=A0=81=20?=
 =?UTF-8?q?=ED=8C=A9=ED=84=B0=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleSearchResponse에서 엔티티를 변환하도록 수정
---
 .../java/com/atwoz/member/ui/info/StyleController.java    | 4 +---
 .../com/atwoz/member/ui/info/dto/StyleSearchResponse.java | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/StyleController.java b/src/main/java/com/atwoz/member/ui/info/StyleController.java
index 90f567b8..cea266b0 100644
--- a/src/main/java/com/atwoz/member/ui/info/StyleController.java
+++ b/src/main/java/com/atwoz/member/ui/info/StyleController.java
@@ -1,7 +1,6 @@
 package com.atwoz.member.ui.info;
 
 import com.atwoz.member.application.info.style.StyleService;
-import com.atwoz.member.domain.info.style.Style;
 import com.atwoz.member.ui.auth.support.auth.AuthMember;
 import com.atwoz.member.ui.info.dto.StyleSearchResponse;
 import lombok.RequiredArgsConstructor;
@@ -22,8 +21,7 @@ public class StyleController {
     public ResponseEntity<List<StyleSearchResponse>> findMemberStyles(@AuthMember final Long memberId) {
         List<StyleSearchResponse> styles = styleService.findMemberStyles(memberId)
                 .stream()
-                .map(Style::getStyleName)
-                .map(styleName -> new StyleSearchResponse(styleName.getName()))
+                .map(StyleSearchResponse::from)
                 .toList();
 
         return ResponseEntity.ok()
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
index f8932809..d5cde03f 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
@@ -1,7 +1,15 @@
 package com.atwoz.member.ui.info.dto;
 
+import com.atwoz.member.domain.info.style.Style;
+import com.atwoz.member.domain.info.style.StyleName;
+
 public record StyleSearchResponse(
 
         String style
 ) {
+
+    public static StyleSearchResponse from(final Style style) {
+        StyleName styleName = style.getStyleName();
+        return new StyleSearchResponse(styleName.getName());
+    }
 }

From 41e30f75cb6c4c82ac4ed793912b519d64ac2b5d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 13:02:32 +0900
Subject: [PATCH 084/225] =?UTF-8?q?refactor:=20MockBean=20=EC=BA=90?=
 =?UTF-8?q?=EC=8B=B1=20=EC=B2=98=EB=A6=AC=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 각 컨트롤러들의 MockBean을 MockBeanInjection에 두어 캐싱되도록 수정
---
 .../com/atwoz/helper/MockBeanInjection.java   | 28 +++++++++++++++++++
 .../ui/info/HobbyControllerWebMvcTest.java    | 23 ++-------------
 .../ui/info/InfoControllerWebMvcTest.java     | 19 ++-----------
 .../ui/info/OptionControllerWebMvcTest.java   | 23 ++-------------
 .../ui/info/ProfileControllerWebMvcTest.java  | 23 ++-------------
 .../ui/info/StyleControllerWebMvcTest.java    | 23 ++-------------
 6 files changed, 38 insertions(+), 101 deletions(-)

diff --git a/src/test/java/com/atwoz/helper/MockBeanInjection.java b/src/test/java/com/atwoz/helper/MockBeanInjection.java
index 547ad70b..d4b95828 100644
--- a/src/test/java/com/atwoz/helper/MockBeanInjection.java
+++ b/src/test/java/com/atwoz/helper/MockBeanInjection.java
@@ -1,9 +1,16 @@
 package com.atwoz.helper;
 
 import com.atwoz.member.application.auth.AuthService;
+import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.member.application.info.option.OptionService;
+import com.atwoz.member.application.info.profile.ProfileService;
+import com.atwoz.member.application.info.style.StyleService;
 import com.atwoz.member.domain.auth.TokenProvider;
+import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
+import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
 import com.atwoz.member.ui.auth.support.auth.AuthenticationContext;
 import com.atwoz.member.ui.auth.support.auth.OAuthProperties;
+import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
 import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
@@ -20,9 +27,30 @@ public class MockBeanInjection {
     @MockBean
     protected AuthService authService;
 
+    @MockBean
+    protected HobbyService hobbyService;
+
+    @MockBean
+    protected OptionService optionService;
+
+    @MockBean
+    protected ProfileService profileService;
+
+    @MockBean
+    protected StyleService styleService;
+
     @MockBean
     protected OAuthProperties oAuthProperties;
 
     @MockBean
     protected OAuthArgumentResolver oAuthArgumentResolver;
+
+    @MockBean
+    protected AuthArgumentResolver authArgumentResolver;
+
+    @MockBean
+    protected ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
+
+    @MockBean
+    protected LoginValidCheckerInterceptor loginValidCheckerInterceptor;
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
index 202474bc..5ad77ae6 100644
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -10,13 +10,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.domain.info.hobby.Hobby;
 import com.atwoz.member.domain.info.hobby.HobbyName;
-import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
-import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
-import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
-import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -33,26 +29,11 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(HobbyController.class)
-class HobbyControllerWebMvcTest {
+class HobbyControllerWebMvcTest extends MockBeanInjection {
 
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
-    private HobbyService hobbyService;
-
-    @MockBean
-    private AuthArgumentResolver authArgumentResolver;
-
-    @MockBean
-    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
-
-    @MockBean
-    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
-
-    @MockBean
-    private OAuthArgumentResolver oAuthArgumentResolver;
-
     @Test
     void 회원의_취미를_조회한다() throws Exception {
         // given
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index bc789116..c29c8a6a 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -9,6 +9,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.application.info.InfoService;
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
@@ -17,10 +18,6 @@
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
-import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
-import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
-import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -40,7 +37,7 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(InfoController.class)
-class InfoControllerWebMvcTest {
+class InfoControllerWebMvcTest extends MockBeanInjection {
 
     @Autowired
     private MockMvc mockMvc;
@@ -51,18 +48,6 @@ class InfoControllerWebMvcTest {
     @Autowired
     private ObjectMapper objectMapper;
 
-    @MockBean
-    private AuthArgumentResolver authArgumentResolver;
-
-    @MockBean
-    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
-
-    @MockBean
-    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
-
-    @MockBean
-    private OAuthArgumentResolver oAuthArgumentResolver;
-
     @Test
     void 회원_정보를_작성한다() throws Exception {
         // given
diff --git a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
index 996b5984..459dbe1c 100644
--- a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
@@ -10,17 +10,13 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.atwoz.member.application.info.option.OptionService;
+import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
-import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
-import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
-import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -36,26 +32,11 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(OptionController.class)
-class OptionControllerWebMvcTest {
+class OptionControllerWebMvcTest extends MockBeanInjection {
 
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
-    private OptionService optionService;
-
-    @MockBean
-    private AuthArgumentResolver authArgumentResolver;
-
-    @MockBean
-    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
-
-    @MockBean
-    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
-
-    @MockBean
-    private OAuthArgumentResolver oAuthArgumentResolver;
-
     @Test
     void 회원의_option을_조회한다() throws Exception {
         // given
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
index bb0f37ee..2227f754 100644
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -10,7 +10,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.atwoz.member.application.info.profile.ProfileService;
+import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Job;
 import com.atwoz.member.domain.info.profile.Location;
@@ -20,10 +20,6 @@
 import com.atwoz.member.fixture.info.JobFixture;
 import com.atwoz.member.fixture.info.LocationFixture;
 import com.atwoz.member.fixture.info.PositionFixture;
-import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
-import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
-import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
-import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -39,26 +35,11 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(ProfileController.class)
-class ProfileControllerWebMvcTest {
+class ProfileControllerWebMvcTest extends MockBeanInjection {
 
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
-    private ProfileService profileService;
-
-    @MockBean
-    private AuthArgumentResolver authArgumentResolver;
-
-    @MockBean
-    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
-
-    @MockBean
-    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
-
-    @MockBean
-    private OAuthArgumentResolver oAuthArgumentResolver;
-
     @Test
     void 회원의_profile을_조회한다() throws Exception {
         // given
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
index 38c503fa..39a6d8ad 100644
--- a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
@@ -10,13 +10,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import com.atwoz.member.application.info.style.StyleService;
+import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.domain.info.style.Style;
 import com.atwoz.member.domain.info.style.StyleName;
-import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
-import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
-import com.atwoz.member.ui.auth.support.resolver.AuthArgumentResolver;
-import com.atwoz.member.ui.auth.support.resolver.OAuthArgumentResolver;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -33,26 +29,11 @@
 @AutoConfigureRestDocs
 @MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(StyleController.class)
-class StyleControllerWebMvcTest {
+class StyleControllerWebMvcTest extends MockBeanInjection {
 
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
-    private StyleService styleService;
-
-    @MockBean
-    private AuthArgumentResolver authArgumentResolver;
-
-    @MockBean
-    private ParseMemberIdFromTokenInterceptor parseMemberIdFromTokenInterceptor;
-
-    @MockBean
-    private LoginValidCheckerInterceptor loginValidCheckerInterceptor;
-
-    @MockBean
-    private OAuthArgumentResolver oAuthArgumentResolver;
-
     @Test
     void 회원의_스타일을_조회한다() throws Exception {
         // given

From d6e166eaafc67ba3a1ed1e9b96fc565b415935a1 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 18:18:43 +0900
Subject: [PATCH 085/225] =?UTF-8?q?refactor:=20InfoService=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=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

- 변수를 추출하지 않고 직접 전달하도록 수정
- hobbyNames, styleNames 메서드 분리
---
 .../member/application/info/InfoService.java  | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 623e81fa..739ab913 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -8,8 +8,6 @@
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,21 +20,27 @@ public class InfoService {
 
     @Transactional
     public void writeProfile(final Long memberId, final InfoWriteRequest request) {
-        ProfileWriteRequest profileWriteRequest = request.profile();
-        OptionWriteRequest optionWriteRequest = request.option();
-        List<String> hobbyNames = request.hobbies()
+        List<String> hobbyNames = extractHobbyNamesFromInfoWriteRequest(request);
+        List<String> styleNames = extractStyleNamesFromInfoWriteRequest(request);
+
+        Events.raise(new ProfileWroteEvent(memberId, request.profile()));
+        Events.raise(new OptionWroteEvent(memberId, request.option()));
+
+        Events.raise(new HobbyWroteEvent(memberId, hobbyNames));
+        Events.raise(new StyleWroteEvent(memberId, styleNames));
+    }
+
+    private List<String> extractHobbyNamesFromInfoWriteRequest(final InfoWriteRequest request) {
+        return request.hobbies()
                 .stream()
                 .map(HobbyWriteRequest::hobby)
                 .toList();
-        List<String> styleNames = request.styles()
+    }
+
+    private List<String> extractStyleNamesFromInfoWriteRequest(final InfoWriteRequest request) {
+        return request.styles()
                 .stream()
                 .map(StyleWriteRequest::style)
                 .toList();
-
-        Events.raise(new ProfileWroteEvent(memberId, profileWriteRequest));
-        Events.raise(new OptionWroteEvent(memberId, optionWriteRequest));
-
-        Events.raise(new HobbyWroteEvent(memberId, hobbyNames));
-        Events.raise(new StyleWroteEvent(memberId, styleNames));
     }
 }

From b460eeb60b7c5c871a92121d168d00eda457802f Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 19:22:30 +0900
Subject: [PATCH 086/225] =?UTF-8?q?refactor:=20MockBean=20=EC=96=B4?=
 =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MockBeanInjection에서 이미 MockBean 어노테이션을 가지므로 삭제 조치
---
 .../com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java    | 3 ---
 .../com/atwoz/member/ui/info/InfoControllerWebMvcTest.java     | 2 --
 .../com/atwoz/member/ui/info/OptionControllerWebMvcTest.java   | 3 ---
 .../com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java  | 3 ---
 .../com/atwoz/member/ui/info/StyleControllerWebMvcTest.java    | 1 -
 5 files changed, 12 deletions(-)

diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
index 5ad77ae6..337e3e42 100644
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -19,15 +19,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.test.web.servlet.MockMvc;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @AutoConfigureRestDocs
-@MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(HobbyController.class)
 class HobbyControllerWebMvcTest extends MockBeanInjection {
 
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index c29c8a6a..5d817e58 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -26,7 +26,6 @@
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import java.math.BigDecimal;
@@ -35,7 +34,6 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @AutoConfigureRestDocs
-@MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(InfoController.class)
 class InfoControllerWebMvcTest extends MockBeanInjection {
 
diff --git a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
index 459dbe1c..551587cb 100644
--- a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
@@ -23,14 +23,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.test.web.servlet.MockMvc;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @AutoConfigureRestDocs
-@MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(OptionController.class)
 class OptionControllerWebMvcTest extends MockBeanInjection {
 
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
index 2227f754..a3fdf698 100644
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -26,14 +26,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.test.web.servlet.MockMvc;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @AutoConfigureRestDocs
-@MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(ProfileController.class)
 class ProfileControllerWebMvcTest extends MockBeanInjection {
 
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
index 39a6d8ad..6a5e773f 100644
--- a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
@@ -27,7 +27,6 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @AutoConfigureRestDocs
-@MockBean(JpaMetamodelMappingContext.class)
 @WebMvcTest(StyleController.class)
 class StyleControllerWebMvcTest extends MockBeanInjection {
 

From 31209e613b95d0084bbe2d6f5dc9d1ede87f3488 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 19:27:20 +0900
Subject: [PATCH 087/225] =?UTF-8?q?refactor:=20StyleControllerWebMvcTest?=
 =?UTF-8?q?=20=ED=97=A4=EB=8D=94=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 불필요한 when 삭제
- REST Docs에 토큰 요청 정보 추가
---
 src/docs/asciidoc/style.adoc                  |  2 +-
 .../ui/info/StyleControllerWebMvcTest.java    | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/docs/asciidoc/style.adoc b/src/docs/asciidoc/style.adoc
index 7a468290..b7466a2d 100644
--- a/src/docs/asciidoc/style.adoc
+++ b/src/docs/asciidoc/style.adoc
@@ -11,7 +11,7 @@
 
 ==== 요청
 include::{snippets}/style-controller-web-mvc-test/search_styles/http-request.adoc[]
-
+include::{snippets}/style-controller-web-mvc-test/search_styles/request-headers.adoc[]
 ==== 응답
 include::{snippets}/style-controller-web-mvc-test/search_styles/http-response.adoc[]
 include::{snippets}/style-controller-web-mvc-test/search_styles/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
index 6a5e773f..6d3c63dd 100644
--- a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
@@ -3,6 +3,9 @@
 import static com.atwoz.helper.RestDocsHelper.customDocument;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
+import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -19,8 +22,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.jpa.mapping.JpaMetamodelMappingContext;
 import org.springframework.test.web.servlet.MockMvc;
 import java.util.List;
 
@@ -37,27 +38,26 @@ class StyleControllerWebMvcTest extends MockBeanInjection {
     void 회원의_스타일을_조회한다() throws Exception {
         // given
         Long memberId = 1L;
-
-        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+        String bearerToken = "Bearer token";
 
         List<Style> savedStyles = List.of(
                 new Style(memberId, StyleName.POSITIVE),
                 new Style(memberId, StyleName.GENTLE)
         );
-        when(styleService.findMemberStyles(memberId)).thenReturn(savedStyles);
+        when(styleService.findMemberStyles(any())).thenReturn(savedStyles);
 
         // when & then
-        mockMvc.perform(get("/api/info/style"))
+        mockMvc.perform(get("/api/info/style")
+                        .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.length()").value(2))
                 .andExpect(jsonPath("$[0].style").value("긍정적"))
                 .andExpect(jsonPath("$[1].style").value("진중함"))
                 .andDo(print())
                 .andDo(customDocument("search_styles",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
                         responseFields(
                                 fieldWithPath("[].style").description("스타일 이름")
                         )

From e017194b5c19ba4e034c17a1d073fbc45dbd1053 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 19:31:27 +0900
Subject: [PATCH 088/225] =?UTF-8?q?refactor:=20ProfileControllerWebMvcTest?=
 =?UTF-8?q?=20=ED=97=A4=EB=8D=94=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 불필요한 when 삭제
- REST Docs에 토큰 요청 정보 추가
---
 src/docs/asciidoc/profile.adoc                 |  2 +-
 .../ui/info/ProfileControllerWebMvcTest.java   | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/docs/asciidoc/profile.adoc b/src/docs/asciidoc/profile.adoc
index 80e5997f..8e31852a 100644
--- a/src/docs/asciidoc/profile.adoc
+++ b/src/docs/asciidoc/profile.adoc
@@ -11,7 +11,7 @@
 
 ==== 요청
 include::{snippets}/profile-controller-web-mvc-test/search_profile/http-request.adoc[]
-
+include::{snippets}/profile-controller-web-mvc-test/search_profile/request-headers.adoc[]
 ==== 응답
 include::{snippets}/profile-controller-web-mvc-test/search_profile/http-response.adoc[]
 include::{snippets}/profile-controller-web-mvc-test/search_profile/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
index a3fdf698..58263546 100644
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -3,6 +3,9 @@
 import static com.atwoz.helper.RestDocsHelper.customDocument;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
+import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -41,12 +44,7 @@ class ProfileControllerWebMvcTest extends MockBeanInjection {
     void 회원의_profile을_조회한다() throws Exception {
         // given
         Long memberId = 1L;
-
-        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+        String bearerToken = "Bearer token";
 
         Body body = BodyFixture.일반_body_생성();
         Location location = LocationFixture.일반_위치_생성();
@@ -55,10 +53,11 @@ class ProfileControllerWebMvcTest extends MockBeanInjection {
 
         Profile savedProfile = new Profile(memberId, body, location, position, job);
 
-        when(profileService.findByMemberId(memberId)).thenReturn(savedProfile);
+        when(profileService.findByMemberId(any())).thenReturn(savedProfile);
 
         // when & then
-        mockMvc.perform(get("/api/info/profile"))
+        mockMvc.perform(get("/api/info/profile")
+                        .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.age").value(body.getAge()))
                 .andExpect(jsonPath("$.height").value(body.getHeight()))
@@ -70,6 +69,9 @@ class ProfileControllerWebMvcTest extends MockBeanInjection {
                 .andExpect(jsonPath("$.job").value(job.getJob()))
                 .andDo(print())
                 .andDo(customDocument("search_profile",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
                         responseFields(
                                 fieldWithPath("age").description("나이"),
                                 fieldWithPath("height").description("키"),

From b9d475a4675386b0034d8e4fbb017f4e99d38d32 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 19:34:02 +0900
Subject: [PATCH 089/225] =?UTF-8?q?refactor:=20OptionControllerWebMvcTest?=
 =?UTF-8?q?=20=ED=97=A4=EB=8D=94=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 불필요한 when 삭제
- REST Docs에 토큰 요청 정보 추가
---
 src/docs/asciidoc/option.adoc                  |  2 +-
 .../ui/info/OptionControllerWebMvcTest.java    | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/docs/asciidoc/option.adoc b/src/docs/asciidoc/option.adoc
index f49c6801..4bb6050f 100644
--- a/src/docs/asciidoc/option.adoc
+++ b/src/docs/asciidoc/option.adoc
@@ -11,7 +11,7 @@
 
 ==== 요청
 include::{snippets}/option-controller-web-mvc-test/search_option/http-request.adoc[]
-
+include::{snippets}/option-controller-web-mvc-test/search_option/request-headers.adoc[]
 ==== 응답
 include::{snippets}/option-controller-web-mvc-test/search_option/http-response.adoc[]
 include::{snippets}/option-controller-web-mvc-test/search_option/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
index 551587cb..62886c65 100644
--- a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
@@ -3,6 +3,9 @@
 import static com.atwoz.helper.RestDocsHelper.customDocument;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
+import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -38,12 +41,7 @@ class OptionControllerWebMvcTest extends MockBeanInjection {
     void 회원의_option을_조회한다() throws Exception {
         // given
         Long memberId = 1L;
-
-        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+        String bearerToken = "Bearer token";
 
         Smoke smoke = Smoke.NEVER;
         Religion religion = Religion.CHRIST;
@@ -52,10 +50,11 @@ class OptionControllerWebMvcTest extends MockBeanInjection {
         Graduate graduate = Graduate.SEOUL_FOURTH;
         Option savedOption = new Option(memberId, smoke, religion, drink, mbti, graduate);
 
-        when(optionService.findByMemberId(memberId)).thenReturn(savedOption);
+        when(optionService.findByMemberId(any())).thenReturn(savedOption);
 
         // when & then
-        mockMvc.perform(get("/api/info/option"))
+        mockMvc.perform(get("/api/info/option")
+                        .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.drink").value("전혀 마시지 않음"))
                 .andExpect(jsonPath("$.graduate").value("서울 4년제"))
@@ -64,6 +63,9 @@ class OptionControllerWebMvcTest extends MockBeanInjection {
                 .andExpect(jsonPath("$.mbti").value("INFJ"))
                 .andDo(print())
                 .andDo(customDocument("search_option",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
                         responseFields(
                                 fieldWithPath("drink").description("음주 단계"),
                                 fieldWithPath("graduate").description("최종 학력"),

From 67ef079089f74d5a91e4bb514fb2ec6dd6708e63 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 19:36:34 +0900
Subject: [PATCH 090/225] =?UTF-8?q?refactor:=20InfoControllerWebMvcTest=20?=
 =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 불필요한 when 삭제
- REST Docs에 토큰 요청 정보 추가
---
 src/docs/asciidoc/info.adoc                      |  1 +
 .../member/ui/info/InfoControllerWebMvcTest.java | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/docs/asciidoc/info.adoc b/src/docs/asciidoc/info.adoc
index a5f1bf0b..e6cb56b3 100644
--- a/src/docs/asciidoc/info.adoc
+++ b/src/docs/asciidoc/info.adoc
@@ -11,6 +11,7 @@
 
 ==== 요청
 include::{snippets}/info-controller-web-mvc-test/write_info/http-request.adoc[]
+include::{snippets}/info-controller-web-mvc-test/write_info/request-headers.adoc[]
 include::{snippets}/info-controller-web-mvc-test/write_info/request-fields.adoc[]
 
 ==== 응답
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 5d817e58..672a2011 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,8 +1,9 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
+import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -50,12 +51,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_작성한다() throws Exception {
         // given
         Long memberId = 1L;
-
-        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+        String bearerToken = "Bearer token";
 
         int birthYear = 2000;
         int height = 171;
@@ -101,11 +97,15 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
 
         // when & then
         mockMvc.perform(post("/api/info")
+                        .header(AUTHORIZATION, bearerToken)
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(infoWriteRequest)))
                 .andExpect(status().isOk())
                 .andDo(print())
                 .andDo(customDocument("write_info",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
                         requestFields(
                                 fieldWithPath("profile.birthYear").description("출생년도"),
                                 fieldWithPath("profile.height").description("키"),

From 570f2f4a5f776fe3d692625c6f0646a09e460c4e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 19:38:49 +0900
Subject: [PATCH 091/225] =?UTF-8?q?refactor:=20HobbyControllerWebMvcTest?=
 =?UTF-8?q?=20=ED=97=A4=EB=8D=94=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 불필요한 when 삭제
- REST Docs에 토큰 요청 정보 추가
---
 src/docs/asciidoc/hobby.adoc                   |  2 +-
 .../ui/info/HobbyControllerWebMvcTest.java     | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/docs/asciidoc/hobby.adoc b/src/docs/asciidoc/hobby.adoc
index 01450e9b..b1648c50 100644
--- a/src/docs/asciidoc/hobby.adoc
+++ b/src/docs/asciidoc/hobby.adoc
@@ -11,7 +11,7 @@
 
 ==== 요청
 include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-request.adoc[]
-
+include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/request-headers.adoc[]
 ==== 응답
 include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-response.adoc[]
 include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/response-fields.adoc[]
diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
index 337e3e42..d6ca7210 100644
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -3,6 +3,9 @@
 import static com.atwoz.helper.RestDocsHelper.customDocument;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
+import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -35,27 +38,26 @@ class HobbyControllerWebMvcTest extends MockBeanInjection {
     void 회원의_취미를_조회한다() throws Exception {
         // given
         Long memberId = 1L;
-
-        when(oAuthArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(parseMemberIdFromTokenInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(loginValidCheckerInterceptor.preHandle(any(), any(), any())).thenReturn(true);
-        when(authArgumentResolver.supportsParameter(any())).thenReturn(true);
-        when(authArgumentResolver.resolveArgument(any(), any(), any(), any())).thenReturn(memberId);
+        String bearerToken = "Bearer token";
 
         List<Hobby> savedHobbies = List.of(
                 new Hobby(memberId, HobbyName.DANCE),
                 new Hobby(memberId, HobbyName.ANIMATION)
         );
-        when(hobbyService.findMemberHobbies(memberId)).thenReturn(savedHobbies);
+        when(hobbyService.findMemberHobbies(any())).thenReturn(savedHobbies);
 
         // when & then
-        mockMvc.perform(get("/api/info/hobby"))
+        mockMvc.perform(get("/api/info/hobby")
+                        .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.length()").value(2))
                 .andExpect(jsonPath("$[0].hobby").value("댄스"))
                 .andExpect(jsonPath("$[1].hobby").value("애니메이션"))
                 .andDo(print())
                 .andDo(customDocument("search_hobbies",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
                         responseFields(
                                 fieldWithPath("[].hobby").description("취미 이름")
                         )

From dfed61b4e38cb9d90b15dad822cc1076dc813795 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 20:25:06 +0900
Subject: [PATCH 092/225] =?UTF-8?q?refactor:=20=ED=95=98=EC=9C=84=20DTO?=
 =?UTF-8?q?=EB=93=A4=EC=9D=98=20validation=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 하위 DTO들에 validation 적용하여 null 및 기타 검증되도록 수정
---
 .../member/application/info/dto/InfoWriteRequest.java  | 10 ++++++++++
 .../info/dto/profile/ProfileWriteRequest.java          |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
index 45aaedf6..251175a7 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
@@ -2,15 +2,25 @@
 
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 public record InfoWriteRequest(
+        @Valid
+        @NotNull(message = "profile 요청이 있어야 합니다.")
         ProfileWriteRequest profile,
 
+        @Valid
+        @NotNull(message = "option 요청이 있어야 합니다.")
         OptionWriteRequest option,
 
+        @Valid
+        @NotNull(message = "취미 요청이 있어야 합니다.")
         List<HobbyWriteRequest> hobbies,
 
+        @Valid
+        @NotNull(message = "스타일 요청이 있어야 합니다.")
         List<StyleWriteRequest> styles
 ) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index 76484ce1..d8002528 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.dto.profile;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
@@ -13,8 +14,12 @@ public record ProfileWriteRequest(
         @NotBlank(message = "성별이 작성되어야 합니다.")
         String gender,
 
+        @Valid
+        @NotNull(message = "위치가 작성되어야 합니다.")
         LocationWriteRequest location,
 
+        @Valid
+        @NotNull(message = "위도-경도가 작성되어야 합니다.")
         PositionWriteRequest position,
 
         @NotBlank(message = "직업이 작성되어야 합니다.")

From 976e41036f8b5ddb8436b558e5939938b6debee0 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 24 Feb 2024 20:45:23 +0900
Subject: [PATCH 093/225] =?UTF-8?q?refactor:=20OptionService=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=B6=84=EB=A6=AC=20=ED=95=B4=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionService의 isMemberOptionExist 메서드 분리 해제
---
 .../atwoz/member/application/info/option/OptionService.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 40cdcea4..0177298f 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -19,7 +19,7 @@ public class OptionService {
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
         Option newOption = optionFactory.fromRequest(memberId, request);
-        if (!isMemberOptionExist(memberId)) {
+        if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
             return;
         }
@@ -33,10 +33,6 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
         );
     }
 
-    private boolean isMemberOptionExist(final Long memberId) {
-        return optionRepository.isExistMemberOption(memberId);
-    }
-
     public Option findByMemberId(final Long memberId) {
         return optionRepository.findByMemberId(memberId)
                 .orElseThrow(OptionNotFoundException::new);

From f39669bc4d9af192591aa7f6c174a2d36800a1d4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 14:20:45 +0900
Subject: [PATCH 094/225] =?UTF-8?q?refactor:=20Hobby=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hobby의 코드로 관리되도록 수정
---
 .../application/info/hobby/HobbyService.java  |  2 +-
 .../member/domain/info/hobby/HobbyName.java   | 98 ++++++++++---------
 .../application/info/HobbyServiceTest.java    | 12 +--
 .../application/info/InfoServiceTest.java     |  4 +-
 .../domain/info/hobby/HobbyNameTest.java      | 26 ++---
 5 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
index 23bcaf34..1fe813aa 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -18,7 +18,7 @@ public class HobbyService {
     @Transactional
     public void saveMemberHobbies(final Long memberId, final List<String> hobbyNames) {
         deleteMemberHobbies(memberId);
-        List<Hobby> memberHobbies = HobbyName.findAllByNames(hobbyNames)
+        List<Hobby> memberHobbies = HobbyName.findAllByCodes(hobbyNames)
                 .stream()
                 .map(hobbyName -> new Hobby(memberId, hobbyName))
                 .toList();
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
index de1a2a8f..8a6537b0 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
@@ -12,73 +12,75 @@
 @Getter
 public enum HobbyName {
 
-    TRIP("국내여행 · 해외여행"),
-    GOLF("골프"),
-    THEATER("공연 · 전시회관람"),
-    WRITE("글쓰기"),
-    GAME("PC · 모바일 게임"),
-    SING("노래"),
-    DANCE("댄스"),
-    DRAMA("드라마 · 예능보기"),
-    DRIVE("드라이브"),
-    CLIMB("등산 · 클라이밍"),
-    RUNNING("러닝"),
-    EAT("맛집탐방"),
-    TENNIS("배드민턴 · 테니스"),
-    BOARD_GAME("보드게임"),
-    PHOTO("사진촬영"),
-    WALK("산책"),
-    SHOPPING("쇼핑"),
-    SKI("스키 · 스노우보드"),
-    INSTRUMENT("악기연주"),
-    ANIMATION("애니메이션"),
-    MOVIE("연극 · 영화"),
-    WINE("와인"),
-    HEALTH("운동 · 헬스"),
-    YOGA("요가 · 필라테스"),
-    COOK("요리"),
-    CARTOON("웹툰 · 만화"),
-    INTERIOR("인테리어"),
-    BICYCLE("자전거"),
-    CAMP("캠핑");
+    TRIP("국내여행/해외여행", "B001"),
+    GOLF("골프", "B002"),
+    THEATER("공연/전시회관람", "B003"),
+    WRITE("글쓰기", "B004"),
+    GAME("PC/모바일 게임", "B005"),
+    SING("노래", "B006"),
+    DANCE("댄스", "B007"),
+    DRAMA("드라마/예능보기", "B008"),
+    DRIVE("드라이브", "B009"),
+    CLIMB("등산/클라이밍", "B010"),
+    RUNNING("러닝", "B011"),
+    EAT("맛집탐방", "B012"),
+    TENNIS("배드민턴/테니스", "B013"),
+    BOARD_GAME("보드게임", "B014"),
+    PHOTO("사진촬영", "B015"),
+    WALK("산책", "B016"),
+    SHOPPING("쇼핑", "B017"),
+    SKI("스키/스노우보드", "B018"),
+    INSTRUMENT("악기연주", "B019"),
+    ANIMATION("애니메이션", "B020"),
+    MOVIE("연극/영화", "B021"),
+    WINE("와인", "B022"),
+    HEALTH("운동/헬스", "B023"),
+    YOGA("요가/필라테스", "B024"),
+    COOK("요리", "B025"),
+    CARTOON("웹툰/만화", "B026"),
+    INTERIOR("인테리어", "B027"),
+    BICYCLE("자전거", "B028"),
+    CAMP("캠핑", "B029");
 
     private static final int MAX_SIZE = 3;
 
     private final String name;
+    private final String code;
 
-    HobbyName(final String name) {
+    HobbyName(final String name, final String code) {
         this.name = name;
+        this.code = code;
     }
 
-    public static List<HobbyName> findAllByNames(final List<String> names) {
-        validateNames(names);
-        return names.stream()
+    public static List<HobbyName> findAllByCodes(final List<String> codes) {
+        validateCodes(codes);
+        return codes.stream()
                 .map(HobbyName::findBy)
                 .toList();
     }
 
-    private static void validateNames(final List<String> names) {
-        validateIsNotEmptyNames(names);
-        validateIsUniqueNames(names);
-        validateIsNotOverMaxSizeOfHobby(names);
+    private static void validateCodes(final List<String> codes) {
+        validateIsNotEmptyCodes(codes);
+        validateIsUniqueCodes(codes);
+        validateIsNotOverMaxSizeOfHobby(codes);
     }
 
-    private static void validateIsNotEmptyNames(final List<String> names) {
-        if (names.isEmpty()) {
+    private static void validateIsNotEmptyCodes(final List<String> codes) {
+        if (codes.isEmpty()) {
             throw new HobbySizeException();
         }
     }
 
-    private static void validateIsUniqueNames(final List<String> names) {
-        Set<String> uniqueNames = new HashSet<>(names);
-        if (uniqueNames.size() != names.size()) {
+    private static void validateIsUniqueCodes(final List<String> codes) {
+        Set<String> uniqueCodes = new HashSet<>(codes);
+        if (uniqueCodes.size() != codes.size()) {
             throw new HobbyDuplicateException();
         }
     }
 
-    private static void validateIsNotOverMaxSizeOfHobby(final List<String> names) {
+    private static void validateIsNotOverMaxSizeOfHobby(final List<String> codes) {
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> names.contains(hobbyName.getName()))
+                .filter(hobbyName -> codes.contains(hobbyName.getCode()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {
@@ -86,14 +88,14 @@ private static void validateIsNotOverMaxSizeOfHobby(final List<String> names) {
         }
     }
 
-    private static HobbyName findBy(final String name) {
+    private static HobbyName findBy(final String code) {
         return Arrays.stream(values())
-                .filter(hobbyName -> hobbyName.isSame(name))
+                .filter(hobbyName -> hobbyName.isSame(code))
                 .findFirst()
                 .orElseThrow(HobbyNotFoundException::new);
     }
 
-    private boolean isSame(final String name) {
-        return this.name.equals(name);
+    private boolean isSame(final String code) {
+        return this.code.equals(code);
     }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
index f7728e1d..e357e814 100644
--- a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
@@ -29,10 +29,10 @@ void init() {
     void 회원의_모든_취미를_저장한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyNames = List.of("자전거", "애니메이션");
+        List<String> hobbyCodes = List.of("B028", "B020");
 
         // when
-        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // then
         List<Hobby> saveHobbies = hobbyRepository.findAllByMemberId(memberId);
@@ -43,8 +43,8 @@ void init() {
     void 회원의_모든_취미를_삭제한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyNames = List.of("자전거", "애니메이션");
-        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+        List<String> hobbyCodes = List.of("B028", "B020");
+        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // when
         hobbyService.deleteMemberHobbies(memberId);
@@ -57,8 +57,8 @@ void init() {
     void 회원의_모든_취미를_조회한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyNames = List.of("자전거", "애니메이션");
-        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+        List<String> hobbyCodes = List.of("B028", "B020");
+        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // when
         List<Hobby> memberHobbies = hobbyService.findMemberHobbies(memberId);
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index f473b267..1497f5c5 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -77,8 +77,8 @@ void init() {
         );
 
         List<HobbyWriteRequest> hobbyWriteRequests = List.of(
-            new HobbyWriteRequest("노래"),
-            new HobbyWriteRequest("댄스")
+            new HobbyWriteRequest("B006"),
+            new HobbyWriteRequest("B007")
         );
 
         List<StyleWriteRequest> styleWriteRequests = List.of(
diff --git a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
index c7156274..b0e4e522 100644
--- a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
@@ -18,56 +18,56 @@ class HobbyNameTest {
     @Test
     void 취미가_존재하면_정상적으로_가져온다() {
         // given
-        List<String> hobbyNames = List.of("국내여행 · 해외여행", "골프", "댄스");
-        List<HobbyName> expectedHobbyNames = List.of(HobbyName.TRIP, HobbyName.GOLF, HobbyName.DANCE);
+        List<String> hobbyCodes = List.of("B001", "B002", "B007");
+        List<HobbyName> expectedHobbies = List.of(HobbyName.TRIP, HobbyName.GOLF, HobbyName.DANCE);
 
         // when
-        List<HobbyName> findHobbyNames = HobbyName.findAllByNames(hobbyNames);
+        List<HobbyName> findHobbies = HobbyName.findAllByCodes(hobbyCodes);
 
         // then
         assertSoftly(softly -> {
-            softly.assertThat(findHobbyNames.size()).isEqualTo(hobbyNames.size());
-            softly.assertThat(findHobbyNames).containsAll(expectedHobbyNames);
+            softly.assertThat(findHobbies.size()).isEqualTo(hobbyCodes.size());
+            softly.assertThat(findHobbies).containsAll(expectedHobbies);
         });
     }
 
     @Test
     void 취미_갯수가_초과되면_예외가_발생한다() {
         // given
-        List<String> hobbyNames = List.of("국내여행 · 해외여행", "골프", "댄스", "쇼핑");
+        List<String> hobbyCodes = List.of("B001", "B002", "B007", "B017");
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbySizeException.class);
     }
 
     @Test
     void 아예_선택하지_않으면_예외가_발생한다() {
         // given
-        List<String> hobbyNames = List.of();
+        List<String> hobbyCodes = List.of();
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbySizeException.class);
     }
 
     @Test
     void 없는_취미를_선택하면_예외가_발생한다() {
         // given
-        List<String> hobbyNames = List.of("hello");
+        List<String> hobbyCodes = List.of("ABCD");
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbyNotFoundException.class);
     }
 
     @Test
     void 중복_선택하면_예외가_발생한다() {
         // given
-        List<String> hobbyNames = List.of("댄스", "댄스");
+        List<String> hobbyCodes = List.of("B001", "B001");
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByNames(hobbyNames))
+        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbyDuplicateException.class);
     }
 }

From 4eda5ddf00b27d7df7ff4de66a0267f569855ad7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 14:35:14 +0900
Subject: [PATCH 095/225] =?UTF-8?q?refactor:=20Style=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Style의 코드로 관리되도록 수정
---
 .../application/info/style/StyleService.java  |  2 +-
 .../member/domain/info/style/StyleName.java   | 88 ++++++++++---------
 .../application/info/InfoServiceTest.java     |  4 +-
 .../application/info/StyleServiceTest.java    | 12 +--
 .../domain/info/style/StyleNameTest.java      | 26 +++---
 5 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
index 9ad4608c..4c235932 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -18,7 +18,7 @@ public class StyleService {
     @Transactional
     public void saveMemberStyles(final Long memberId, final List<String> styleNames) {
         deleteMemberStyles(memberId);
-        List<Style> memberStyles = StyleName.findAllByNames(styleNames)
+        List<Style> memberStyles = StyleName.findAllByCodes(styleNames)
                 .stream()
                 .map(styleName -> new Style(memberId, styleName))
                 .toList();
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
index 36b94b45..bdf492d9 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
@@ -12,64 +12,66 @@
 @Getter
 public enum StyleName {
 
-    FASHION("패션 센스"),
-    FRIENDLY("다정다감"),
-    FUNNY("유머 감각"),
-    GOOD_RATIO("좋은 비율"),
-    PRETTY_SMILE("웃는 미소가 예쁨"),
-    LOW_VOICE("저음 목소리"),
-    CONSIDERABLE("넓은 배려심"),
-    EXTROVERT("외향형"),
-    INTROVERT("내향형"),
-    ATTRACTIVE("애교쟁이"),
-    GOOD_SKIN("좋은 피부"),
-    POSITIVE("긍정적"),
-    CUTE("귀여움"),
-    RELIABLE("듬직함"),
-    PRETTY_HAND("예쁜 손"),
-    LOVELY("사랑스러움"),
-    MOOD("분위기 있음"),
-    REAL_BETTER("실물이 더 좋음"),
-    INNOCENT("천진난만"),
-    INTELLECTUAL("지적 섹시"),
-    POLITE("예의 바름"),
-    GENTLE("진중함"),
-    GOOD_SPEECH("나긋나긋한 말투"),
-    ONE_LOVE("순정파"),
-    PURE("청순함"),
-    BOLD_DOUBLE_EYELID("짙은 쌍꺼풀"),
-    NONE_DOUBLE_EYELID("무쌍꺼풀"),
-    INNER_DOUBLE_EYELID("속쌍꺼풀"),
-    PROUD("도도함"),
-    MAKER("분위기 메이커");
+    FASHION("패션 센스", "C001"),
+    FRIENDLY("다정다감", "C002"),
+    FUNNY("유머 감각", "C003"),
+    GOOD_RATIO("좋은 비율", "C004"),
+    PRETTY_SMILE("웃는 미소가 예쁨", "C005"),
+    LOW_VOICE("저음 목소리", "C006"),
+    CONSIDERABLE("넓은 배려심", "C007"),
+    EXTROVERT("외향형", "C008"),
+    INTROVERT("내향형", "C009"),
+    ATTRACTIVE("애교쟁이", "C010"),
+    GOOD_SKIN("좋은 피부", "C011"),
+    POSITIVE("긍정적", "C012"),
+    CUTE("귀여움", "C013"),
+    RELIABLE("듬직함", "C014"),
+    PRETTY_HAND("예쁜 손", "C015"),
+    LOVELY("사랑스러움", "C016"),
+    MOOD("분위기 있음", "C017"),
+    REAL_BETTER("실물이 더 좋음", "C018"),
+    INNOCENT("천진난만", "C019"),
+    INTELLECTUAL("지적 섹시", "C020"),
+    POLITE("예의 바름", "C021"),
+    GENTLE("진중함", "C022"),
+    GOOD_SPEECH("나긋나긋한 말투", "C023"),
+    ONE_LOVE("순정파", "C024"),
+    PURE("청순함", "C025"),
+    BOLD_DOUBLE_EYELID("짙은 쌍꺼풀", "C026"),
+    NONE_DOUBLE_EYELID("무쌍꺼풀", "C027"),
+    INNER_DOUBLE_EYELID("속쌍꺼풀", "C028"),
+    PROUD("도도함", "C029"),
+    MAKER("분위기 메이커", "C030");
 
     private static final int MAX_SIZE = 3;
 
     private final String name;
+    private final String code;
 
-    StyleName(final String name) {
+    StyleName(final String name, final String code) {
         this.name = name;
+        this.code = code;
     }
 
-    public static List<StyleName> findAllByNames(final List<String> names) {
-        validateSize(names);
-        return names.stream()
+    public static List<StyleName> findAllByCodes(final List<String> codes) {
+        validateSize(codes);
+        return codes.stream()
                 .map(StyleName::findBy)
                 .toList();
     }
 
-    public static void validateSize(final List<String> names) {
-        if (names.isEmpty()) {
+    public static void validateSize(final List<String> codes) {
+        if (codes.isEmpty()) {
             throw new StyleSizeException();
         }
 
-        Set<String> uniqueNames = new HashSet<>(names);
-        if (uniqueNames.size() != names.size()) {
+        Set<String> uniqueCodes = new HashSet<>(codes);
+        if (uniqueCodes.size() != codes.size()) {
             throw new StyleDuplicateException();
         }
 
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> uniqueNames.contains(hobbyName.getName()))
+                .filter(hobbyName -> uniqueCodes.contains(hobbyName.getCode()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {
@@ -77,14 +79,14 @@ public static void validateSize(final List<String> names) {
         }
     }
 
-    private static StyleName findBy(final String name) {
+    private static StyleName findBy(final String code) {
         return Arrays.stream(values())
-                .filter(styleName -> styleName.isSame(name))
+                .filter(styleName -> styleName.isSame(code))
                 .findFirst()
                 .orElseThrow(StyleNotFoundException::new);
     }
 
-    private boolean isSame(final String name) {
-        return this.name.equals(name);
+    private boolean isSame(final String code) {
+        return this.code.equals(code);
     }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 1497f5c5..ccc24f96 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -82,8 +82,8 @@ void init() {
         );
 
         List<StyleWriteRequest> styleWriteRequests = List.of(
-            new StyleWriteRequest("긍정적"),
-            new StyleWriteRequest("예의 바름")
+            new StyleWriteRequest("C012"),
+            new StyleWriteRequest("C021")
         );
 
         InfoWriteRequest request = new InfoWriteRequest(
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
index 25759084..1f334893 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -29,10 +29,10 @@ void init() {
     void 회원의_모든_스타일을_저장한다() {
         // given
         Long memberId = 1L;
-        List<String> styleNames = List.of("긍정적", "유머 감각");
+        List<String> styleCodes = List.of("C012", "C003");
 
         // when
-        styleService.saveMemberStyles(memberId, styleNames);
+        styleService.saveMemberStyles(memberId, styleCodes);
 
         // then
         List<Style> saveStyles = styleRepository.findAllByMemberId(memberId);
@@ -43,8 +43,8 @@ void init() {
     void 회원의_모든_스타일을_삭제한다() {
         // given
         Long memberId = 1L;
-        List<String> styleNames = List.of("긍정적", "유머 감각");
-        styleService.saveMemberStyles(memberId, styleNames);
+        List<String> styleCodes = List.of("C012", "C003");
+        styleService.saveMemberStyles(memberId, styleCodes);
 
         // when
         styleService.deleteMemberStyles(memberId);
@@ -57,8 +57,8 @@ void init() {
     void 회원의_모든_스타일을_조회한다() {
         // given
         Long memberId = 1L;
-        List<String> styleNames = List.of("긍정적", "유머 감각");
-        styleService.saveMemberStyles(memberId, styleNames);
+        List<String> styleCodes = List.of("C012", "C003");
+        styleService.saveMemberStyles(memberId, styleCodes);
 
         // when
         List<Style> memberStyles = styleService.findMemberStyles(memberId);
diff --git a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java b/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
index e138aa22..bc4c4cf2 100644
--- a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
@@ -18,56 +18,56 @@ class StyleNameTest {
     @Test
     void 스타일이_존재하면_정상적으로_가져온다() {
         // given
-        List<String> styleNames = List.of("패션 센스", "다정다감", "유머 감각");
-        List<StyleName> expectedStyleNames = List.of(StyleName.FASHION, StyleName.FRIENDLY, StyleName.FUNNY);
+        List<String> styleCodes = List.of("C001", "C002", "C003");
+        List<StyleName> expectedStyles = List.of(StyleName.FASHION, StyleName.FRIENDLY, StyleName.FUNNY);
 
         // when
-        List<StyleName> findStyleNames = StyleName.findAllByNames(styleNames);
+        List<StyleName> findStyles = StyleName.findAllByCodes(styleCodes);
 
         // then
         assertSoftly(softly -> {
-            softly.assertThat(findStyleNames.size()).isEqualTo(styleNames.size());
-            softly.assertThat(findStyleNames).containsAll(expectedStyleNames);
+            softly.assertThat(findStyles.size()).isEqualTo(styleCodes.size());
+            softly.assertThat(findStyles).containsAll(expectedStyles);
         });
     }
 
     @Test
     void 스타일_갯수가_초과되면_예외가_발생한다() {
         // given
-        List<String> styleNames = List.of("패션 센스", "다정다감", "유머 감각", "좋은 비율");
+        List<String> styleCodes = List.of("C001", "C002", "C003", "C004");
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleSizeException.class);
     }
 
     @Test
     void 아예_선택하지_않으면_예외가_발생한다() {
         // given
-        List<String> styleNames = List.of();
+        List<String> styleCodes = List.of();
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleSizeException.class);
     }
 
     @Test
     void 없는_스타일을_선택하면_예외가_발생한다() {
         // given
-        List<String> styleNames = List.of("hello");
+        List<String> styleCodes = List.of("ABCD");
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleNotFoundException.class);
     }
 
     @Test
     void 중복_선택하면_예외가_발생한다() {
         // given
-        List<String> styleNames = List.of("패션 센스", "패션 센스");
+        List<String> styleCodes = List.of("C001", "C001");
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByNames(styleNames))
+        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleDuplicateException.class);
     }
 }

From 2d841728c03feb9a99db403c8d9730d9ba5b5aaa Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 15:06:53 +0900
Subject: [PATCH 096/225] =?UTF-8?q?refactor:=20Job=20enum=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Job을 enum으로 변경
- 직업 코드로 Job을 조회하도록 수정
- 관련 예외 추가
- Job 테스트 작성
---
 .../info/profile/ProfileFactory.java          |  4 +-
 .../atwoz/member/domain/info/profile/Job.java | 53 ++++++++++++++-----
 .../member/domain/info/profile/Profile.java   |  4 +-
 .../info/profile/JobNotFoundException.java    |  8 +++
 .../dto/profile/ProfileSearchResponse.java    |  2 +-
 .../application/info/InfoServiceTest.java     |  2 +-
 .../application/info/ProfileServiceTest.java  |  4 +-
 .../member/domain/info/profile/JobTest.java   | 33 ++++++++++++
 .../atwoz/member/fixture/info/JobFixture.java |  2 +-
 .../ui/info/ProfileControllerWebMvcTest.java  |  4 +-
 10 files changed, 93 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java
 create mode 100644 src/test/java/com/atwoz/member/domain/info/profile/JobTest.java

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 756f55c0..dde1487d 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -44,7 +44,7 @@ private Position createPosition(final PositionWriteRequest request) {
         return new Position(request.latitude(), request.longitude());
     }
 
-    private Job createJob(final String job) {
-        return new Job(job);
+    private Job createJob(final String code) {
+        return Job.findBy(code);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
index e9d601d7..4a369226 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -1,22 +1,49 @@
 package com.atwoz.member.domain.info.profile;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
+import com.atwoz.member.exception.exceptions.info.profile.JobNotFoundException;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Arrays;
 
 @Getter
-@EqualsAndHashCode
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Embeddable
-public class Job {
+public enum Job {
 
-    @Column(nullable = false)
-    private String job;
+    RESEARCH_AND_DEVELOP("연구개발/엔지니어", "A001"),
+    SELF_BUSINESS("개인사업/자영업", "A002"),
+    SALES("영업/판매", "A003"),
+    PLAN("경영/기획", "A004"),
+    STUDY_FOR_FUTURE("미래를 위한 공부중", "A005"),
+    PREPARE_FOR_CAREER("취업을 위한 준비중", "A006"),
+    EDUCATION("교육", "A007"),
+    ART_AND_PHYSIC("예술/체육", "A008"),
+    FOOD("요식업", "A009"),
+    MEDICAL("의료/보건", "A010"),
+    MECHANIC("기계/건설", "A011"),
+    DESIGN("디자인", "A012"),
+    MARKETING("마케팅/광고", "A013"),
+    TRADE("무역/유통", "A014"),
+    BROADCAST("방송언론/연예", "A015"),
+    LAW("법률/공공", "A016"),
+    PRODUCE("생산/제조", "A017"),
+    SERVICE("서비스", "A018"),
+    TRAVEL("여행/운송", "A019"),
+    ETC("기타", "A020");
 
-    public Job(final String job) {
-        this.job = job;
+    private final String name;
+    private final String code;
+
+    Job(final String name, final String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static Job findBy(final String code) {
+        return Arrays.stream(values())
+                .filter(job -> job.isSame(code))
+                .findFirst()
+                .orElseThrow(JobNotFoundException::new);
+    }
+
+    private boolean isSame(final String code) {
+        return this.code.equals(code);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index df074095..01ba1ab9 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -3,6 +3,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -37,8 +39,8 @@ public class Profile {
     @Column(nullable = false)
     private Position position;
 
-    @Embedded
     @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
     private Job job;
 
     public Profile(final Long memberId,
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java
new file mode 100644
index 00000000..dd9ae4d3
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile;
+
+public class JobNotFoundException extends RuntimeException {
+
+    public JobNotFoundException() {
+        super("직업을 찾을 수 없습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index 626d3f26..f42385b5 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -37,7 +37,7 @@ public static ProfileSearchResponse from(final Profile profile) {
                 gender.getName(),
                 LocationSearchResponse.from(location),
                 PositionSearchResponse.from(position),
-                job.getJob()
+                job.getCode()
         );
     }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index ccc24f96..cf0bdfb3 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -53,7 +53,7 @@ void init() {
         BigDecimal latitude = BigDecimal.valueOf(70.5);
         BigDecimal longitude = BigDecimal.valueOf(140.3);
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
-        String job = "개발자";
+        String job = "A001";
         ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(
                 birthYear,
                 height,
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 29d0d105..f4de65b5 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -47,7 +47,7 @@ void init() {
         String gender = "남성";
         BigDecimal latitude = BigDecimal.valueOf(70.5);
         BigDecimal longitude = BigDecimal.valueOf(140.3);
-        String job = "개발자";
+        String job = "A001";
         LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
         ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
@@ -73,7 +73,7 @@ void init() {
         String gender = "남성";
         BigDecimal latitude = BigDecimal.valueOf(70.5);
         BigDecimal longitude = BigDecimal.valueOf(140.3);
-        String job = "개발자";
+        String job = "A001";
         LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
         ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
new file mode 100644
index 00000000..5c74a3e1
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.profile;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.profile.JobNotFoundException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class JobTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String jobCode = "A001";
+
+        // when & then
+        assertDoesNotThrow(() -> Job.findBy(jobCode));
+    }
+
+    @Test
+    void 올바른_직업이_아니면_예외가_발생한다() {
+        // given
+        String jobCode = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Job.findBy(jobCode))
+                .isInstanceOf(JobNotFoundException.class);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
index 23a9bc23..ed23b4bc 100644
--- a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
@@ -5,6 +5,6 @@
 public class JobFixture {
 
     public static Job 일반_직업_생성() {
-        return new Job("개발자");
+        return Job.RESEARCH_AND_DEVELOP;
     }
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
index 58263546..fa49a335 100644
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -66,7 +66,7 @@ class ProfileControllerWebMvcTest extends MockBeanInjection {
                 .andExpect(jsonPath("$.location.sector").value(location.getSector()))
                 .andExpect(jsonPath("$.position.latitude").value(position.getLatitude()))
                 .andExpect(jsonPath("$.position.longitude").value(position.getLongitude()))
-                .andExpect(jsonPath("$.job").value(job.getJob()))
+                .andExpect(jsonPath("$.job").value(job.getCode()))
                 .andDo(print())
                 .andDo(customDocument("search_profile",
                         requestHeaders(
@@ -80,7 +80,7 @@ class ProfileControllerWebMvcTest extends MockBeanInjection {
                                 fieldWithPath("location.sector").description("위치 (구)"),
                                 fieldWithPath("position.latitude").description("위도"),
                                 fieldWithPath("position.longitude").description("경도"),
-                                fieldWithPath("job").description("직업")
+                                fieldWithPath("job").description("직업 코드")
                         )
                 ));
     }

From 551f0e39690f83c7aff769318e9d6dffbaf10ce7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 15:16:10 +0900
Subject: [PATCH 097/225] =?UTF-8?q?refactor:=20Hobby=20=EC=9D=91=EB=8B=B5?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hobby 응답이 코드로 표현되도록 수정
---
 .../com/atwoz/member/ui/info/dto/HobbySearchResponse.java   | 2 +-
 .../com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
index 0cd64214..cb8d89cb 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
@@ -10,6 +10,6 @@ public record HobbySearchResponse(
 
     public static HobbySearchResponse from(final Hobby hobby) {
         HobbyName hobbyName = hobby.getHobbyName();
-        return new HobbySearchResponse(hobbyName.getName());
+        return new HobbySearchResponse(hobbyName.getCode());
     }
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
index d6ca7210..0a38398e 100644
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
@@ -51,15 +51,15 @@ class HobbyControllerWebMvcTest extends MockBeanInjection {
                         .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.length()").value(2))
-                .andExpect(jsonPath("$[0].hobby").value("댄스"))
-                .andExpect(jsonPath("$[1].hobby").value("애니메이션"))
+                .andExpect(jsonPath("$[0].hobby").value(HobbyName.DANCE.getCode()))
+                .andExpect(jsonPath("$[1].hobby").value(HobbyName.ANIMATION.getCode()))
                 .andDo(print())
                 .andDo(customDocument("search_hobbies",
                         requestHeaders(
                                 headerWithName("Authorization").description("유저 토큰 정보")
                         ),
                         responseFields(
-                                fieldWithPath("[].hobby").description("취미 이름")
+                                fieldWithPath("[].hobby").description("취미 코드")
                         )
                 ));
     }

From 2d961ce8fe02ce8aedec99cc17a1a58e7ecdcbf8 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 15:16:24 +0900
Subject: [PATCH 098/225] =?UTF-8?q?refactor:=20Style=20=EC=9D=91=EB=8B=B5?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Style 응답이 코드로 표현되도록 수정
---
 .../com/atwoz/member/ui/info/dto/StyleSearchResponse.java   | 2 +-
 .../com/atwoz/member/ui/info/StyleControllerWebMvcTest.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
index d5cde03f..a287ff1f 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
@@ -10,6 +10,6 @@ public record StyleSearchResponse(
 
     public static StyleSearchResponse from(final Style style) {
         StyleName styleName = style.getStyleName();
-        return new StyleSearchResponse(styleName.getName());
+        return new StyleSearchResponse(styleName.getCode());
     }
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
index 6d3c63dd..8d411736 100644
--- a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
@@ -51,15 +51,15 @@ class StyleControllerWebMvcTest extends MockBeanInjection {
                         .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.length()").value(2))
-                .andExpect(jsonPath("$[0].style").value("긍정적"))
-                .andExpect(jsonPath("$[1].style").value("진중함"))
+                .andExpect(jsonPath("$[0].style").value(StyleName.POSITIVE.getCode()))
+                .andExpect(jsonPath("$[1].style").value(StyleName.GENTLE.getCode()))
                 .andDo(print())
                 .andDo(customDocument("search_styles",
                         requestHeaders(
                                 headerWithName("Authorization").description("유저 토큰 정보")
                         ),
                         responseFields(
-                                fieldWithPath("[].style").description("스타일 이름")
+                                fieldWithPath("[].style").description("스타일 코드")
                         )
                 ));
     }

From 56354cb79873980098e0a8058725e60f50e76880 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 15:58:53 +0900
Subject: [PATCH 099/225] =?UTF-8?q?refactor:=20=EA=B0=92=20=EB=B2=94?=
 =?UTF-8?q?=EC=9C=84=20=EC=98=88=EC=99=B8=20=EB=B6=84=ED=95=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 나이, 키, 위도, 경도 범위 예외를 각각 분할
- 테스트 코드 수정
---
 .../member/domain/info/profile/Body.java      |  7 ++--
 .../member/domain/info/profile/Position.java  |  7 ++--
 .../exception/MemberExceptionHandler.java     | 24 +++++++++++--
 .../info/profile/ProfileRangeException.java   |  8 -----
 .../info/profile/body/AgeRangeException.java  |  8 +++++
 .../profile/body/HeightRangeException.java    |  8 +++++
 .../position/LatitudeRangeException.java      |  8 +++++
 .../position/LongitudeRangeException.java     |  8 +++++
 .../member/domain/info/profile/BodyTest.java  | 34 ++++++++++--------
 .../domain/info/profile/PositionTest.java     | 36 +++++++++++--------
 10 files changed, 101 insertions(+), 47 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/AgeRangeException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/HeightRangeException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LatitudeRangeException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LongitudeRangeException.java

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index dc8c8abd..590a67ae 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EnumType;
@@ -41,14 +42,14 @@ public Body(final int currentYear, final int birthYear, final int height, final
 
     private void validateHeight(final int height) {
         if (height < MIN_HEIGHT || MAX_HEIGHT < height) {
-            throw new ProfileRangeException();
+            throw new HeightRangeException();
         }
     }
 
     private int calculateAgeFromYear(final int currentYear, final int birthYear) {
         int memberAge = currentYear - birthYear;
         if (memberAge < MIN_AGE || MAX_AGE < memberAge) {
-            throw new ProfileRangeException();
+            throw new AgeRangeException();
         }
         return memberAge;
     }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Position.java b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
index fab2e642..1198d5e7 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Position.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
@@ -32,13 +33,13 @@ public Position(final BigDecimal latitude, final BigDecimal longitude) {
 
     private static void validateLatitude(final BigDecimal latitude) {
         if (latitude.compareTo(MIN_LATITUDE) < 0 || latitude.compareTo(MAX_LATITUDE) > 0) {
-            throw new ProfileRangeException();
+            throw new LatitudeRangeException();
         }
     }
 
     private static void validateLongitude(final BigDecimal longitude) {
         if (longitude.compareTo(MIN_LONGITUDE) < 0 || longitude.compareTo(MAX_LONGITUDE) > 0) {
-            throw new ProfileRangeException();
+            throw new LongitudeRangeException();
         }
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index e6939236..857cddf0 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -14,7 +14,10 @@
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
-import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
 import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
@@ -136,8 +139,23 @@ public ResponseEntity<String> handleProfileNotFoundException(ProfileNotFoundExce
         return getNotFoundResponse(e);
     }
 
-    @ExceptionHandler(ProfileRangeException.class)
-    public ResponseEntity<String> handleProfileRangeException(final ProfileRangeException e) {
+    @ExceptionHandler(AgeRangeException.class)
+    public ResponseEntity<String> handleAgeRangeException(final AgeRangeException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(HeightRangeException.class)
+    public ResponseEntity<String> handleHeightRangeException(final HeightRangeException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(LatitudeRangeException.class)
+    public ResponseEntity<String> handleLatitudeRangeException(final LatitudeRangeException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(LongitudeRangeException.class)
+    public ResponseEntity<String> handleLongitudeRangeException(final LongitudeRangeException e) {
         return getBadRequest(e);
     }
 
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java
deleted file mode 100644
index f9a4bc78..00000000
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/ProfileRangeException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.member.exception.exceptions.info.profile;
-
-public class ProfileRangeException extends RuntimeException {
-
-    public ProfileRangeException() {
-        super("값 범위가 잘못되었습니다.");
-    }
-}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/AgeRangeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/AgeRangeException.java
new file mode 100644
index 00000000..3fd4a489
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/AgeRangeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile.body;
+
+public class AgeRangeException extends RuntimeException {
+
+    public AgeRangeException() {
+        super("나이 범위가 올바르지 않습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/HeightRangeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/HeightRangeException.java
new file mode 100644
index 00000000..7fa0627e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/HeightRangeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile.body;
+
+public class HeightRangeException extends RuntimeException {
+
+    public HeightRangeException() {
+        super("키 범위가 올바르지 않습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LatitudeRangeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LatitudeRangeException.java
new file mode 100644
index 00000000..a4338dac
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LatitudeRangeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile.position;
+
+public class LatitudeRangeException extends RuntimeException {
+
+    public LatitudeRangeException() {
+        super("위도 범위가 올바르지 않습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LongitudeRangeException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LongitudeRangeException.java
new file mode 100644
index 00000000..5a7e6240
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/position/LongitudeRangeException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile.position;
+
+public class LongitudeRangeException extends RuntimeException {
+
+    public LongitudeRangeException() {
+        super("경도 범위가 올바르지 않습니다.");
+    }
+}
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
index 06d69661..3a43a19f 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
@@ -3,14 +3,13 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import java.util.stream.Stream;
+import org.junit.jupiter.params.provider.ValueSource;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -28,24 +27,29 @@ class BodyTest {
         assertDoesNotThrow(() -> new Body(currentYear, birthYear, height, gender));
     }
 
-    @ParameterizedTest(name = "출생년도 {0}, 키 {1}인 경우")
-    @MethodSource("birthYearAndHeight")
-    void 키_또는_출생년도_제한을_벗어나면_예외가_발생한다(final int birthYear, final int height) {
+    @ParameterizedTest(name = "출생년도가 {0}인 경우")
+    @ValueSource(ints = {2010, 1978})
+    void 연도_제한을_벗어나면_예외가_발생한다(final int birthYear) {
         // given
         int currentYear = 2024;
+        int height = 171;
         Gender gender = Gender.MALE;
 
         // when & then
         assertThatThrownBy(() -> new Body(currentYear, birthYear, height, gender))
-                .isInstanceOf(ProfileRangeException.class);
+                .isInstanceOf(AgeRangeException.class);
     }
 
-    static Stream<Arguments> birthYearAndHeight() {
-        return Stream.of(
-                Arguments.arguments(2010, 171),
-                Arguments.arguments(1978, 171),
-                Arguments.arguments(2000, 130),
-                Arguments.arguments(2000, 200)
-        );
+    @ParameterizedTest(name = "키가 {0}인 경우")
+    @ValueSource(ints = {130, 500})
+    void 키_제한을_벗어나면_예외가_발생한다(final int height) {
+        // given
+        int currentYear = 2024;
+        int birthYear = 2000;
+        Gender gender = Gender.MALE;
+
+        // when & then
+        assertThatThrownBy(() -> new Body(currentYear, birthYear, height, gender))
+                .isInstanceOf(HeightRangeException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
index d801c873..d98e2a53 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
@@ -3,15 +3,14 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.profile.ProfileRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import java.math.BigDecimal;
-import java.util.stream.Stream;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -27,20 +26,27 @@ class PositionTest {
         assertDoesNotThrow(() -> new Position(latitude, longitude));
     }
 
-    @ParameterizedTest(name = "위도 {0}, 경도 {1}인 경우")
-    @MethodSource("latitudeAndLongitude")
-    void 위도_또는_경도_제한을_벗어나면_예외가_발생한다(final BigDecimal latitude, final BigDecimal longitude) {
+    @ParameterizedTest(name = "위도가 {0}인 경우")
+    @ValueSource(ints = {-100, 100})
+    void 위도_제한을_벗어나면_예외가_발생한다(final int lat) {
+        // given
+        BigDecimal latitude = BigDecimal.valueOf(lat);
+        BigDecimal longitude = BigDecimal.valueOf(130);
+
         // when & then
         assertThatThrownBy(() -> new Position(latitude, longitude))
-                .isInstanceOf(ProfileRangeException.class);
+                .isInstanceOf(LatitudeRangeException.class);
     }
 
-    static Stream<Arguments> latitudeAndLongitude() {
-        return Stream.of(
-                Arguments.of(BigDecimal.valueOf(-100), BigDecimal.valueOf(130)),
-                Arguments.of(BigDecimal.valueOf(100), BigDecimal.valueOf(130)),
-                Arguments.of(BigDecimal.valueOf(40), BigDecimal.valueOf(-200)),
-                Arguments.of(BigDecimal.valueOf(40), BigDecimal.valueOf(200))
-        );
+    @ParameterizedTest(name = "경도가 {0}인 경우")
+    @ValueSource(ints = {-200, 200})
+    void 경도_제한을_벗어나면_예외가_발생한다(final int lon) {
+        // given
+        BigDecimal latitude = BigDecimal.valueOf(40);
+        BigDecimal longitude = BigDecimal.valueOf(lon);
+
+        // when & then
+        assertThatThrownBy(() -> new Position(latitude, longitude))
+                .isInstanceOf(LongitudeRangeException.class);
     }
 }

From bd9fa81ba90dd91b81de04780ce601f97175bed3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 25 Feb 2024 18:27:05 +0900
Subject: [PATCH 100/225] =?UTF-8?q?refactor:=20info=20=EC=9E=91=EC=84=B1?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- info 작성 시의 상태 코드 변경
---
 src/main/java/com/atwoz/member/ui/info/InfoController.java     | 3 ++-
 .../com/atwoz/member/ui/info/InfoControllerWebMvcTest.java     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
index 96b07e5e..7c859494 100644
--- a/src/main/java/com/atwoz/member/ui/info/InfoController.java
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -5,6 +5,7 @@
 import com.atwoz.member.ui.auth.support.auth.AuthMember;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@ public class InfoController {
     public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
                                           @Valid @RequestBody final InfoWriteRequest request) {
         infoService.writeProfile(memberId, request);
-        return ResponseEntity.ok()
+        return ResponseEntity.status(HttpStatus.CREATED)
                 .build();
     }
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 672a2011..ba86f2e1 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -100,7 +100,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                         .header(AUTHORIZATION, bearerToken)
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(infoWriteRequest)))
-                .andExpect(status().isOk())
+                .andExpect(status().isCreated())
                 .andDo(print())
                 .andDo(customDocument("write_info",
                         requestHeaders(

From d4fa06731b0ae2e4ff5dc1519ef3ec56ca5d9265 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 15:38:21 +0900
Subject: [PATCH 101/225] =?UTF-8?q?refactor:=20InfoServiceTest=20beforeEac?=
 =?UTF-8?q?h=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoServiceTest beforeEach 삭제
---
 .../atwoz/member/application/info/InfoServiceTest.java    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index cf0bdfb3..339d6d8e 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -13,7 +13,6 @@
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -35,12 +34,7 @@ class InfoServiceTest {
 
     @Autowired
     private ApplicationEvents events;
-
-    @BeforeEach
-    void init() {
-        infoService = new InfoService();
-    }
-
+    
     @Test
     void 모든_정보를_저장한다() {
         // given

From 1d733d67d93091408ea06a9c37b3e423c9992655 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 16:06:50 +0900
Subject: [PATCH 102/225] =?UTF-8?q?refactor:=20Factory=20=EC=A0=95?=
 =?UTF-8?q?=EC=A0=81=20=ED=81=B4=EB=9E=98=EC=8A=A4=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileFactory 정적 클래스화 및 메서드명 변경
- YearManager 인터페이스 전달 방식으로 수정
- OptionFactory 정적 클래스화 및 메서드명 변경
---
 .../application/info/option/OptionFactory.java |  4 +---
 .../application/info/option/OptionService.java |  3 +--
 .../info/profile/ProfileFactory.java           | 18 ++++++------------
 .../info/profile/ProfileService.java           |  5 +++--
 .../application/info/OptionServiceTest.java    |  8 +++-----
 .../application/info/ProfileServiceTest.java   |  8 +++-----
 6 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index 8666a89b..09a2dad2 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -7,12 +7,10 @@
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import org.springframework.stereotype.Component;
 
-@Component
 public class OptionFactory {
 
-    public Option fromRequest(final Long memberId, final OptionWriteRequest request) {
+    public static Option of(final Long memberId, final OptionWriteRequest request) {
         Smoke smoke = Smoke.findByName(request.smoke());
         Religion religion = Religion.findByName(request.religion());
         Drink drink = Drink.findByName(request.drink());
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 0177298f..ef7d39cb 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -14,11 +14,10 @@
 public class OptionService {
 
     private final OptionRepository optionRepository;
-    private final OptionFactory optionFactory;
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = optionFactory.fromRequest(memberId, request);
+        Option newOption = OptionFactory.of(memberId, request);
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
             return;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index dde1487d..14380d67 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -10,24 +10,18 @@
 import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.YearManager;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
 
-@RequiredArgsConstructor
-@Component
 public class ProfileFactory {
 
-    private final YearManager yearManager;
-
-    public Profile fromRequest(final Long memberId, final ProfileWriteRequest request) {
-        Body body = createMemberBody(request);
+    public static Profile of(final Long memberId, final ProfileWriteRequest request, final YearManager yearManager) {
+        Body body = createMemberBody(request, yearManager);
         Location location = createLocation(request.location());
         Position position = createPosition(request.position());
         Job job = createJob(request.job());
         return new Profile(memberId, body, location, position, job);
     }
 
-    private Body createMemberBody(final ProfileWriteRequest request) {
+    private static Body createMemberBody(final ProfileWriteRequest request, final YearManager yearManager) {
         int currentYear = yearManager.getCurrentYear();
         int birthYear = request.birthYear();
         int height = request.height();
@@ -36,15 +30,15 @@ private Body createMemberBody(final ProfileWriteRequest request) {
         return new Body(currentYear, birthYear, height, gender);
     }
 
-    private Location createLocation(final LocationWriteRequest request) {
+    private static Location createLocation(final LocationWriteRequest request) {
         return new Location(request.city(), request.sector());
     }
 
-    private Position createPosition(final PositionWriteRequest request) {
+    private static Position createPosition(final PositionWriteRequest request) {
         return new Position(request.latitude(), request.longitude());
     }
 
-    private Job createJob(final String code) {
+    private static Job createJob(final String code) {
         return Job.findBy(code);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 25dc1272..6aba9fa3 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -3,6 +3,7 @@
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
+import com.atwoz.member.domain.info.profile.YearManager;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -14,11 +15,11 @@
 public class ProfileService {
 
     private final ProfileRepository profileRepository;
-    private final ProfileFactory profileFactory;
+    private final YearManager yearManager;
 
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
-        Profile newProfile = profileFactory.fromRequest(memberId, request);
+        Profile newProfile = ProfileFactory.of(memberId, request, yearManager);
 
         if (!isMemberProfileExist(memberId)) {
             profileRepository.save(newProfile);
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index eaa78dfa..f87fae2e 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -22,13 +22,11 @@ class OptionServiceTest {
 
     private OptionService optionService;
     private OptionRepository optionRepository;
-    private OptionFactory optionFactory;
 
     @BeforeEach
     void init() {
-        optionFactory = new OptionFactory();
         optionRepository = new OptionFakeRepository();
-        optionService = new OptionService(optionRepository, optionFactory);
+        optionService = new OptionService(optionRepository);
     }
 
     @Test
@@ -42,7 +40,7 @@ void init() {
         String mbti = "INFJ";
 
         OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
-        Option expectedOption = optionFactory.fromRequest(memberId, request);
+        Option expectedOption = OptionFactory.of(memberId, request);
 
         // when
         optionService.writeOption(memberId, request);
@@ -68,7 +66,7 @@ void init() {
         OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
         
         optionService.writeOption(memberId, request);
-        Option expectedOption = optionFactory.fromRequest(memberId, request);
+        Option expectedOption = OptionFactory.of(memberId, request);
 
         // when
         Option memberOption = optionService.findByMemberId(memberId);
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index f4de65b5..958a3891 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -27,15 +27,13 @@ class ProfileServiceTest {
 
     private ProfileService profileService;
     private ProfileRepository profileRepository;
-    private ProfileFactory profileFactory;
     private YearManager yearManager;
 
     @BeforeEach
     void init() {
         profileRepository = new ProfileFakeRepository();
         yearManager = new FakeYearManager();
-        profileFactory = new ProfileFactory(yearManager);
-        profileService = new ProfileService(profileRepository, profileFactory);
+        profileService = new ProfileService(profileRepository, yearManager);
     }
 
     @Test
@@ -52,7 +50,7 @@ void init() {
         PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
         ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
 
-        Profile expectedProfile = profileFactory.fromRequest(memberId, request);
+        Profile expectedProfile = ProfileFactory.of(memberId, request, yearManager);
 
         // when
         profileService.writeProfile(memberId, request);
@@ -79,7 +77,7 @@ void init() {
         ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
 
         profileService.writeProfile(memberId, request);
-        Profile expectedProfile = profileFactory.fromRequest(memberId, request);
+        Profile expectedProfile = ProfileFactory.of(memberId, request, yearManager);
 
         // when
         Profile findProfile = profileService.findByMemberId(memberId);

From 439b19c230c1ce30363d7e0071a2d4c7ef221d93 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 16:09:12 +0900
Subject: [PATCH 103/225] =?UTF-8?q?refactor:=20YearManager=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=EC=9E=90=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

- YearManager 사용을 도메인에서 하도록 수정
---
 .../info/profile/ProfileFactory.java           |  3 +--
 .../atwoz/member/domain/info/profile/Body.java |  7 ++++---
 .../member/domain/info/profile/BodyTest.java   | 18 ++++++++++++------
 .../atwoz/member/fixture/info/BodyFixture.java |  6 ++++--
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 14380d67..b2893116 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -22,12 +22,11 @@ public static Profile of(final Long memberId, final ProfileWriteRequest request,
     }
 
     private static Body createMemberBody(final ProfileWriteRequest request, final YearManager yearManager) {
-        int currentYear = yearManager.getCurrentYear();
         int birthYear = request.birthYear();
         int height = request.height();
         Gender gender = Gender.findByName(request.gender());
 
-        return new Body(currentYear, birthYear, height, gender);
+        return new Body(yearManager, birthYear, height, gender);
     }
 
     private static Location createLocation(final LocationWriteRequest request) {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index 590a67ae..c1249158 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -32,10 +32,10 @@ public class Body {
     @Enumerated(value = EnumType.STRING)
     private Gender gender;
 
-    public Body(final int currentYear, final int birthYear, final int height, final Gender gender) {
+    public Body(final YearManager yearManager, final int birthYear, final int height, final Gender gender) {
         validateHeight(height);
 
-        this.age = calculateAgeFromYear(currentYear, birthYear);
+        this.age = calculateAgeFromYear(yearManager, birthYear);
         this.height = height;
         this.gender = gender;
     }
@@ -46,7 +46,8 @@ private void validateHeight(final int height) {
         }
     }
 
-    private int calculateAgeFromYear(final int currentYear, final int birthYear) {
+    private int calculateAgeFromYear(final YearManager yearManager, final int birthYear) {
+        int currentYear = yearManager.getCurrentYear();
         int memberAge = currentYear - birthYear;
         if (memberAge < MIN_AGE || MAX_AGE < memberAge) {
             throw new AgeRangeException();
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
index 3a43a19f..aa095878 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
@@ -5,6 +5,8 @@
 
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
+import com.atwoz.member.infrastructure.info.FakeYearManager;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -15,28 +17,33 @@
 @SuppressWarnings("NonAsciiCharacters")
 class BodyTest {
 
+    private YearManager yearManager;
+
+    @BeforeEach
+    void init() {
+        yearManager = new FakeYearManager();
+    }
+
     @Test
     void 입력값이_올바른_경우_생성된다() {
         // given
-        int currentYear = 2024;
         int birthYear = 2000;
         int height = 171;
         Gender gender = Gender.MALE;
 
         // when & then
-        assertDoesNotThrow(() -> new Body(currentYear, birthYear, height, gender));
+        assertDoesNotThrow(() -> new Body(yearManager, birthYear, height, gender));
     }
 
     @ParameterizedTest(name = "출생년도가 {0}인 경우")
     @ValueSource(ints = {2010, 1978})
     void 연도_제한을_벗어나면_예외가_발생한다(final int birthYear) {
         // given
-        int currentYear = 2024;
         int height = 171;
         Gender gender = Gender.MALE;
 
         // when & then
-        assertThatThrownBy(() -> new Body(currentYear, birthYear, height, gender))
+        assertThatThrownBy(() -> new Body(yearManager, birthYear, height, gender))
                 .isInstanceOf(AgeRangeException.class);
     }
 
@@ -44,12 +51,11 @@ class BodyTest {
     @ValueSource(ints = {130, 500})
     void 키_제한을_벗어나면_예외가_발생한다(final int height) {
         // given
-        int currentYear = 2024;
         int birthYear = 2000;
         Gender gender = Gender.MALE;
 
         // when & then
-        assertThatThrownBy(() -> new Body(currentYear, birthYear, height, gender))
+        assertThatThrownBy(() -> new Body(yearManager, birthYear, height, gender))
                 .isInstanceOf(HeightRangeException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
index 693b0229..d2b908e4 100644
--- a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
@@ -2,14 +2,16 @@
 
 import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.infrastructure.info.FakeYearManager;
 
 public class BodyFixture {
 
-    private static final int CURRENT_YEAR = 2024;
     private static final int BIRTH_YEAR = 2000;
     private static final int HEIGHT = 171;
 
     public static Body 일반_body_생성() {
-        return new Body(CURRENT_YEAR, BIRTH_YEAR, HEIGHT, Gender.MALE);
+        YearManager yearManager = new FakeYearManager();
+        return new Body(yearManager, BIRTH_YEAR, HEIGHT, Gender.MALE);
     }
 }

From 5f8aaa0782ee6009b8c43f8287a60829c03abf05 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 16:20:19 +0900
Subject: [PATCH 104/225] =?UTF-8?q?refactor:=20InfoService=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile과의 혼동을 막기 위해 메서드명 변경
---
 .../java/com/atwoz/member/application/info/InfoService.java     | 2 +-
 src/main/java/com/atwoz/member/ui/info/InfoController.java      | 2 +-
 .../java/com/atwoz/member/application/info/InfoServiceTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 739ab913..b73512a5 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -19,7 +19,7 @@
 public class InfoService {
 
     @Transactional
-    public void writeProfile(final Long memberId, final InfoWriteRequest request) {
+    public void writeInfo(final Long memberId, final InfoWriteRequest request) {
         List<String> hobbyNames = extractHobbyNamesFromInfoWriteRequest(request);
         List<String> styleNames = extractStyleNamesFromInfoWriteRequest(request);
 
diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
index 7c859494..130b5527 100644
--- a/src/main/java/com/atwoz/member/ui/info/InfoController.java
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -22,7 +22,7 @@ public class InfoController {
     @PostMapping
     public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
                                           @Valid @RequestBody final InfoWriteRequest request) {
-        infoService.writeProfile(memberId, request);
+        infoService.writeInfo(memberId, request);
         return ResponseEntity.status(HttpStatus.CREATED)
                 .build();
     }
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 339d6d8e..20976c68 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -89,7 +89,7 @@ class InfoServiceTest {
 
 
         // when
-        infoService.writeProfile(memberId, request);
+        infoService.writeInfo(memberId, request);
 
         // then
         int profileWroteEventCount = (int) events.stream(ProfileWroteEvent.class).count();

From 8263a1e23e7791260d394591e37a51cd2d77211d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 16:51:37 +0900
Subject: [PATCH 105/225] =?UTF-8?q?refactor:=20Hobby,=20Style=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hobby, Style을 코드로 조회하므로 Name을 Code로 변경
---
 .../atwoz/member/application/event/HobbyWroteEvent.java   | 2 +-
 .../atwoz/member/application/event/StyleWroteEvent.java   | 2 +-
 .../com/atwoz/member/application/info/InfoService.java    | 8 ++++----
 .../member/application/info/hobby/HobbyEventHandler.java  | 4 ++--
 .../atwoz/member/application/info/hobby/HobbyService.java | 4 ++--
 .../member/application/info/style/StyleEventHandler.java  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java b/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
index 32610858..6221f4c4 100644
--- a/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
@@ -10,5 +10,5 @@
 public class HobbyWroteEvent extends Event {
 
     private final Long memberId;
-    private final List<String> hobbyNames;
+    private final List<String> hobbyCodes;
 }
diff --git a/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java b/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
index a499e128..4d1ca3c4 100644
--- a/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
@@ -10,5 +10,5 @@
 public class StyleWroteEvent extends Event {
 
     private final Long memberId;
-    private final List<String> styleNames;
+    private final List<String> styleCodes;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index b73512a5..5467a49e 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -20,14 +20,14 @@ public class InfoService {
 
     @Transactional
     public void writeInfo(final Long memberId, final InfoWriteRequest request) {
-        List<String> hobbyNames = extractHobbyNamesFromInfoWriteRequest(request);
-        List<String> styleNames = extractStyleNamesFromInfoWriteRequest(request);
+        List<String> hobbyCodes = extractHobbyNamesFromInfoWriteRequest(request);
+        List<String> styleCodes = extractStyleNamesFromInfoWriteRequest(request);
 
         Events.raise(new ProfileWroteEvent(memberId, request.profile()));
         Events.raise(new OptionWroteEvent(memberId, request.option()));
 
-        Events.raise(new HobbyWroteEvent(memberId, hobbyNames));
-        Events.raise(new StyleWroteEvent(memberId, styleNames));
+        Events.raise(new HobbyWroteEvent(memberId, hobbyCodes));
+        Events.raise(new StyleWroteEvent(memberId, styleCodes));
     }
 
     private List<String> extractHobbyNamesFromInfoWriteRequest(final InfoWriteRequest request) {
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
index a121f0af..3fbcf837 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
@@ -15,8 +15,8 @@ public class HobbyEventHandler {
     @EventListener
     public void writeHobbies(final HobbyWroteEvent event) {
         Long memberId = event.getMemberId();
-        List<String> hobbyNames = event.getHobbyNames();
+        List<String> hobbyCodes = event.getHobbyCodes();
 
-        hobbyService.saveMemberHobbies(memberId, hobbyNames);
+        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
index 1fe813aa..b7d5fafd 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -16,9 +16,9 @@ public class HobbyService {
     private final HobbyRepository hobbyRepository;
 
     @Transactional
-    public void saveMemberHobbies(final Long memberId, final List<String> hobbyNames) {
+    public void saveMemberHobbies(final Long memberId, final List<String> hobbyCodes) {
         deleteMemberHobbies(memberId);
-        List<Hobby> memberHobbies = HobbyName.findAllByCodes(hobbyNames)
+        List<Hobby> memberHobbies = HobbyName.findAllByCodes(hobbyCodes)
                 .stream()
                 .map(hobbyName -> new Hobby(memberId, hobbyName))
                 .toList();
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
index 5652e80e..3a6445ea 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -15,8 +15,8 @@ public class StyleEventHandler {
     @EventListener
     public void writeHobbies(final StyleWroteEvent event) {
         Long memberId = event.getMemberId();
-        List<String> styleNames = event.getStyleNames();
+        List<String> styleCodes = event.getStyleCodes();
 
-        styleService.saveMemberStyles(memberId, styleNames);
+        styleService.saveMemberStyles(memberId, styleCodes);
     }
 }

From 8cd2391e5f86b8c403780a27171c3807585e5aac Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 17:35:36 +0900
Subject: [PATCH 106/225] =?UTF-8?q?refactor:=20BodyFixture=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=20=ED=95=A0=EB=8B=B9=EC=9C=BC=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BodyFixture 메서드 상수 대신 변수를 사용하도록 수정
---
 .../java/com/atwoz/member/fixture/info/BodyFixture.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
index d2b908e4..9fded201 100644
--- a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
@@ -7,11 +7,11 @@
 
 public class BodyFixture {
 
-    private static final int BIRTH_YEAR = 2000;
-    private static final int HEIGHT = 171;
-
     public static Body 일반_body_생성() {
         YearManager yearManager = new FakeYearManager();
-        return new Body(yearManager, BIRTH_YEAR, HEIGHT, Gender.MALE);
+        int birthYear = 2000;
+        int height = 171;
+
+        return new Body(yearManager, birthYear, height, Gender.MALE);
     }
 }

From 3884a8803a2314d8eed6a884991482e6d5c37154 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 18:38:58 +0900
Subject: [PATCH 107/225] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20Fixture=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 필요한 데이터 정의를 줄이기 위해 요청 DTO Fixture 추가
---
 .../info/dto/LocationWriteRequestFixture.java | 13 +++++
 .../info/dto/OptionWriteRequestFixture.java   | 27 ++++++++++
 .../info/dto/PositionWriteRequestFixture.java | 14 +++++
 .../info/dto/ProfileWriteRequestFixture.java  | 31 +++++++++++
 .../ui/info/InfoControllerWebMvcTest.java     | 53 +++++--------------
 .../ui/info/ProfileControllerWebMvcTest.java  | 16 +++---
 6 files changed, 107 insertions(+), 47 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java

diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java
new file mode 100644
index 00000000..31d921a1
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.fixture.info.dto;
+
+import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+
+public class LocationWriteRequestFixture {
+
+    public static LocationWriteRequest 위치_생성_요청() {
+        String city = "서울시";
+        String sector = "강남구";
+        
+        return new LocationWriteRequest(city, sector);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java
new file mode 100644
index 00000000..9c08d111
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java
@@ -0,0 +1,27 @@
+package com.atwoz.member.fixture.info.dto;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+
+public class OptionWriteRequestFixture {
+
+    public static OptionWriteRequest 옵션_생성_요청() {
+        String drink = Drink.NEVER.getName();
+        String graduate = Graduate.SEOUL_FOURTH.getName();
+        String religion = Religion.CHRIST.getName();
+        String smoke = Smoke.NEVER.getName();
+        String mbti = Mbti.INFJ.name();
+
+        return new OptionWriteRequest(
+                drink,
+                graduate,
+                religion,
+                smoke,
+                mbti
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java
new file mode 100644
index 00000000..1ef79941
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.fixture.info.dto;
+
+import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import java.math.BigDecimal;
+
+public class PositionWriteRequestFixture {
+
+    public static PositionWriteRequest 좌표_생성_요청() {
+        BigDecimal latitude = BigDecimal.valueOf(70.3);
+        BigDecimal longitude = BigDecimal.valueOf(140.3);
+
+        return new PositionWriteRequest(latitude, longitude);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java
new file mode 100644
index 00000000..6ab8c65d
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java
@@ -0,0 +1,31 @@
+package com.atwoz.member.fixture.info.dto;
+
+import static com.atwoz.member.fixture.info.dto.LocationWriteRequestFixture.위치_생성_요청;
+import static com.atwoz.member.fixture.info.dto.PositionWriteRequestFixture.좌표_생성_요청;
+
+import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+
+public class ProfileWriteRequestFixture {
+
+    public static ProfileWriteRequest 프로필_생성_요청() {
+        int birthYear = 2000;
+        int height = 171;
+        String gender = Gender.MALE.getName();
+        LocationWriteRequest locationWriteRequest = 위치_생성_요청();
+        PositionWriteRequest positionWriteRequest = 좌표_생성_요청();
+        String job = Job.RESEARCH_AND_DEVELOP.getCode();
+
+        return new ProfileWriteRequest(
+                birthYear,
+                height,
+                gender,
+                locationWriteRequest,
+                positionWriteRequest,
+                job
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index ba86f2e1..ce38563a 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,6 +1,12 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static com.atwoz.member.domain.info.hobby.HobbyName.COOK;
+import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
+import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
+import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
+import static com.atwoz.member.fixture.info.dto.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
@@ -16,8 +22,6 @@
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -29,7 +33,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
-import java.math.BigDecimal;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -50,47 +53,19 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     @Test
     void 회원_정보를_작성한다() throws Exception {
         // given
-        Long memberId = 1L;
         String bearerToken = "Bearer token";
 
-        int birthYear = 2000;
-        int height = 171;
-        String gender = "남성";
-        LocationWriteRequest locationWriteRequest = new LocationWriteRequest("서울시", "강남구");
-        BigDecimal latitude = BigDecimal.valueOf(70.3);
-        BigDecimal longitude = BigDecimal.valueOf(140.3);
-        PositionWriteRequest positionWriteRequest = new PositionWriteRequest(latitude, longitude);
-        String job = "개발자";
-        ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(
-                birthYear,
-                height,
-                gender,
-                locationWriteRequest,
-                positionWriteRequest,
-                job
-        );
-
-        String drink = "전혀 마시지 않음";
-        String graduate = "서울 4년제";
-        String religion = "기독교";
-        String smoke = "비흡연";
-        String mbti = "INFJ";
-        OptionWriteRequest optionWriteRequest = new OptionWriteRequest(
-                drink,
-                graduate,
-                religion,
-                smoke,
-                mbti
-        );
+        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
+        OptionWriteRequest optionWriteRequest = 옵션_생성_요청();
 
         List<HobbyWriteRequest> hobbies = List.of(
-                new HobbyWriteRequest("와인"),
-                new HobbyWriteRequest("요리")
+                new HobbyWriteRequest(WINE.getCode()),
+                new HobbyWriteRequest(COOK.getCode())
         );
 
         List<StyleWriteRequest> styles = List.of(
-                new StyleWriteRequest("긍정적"),
-                new StyleWriteRequest("진중함")
+                new StyleWriteRequest(POSITIVE.getCode()),
+                new StyleWriteRequest(GENTLE.getCode())
         );
 
         InfoWriteRequest infoWriteRequest = new InfoWriteRequest(profileWriteRequest, optionWriteRequest, hobbies, styles);
@@ -121,9 +96,9 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 fieldWithPath("option.smoke").description("흡연 단계"),
                                 fieldWithPath("option.mbti").description("MBTI"),
                                 fieldWithPath("hobbies").description("취미 목록"),
-                                fieldWithPath("hobbies[].hobby").description("취미 이름"),
+                                fieldWithPath("hobbies[].hobby").description("취미 코드"),
                                 fieldWithPath("styles").description("스타일 목록"),
-                                fieldWithPath("styles[].style").description("스타일 이름")
+                                fieldWithPath("styles[].style").description("스타일 코드")
                         )
                 ));
     }
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
index fa49a335..fa1235f2 100644
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
@@ -1,6 +1,10 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
+import static com.atwoz.member.fixture.info.BodyFixture.일반_body_생성;
+import static com.atwoz.member.fixture.info.JobFixture.일반_직업_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.일반_위치_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.일반_좌표_생성;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
@@ -19,10 +23,6 @@
 import com.atwoz.member.domain.info.profile.Location;
 import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.fixture.info.BodyFixture;
-import com.atwoz.member.fixture.info.JobFixture;
-import com.atwoz.member.fixture.info.LocationFixture;
-import com.atwoz.member.fixture.info.PositionFixture;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -46,10 +46,10 @@ class ProfileControllerWebMvcTest extends MockBeanInjection {
         Long memberId = 1L;
         String bearerToken = "Bearer token";
 
-        Body body = BodyFixture.일반_body_생성();
-        Location location = LocationFixture.일반_위치_생성();
-        Position position = PositionFixture.일반_좌표_생성();
-        Job job = JobFixture.일반_직업_생성();
+        Body body = 일반_body_생성();
+        Location location = 일반_위치_생성();
+        Position position = 일반_좌표_생성();
+        Job job = 일반_직업_생성();
 
         Profile savedProfile = new Profile(memberId, body, location, position, job);
 

From 0fcd5f40825bb83a4f17c5540045cb00b4ab10a2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 18:47:29 +0900
Subject: [PATCH 108/225] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20Fixture=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileServiceTest, OptionServiceTest Fixture 적용
- 취미, 스타일 given 데이터 실제 값으로 수정
---
 .../application/info/HobbyServiceTest.java    |  8 +--
 .../application/info/InfoServiceTest.java     | 50 +++++--------------
 .../application/info/OptionServiceTest.java   | 15 ++----
 .../application/info/ProfileServiceTest.java  | 24 ++-------
 .../application/info/StyleServiceTest.java    |  8 +--
 5 files changed, 28 insertions(+), 77 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
index e357e814..e7c89d01 100644
--- a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.domain.info.hobby.HobbyName.COOK;
+import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.atwoz.member.application.info.hobby.HobbyService;
@@ -29,7 +31,7 @@ void init() {
     void 회원의_모든_취미를_저장한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyCodes = List.of("B028", "B020");
+        List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
 
         // when
         hobbyService.saveMemberHobbies(memberId, hobbyCodes);
@@ -43,7 +45,7 @@ void init() {
     void 회원의_모든_취미를_삭제한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyCodes = List.of("B028", "B020");
+        List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
         hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // when
@@ -57,7 +59,7 @@ void init() {
     void 회원의_모든_취미를_조회한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyCodes = List.of("B028", "B020");
+        List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
         hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // when
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 20976c68..294d17ac 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -1,5 +1,11 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.domain.info.hobby.HobbyName.COOK;
+import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
+import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
+import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
+import static com.atwoz.member.fixture.info.dto.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.event.HobbyWroteEvent;
@@ -10,8 +16,6 @@
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -20,7 +24,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.event.ApplicationEvents;
 import org.springframework.test.context.event.RecordApplicationEvents;
-import java.math.BigDecimal;
 import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
@@ -39,45 +42,17 @@ class InfoServiceTest {
     void 모든_정보를_저장한다() {
         // given
         Long memberId = 1L;
-
-        int birthYear = 2000;
-        int height = 171;
-        String gender = "남성";
-        LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
-        BigDecimal latitude = BigDecimal.valueOf(70.5);
-        BigDecimal longitude = BigDecimal.valueOf(140.3);
-        PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
-        String job = "A001";
-        ProfileWriteRequest profileWriteRequest = new ProfileWriteRequest(
-                birthYear,
-                height,
-                gender,
-                location,
-                position,
-                job
-        );
-
-        String drink = "전혀 마시지 않음";
-        String graduate = "서울 4년제";
-        String religion = "기독교";
-        String smoke = "비흡연";
-        String mbti = "INFJ";
-        OptionWriteRequest optionWriteRequest = new OptionWriteRequest(
-                drink,
-                graduate,
-                religion,
-                smoke,
-                mbti
-        );
+        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
+        OptionWriteRequest optionWriteRequest = 옵션_생성_요청();
 
         List<HobbyWriteRequest> hobbyWriteRequests = List.of(
-            new HobbyWriteRequest("B006"),
-            new HobbyWriteRequest("B007")
+            new HobbyWriteRequest(WINE.getCode()),
+            new HobbyWriteRequest(COOK.getCode())
         );
 
         List<StyleWriteRequest> styleWriteRequests = List.of(
-            new StyleWriteRequest("C012"),
-            new StyleWriteRequest("C021")
+            new StyleWriteRequest(POSITIVE.getCode()),
+            new StyleWriteRequest(GENTLE.getCode())
         );
 
         InfoWriteRequest request = new InfoWriteRequest(
@@ -87,7 +62,6 @@ class InfoServiceTest {
                 styleWriteRequests
         );
 
-
         // when
         infoService.writeInfo(memberId, request);
 
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index f87fae2e..08b38551 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.fixture.info.dto.OptionWriteRequestFixture.옵션_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -33,13 +34,8 @@ void init() {
     void option을_저장한다() {
         // given
         Long memberId = 1L;
-        String drink = "전혀 마시지 않음";
-        String graduate = "서울 4년제";
-        String religion = "기독교";
-        String smoke = "비흡연";
-        String mbti = "INFJ";
 
-        OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
+        OptionWriteRequest request = 옵션_생성_요청();
         Option expectedOption = OptionFactory.of(memberId, request);
 
         // when
@@ -57,13 +53,8 @@ void init() {
     void option을_조회한다() {
         // given
         Long memberId = 1L;
-        String drink = "전혀 마시지 않음";
-        String graduate = "서울 4년제";
-        String religion = "기독교";
-        String smoke = "비흡연";
-        String mbti = "INFJ";
 
-        OptionWriteRequest request = new OptionWriteRequest(drink, graduate, religion, smoke, mbti);
+        OptionWriteRequest request = 옵션_생성_요청();
         
         optionService.writeOption(memberId, request);
         Option expectedOption = OptionFactory.of(memberId, request);
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 958a3891..7f953c1c 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,11 +1,10 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.fixture.info.dto.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.application.info.profile.ProfileFactory;
 import com.atwoz.member.application.info.profile.ProfileService;
@@ -19,7 +18,6 @@
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import java.math.BigDecimal;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -40,15 +38,7 @@ void init() {
     void profile을_저장한다() {
         // given
         Long memberId = 1L;
-        int birthYear = 2000;
-        int height = 171;
-        String gender = "남성";
-        BigDecimal latitude = BigDecimal.valueOf(70.5);
-        BigDecimal longitude = BigDecimal.valueOf(140.3);
-        String job = "A001";
-        LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
-        PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
-        ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
+        ProfileWriteRequest request = 프로필_생성_요청();
 
         Profile expectedProfile = ProfileFactory.of(memberId, request, yearManager);
 
@@ -66,15 +56,7 @@ void init() {
     void profile을_조회한다() {
         // given
         Long memberId = 1L;
-        int birthYear = 2000;
-        int height = 171;
-        String gender = "남성";
-        BigDecimal latitude = BigDecimal.valueOf(70.5);
-        BigDecimal longitude = BigDecimal.valueOf(140.3);
-        String job = "A001";
-        LocationWriteRequest location = new LocationWriteRequest("서울시", "강남구");
-        PositionWriteRequest position = new PositionWriteRequest(latitude, longitude);
-        ProfileWriteRequest request = new ProfileWriteRequest(birthYear, height, gender, location, position, job);
+        ProfileWriteRequest request = 프로필_생성_요청();
 
         profileService.writeProfile(memberId, request);
         Profile expectedProfile = ProfileFactory.of(memberId, request, yearManager);
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
index 1f334893..8d04700c 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
+import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.atwoz.member.application.info.style.StyleService;
@@ -29,7 +31,7 @@ void init() {
     void 회원의_모든_스타일을_저장한다() {
         // given
         Long memberId = 1L;
-        List<String> styleCodes = List.of("C012", "C003");
+        List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
 
         // when
         styleService.saveMemberStyles(memberId, styleCodes);
@@ -43,7 +45,7 @@ void init() {
     void 회원의_모든_스타일을_삭제한다() {
         // given
         Long memberId = 1L;
-        List<String> styleCodes = List.of("C012", "C003");
+        List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
         styleService.saveMemberStyles(memberId, styleCodes);
 
         // when
@@ -57,7 +59,7 @@ void init() {
     void 회원의_모든_스타일을_조회한다() {
         // given
         Long memberId = 1L;
-        List<String> styleCodes = List.of("C012", "C003");
+        List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
         styleService.saveMemberStyles(memberId, styleCodes);
 
         // when

From 9864d372b483341bba83c91f371c483bf0b310ea Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 27 Feb 2024 23:57:26 +0900
Subject: [PATCH 109/225] =?UTF-8?q?refactor:=20Info=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20=EB=AA=A8=EB=8D=B8=20=EC=83=9D=EC=84=B1=20(Querydsl)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Querydsl을 사용하여 전체 정보 파악하도록 수정
- HobbyController, StyleController, ProfileController, OptionController 삭제
- InfoService 조회 메서드 작성
- 조회 DTO 작성
- 관련 테스트 작성, 테스트 Fixture 생성
---
 src/docs/asciidoc/hobby.adoc                  | 17 ----
 src/docs/asciidoc/info.adoc                   |  9 ++
 src/docs/asciidoc/option.adoc                 | 17 ----
 src/docs/asciidoc/profile.adoc                | 17 ----
 src/docs/asciidoc/style.adoc                  | 17 ----
 .../member/application/info/InfoService.java  |  8 ++
 .../member/domain/info/InfoRepository.java    |  8 ++
 .../info/InfoRepositoryImpl.java              | 77 ++++++++++++++++
 .../atwoz/member/ui/info/HobbyController.java | 30 ------
 .../atwoz/member/ui/info/InfoController.java  |  9 ++
 .../member/ui/info/OptionController.java      | 28 ------
 .../member/ui/info/ProfileController.java     | 28 ------
 .../atwoz/member/ui/info/StyleController.java | 30 ------
 .../ui/info/dto/InfoSearchResponse.java       | 13 +++
 .../application/info/InfoServiceTest.java     |  4 +-
 .../application/info/OptionServiceTest.java   |  2 +-
 .../application/info/ProfileServiceTest.java  |  2 +-
 .../LocationWriteRequestFixture.java          |  2 +-
 .../OptionWriteRequestFixture.java            |  2 +-
 .../PositionWriteRequestFixture.java          |  2 +-
 .../ProfileWriteRequestFixture.java           |  6 +-
 .../LocationSearchResponseFixture.java        | 13 +++
 .../response/OptionSearchResponseFixture.java | 27 ++++++
 .../PositionSearchResponseFixture.java        | 14 +++
 .../ProfileSearchResponseFixture.java         | 31 +++++++
 .../ui/info/HobbyControllerWebMvcTest.java    | 66 --------------
 .../ui/info/InfoControllerWebMvcTest.java     | 91 ++++++++++++++++++-
 .../ui/info/OptionControllerWebMvcTest.java   | 78 ----------------
 .../ui/info/ProfileControllerWebMvcTest.java  | 87 ------------------
 .../ui/info/StyleControllerWebMvcTest.java    | 66 --------------
 30 files changed, 307 insertions(+), 494 deletions(-)
 delete mode 100644 src/docs/asciidoc/hobby.adoc
 delete mode 100644 src/docs/asciidoc/option.adoc
 delete mode 100644 src/docs/asciidoc/profile.adoc
 delete mode 100644 src/docs/asciidoc/style.adoc
 create mode 100644 src/main/java/com/atwoz/member/domain/info/InfoRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
 delete mode 100644 src/main/java/com/atwoz/member/ui/info/HobbyController.java
 delete mode 100644 src/main/java/com/atwoz/member/ui/info/OptionController.java
 delete mode 100644 src/main/java/com/atwoz/member/ui/info/ProfileController.java
 delete mode 100644 src/main/java/com/atwoz/member/ui/info/StyleController.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
 rename src/test/java/com/atwoz/member/fixture/info/dto/{ => request}/LocationWriteRequestFixture.java (86%)
 rename src/test/java/com/atwoz/member/fixture/info/dto/{ => request}/OptionWriteRequestFixture.java (94%)
 rename src/test/java/com/atwoz/member/fixture/info/dto/{ => request}/PositionWriteRequestFixture.java (88%)
 rename src/test/java/com/atwoz/member/fixture/info/dto/{ => request}/ProfileWriteRequestFixture.java (78%)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
 delete mode 100644 src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
 delete mode 100644 src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
 delete mode 100644 src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
 delete mode 100644 src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java

diff --git a/src/docs/asciidoc/hobby.adoc b/src/docs/asciidoc/hobby.adoc
deleted file mode 100644
index b1648c50..00000000
--- a/src/docs/asciidoc/hobby.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-:toc: left
-:source-highlighter: highlightjs
-:sectlinks:
-:toclevels: 2
-:sectlinks:
-:sectnums:
-
-== Hobby
-
-=== 취미 조회
-
-==== 요청
-include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-request.adoc[]
-include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/request-headers.adoc[]
-==== 응답
-include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/http-response.adoc[]
-include::{snippets}/hobby-controller-web-mvc-test/search_hobbies/response-fields.adoc[]
diff --git a/src/docs/asciidoc/info.adoc b/src/docs/asciidoc/info.adoc
index e6cb56b3..c399a8de 100644
--- a/src/docs/asciidoc/info.adoc
+++ b/src/docs/asciidoc/info.adoc
@@ -16,3 +16,12 @@ include::{snippets}/info-controller-web-mvc-test/write_info/request-fields.adoc[
 
 ==== 응답
 include::{snippets}/info-controller-web-mvc-test/write_info/http-response.adoc[]
+
+=== 회원 정보 조회
+
+==== 요청
+include::{snippets}/info-controller-web-mvc-test/search_info/http-request.adoc[]
+include::{snippets}/info-controller-web-mvc-test/search_info/request-headers.adoc[]
+==== 응답
+include::{snippets}/info-controller-web-mvc-test/search_info/http-response.adoc[]
+include::{snippets}/info-controller-web-mvc-test/search_info/response-fields.adoc[]
diff --git a/src/docs/asciidoc/option.adoc b/src/docs/asciidoc/option.adoc
deleted file mode 100644
index 4bb6050f..00000000
--- a/src/docs/asciidoc/option.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-:toc: left
-:source-highlighter: highlightjs
-:sectlinks:
-:toclevels: 2
-:sectlinks:
-:sectnums:
-
-== Option
-
-=== Option 조회
-
-==== 요청
-include::{snippets}/option-controller-web-mvc-test/search_option/http-request.adoc[]
-include::{snippets}/option-controller-web-mvc-test/search_option/request-headers.adoc[]
-==== 응답
-include::{snippets}/option-controller-web-mvc-test/search_option/http-response.adoc[]
-include::{snippets}/option-controller-web-mvc-test/search_option/response-fields.adoc[]
diff --git a/src/docs/asciidoc/profile.adoc b/src/docs/asciidoc/profile.adoc
deleted file mode 100644
index 8e31852a..00000000
--- a/src/docs/asciidoc/profile.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-:toc: left
-:source-highlighter: highlightjs
-:sectlinks:
-:toclevels: 2
-:sectlinks:
-:sectnums:
-
-== Profile
-
-=== Profile 조회
-
-==== 요청
-include::{snippets}/profile-controller-web-mvc-test/search_profile/http-request.adoc[]
-include::{snippets}/profile-controller-web-mvc-test/search_profile/request-headers.adoc[]
-==== 응답
-include::{snippets}/profile-controller-web-mvc-test/search_profile/http-response.adoc[]
-include::{snippets}/profile-controller-web-mvc-test/search_profile/response-fields.adoc[]
diff --git a/src/docs/asciidoc/style.adoc b/src/docs/asciidoc/style.adoc
deleted file mode 100644
index b7466a2d..00000000
--- a/src/docs/asciidoc/style.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-:toc: left
-:source-highlighter: highlightjs
-:sectlinks:
-:toclevels: 2
-:sectlinks:
-:sectnums:
-
-== Style
-
-=== 스타일 조회
-
-==== 요청
-include::{snippets}/style-controller-web-mvc-test/search_styles/http-request.adoc[]
-include::{snippets}/style-controller-web-mvc-test/search_styles/request-headers.adoc[]
-==== 응답
-include::{snippets}/style-controller-web-mvc-test/search_styles/http-response.adoc[]
-include::{snippets}/style-controller-web-mvc-test/search_styles/response-fields.adoc[]
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 5467a49e..74ca8ab7 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -8,6 +8,8 @@
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.domain.info.InfoRepository;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +20,8 @@
 @Service
 public class InfoService {
 
+    private final InfoRepository infoRepository;
+
     @Transactional
     public void writeInfo(final Long memberId, final InfoWriteRequest request) {
         List<String> hobbyCodes = extractHobbyNamesFromInfoWriteRequest(request);
@@ -43,4 +47,8 @@ private List<String> extractStyleNamesFromInfoWriteRequest(final InfoWriteReques
                 .map(StyleWriteRequest::style)
                 .toList();
     }
+
+    public InfoSearchResponse findInfo(final Long memberId) {
+        return infoRepository.findByMemberId(memberId);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/InfoRepository.java b/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
new file mode 100644
index 00000000..dbf6fe0a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.domain.info;
+
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+
+public interface InfoRepository {
+
+    InfoSearchResponse findByMemberId(final Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
new file mode 100644
index 00000000..d61fe3a6
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -0,0 +1,77 @@
+package com.atwoz.member.infrastructure.info;
+
+import com.atwoz.member.domain.info.InfoRepository;
+import com.atwoz.member.domain.info.hobby.QHobby;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.QOption;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.QProfile;
+import com.atwoz.member.domain.info.style.QStyle;
+import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
+import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+import java.util.Optional;
+
+@RequiredArgsConstructor
+@Repository
+public class InfoRepositoryImpl implements InfoRepository {
+
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public InfoSearchResponse findByMemberId(final Long memberId) {
+        Profile profile = selectProfileByMemberId(memberId);
+        Option option = selectOptionByMemberId(memberId);
+        ProfileSearchResponse profileSearchResponse = ProfileSearchResponse.from(profile);
+        OptionSearchResponse optionSearchResponse = OptionSearchResponse.from(option);
+
+        List<HobbySearchResponse> hobbyCodes = selectHobbyResponseByMemberId(memberId);
+        List<StyleSearchResponse> styleCodes = selectStyleResponseByMemberId(memberId);
+
+        return new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbyCodes, styleCodes);
+    }
+
+    private Profile selectProfileByMemberId(final Long memberId) {
+        return Optional.ofNullable(queryFactory.select(QProfile.profile)
+                .from(QProfile.profile)
+                .where(QProfile.profile.memberId.eq(memberId))
+                .fetchOne())
+                .orElseThrow(ProfileNotFoundException::new);
+    }
+
+    private Option selectOptionByMemberId(final Long memberId) {
+        return Optional.ofNullable(queryFactory.select(QOption.option)
+                .from(QOption.option)
+                .where(QOption.option.memberId.eq(memberId))
+                .fetchOne())
+                .orElseThrow(OptionNotFoundException::new);
+    }
+
+    private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long memberId) {
+        return queryFactory.select(QHobby.hobby)
+                .from(QHobby.hobby)
+                .where(QHobby.hobby.memberId.eq(memberId))
+                .fetch()
+                .stream()
+                .map(HobbySearchResponse::from)
+                .toList();
+    }
+
+    private List<StyleSearchResponse> selectStyleResponseByMemberId(final Long memberId) {
+        return queryFactory.select(QStyle.style)
+                .from(QStyle.style)
+                .where(QStyle.style.memberId.eq(memberId))
+                .fetch()
+                .stream()
+                .map(StyleSearchResponse::from)
+                .toList();
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/HobbyController.java b/src/main/java/com/atwoz/member/ui/info/HobbyController.java
deleted file mode 100644
index f59f0227..00000000
--- a/src/main/java/com/atwoz/member/ui/info/HobbyController.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import com.atwoz.member.application.info.hobby.HobbyService;
-import com.atwoz.member.ui.auth.support.auth.AuthMember;
-import com.atwoz.member.ui.info.dto.HobbySearchResponse;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-
-@RequiredArgsConstructor
-@RequestMapping("/api/info/hobby")
-@RestController
-public class HobbyController {
-
-    private final HobbyService hobbyService;
-
-    @GetMapping
-    public ResponseEntity<List<HobbySearchResponse>> findMemberHobbies(@AuthMember final Long memberId) {
-        List<HobbySearchResponse> hobbies = hobbyService.findMemberHobbies(memberId)
-                .stream()
-                .map(HobbySearchResponse::from)
-                .toList();
-
-        return ResponseEntity.ok()
-                .body(hobbies);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
index 130b5527..9b9ca4c1 100644
--- a/src/main/java/com/atwoz/member/ui/info/InfoController.java
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -3,10 +3,12 @@
 import com.atwoz.member.application.info.InfoService;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.ui.auth.support.auth.AuthMember;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,4 +28,11 @@ public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
         return ResponseEntity.status(HttpStatus.CREATED)
                 .build();
     }
+
+    @GetMapping
+    public ResponseEntity<InfoSearchResponse> findInfo(@AuthMember final Long memberId) {
+        InfoSearchResponse response = infoService.findInfo(memberId);
+        return ResponseEntity.ok()
+                .body(response);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/OptionController.java b/src/main/java/com/atwoz/member/ui/info/OptionController.java
deleted file mode 100644
index 7f37f649..00000000
--- a/src/main/java/com/atwoz/member/ui/info/OptionController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import com.atwoz.member.application.info.option.OptionService;
-import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.ui.auth.support.auth.AuthMember;
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RequiredArgsConstructor
-@RequestMapping("/api/info/option")
-@RestController
-public class OptionController {
-
-    private final OptionService optionService;
-
-    @GetMapping
-    public ResponseEntity<OptionSearchResponse> findOption(@AuthMember final Long memberId) {
-        Option option = optionService.findByMemberId(memberId);
-        OptionSearchResponse response = OptionSearchResponse.from(option);
-
-        return ResponseEntity.ok()
-                .body(response);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/ui/info/ProfileController.java b/src/main/java/com/atwoz/member/ui/info/ProfileController.java
deleted file mode 100644
index cff0d1ba..00000000
--- a/src/main/java/com/atwoz/member/ui/info/ProfileController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import com.atwoz.member.application.info.profile.ProfileService;
-import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.ui.auth.support.auth.AuthMember;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RequiredArgsConstructor
-@RequestMapping("/api/info/profile")
-@RestController
-public class ProfileController {
-
-    private final ProfileService profileService;
-
-    @GetMapping
-    public ResponseEntity<ProfileSearchResponse> findProfile(@AuthMember final Long memberId) {
-        Profile profile = profileService.findByMemberId(memberId);
-        ProfileSearchResponse response = ProfileSearchResponse.from(profile);
-
-        return ResponseEntity.ok()
-                .body(response);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/ui/info/StyleController.java b/src/main/java/com/atwoz/member/ui/info/StyleController.java
deleted file mode 100644
index cea266b0..00000000
--- a/src/main/java/com/atwoz/member/ui/info/StyleController.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import com.atwoz.member.application.info.style.StyleService;
-import com.atwoz.member.ui.auth.support.auth.AuthMember;
-import com.atwoz.member.ui.info.dto.StyleSearchResponse;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-
-@RequiredArgsConstructor
-@RequestMapping("/api/info/style")
-@RestController
-public class StyleController {
-
-    private final StyleService styleService;
-
-    @GetMapping
-    public ResponseEntity<List<StyleSearchResponse>> findMemberStyles(@AuthMember final Long memberId) {
-        List<StyleSearchResponse> styles = styleService.findMemberStyles(memberId)
-                .stream()
-                .map(StyleSearchResponse::from)
-                .toList();
-
-        return ResponseEntity.ok()
-                .body(styles);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
new file mode 100644
index 00000000..d35f19b5
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.ui.info.dto;
+
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import java.util.List;
+
+public record InfoSearchResponse(
+    ProfileSearchResponse profile,
+    OptionSearchResponse option,
+    List<HobbySearchResponse> hobbies,
+    List<StyleSearchResponse> styles
+) {
+}
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 294d17ac..b7b17823 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -4,8 +4,8 @@
 import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
 import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
 import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
-import static com.atwoz.member.fixture.info.dto.OptionWriteRequestFixture.옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.event.HobbyWroteEvent;
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 08b38551..081d531f 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 7f953c1c..d7fd4ce2 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
similarity index 86%
rename from src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
index 31d921a1..9ee9b5ab 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/LocationWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto;
+package com.atwoz.member.fixture.info.dto.request;
 
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
similarity index 94%
rename from src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
index 9c08d111..de7d5dd1 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/OptionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto;
+package com.atwoz.member.fixture.info.dto.request;
 
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Drink;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
similarity index 88%
rename from src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
index 1ef79941..7c0950e1 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/PositionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto;
+package com.atwoz.member.fixture.info.dto.request;
 
 import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import java.math.BigDecimal;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
similarity index 78%
rename from src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
index 6ab8c65d..d0b1b9fe 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/ProfileWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
@@ -1,7 +1,7 @@
-package com.atwoz.member.fixture.info.dto;
+package com.atwoz.member.fixture.info.dto.request;
 
-import static com.atwoz.member.fixture.info.dto.LocationWriteRequestFixture.위치_생성_요청;
-import static com.atwoz.member.fixture.info.dto.PositionWriteRequestFixture.좌표_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.LocationWriteRequestFixture.위치_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.PositionWriteRequestFixture.좌표_생성_요청;
 
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
new file mode 100644
index 00000000..b8cd7b07
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import com.atwoz.member.ui.info.dto.profile.LocationSearchResponse;
+
+public class LocationSearchResponseFixture {
+
+    public static LocationSearchResponse 위치_정보_조회_응답() {
+        String city = "서울시";
+        String sector = "강남구";
+
+        return new LocationSearchResponse(city, sector);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
new file mode 100644
index 00000000..49bd837e
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
@@ -0,0 +1,27 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+
+public class OptionSearchResponseFixture {
+
+    public static OptionSearchResponse 옵션_정보_조회_응답() {
+        String drink = Drink.NEVER.getName();
+        String graduate = Graduate.SEOUL_FOURTH.getName();
+        String religion = Religion.CHRIST.getName();
+        String smoke = Smoke.NEVER.getName();
+        String mbti = Mbti.INFJ.name();
+
+        return new OptionSearchResponse(
+                drink,
+                graduate,
+                religion,
+                smoke,
+                mbti
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
new file mode 100644
index 00000000..854ed2af
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
+import java.math.BigDecimal;
+
+public class PositionSearchResponseFixture {
+
+    public static PositionSearchResponse 좌표_정보_조회_응답() {
+        BigDecimal latitude = BigDecimal.valueOf(70.3);
+        BigDecimal longitude = BigDecimal.valueOf(140.3);
+
+        return new PositionSearchResponse(latitude, longitude);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
new file mode 100644
index 00000000..e1f61e72
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
@@ -0,0 +1,31 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import static com.atwoz.member.fixture.info.dto.response.LocationSearchResponseFixture.위치_정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.PositionSearchResponseFixture.좌표_정보_조회_응답;
+
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.ui.info.dto.profile.LocationSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+
+public class ProfileSearchResponseFixture {
+
+    public static ProfileSearchResponse 프로필_정보_조회_응답() {
+        int age = 24;
+        int height = 171;
+        String gender = Gender.MALE.getName();
+        LocationSearchResponse locationSearchResponse = 위치_정보_조회_응답();
+        PositionSearchResponse positionSearchResponse = 좌표_정보_조회_응답();
+        String job = Job.RESEARCH_AND_DEVELOP.getCode();
+
+        return new ProfileSearchResponse(
+                age,
+                height,
+                gender,
+                locationSearchResponse,
+                positionSearchResponse,
+                job
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
deleted file mode 100644
index 0a38398e..00000000
--- a/src/test/java/com/atwoz/member/ui/info/HobbyControllerWebMvcTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
-import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import com.atwoz.helper.MockBeanInjection;
-import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyName;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.test.web.servlet.MockMvc;
-import java.util.List;
-
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-@SuppressWarnings("NonAsciiCharacters")
-@AutoConfigureRestDocs
-@WebMvcTest(HobbyController.class)
-class HobbyControllerWebMvcTest extends MockBeanInjection {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Test
-    void 회원의_취미를_조회한다() throws Exception {
-        // given
-        Long memberId = 1L;
-        String bearerToken = "Bearer token";
-
-        List<Hobby> savedHobbies = List.of(
-                new Hobby(memberId, HobbyName.DANCE),
-                new Hobby(memberId, HobbyName.ANIMATION)
-        );
-        when(hobbyService.findMemberHobbies(any())).thenReturn(savedHobbies);
-
-        // when & then
-        mockMvc.perform(get("/api/info/hobby")
-                        .header(AUTHORIZATION, bearerToken))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.length()").value(2))
-                .andExpect(jsonPath("$[0].hobby").value(HobbyName.DANCE.getCode()))
-                .andExpect(jsonPath("$[1].hobby").value(HobbyName.ANIMATION.getCode()))
-                .andDo(print())
-                .andDo(customDocument("search_hobbies",
-                        requestHeaders(
-                                headerWithName("Authorization").description("유저 토큰 정보")
-                        ),
-                        responseFields(
-                                fieldWithPath("[].hobby").description("취미 코드")
-                        )
-                ));
-    }
-}
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index ce38563a..544a6599 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -5,15 +5,22 @@
 import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
 import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
 import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
-import static com.atwoz.member.fixture.info.dto.OptionWriteRequestFixture.옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.옵션_정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.프로필_정보_조회_응답;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
+import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.atwoz.helper.MockBeanInjection;
@@ -23,6 +30,11 @@
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -89,7 +101,80 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 fieldWithPath("profile.location.sector").description("위치 (구)"),
                                 fieldWithPath("profile.position.latitude").description("위도"),
                                 fieldWithPath("profile.position.longitude").description("경도"),
-                                fieldWithPath("profile.job").description("직업"),
+                                fieldWithPath("profile.job").description("직업 코드"),
+                                fieldWithPath("option.drink").description("음주 단계"),
+                                fieldWithPath("option.graduate").description("최종 학력"),
+                                fieldWithPath("option.religion").description("종교"),
+                                fieldWithPath("option.smoke").description("흡연 단계"),
+                                fieldWithPath("option.mbti").description("MBTI"),
+                                fieldWithPath("hobbies").description("취미 목록"),
+                                fieldWithPath("hobbies[].hobby").description("취미 코드"),
+                                fieldWithPath("styles").description("스타일 목록"),
+                                fieldWithPath("styles[].style").description("스타일 코드")
+                        )
+                ));
+    }
+
+    @Test
+    void 회원_정보를_조회한다() throws Exception {
+        // given
+        String bearerToken = "Bearer token";
+
+        ProfileSearchResponse profileSearchResponse = 프로필_정보_조회_응답();
+        OptionSearchResponse optionSearchResponse = 옵션_정보_조회_응답();
+
+        List<HobbySearchResponse> hobbies = List.of(
+                new HobbySearchResponse(WINE.getCode()),
+                new HobbySearchResponse(COOK.getCode())
+        );
+
+        List<StyleSearchResponse> styles = List.of(
+                new StyleSearchResponse(POSITIVE.getCode()),
+                new StyleSearchResponse(GENTLE.getCode())
+        );
+
+        InfoSearchResponse infoSearchResponse = new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbies, styles);
+
+        when(infoService.findInfo(any())).thenReturn(infoSearchResponse);
+
+        // when & then
+        mockMvc.perform(get("/api/info")
+                        .header(AUTHORIZATION, bearerToken))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("profile").exists())
+                .andExpect(jsonPath("profile.height").exists())
+                .andExpect(jsonPath("profile.gender").exists())
+                .andExpect(jsonPath("profile.location").exists())
+                .andExpect(jsonPath("profile.location.city").exists())
+                .andExpect(jsonPath("profile.location.sector").exists())
+                .andExpect(jsonPath("profile.position").exists())
+                .andExpect(jsonPath("profile.position.latitude").exists())
+                .andExpect(jsonPath("profile.position.longitude").exists())
+                .andExpect(jsonPath("profile.job").exists())
+                .andExpect(jsonPath("option").exists())
+                .andExpect(jsonPath("option.drink").exists())
+                .andExpect(jsonPath("option.graduate").exists())
+                .andExpect(jsonPath("option.religion").exists())
+                .andExpect(jsonPath("option.smoke").exists())
+                .andExpect(jsonPath("option.mbti").exists())
+                .andExpect(jsonPath("hobbies").exists())
+                .andExpect(jsonPath("hobbies[0].hobby").exists())
+                .andExpect(jsonPath("styles").exists())
+                .andExpect(jsonPath("styles[0].style").exists())
+                .andDo(print())
+                .andDo(customDocument("search_info",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
+                        responseFields(
+                                fieldWithPath("profile.age").description("나이"),
+                                fieldWithPath("profile.height").description("키"),
+                                fieldWithPath("profile.gender").description("성별"),
+                                fieldWithPath("profile.location.city").description("위치 (시/도)"),
+                                fieldWithPath("profile.location.sector").description("위치 (구)"),
+                                fieldWithPath("profile.position.latitude").description("위도"),
+                                fieldWithPath("profile.position.longitude").description("경도"),
+                                fieldWithPath("profile.job").description("직업 코드"),
                                 fieldWithPath("option.drink").description("음주 단계"),
                                 fieldWithPath("option.graduate").description("최종 학력"),
                                 fieldWithPath("option.religion").description("종교"),
diff --git a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
deleted file mode 100644
index 62886c65..00000000
--- a/src/test/java/com/atwoz/member/ui/info/OptionControllerWebMvcTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
-import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import com.atwoz.helper.MockBeanInjection;
-import com.atwoz.member.domain.info.option.Drink;
-import com.atwoz.member.domain.info.option.Graduate;
-import com.atwoz.member.domain.info.option.Mbti;
-import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.domain.info.option.Religion;
-import com.atwoz.member.domain.info.option.Smoke;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.test.web.servlet.MockMvc;
-
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-@SuppressWarnings("NonAsciiCharacters")
-@AutoConfigureRestDocs
-@WebMvcTest(OptionController.class)
-class OptionControllerWebMvcTest extends MockBeanInjection {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Test
-    void 회원의_option을_조회한다() throws Exception {
-        // given
-        Long memberId = 1L;
-        String bearerToken = "Bearer token";
-
-        Smoke smoke = Smoke.NEVER;
-        Religion religion = Religion.CHRIST;
-        Drink drink = Drink.NEVER;
-        Mbti mbti = Mbti.INFJ;
-        Graduate graduate = Graduate.SEOUL_FOURTH;
-        Option savedOption = new Option(memberId, smoke, religion, drink, mbti, graduate);
-
-        when(optionService.findByMemberId(any())).thenReturn(savedOption);
-
-        // when & then
-        mockMvc.perform(get("/api/info/option")
-                        .header(AUTHORIZATION, bearerToken))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.drink").value("전혀 마시지 않음"))
-                .andExpect(jsonPath("$.graduate").value("서울 4년제"))
-                .andExpect(jsonPath("$.religion").value("기독교"))
-                .andExpect(jsonPath("$.smoke").value("비흡연"))
-                .andExpect(jsonPath("$.mbti").value("INFJ"))
-                .andDo(print())
-                .andDo(customDocument("search_option",
-                        requestHeaders(
-                                headerWithName("Authorization").description("유저 토큰 정보")
-                        ),
-                        responseFields(
-                                fieldWithPath("drink").description("음주 단계"),
-                                fieldWithPath("graduate").description("최종 학력"),
-                                fieldWithPath("religion").description("종교"),
-                                fieldWithPath("smoke").description("흡연 단계"),
-                                fieldWithPath("mbti").description("MBTI")
-                        )
-                ));
-    }
-}
diff --git a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
deleted file mode 100644
index fa1235f2..00000000
--- a/src/test/java/com/atwoz/member/ui/info/ProfileControllerWebMvcTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.fixture.info.BodyFixture.일반_body_생성;
-import static com.atwoz.member.fixture.info.JobFixture.일반_직업_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.일반_위치_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.일반_좌표_생성;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
-import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import com.atwoz.helper.MockBeanInjection;
-import com.atwoz.member.domain.info.profile.Body;
-import com.atwoz.member.domain.info.profile.Job;
-import com.atwoz.member.domain.info.profile.Location;
-import com.atwoz.member.domain.info.profile.Position;
-import com.atwoz.member.domain.info.profile.Profile;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.test.web.servlet.MockMvc;
-
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-@SuppressWarnings("NonAsciiCharacters")
-@AutoConfigureRestDocs
-@WebMvcTest(ProfileController.class)
-class ProfileControllerWebMvcTest extends MockBeanInjection {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Test
-    void 회원의_profile을_조회한다() throws Exception {
-        // given
-        Long memberId = 1L;
-        String bearerToken = "Bearer token";
-
-        Body body = 일반_body_생성();
-        Location location = 일반_위치_생성();
-        Position position = 일반_좌표_생성();
-        Job job = 일반_직업_생성();
-
-        Profile savedProfile = new Profile(memberId, body, location, position, job);
-
-        when(profileService.findByMemberId(any())).thenReturn(savedProfile);
-
-        // when & then
-        mockMvc.perform(get("/api/info/profile")
-                        .header(AUTHORIZATION, bearerToken))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.age").value(body.getAge()))
-                .andExpect(jsonPath("$.height").value(body.getHeight()))
-                .andExpect(jsonPath("$.gender").value(body.getGender().getName()))
-                .andExpect(jsonPath("$.location.city").value(location.getCity()))
-                .andExpect(jsonPath("$.location.sector").value(location.getSector()))
-                .andExpect(jsonPath("$.position.latitude").value(position.getLatitude()))
-                .andExpect(jsonPath("$.position.longitude").value(position.getLongitude()))
-                .andExpect(jsonPath("$.job").value(job.getCode()))
-                .andDo(print())
-                .andDo(customDocument("search_profile",
-                        requestHeaders(
-                                headerWithName("Authorization").description("유저 토큰 정보")
-                        ),
-                        responseFields(
-                                fieldWithPath("age").description("나이"),
-                                fieldWithPath("height").description("키"),
-                                fieldWithPath("gender").description("성별"),
-                                fieldWithPath("location.city").description("위치 (시/도)"),
-                                fieldWithPath("location.sector").description("위치 (구)"),
-                                fieldWithPath("position.latitude").description("위도"),
-                                fieldWithPath("position.longitude").description("경도"),
-                                fieldWithPath("job").description("직업 코드")
-                        )
-                ));
-    }
-}
diff --git a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
deleted file mode 100644
index 8d411736..00000000
--- a/src/test/java/com/atwoz/member/ui/info/StyleControllerWebMvcTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.atwoz.member.ui.info;
-
-import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.http.HttpHeaders.AUTHORIZATION;
-import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
-import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import com.atwoz.helper.MockBeanInjection;
-import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleName;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.test.web.servlet.MockMvc;
-import java.util.List;
-
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
-@SuppressWarnings("NonAsciiCharacters")
-@AutoConfigureRestDocs
-@WebMvcTest(StyleController.class)
-class StyleControllerWebMvcTest extends MockBeanInjection {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Test
-    void 회원의_스타일을_조회한다() throws Exception {
-        // given
-        Long memberId = 1L;
-        String bearerToken = "Bearer token";
-
-        List<Style> savedStyles = List.of(
-                new Style(memberId, StyleName.POSITIVE),
-                new Style(memberId, StyleName.GENTLE)
-        );
-        when(styleService.findMemberStyles(any())).thenReturn(savedStyles);
-
-        // when & then
-        mockMvc.perform(get("/api/info/style")
-                        .header(AUTHORIZATION, bearerToken))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.length()").value(2))
-                .andExpect(jsonPath("$[0].style").value(StyleName.POSITIVE.getCode()))
-                .andExpect(jsonPath("$[1].style").value(StyleName.GENTLE.getCode()))
-                .andDo(print())
-                .andDo(customDocument("search_styles",
-                        requestHeaders(
-                                headerWithName("Authorization").description("유저 토큰 정보")
-                        ),
-                        responseFields(
-                                fieldWithPath("[].style").description("스타일 코드")
-                        )
-                ));
-    }
-}

From e46c0cefff0a2ec1fceaeffeeca07a5a18e84be2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 00:46:30 +0900
Subject: [PATCH 110/225] =?UTF-8?q?refactor:=20Profile,=20Option=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EA=B0=92=20=EB=B9=84=EA=B5=90=20=EB=B0=A9?=
 =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile, Option 저장 검증 시 usingRecursiveComparison 사용하도록 수정
---
 .../atwoz/member/application/info/OptionServiceTest.java   | 7 +++++--
 .../atwoz/member/application/info/ProfileServiceTest.java  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 081d531f..17e47029 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -45,7 +45,9 @@ void init() {
         assertSoftly(softly -> {
             softly.assertThat(optionRepository.isExistMemberOption(memberId)).isTrue();
             softly.assertThat(optionRepository.findByMemberId(memberId)).isPresent();
-            softly.assertThat(optionRepository.findByMemberId(memberId).get()).isEqualTo(expectedOption);
+            softly.assertThat(optionRepository.findByMemberId(memberId).get())
+                    .usingRecursiveComparison()
+                    .isEqualTo(expectedOption);
         });
     }
 
@@ -63,7 +65,8 @@ void init() {
         Option memberOption = optionService.findByMemberId(memberId);
 
         // then
-        assertThat(memberOption).isEqualTo(expectedOption);
+        assertThat(memberOption).usingRecursiveComparison()
+                .isEqualTo(expectedOption);
     }
 
     @Test
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index d7fd4ce2..fbfa3725 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -48,7 +48,9 @@ void init() {
         // then
         assertSoftly(softly -> {
             softly.assertThat(profileRepository.findByMemberId(memberId)).isPresent();
-            softly.assertThat(profileRepository.findByMemberId(memberId).get()).isEqualTo(expectedProfile);
+            softly.assertThat(profileRepository.findByMemberId(memberId).get())
+                    .usingRecursiveComparison()
+                    .isEqualTo(expectedProfile);
         });
     }
 
@@ -65,7 +67,8 @@ void init() {
         Profile findProfile = profileService.findByMemberId(memberId);
 
         // then
-        assertThat(findProfile).isEqualTo(expectedProfile);
+        assertThat(findProfile).usingRecursiveComparison()
+                .isEqualTo(expectedProfile);
     }
 
     @Test

From a84e8f9e862b9f0303f8bc49f7c419ec71481f43 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 15:34:57 +0900
Subject: [PATCH 111/225] =?UTF-8?q?refactor:=20Image=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Image 개발은 다른 PR에서 진행하도록 하기 위해 파일 삭제 조치
---
 .../atwoz/member/domain/info/image/Image.java | 13 -------------
 .../member/domain/info/image/Images.java      | 19 -------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/image/Image.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/image/Images.java

diff --git a/src/main/java/com/atwoz/member/domain/info/image/Image.java b/src/main/java/com/atwoz/member/domain/info/image/Image.java
deleted file mode 100644
index 7b24316c..00000000
--- a/src/main/java/com/atwoz/member/domain/info/image/Image.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.domain.info.image;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-
-@Getter
-@Embeddable
-public class Image {
-
-    @Column(nullable = false)
-    private String url;
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/image/Images.java b/src/main/java/com/atwoz/member/domain/info/image/Images.java
deleted file mode 100644
index 71cc8324..00000000
--- a/src/main/java/com/atwoz/member/domain/info/image/Images.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.atwoz.member.domain.info.image;
-
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.Embeddable;
-import lombok.Getter;
-import java.util.ArrayList;
-import java.util.List;
-
-@Getter
-@Embeddable
-public class Images {
-
-    @ElementCollection
-    private List<Image> images;
-
-    public Images() {
-        this.images = new ArrayList<>();
-    }
-}

From e59e03c725c0c9424e97f07d1ac6e4bfe6b6b1cc Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 15:52:15 +0900
Subject: [PATCH 112/225] =?UTF-8?q?refactor:=20Hobby,=20HobbyName=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HobbyName을 Hobby로 이름 변경
- Hobby를 MemberHobby로 이름 변경
---
 .../application/info/hobby/HobbyService.java  |  18 +--
 .../atwoz/member/domain/info/hobby/Hobby.java | 127 +++++++++++++-----
 .../member/domain/info/hobby/HobbyName.java   | 101 --------------
 .../domain/info/hobby/HobbyRepository.java    |  11 --
 .../member/domain/info/hobby/MemberHobby.java |  40 ++++++
 .../info/hobby/MemberHobbyRepository.java     |  11 ++
 .../info/hobby/HobbyJpaRepository.java        |   6 +-
 ...pl.java => MemberHobbyRepositoryImpl.java} |  14 +-
 .../ui/info/dto/HobbySearchResponse.java      |   8 +-
 .../application/info/InfoServiceTest.java     |   4 +-
 ...eTest.java => MemberHobbyServiceTest.java} |  28 ++--
 .../{HobbyNameTest.java => HobbyTest.java}    |  14 +-
 .../info/HobbyFakeRepository.java             |  44 ------
 .../info/MemberHobbyFakeRepository.java       |  44 ++++++
 ...java => MemberHobbyJpaRepositoryTest.java} |  24 ++--
 .../ui/info/InfoControllerWebMvcTest.java     |   4 +-
 16 files changed, 249 insertions(+), 249 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/hobby/MemberHobbyRepository.java
 rename src/main/java/com/atwoz/member/infrastructure/info/hobby/{HobbyRepositoryImpl.java => MemberHobbyRepositoryImpl.java} (57%)
 rename src/test/java/com/atwoz/member/application/info/{HobbyServiceTest.java => MemberHobbyServiceTest.java} (61%)
 rename src/test/java/com/atwoz/member/domain/info/hobby/{HobbyNameTest.java => HobbyTest.java} (80%)
 delete mode 100644 src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
 rename src/test/java/com/atwoz/member/infrastructure/info/{HobbyJpaRepositoryTest.java => MemberHobbyJpaRepositoryTest.java} (74%)

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
index b7d5fafd..4af06286 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.application.info.hobby;
 
 import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyName;
-import com.atwoz.member.domain.info.hobby.HobbyRepository;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
+import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,25 +13,25 @@
 @Service
 public class HobbyService {
 
-    private final HobbyRepository hobbyRepository;
+    private final MemberHobbyRepository memberHobbyRepository;
 
     @Transactional
     public void saveMemberHobbies(final Long memberId, final List<String> hobbyCodes) {
         deleteMemberHobbies(memberId);
-        List<Hobby> memberHobbies = HobbyName.findAllByCodes(hobbyCodes)
+        List<MemberHobby> memberHobbies = Hobby.findAllByCodes(hobbyCodes)
                 .stream()
-                .map(hobbyName -> new Hobby(memberId, hobbyName))
+                .map(hobby -> new MemberHobby(memberId, hobby))
                 .toList();
 
-        hobbyRepository.saveAll(memberHobbies);
+        memberHobbyRepository.saveAll(memberHobbies);
     }
 
     @Transactional
     public void deleteMemberHobbies(final Long memberId) {
-        hobbyRepository.deleteHobbiesByMemberId(memberId);
+        memberHobbyRepository.deleteHobbiesByMemberId(memberId);
     }
 
-    public List<Hobby> findMemberHobbies(final Long memberId) {
-        return hobbyRepository.findAllByMemberId(memberId);
+    public List<MemberHobby> findMemberHobbies(final Long memberId) {
+        return memberHobbyRepository.findAllByMemberId(memberId);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index 1a33220c..9ab307d9 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -1,40 +1,101 @@
 package com.atwoz.member.domain.info.hobby;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Getter
-@Table(name = "member_hobbies")
-@AllArgsConstructor(access = AccessLevel.PROTECTED)
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Builder
-@Entity
-public class Hobby {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Enumerated(value = EnumType.STRING)
-    @Column(nullable = false)
-    private HobbyName hobbyName;
-
-    public Hobby(final Long memberId, final HobbyName hobbyName) {
-        this.memberId = memberId;
-        this.hobbyName = hobbyName;
+public enum Hobby {
+
+    TRIP("국내여행/해외여행", "B001"),
+    GOLF("골프", "B002"),
+    THEATER("공연/전시회관람", "B003"),
+    WRITE("글쓰기", "B004"),
+    GAME("PC/모바일 게임", "B005"),
+    SING("노래", "B006"),
+    DANCE("댄스", "B007"),
+    DRAMA("드라마/예능보기", "B008"),
+    DRIVE("드라이브", "B009"),
+    CLIMB("등산/클라이밍", "B010"),
+    RUNNING("러닝", "B011"),
+    EAT("맛집탐방", "B012"),
+    TENNIS("배드민턴/테니스", "B013"),
+    BOARD_GAME("보드게임", "B014"),
+    PHOTO("사진촬영", "B015"),
+    WALK("산책", "B016"),
+    SHOPPING("쇼핑", "B017"),
+    SKI("스키/스노우보드", "B018"),
+    INSTRUMENT("악기연주", "B019"),
+    ANIMATION("애니메이션", "B020"),
+    MOVIE("연극/영화", "B021"),
+    WINE("와인", "B022"),
+    HEALTH("운동/헬스", "B023"),
+    YOGA("요가/필라테스", "B024"),
+    COOK("요리", "B025"),
+    CARTOON("웹툰/만화", "B026"),
+    INTERIOR("인테리어", "B027"),
+    BICYCLE("자전거", "B028"),
+    CAMP("캠핑", "B029");
+
+    private static final int MAX_SIZE = 3;
+
+    private final String name;
+    private final String code;
+
+    Hobby(final String name, final String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static List<Hobby> findAllByCodes(final List<String> codes) {
+        validateCodes(codes);
+        return codes.stream()
+                .map(Hobby::findByCode)
+                .toList();
+    }
+
+    private static void validateCodes(final List<String> codes) {
+        validateIsNotEmptyCodes(codes);
+        validateIsUniqueCodes(codes);
+        validateIsNotOverMaxSizeOfHobby(codes);
+    }
+
+    private static void validateIsNotEmptyCodes(final List<String> codes) {
+        if (codes.isEmpty()) {
+            throw new HobbySizeException();
+        }
+    }
+
+    private static void validateIsUniqueCodes(final List<String> codes) {
+        Set<String> uniqueCodes = new HashSet<>(codes);
+        if (uniqueCodes.size() != codes.size()) {
+            throw new HobbyDuplicateException();
+        }
+    }
+
+    private static void validateIsNotOverMaxSizeOfHobby(final List<String> codes) {
+        int validSize = Arrays.stream(values())
+                .filter(hobbyName -> codes.contains(hobbyName.getCode()))
+                .toList()
+                .size();
+        if (validSize > MAX_SIZE) {
+            throw new HobbySizeException();
+        }
+    }
+
+    private static Hobby findByCode(final String code) {
+        return Arrays.stream(values())
+                .filter(hobbyName -> hobbyName.isSame(code))
+                .findFirst()
+                .orElseThrow(HobbyNotFoundException::new);
+    }
+
+    private boolean isSame(final String code) {
+        return this.code.equals(code);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
deleted file mode 100644
index 8a6537b0..00000000
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyName.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.atwoz.member.domain.info.hobby;
-
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
-import lombok.Getter;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@Getter
-public enum HobbyName {
-
-    TRIP("국내여행/해외여행", "B001"),
-    GOLF("골프", "B002"),
-    THEATER("공연/전시회관람", "B003"),
-    WRITE("글쓰기", "B004"),
-    GAME("PC/모바일 게임", "B005"),
-    SING("노래", "B006"),
-    DANCE("댄스", "B007"),
-    DRAMA("드라마/예능보기", "B008"),
-    DRIVE("드라이브", "B009"),
-    CLIMB("등산/클라이밍", "B010"),
-    RUNNING("러닝", "B011"),
-    EAT("맛집탐방", "B012"),
-    TENNIS("배드민턴/테니스", "B013"),
-    BOARD_GAME("보드게임", "B014"),
-    PHOTO("사진촬영", "B015"),
-    WALK("산책", "B016"),
-    SHOPPING("쇼핑", "B017"),
-    SKI("스키/스노우보드", "B018"),
-    INSTRUMENT("악기연주", "B019"),
-    ANIMATION("애니메이션", "B020"),
-    MOVIE("연극/영화", "B021"),
-    WINE("와인", "B022"),
-    HEALTH("운동/헬스", "B023"),
-    YOGA("요가/필라테스", "B024"),
-    COOK("요리", "B025"),
-    CARTOON("웹툰/만화", "B026"),
-    INTERIOR("인테리어", "B027"),
-    BICYCLE("자전거", "B028"),
-    CAMP("캠핑", "B029");
-
-    private static final int MAX_SIZE = 3;
-
-    private final String name;
-    private final String code;
-
-    HobbyName(final String name, final String code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public static List<HobbyName> findAllByCodes(final List<String> codes) {
-        validateCodes(codes);
-        return codes.stream()
-                .map(HobbyName::findBy)
-                .toList();
-    }
-
-    private static void validateCodes(final List<String> codes) {
-        validateIsNotEmptyCodes(codes);
-        validateIsUniqueCodes(codes);
-        validateIsNotOverMaxSizeOfHobby(codes);
-    }
-
-    private static void validateIsNotEmptyCodes(final List<String> codes) {
-        if (codes.isEmpty()) {
-            throw new HobbySizeException();
-        }
-    }
-
-    private static void validateIsUniqueCodes(final List<String> codes) {
-        Set<String> uniqueCodes = new HashSet<>(codes);
-        if (uniqueCodes.size() != codes.size()) {
-            throw new HobbyDuplicateException();
-        }
-    }
-
-    private static void validateIsNotOverMaxSizeOfHobby(final List<String> codes) {
-        int validSize = Arrays.stream(values())
-                .filter(hobbyName -> codes.contains(hobbyName.getCode()))
-                .toList()
-                .size();
-        if (validSize > MAX_SIZE) {
-            throw new HobbySizeException();
-        }
-    }
-
-    private static HobbyName findBy(final String code) {
-        return Arrays.stream(values())
-                .filter(hobbyName -> hobbyName.isSame(code))
-                .findFirst()
-                .orElseThrow(HobbyNotFoundException::new);
-    }
-
-    private boolean isSame(final String code) {
-        return this.code.equals(code);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java b/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
deleted file mode 100644
index f03c1598..00000000
--- a/src/main/java/com/atwoz/member/domain/info/hobby/HobbyRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.atwoz.member.domain.info.hobby;
-
-import java.util.List;
-
-public interface HobbyRepository {
-
-    void save(final Hobby hobby);
-    void saveAll(final List<Hobby> memberHobbies);
-    void deleteHobbiesByMemberId(final Long memberId);
-    List<Hobby> findAllByMemberId(final Long memberId);
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
new file mode 100644
index 00000000..bf1c8e87
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
@@ -0,0 +1,40 @@
+package com.atwoz.member.domain.info.hobby;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "member_hobbies")
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+@Entity
+public class MemberHobby {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    @Column(nullable = false)
+    private Hobby hobby;
+
+    public MemberHobby(final Long memberId, final Hobby hobby) {
+        this.memberId = memberId;
+        this.hobby = hobby;
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobbyRepository.java b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobbyRepository.java
new file mode 100644
index 00000000..195ad6e9
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobbyRepository.java
@@ -0,0 +1,11 @@
+package com.atwoz.member.domain.info.hobby;
+
+import java.util.List;
+
+public interface MemberHobbyRepository {
+
+    void save(final MemberHobby memberHobby);
+    void saveAll(final List<MemberHobby> memberHobbies);
+    void deleteHobbiesByMemberId(final Long memberId);
+    List<MemberHobby> findAllByMemberId(final Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
index fdb54a2d..7281f703 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
@@ -1,12 +1,12 @@
 package com.atwoz.member.infrastructure.info.hobby;
 
-import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
 import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 
-public interface HobbyJpaRepository extends JpaRepository<Hobby, Long> {
+public interface HobbyJpaRepository extends JpaRepository<MemberHobby, Long> {
 
     void deleteByMemberId(final Long memberId);
 
-    List<Hobby> findAllByMemberId(final Long memberId);
+    List<MemberHobby> findAllByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java
similarity index 57%
rename from src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
rename to src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java
index 63d092cb..244bca37 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java
@@ -1,24 +1,24 @@
 package com.atwoz.member.infrastructure.info.hobby;
 
-import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyRepository;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
+import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @RequiredArgsConstructor
 @Repository
-public class HobbyRepositoryImpl implements HobbyRepository {
+public class MemberHobbyRepositoryImpl implements MemberHobbyRepository {
 
     private final HobbyJpaRepository hobbyJpaRepository;
 
     @Override
-    public void save(final Hobby hobby) {
-        hobbyJpaRepository.save(hobby);
+    public void save(final MemberHobby memberHobby) {
+        hobbyJpaRepository.save(memberHobby);
     }
 
     @Override
-    public void saveAll(final List<Hobby> memberHobbies) {
+    public void saveAll(final List<MemberHobby> memberHobbies) {
         hobbyJpaRepository.saveAll(memberHobbies);
     }
 
@@ -28,7 +28,7 @@ public void deleteHobbiesByMemberId(final Long memberId) {
     }
 
     @Override
-    public List<Hobby> findAllByMemberId(final Long memberId) {
+    public List<MemberHobby> findAllByMemberId(final Long memberId) {
         return hobbyJpaRepository.findAllByMemberId(memberId);
     }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
index cb8d89cb..09d2a134 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
@@ -1,15 +1,15 @@
 package com.atwoz.member.ui.info.dto;
 
 import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyName;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
 
 public record HobbySearchResponse(
 
         String hobby
 ) {
 
-    public static HobbySearchResponse from(final Hobby hobby) {
-        HobbyName hobbyName = hobby.getHobbyName();
-        return new HobbySearchResponse(hobbyName.getCode());
+    public static HobbySearchResponse from(final MemberHobby memberHobby) {
+        Hobby hobby = memberHobby.getHobby();
+        return new HobbySearchResponse(hobby.getCode());
     }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index b7b17823..1f55cd3f 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.domain.info.hobby.HobbyName.COOK;
-import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
 import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
diff --git a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
similarity index 61%
rename from src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index e7c89d01..93f5ff6f 100644
--- a/src/test/java/com/atwoz/member/application/info/HobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -1,13 +1,13 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.domain.info.hobby.HobbyName.COOK;
-import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.atwoz.member.application.info.hobby.HobbyService;
-import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyRepository;
-import com.atwoz.member.infrastructure.info.HobbyFakeRepository;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
+import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
+import com.atwoz.member.infrastructure.info.MemberHobbyFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -16,15 +16,15 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-class HobbyServiceTest {
+class MemberHobbyServiceTest {
 
     private HobbyService hobbyService;
-    private HobbyRepository hobbyRepository;
+    private MemberHobbyRepository memberHobbyRepository;
 
     @BeforeEach
     void init() {
-        hobbyRepository = new HobbyFakeRepository();
-        hobbyService = new HobbyService(hobbyRepository);
+        memberHobbyRepository = new MemberHobbyFakeRepository();
+        hobbyService = new HobbyService(memberHobbyRepository);
     }
 
     @Test
@@ -37,8 +37,8 @@ void init() {
         hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // then
-        List<Hobby> saveHobbies = hobbyRepository.findAllByMemberId(memberId);
-        assertThat(saveHobbies.size()).isEqualTo(2);
+        List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
+        assertThat(saveMemberHobbies.size()).isEqualTo(hobbyCodes.size());
     }
 
     @Test
@@ -52,7 +52,7 @@ void init() {
         hobbyService.deleteMemberHobbies(memberId);
 
         // then
-        assertThat(hobbyRepository.findAllByMemberId(memberId)).isEmpty();
+        assertThat(memberHobbyRepository.findAllByMemberId(memberId)).isEmpty();
     }
 
     @Test
@@ -63,9 +63,9 @@ void init() {
         hobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // when
-        List<Hobby> memberHobbies = hobbyService.findMemberHobbies(memberId);
+        List<MemberHobby> memberHobbies = hobbyService.findMemberHobbies(memberId);
 
         // then
-        assertThat(memberHobbies.size()).isEqualTo(2);
+        assertThat(memberHobbies.size()).isEqualTo(hobbyCodes.size());
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
similarity index 80%
rename from src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
rename to src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
index b0e4e522..bb8bb736 100644
--- a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyNameTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
@@ -13,16 +13,16 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-class HobbyNameTest {
+class HobbyTest {
 
     @Test
     void 취미가_존재하면_정상적으로_가져온다() {
         // given
         List<String> hobbyCodes = List.of("B001", "B002", "B007");
-        List<HobbyName> expectedHobbies = List.of(HobbyName.TRIP, HobbyName.GOLF, HobbyName.DANCE);
+        List<Hobby> expectedHobbies = List.of(Hobby.TRIP, Hobby.GOLF, Hobby.DANCE);
 
         // when
-        List<HobbyName> findHobbies = HobbyName.findAllByCodes(hobbyCodes);
+        List<Hobby> findHobbies = Hobby.findAllByCodes(hobbyCodes);
 
         // then
         assertSoftly(softly -> {
@@ -37,7 +37,7 @@ class HobbyNameTest {
         List<String> hobbyCodes = List.of("B001", "B002", "B007", "B017");
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
+        assertThatThrownBy(() -> Hobby.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbySizeException.class);
     }
 
@@ -47,7 +47,7 @@ class HobbyNameTest {
         List<String> hobbyCodes = List.of();
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
+        assertThatThrownBy(() -> Hobby.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbySizeException.class);
     }
 
@@ -57,7 +57,7 @@ class HobbyNameTest {
         List<String> hobbyCodes = List.of("ABCD");
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
+        assertThatThrownBy(() -> Hobby.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbyNotFoundException.class);
     }
 
@@ -67,7 +67,7 @@ class HobbyNameTest {
         List<String> hobbyCodes = List.of("B001", "B001");
 
         // when & then
-        assertThatThrownBy(() -> HobbyName.findAllByCodes(hobbyCodes))
+        assertThatThrownBy(() -> Hobby.findAllByCodes(hobbyCodes))
                 .isInstanceOf(HobbyDuplicateException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
deleted file mode 100644
index 1675523d..00000000
--- a/src/test/java/com/atwoz/member/infrastructure/info/HobbyFakeRepository.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.atwoz.member.infrastructure.info;
-
-import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyRepository;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class HobbyFakeRepository implements HobbyRepository {
-
-    private final Map<Long, Hobby> map = new HashMap<>();
-    private long id = 1L;
-
-    @Override
-    public void save(final Hobby hobby) {
-        Hobby newHobby = Hobby.builder()
-                .id(id)
-                .memberId(hobby.getMemberId())
-                .hobbyName(hobby.getHobbyName())
-                .build();
-        map.put(id, newHobby);
-        id++;
-    }
-
-    @Override
-    public void saveAll(final List<Hobby> memberHobbies) {
-        memberHobbies.stream()
-                .map(hobby -> new Hobby(hobby.getMemberId(), hobby.getHobbyName()))
-                .forEach(hobby -> map.put(id++, hobby));
-    }
-
-    @Override
-    public void deleteHobbiesByMemberId(final Long memberId) {
-        map.values().removeIf(hobby -> memberId.equals(hobby.getMemberId()));
-    }
-
-    @Override
-    public List<Hobby> findAllByMemberId(final Long memberId) {
-        return map.values()
-                .stream()
-                .filter(hobby -> memberId.equals(hobby.getMemberId()))
-                .toList();
-    }
-}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
new file mode 100644
index 00000000..157c05e5
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
@@ -0,0 +1,44 @@
+package com.atwoz.member.infrastructure.info;
+
+import com.atwoz.member.domain.info.hobby.MemberHobby;
+import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MemberHobbyFakeRepository implements MemberHobbyRepository {
+
+    private final Map<Long, MemberHobby> map = new HashMap<>();
+    private long id = 1L;
+
+    @Override
+    public void save(final MemberHobby memberHobby) {
+        MemberHobby newMemberHobby = MemberHobby.builder()
+                .id(id)
+                .memberId(memberHobby.getMemberId())
+                .hobby(memberHobby.getHobby())
+                .build();
+        map.put(id, newMemberHobby);
+        id++;
+    }
+
+    @Override
+    public void saveAll(final List<MemberHobby> memberHobbies) {
+        memberHobbies.stream()
+                .map(memberHobby -> new MemberHobby(memberHobby.getMemberId(), memberHobby.getHobby()))
+                .forEach(hobby -> map.put(id++, hobby));
+    }
+
+    @Override
+    public void deleteHobbiesByMemberId(final Long memberId) {
+        map.values().removeIf(memberHobby -> memberId.equals(memberHobby.getMemberId()));
+    }
+
+    @Override
+    public List<MemberHobby> findAllByMemberId(final Long memberId) {
+        return map.values()
+                .stream()
+                .filter(memberHobby -> memberId.equals(memberHobby.getMemberId()))
+                .toList();
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
similarity index 74%
rename from src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
index c8743ab3..3715cb23 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/HobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.domain.info.hobby.Hobby;
-import com.atwoz.member.domain.info.hobby.HobbyName;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.fixture.member.MemberFixture;
 import com.atwoz.member.infrastructure.info.hobby.HobbyJpaRepository;
@@ -21,7 +21,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-class HobbyJpaRepositoryTest {
+class MemberHobbyJpaRepositoryTest {
 
     @Autowired
     private HobbyJpaRepository hobbyJpaRepository;
@@ -39,12 +39,12 @@ void init() {
     @Test
     void 회원_취미를_저장한다() {
         // given
-        HobbyName hobbyName = HobbyName.ANIMATION;
+        Hobby hobby = Hobby.ANIMATION;
         Long memberId = member.getId();
-        Hobby memberHobby = new Hobby(memberId, hobbyName);
+        MemberHobby memberHobby = new MemberHobby(memberId, hobby);
 
         // when
-        Hobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
+        MemberHobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
 
         // then
         assertThat(saveMemberHobby)
@@ -55,13 +55,13 @@ void init() {
     @Test
     void 회원_취미를_조회한다() {
         // given
-        HobbyName hobbyName = HobbyName.ANIMATION;
+        Hobby hobby = Hobby.ANIMATION;
         Long memberId = member.getId();
-        Hobby memberHobby = new Hobby(memberId, hobbyName);
-        Hobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
+        MemberHobby memberHobby = new MemberHobby(memberId, hobby);
+        MemberHobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
 
         // when
-        List<Hobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
+        List<MemberHobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
 
         // then
         assertSoftly(softly -> {
@@ -74,13 +74,13 @@ void init() {
     void 회원_취미_목록을_저장_및_조회한다() {
         // given
         Long memberId = member.getId();
-        List<Hobby> memberHobbies = Stream.of(HobbyName.BICYCLE, HobbyName.DANCE)
-                .map(hobbyName -> new Hobby(memberId, hobbyName))
+        List<MemberHobby> memberHobbies = Stream.of(Hobby.BICYCLE, Hobby.DANCE)
+                .map(hobbyName -> new MemberHobby(memberId, hobbyName))
                 .map(hobby -> hobbyJpaRepository.save(hobby))
                 .toList();
 
         // when
-        List<Hobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
+        List<MemberHobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
 
         // then
         assertSoftly(softly -> {
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 544a6599..2ab68e9e 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.domain.info.hobby.HobbyName.COOK;
-import static com.atwoz.member.domain.info.hobby.HobbyName.WINE;
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
 import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;

From f532a388d6fe8b555bf68ae92c4157eaa6a45155 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 16:21:49 +0900
Subject: [PATCH 113/225] =?UTF-8?q?refactor:=20InfoRepositoryImpl=20?=
 =?UTF-8?q?=EC=9A=A9=EC=96=B4=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoRepositoryImpl QHobby를 QMemberHobby로 변경
---
 .../member/infrastructure/info/InfoRepositoryImpl.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
index d61fe3a6..e3a9d9f0 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -1,7 +1,8 @@
 package com.atwoz.member.infrastructure.info;
 
+import static com.atwoz.member.domain.info.hobby.QMemberHobby.memberHobby;
+
 import com.atwoz.member.domain.info.InfoRepository;
-import com.atwoz.member.domain.info.hobby.QHobby;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.QOption;
 import com.atwoz.member.domain.info.profile.Profile;
@@ -56,9 +57,9 @@ private Option selectOptionByMemberId(final Long memberId) {
     }
 
     private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long memberId) {
-        return queryFactory.select(QHobby.hobby)
-                .from(QHobby.hobby)
-                .where(QHobby.hobby.memberId.eq(memberId))
+        return queryFactory.select(memberHobby)
+                .from(memberHobby)
+                .where(memberHobby.memberId.eq(memberId))
                 .fetch()
                 .stream()
                 .map(HobbySearchResponse::from)

From ae46225663fd6952bd7d610bd1f29e8fc12da6aa Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 16:23:15 +0900
Subject: [PATCH 114/225] =?UTF-8?q?refactor:=20PropertyNotFoundException?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- PropertyNotFoundException 삭제
- 각각의 세부 예외로 변경
---
 .../exception/GlobalExceptionHandler.java     |  7 ---
 .../exceptions/PropertyNotFoundException.java |  8 ----
 .../member/domain/info/option/Drink.java      |  4 +-
 .../member/domain/info/option/Graduate.java   |  4 +-
 .../atwoz/member/domain/info/option/Mbti.java |  4 +-
 .../member/domain/info/option/Religion.java   |  4 +-
 .../member/domain/info/option/Smoke.java      |  4 +-
 .../member/domain/info/profile/Gender.java    |  4 +-
 .../exception/MemberExceptionHandler.java     | 43 ++++++++++++++++---
 .../info/option/DrinkInvalidException.java    |  8 ++++
 .../info/option/GraduateInvalidException.java |  8 ++++
 .../info/option/MbtiInvalidException.java     |  8 ++++
 .../info/option/ReligionInvalidException.java |  8 ++++
 .../info/option/SmokeInvalidException.java    |  8 ++++
 .../profile/body/GenderInvalidException.java  |  8 ++++
 .../domain/info/profile/GenderTest.java       |  4 +-
 16 files changed, 98 insertions(+), 36 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java

diff --git a/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java b/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
index c5a7d7fc..d5317b8f 100644
--- a/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/atwoz/global/exception/GlobalExceptionHandler.java
@@ -1,6 +1,5 @@
 package com.atwoz.global.exception;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -31,10 +30,4 @@ public ResponseEntity<String> handleIllegalArgumentException(final IllegalArgume
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body(INTERNAL_SERVER_ERROR_MESSAGE);
     }
-
-    @ExceptionHandler(PropertyNotFoundException.class)
-    public ResponseEntity<String> handlePropertyNotFoundException(final PropertyNotFoundException exception) {
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                .body(exception.getMessage());
-    }
 }
diff --git a/src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java b/src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java
deleted file mode 100644
index f34e780e..00000000
--- a/src/main/java/com/atwoz/global/exception/exceptions/PropertyNotFoundException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.global.exception.exceptions;
-
-public class PropertyNotFoundException extends RuntimeException {
-
-    public PropertyNotFoundException() {
-        super("속성 값에 맞는 타입을 찾지 못했습니다.");
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Drink.java b/src/main/java/com/atwoz/member/domain/info/option/Drink.java
index 0de01972..b693c865 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Drink.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Drink.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -23,6 +23,6 @@ public static Drink findByName(final String name) {
         return Arrays.stream(values())
                 .filter(drink -> name.equals(drink.getName()))
                 .findFirst()
-                .orElseThrow(PropertyNotFoundException::new);
+                .orElseThrow(DrinkInvalidException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Graduate.java b/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
index 459dbf3b..a783d932 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -27,6 +27,6 @@ public static Graduate findByName(final String name) {
         return Arrays.stream(values())
                 .filter(graduate -> name.equals(graduate.getName()))
                 .findFirst()
-                .orElseThrow(PropertyNotFoundException::new);
+                .orElseThrow(GraduateInvalidException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Mbti.java b/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
index b00ce56f..6fd3c260 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
 import java.util.Arrays;
 
 public enum Mbti {
@@ -26,6 +26,6 @@ public static Mbti findByName(final String name) {
         return Arrays.stream(values())
                 .filter(mbti -> name.equals(mbti.name()))
                 .findFirst()
-                .orElseThrow(PropertyNotFoundException::new);
+                .orElseThrow(MbtiInvalidException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Religion.java b/src/main/java/com/atwoz/member/domain/info/option/Religion.java
index 0dbcde46..ed813fae 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Religion.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Religion.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -23,6 +23,6 @@ public static Religion findByName(final String name) {
         return Arrays.stream(values())
                 .filter(religion -> name.equals(religion.getName()))
                 .findFirst()
-                .orElseThrow(PropertyNotFoundException::new);
+                .orElseThrow(ReligionInvalidException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Smoke.java b/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
index 460fc41c..890b0bf6 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -23,6 +23,6 @@ public static Smoke findByName(final String name) {
         return Arrays.stream(values())
                 .filter(smoke -> name.equals(smoke.getName()))
                 .findFirst()
-                .orElseThrow(PropertyNotFoundException::new);
+                .orElseThrow(SmokeInvalidException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java b/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
index f0b0e459..0ecfe45f 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -20,6 +20,6 @@ public static Gender findByName(final String name) {
         return Arrays.stream(values())
                 .filter(gender -> name.equals(gender.getName()))
                 .findFirst()
-                .orElseThrow(PropertyNotFoundException::new);
+                .orElseThrow(GenderInvalidException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 857cddf0..c29bc0b5 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.exception;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
 import com.atwoz.member.exception.exceptions.auth.ExpiredTokenException;
 import com.atwoz.member.exception.exceptions.auth.JsonDataInvalidException;
 import com.atwoz.member.exception.exceptions.auth.LoginInvalidException;
@@ -12,9 +11,15 @@
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
+import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
+import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
+import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
@@ -95,12 +100,6 @@ public ResponseEntity<String> handleOAuthPlatformNotFountException(final OAuthPl
         return getNotFoundResponse(e);
     }
 
-    // info - enum
-    @ExceptionHandler(PropertyNotFoundException.class)
-    public ResponseEntity<String> handlePropertyNotFoundException(final PropertyNotFoundException e) {
-        return getNotFoundResponse(e);
-    }
-
     // info - hobby
     @ExceptionHandler(HobbyNotFoundException.class)
     public ResponseEntity<String> handleHobbyNotFoundException(final HobbyNotFoundException e) {
@@ -149,6 +148,11 @@ public ResponseEntity<String> handleHeightRangeException(final HeightRangeExcept
         return getBadRequest(e);
     }
 
+    @ExceptionHandler(GenderInvalidException.class)
+    public ResponseEntity<String> handleGenderInvalidException(final GenderInvalidException e) {
+        return getBadRequest(e);
+    }
+
     @ExceptionHandler(LatitudeRangeException.class)
     public ResponseEntity<String> handleLatitudeRangeException(final LatitudeRangeException e) {
         return getBadRequest(e);
@@ -165,6 +169,31 @@ public ResponseEntity<String> handleOptionNotFoundException(final OptionNotFound
         return getNotFoundResponse(e);
     }
 
+    @ExceptionHandler(DrinkInvalidException.class)
+    public ResponseEntity<String> handleDrinkNInvalidException(final DrinkInvalidException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(GraduateInvalidException.class)
+    public ResponseEntity<String> handleGraduateInvalidException(final GraduateInvalidException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(MbtiInvalidException.class)
+    public ResponseEntity<String> handleMbtiInvalidException(final MbtiInvalidException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(SmokeInvalidException.class)
+    public ResponseEntity<String> handleSmokeInvalidException(final SmokeInvalidException e) {
+        return getBadRequest(e);
+    }
+
+    @ExceptionHandler(ReligionInvalidException.class)
+    public ResponseEntity<String> handleReligionInvalidException(final ReligionInvalidException e) {
+        return getBadRequest(e);
+    }
+
     private ResponseEntity<String> getNotFoundResponse(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(e.getMessage());
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java
new file mode 100644
index 00000000..6aeedeb3
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.option;
+
+public class DrinkInvalidException extends RuntimeException {
+
+    public DrinkInvalidException() {
+        super("등록되지 않은 음주 단계입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java
new file mode 100644
index 00000000..e374110b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.option;
+
+public class GraduateInvalidException extends RuntimeException {
+
+    public GraduateInvalidException() {
+        super("등록되지 않은 최종 학력입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java
new file mode 100644
index 00000000..adf2eac1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.option;
+
+public class MbtiInvalidException extends RuntimeException {
+
+    public MbtiInvalidException() {
+        super("등록되지 않은 MBTI입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java
new file mode 100644
index 00000000..75a5734d
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.option;
+
+public class ReligionInvalidException extends RuntimeException {
+
+    public ReligionInvalidException() {
+        super("등록되지 않은 종교입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java
new file mode 100644
index 00000000..68fb8b00
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.option;
+
+public class SmokeInvalidException extends RuntimeException {
+
+    public SmokeInvalidException() {
+        super("등록되지 않은 흡연 단계입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java
new file mode 100644
index 00000000..348db4ce
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.profile.body;
+
+public class GenderInvalidException extends RuntimeException {
+
+    public GenderInvalidException() {
+        super("등록되지 않은 성별입니다.");
+    }
+}
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
index 57f6bba8..a01120ce 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.global.exception.exceptions.PropertyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ class GenderTest {
 
         // when & then
         assertThatThrownBy(() -> Gender.findByName(genderName))
-                .isInstanceOf(PropertyNotFoundException.class);
+                .isInstanceOf(GenderInvalidException.class);
     }
 }

From 24d33b61d8887e5c1a1ab09736de022a7c5b5e8a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 16:29:06 +0900
Subject: [PATCH 115/225] =?UTF-8?q?refactor:=20Job=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C,=20=EC=98=88=EC=99=B8=20=EC=9D=B4=EB=A6=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Job 조회 메서드명 findByCode로 수정
- Job 조회 실패 예외 이름 JobInvalidException으로 수정 및 등록
---
 .../member/application/info/profile/ProfileFactory.java   | 2 +-
 .../java/com/atwoz/member/domain/info/profile/Job.java    | 6 +++---
 .../atwoz/member/exception/MemberExceptionHandler.java    | 6 ++++++
 ...JobNotFoundException.java => JobInvalidException.java} | 4 ++--
 .../com/atwoz/member/domain/info/profile/JobTest.java     | 8 ++++----
 5 files changed, 16 insertions(+), 10 deletions(-)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/profile/{JobNotFoundException.java => JobInvalidException.java} (55%)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index b2893116..754e7982 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -38,6 +38,6 @@ private static Position createPosition(final PositionWriteRequest request) {
     }
 
     private static Job createJob(final String code) {
-        return Job.findBy(code);
+        return Job.findByCode(code);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
index 4a369226..37744c88 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.exception.exceptions.info.profile.JobNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.JobInvalidException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -36,11 +36,11 @@ public enum Job {
         this.code = code;
     }
 
-    public static Job findBy(final String code) {
+    public static Job findByCode(final String code) {
         return Arrays.stream(values())
                 .filter(job -> job.isSame(code))
                 .findFirst()
-                .orElseThrow(JobNotFoundException::new);
+                .orElseThrow(JobInvalidException::new);
     }
 
     private boolean isSame(final String code) {
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index c29bc0b5..7e029b29 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -17,6 +17,7 @@
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
 import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
+import com.atwoz.member.exception.exceptions.info.profile.JobInvalidException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
@@ -163,6 +164,11 @@ public ResponseEntity<String> handleLongitudeRangeException(final LongitudeRange
         return getBadRequest(e);
     }
 
+    @ExceptionHandler(JobInvalidException.class)
+    public ResponseEntity<String> handleJobInvalidException(final JobInvalidException e) {
+        return getBadRequest(e);
+    }
+
     // info - option
     @ExceptionHandler(OptionNotFoundException.class)
     public ResponseEntity<String> handleOptionNotFoundException(final OptionNotFoundException e) {
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobInvalidException.java
similarity index 55%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobInvalidException.java
index dd9ae4d3..60d49d21 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobNotFoundException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobInvalidException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.profile;
 
-public class JobNotFoundException extends RuntimeException {
+public class JobInvalidException extends RuntimeException {
 
-    public JobNotFoundException() {
+    public JobInvalidException() {
         super("직업을 찾을 수 없습니다.");
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
index 5c74a3e1..e8502000 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.profile.JobNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.JobInvalidException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -18,7 +18,7 @@ public class JobTest {
         String jobCode = "A001";
 
         // when & then
-        assertDoesNotThrow(() -> Job.findBy(jobCode));
+        assertDoesNotThrow(() -> Job.findByCode(jobCode));
     }
 
     @Test
@@ -27,7 +27,7 @@ public class JobTest {
         String jobCode = "hello";
 
         // when & then
-        assertThatThrownBy(() -> Job.findBy(jobCode))
-                .isInstanceOf(JobNotFoundException.class);
+        assertThatThrownBy(() -> Job.findByCode(jobCode))
+                .isInstanceOf(JobInvalidException.class);
     }
 }

From 43e3aca6b96e4d138920d2b48c71b1e6c4e1e776 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 16:46:17 +0900
Subject: [PATCH 116/225] =?UTF-8?q?refactor:=20Style,=20StyleName=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleName을 Style로 이름 변경
- Style를 MemberStyle로 이름 변경
---
 .../application/info/style/StyleService.java  |  18 +--
 .../member/domain/info/style/MemberStyle.java |  40 ++++++
 .../info/style/MemberStyleRepository.java     |  11 ++
 .../atwoz/member/domain/info/style/Style.java | 118 +++++++++++++-----
 .../member/domain/info/style/StyleName.java   |  92 --------------
 .../domain/info/style/StyleRepository.java    |  11 --
 .../info/style/MemberStyleJpaRepository.java  |  11 ++
 .../info/style/MemberStyleRepositoryImpl.java |  34 +++++
 .../info/style/StyleJpaRepository.java        |  11 --
 .../info/style/StyleRepositoryImpl.java       |  34 -----
 .../ui/info/dto/StyleSearchResponse.java      |   8 +-
 .../application/info/InfoServiceTest.java     |   4 +-
 .../application/info/StyleServiceTest.java    |  22 ++--
 .../{StyleNameTest.java => StyleTest.java}    |  14 +--
 ...> MemberMemberStyleJpaRepositoryTest.java} |  34 ++---
 ...ry.java => MemberStyleFakeRepository.java} |  20 +--
 .../ui/info/InfoControllerWebMvcTest.java     |   4 +-
 17 files changed, 243 insertions(+), 243 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/style/StyleName.java
 delete mode 100644 src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
 delete mode 100644 src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
 rename src/test/java/com/atwoz/member/domain/info/style/{StyleNameTest.java => StyleTest.java} (80%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{StyleJpaRepositoryTest.java => MemberMemberStyleJpaRepositoryTest.java} (64%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{StyleFakeRepository.java => MemberStyleFakeRepository.java} (54%)

diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
index 4c235932..340b2801 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.application.info.style;
 
+import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleName;
-import com.atwoz.member.domain.info.style.StyleRepository;
+import com.atwoz.member.domain.info.style.MemberStyleRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,25 +13,25 @@
 @Service
 public class StyleService {
 
-    private final StyleRepository styleRepository;
+    private final MemberStyleRepository memberStyleRepository;
 
     @Transactional
     public void saveMemberStyles(final Long memberId, final List<String> styleNames) {
         deleteMemberStyles(memberId);
-        List<Style> memberStyles = StyleName.findAllByCodes(styleNames)
+        List<MemberStyle> memberStyles = Style.findAllByCodes(styleNames)
                 .stream()
-                .map(styleName -> new Style(memberId, styleName))
+                .map(style -> new MemberStyle(memberId, style))
                 .toList();
 
-        styleRepository.saveAll(memberStyles);
+        memberStyleRepository.saveAll(memberStyles);
     }
 
     @Transactional
     public void deleteMemberStyles(final Long memberId) {
-        styleRepository.deleteStylesByMemberId(memberId);
+        memberStyleRepository.deleteStylesByMemberId(memberId);
     }
 
-    public List<Style> findMemberStyles(final Long memberId) {
-        return styleRepository.findAllByMemberId(memberId);
+    public List<MemberStyle> findMemberStyles(final Long memberId) {
+        return memberStyleRepository.findAllByMemberId(memberId);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
new file mode 100644
index 00000000..849c5a1b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
@@ -0,0 +1,40 @@
+package com.atwoz.member.domain.info.style;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Table(name = "member_styles")
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+@Entity
+public class MemberStyle {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private Long memberId;
+
+    @Enumerated(value = EnumType.STRING)
+    @Column(nullable = false)
+    private Style style;
+
+    public MemberStyle(final Long memberId, final Style style) {
+        this.memberId = memberId;
+        this.style = style;
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
new file mode 100644
index 00000000..9ba043e1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
@@ -0,0 +1,11 @@
+package com.atwoz.member.domain.info.style;
+
+import java.util.List;
+
+public interface MemberStyleRepository {
+
+    void save(final MemberStyle style);
+    void saveAll(final List<MemberStyle> styles);
+    void deleteStylesByMemberId(final Long memberId);
+    List<MemberStyle> findAllByMemberId(Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index 3e0b9c58..58fe164b 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,40 +1,92 @@
 package com.atwoz.member.domain.info.style;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
+import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Getter
-@Table(name = "member_styles")
-@AllArgsConstructor(access = AccessLevel.PROTECTED)
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Builder
-@Entity
-public class Style {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false)
-    private Long memberId;
-
-    @Enumerated(value = EnumType.STRING)
-    @Column(nullable = false)
-    private StyleName styleName;
-
-    public Style(final Long memberId, final StyleName styleName) {
-        this.memberId = memberId;
-        this.styleName = styleName;
+public enum Style {
+
+    FASHION("패션 센스", "C001"),
+    FRIENDLY("다정다감", "C002"),
+    FUNNY("유머 감각", "C003"),
+    GOOD_RATIO("좋은 비율", "C004"),
+    PRETTY_SMILE("웃는 미소가 예쁨", "C005"),
+    LOW_VOICE("저음 목소리", "C006"),
+    CONSIDERABLE("넓은 배려심", "C007"),
+    EXTROVERT("외향형", "C008"),
+    INTROVERT("내향형", "C009"),
+    ATTRACTIVE("애교쟁이", "C010"),
+    GOOD_SKIN("좋은 피부", "C011"),
+    POSITIVE("긍정적", "C012"),
+    CUTE("귀여움", "C013"),
+    RELIABLE("듬직함", "C014"),
+    PRETTY_HAND("예쁜 손", "C015"),
+    LOVELY("사랑스러움", "C016"),
+    MOOD("분위기 있음", "C017"),
+    REAL_BETTER("실물이 더 좋음", "C018"),
+    INNOCENT("천진난만", "C019"),
+    INTELLECTUAL("지적 섹시", "C020"),
+    POLITE("예의 바름", "C021"),
+    GENTLE("진중함", "C022"),
+    GOOD_SPEECH("나긋나긋한 말투", "C023"),
+    ONE_LOVE("순정파", "C024"),
+    PURE("청순함", "C025"),
+    BOLD_DOUBLE_EYELID("짙은 쌍꺼풀", "C026"),
+    NONE_DOUBLE_EYELID("무쌍꺼풀", "C027"),
+    INNER_DOUBLE_EYELID("속쌍꺼풀", "C028"),
+    PROUD("도도함", "C029"),
+    MAKER("분위기 메이커", "C030");
+
+    private static final int MAX_SIZE = 3;
+
+    private final String name;
+    private final String code;
+
+    Style(final String name, final String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static List<Style> findAllByCodes(final List<String> codes) {
+        validateSize(codes);
+        return codes.stream()
+                .map(Style::findByCode)
+                .toList();
+    }
+
+    public static void validateSize(final List<String> codes) {
+        if (codes.isEmpty()) {
+            throw new StyleSizeException();
+        }
+
+        Set<String> uniqueCodes = new HashSet<>(codes);
+        if (uniqueCodes.size() != codes.size()) {
+            throw new StyleDuplicateException();
+        }
+
+        int validSize = Arrays.stream(values())
+                .filter(hobbyName -> uniqueCodes.contains(hobbyName.getCode()))
+                .toList()
+                .size();
+        if (validSize > MAX_SIZE) {
+            throw new StyleSizeException();
+        }
+    }
+
+    private static Style findByCode(final String code) {
+        return Arrays.stream(values())
+                .filter(styleName -> styleName.isSame(code))
+                .findFirst()
+                .orElseThrow(StyleNotFoundException::new);
+    }
+
+    private boolean isSame(final String code) {
+        return this.code.equals(code);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java b/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
deleted file mode 100644
index bdf492d9..00000000
--- a/src/main/java/com/atwoz/member/domain/info/style/StyleName.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.atwoz.member.domain.info.style;
-
-import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
-import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
-import lombok.Getter;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@Getter
-public enum StyleName {
-
-    FASHION("패션 센스", "C001"),
-    FRIENDLY("다정다감", "C002"),
-    FUNNY("유머 감각", "C003"),
-    GOOD_RATIO("좋은 비율", "C004"),
-    PRETTY_SMILE("웃는 미소가 예쁨", "C005"),
-    LOW_VOICE("저음 목소리", "C006"),
-    CONSIDERABLE("넓은 배려심", "C007"),
-    EXTROVERT("외향형", "C008"),
-    INTROVERT("내향형", "C009"),
-    ATTRACTIVE("애교쟁이", "C010"),
-    GOOD_SKIN("좋은 피부", "C011"),
-    POSITIVE("긍정적", "C012"),
-    CUTE("귀여움", "C013"),
-    RELIABLE("듬직함", "C014"),
-    PRETTY_HAND("예쁜 손", "C015"),
-    LOVELY("사랑스러움", "C016"),
-    MOOD("분위기 있음", "C017"),
-    REAL_BETTER("실물이 더 좋음", "C018"),
-    INNOCENT("천진난만", "C019"),
-    INTELLECTUAL("지적 섹시", "C020"),
-    POLITE("예의 바름", "C021"),
-    GENTLE("진중함", "C022"),
-    GOOD_SPEECH("나긋나긋한 말투", "C023"),
-    ONE_LOVE("순정파", "C024"),
-    PURE("청순함", "C025"),
-    BOLD_DOUBLE_EYELID("짙은 쌍꺼풀", "C026"),
-    NONE_DOUBLE_EYELID("무쌍꺼풀", "C027"),
-    INNER_DOUBLE_EYELID("속쌍꺼풀", "C028"),
-    PROUD("도도함", "C029"),
-    MAKER("분위기 메이커", "C030");
-
-    private static final int MAX_SIZE = 3;
-
-    private final String name;
-    private final String code;
-
-    StyleName(final String name, final String code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public static List<StyleName> findAllByCodes(final List<String> codes) {
-        validateSize(codes);
-        return codes.stream()
-                .map(StyleName::findBy)
-                .toList();
-    }
-
-    public static void validateSize(final List<String> codes) {
-        if (codes.isEmpty()) {
-            throw new StyleSizeException();
-        }
-
-        Set<String> uniqueCodes = new HashSet<>(codes);
-        if (uniqueCodes.size() != codes.size()) {
-            throw new StyleDuplicateException();
-        }
-
-        int validSize = Arrays.stream(values())
-                .filter(hobbyName -> uniqueCodes.contains(hobbyName.getCode()))
-                .toList()
-                .size();
-        if (validSize > MAX_SIZE) {
-            throw new StyleSizeException();
-        }
-    }
-
-    private static StyleName findBy(final String code) {
-        return Arrays.stream(values())
-                .filter(styleName -> styleName.isSame(code))
-                .findFirst()
-                .orElseThrow(StyleNotFoundException::new);
-    }
-
-    private boolean isSame(final String code) {
-        return this.code.equals(code);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java b/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
deleted file mode 100644
index 3b696de4..00000000
--- a/src/main/java/com/atwoz/member/domain/info/style/StyleRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.atwoz.member.domain.info.style;
-
-import java.util.List;
-
-public interface StyleRepository {
-
-    void save(final Style style);
-    void saveAll(final List<Style> styles);
-    void deleteStylesByMemberId(final Long memberId);
-    List<Style> findAllByMemberId(Long memberId);
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
new file mode 100644
index 00000000..9f6365e9
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
@@ -0,0 +1,11 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.MemberStyle;
+import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.List;
+
+public interface MemberStyleJpaRepository extends JpaRepository<MemberStyle, Long> {
+
+    void deleteByMemberId(final Long memberId);
+    List<MemberStyle> findAllByMemberId(Long memberId);
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java
new file mode 100644
index 00000000..9469628b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java
@@ -0,0 +1,34 @@
+package com.atwoz.member.infrastructure.info.style;
+
+import com.atwoz.member.domain.info.style.MemberStyle;
+import com.atwoz.member.domain.info.style.MemberStyleRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Repository
+public class MemberStyleRepositoryImpl implements MemberStyleRepository {
+
+    private final MemberStyleJpaRepository memberStyleJpaRepository;
+
+    @Override
+    public void save(final MemberStyle style) {
+        memberStyleJpaRepository.save(style);
+    }
+
+    @Override
+    public void saveAll(final List<MemberStyle> styles) {
+        memberStyleJpaRepository.saveAll(styles);
+    }
+
+    @Override
+    public void deleteStylesByMemberId(final Long memberId) {
+        memberStyleJpaRepository.deleteByMemberId(memberId);
+    }
+
+    @Override
+    public List<MemberStyle> findAllByMemberId(final Long memberId) {
+        return memberStyleJpaRepository.findAllByMemberId(memberId);
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
deleted file mode 100644
index 19fd2e03..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleJpaRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.atwoz.member.infrastructure.info.style;
-
-import com.atwoz.member.domain.info.style.Style;
-import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.List;
-
-public interface StyleJpaRepository extends JpaRepository<Style, Long> {
-
-    void deleteByMemberId(final Long memberId);
-    List<Style> findAllByMemberId(Long memberId);
-}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
deleted file mode 100644
index 1af49a70..00000000
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/StyleRepositoryImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.atwoz.member.infrastructure.info.style;
-
-import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleRepository;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Repository
-public class StyleRepositoryImpl implements StyleRepository {
-
-    private final StyleJpaRepository styleJpaRepository;
-
-    @Override
-    public void save(final Style style) {
-        styleJpaRepository.save(style);
-    }
-
-    @Override
-    public void saveAll(final List<Style> styles) {
-        styleJpaRepository.saveAll(styles);
-    }
-
-    @Override
-    public void deleteStylesByMemberId(final Long memberId) {
-        styleJpaRepository.deleteByMemberId(memberId);
-    }
-
-    @Override
-    public List<Style> findAllByMemberId(final Long memberId) {
-        return styleJpaRepository.findAllByMemberId(memberId);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
index a287ff1f..51783afc 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
@@ -1,15 +1,15 @@
 package com.atwoz.member.ui.info.dto;
 
+import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleName;
 
 public record StyleSearchResponse(
 
         String style
 ) {
 
-    public static StyleSearchResponse from(final Style style) {
-        StyleName styleName = style.getStyleName();
-        return new StyleSearchResponse(styleName.getCode());
+    public static StyleSearchResponse from(final MemberStyle memberStyle) {
+        Style style = memberStyle.getStyle();
+        return new StyleSearchResponse(style.getCode());
     }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 1f55cd3f..ddf18b08 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -2,8 +2,8 @@
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
-import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
-import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
index 8d04700c..54f8d874 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -1,13 +1,13 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
-import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.atwoz.member.application.info.style.StyleService;
-import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleRepository;
-import com.atwoz.member.infrastructure.info.StyleFakeRepository;
+import com.atwoz.member.domain.info.style.MemberStyle;
+import com.atwoz.member.domain.info.style.MemberStyleRepository;
+import com.atwoz.member.infrastructure.info.MemberStyleFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -19,12 +19,12 @@
 class StyleServiceTest {
 
     private StyleService styleService;
-    private StyleRepository styleRepository;
+    private MemberStyleRepository memberStyleRepository;
 
     @BeforeEach
     void init() {
-        styleRepository = new StyleFakeRepository();
-        styleService = new StyleService(styleRepository);
+        memberStyleRepository = new MemberStyleFakeRepository();
+        styleService = new StyleService(memberStyleRepository);
     }
 
     @Test
@@ -37,7 +37,7 @@ void init() {
         styleService.saveMemberStyles(memberId, styleCodes);
 
         // then
-        List<Style> saveStyles = styleRepository.findAllByMemberId(memberId);
+        List<MemberStyle> saveStyles = memberStyleRepository.findAllByMemberId(memberId);
         assertThat(saveStyles.size()).isEqualTo(2);
     }
 
@@ -52,7 +52,7 @@ void init() {
         styleService.deleteMemberStyles(memberId);
 
         // then
-        assertThat(styleRepository.findAllByMemberId(memberId)).isEmpty();
+        assertThat(memberStyleRepository.findAllByMemberId(memberId)).isEmpty();
     }
 
     @Test
@@ -63,7 +63,7 @@ void init() {
         styleService.saveMemberStyles(memberId, styleCodes);
 
         // when
-        List<Style> memberStyles = styleService.findMemberStyles(memberId);
+        List<MemberStyle> memberStyles = styleService.findMemberStyles(memberId);
 
         // then
         assertThat(memberStyles.size()).isEqualTo(2);
diff --git a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java b/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
similarity index 80%
rename from src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
rename to src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
index bc4c4cf2..b3588d15 100644
--- a/src/test/java/com/atwoz/member/domain/info/style/StyleNameTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
@@ -13,16 +13,16 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-class StyleNameTest {
+class StyleTest {
 
     @Test
     void 스타일이_존재하면_정상적으로_가져온다() {
         // given
         List<String> styleCodes = List.of("C001", "C002", "C003");
-        List<StyleName> expectedStyles = List.of(StyleName.FASHION, StyleName.FRIENDLY, StyleName.FUNNY);
+        List<Style> expectedStyles = List.of(Style.FASHION, Style.FRIENDLY, Style.FUNNY);
 
         // when
-        List<StyleName> findStyles = StyleName.findAllByCodes(styleCodes);
+        List<Style> findStyles = Style.findAllByCodes(styleCodes);
 
         // then
         assertSoftly(softly -> {
@@ -37,7 +37,7 @@ class StyleNameTest {
         List<String> styleCodes = List.of("C001", "C002", "C003", "C004");
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
+        assertThatThrownBy(() -> Style.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleSizeException.class);
     }
 
@@ -47,7 +47,7 @@ class StyleNameTest {
         List<String> styleCodes = List.of();
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
+        assertThatThrownBy(() -> Style.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleSizeException.class);
     }
 
@@ -57,7 +57,7 @@ class StyleNameTest {
         List<String> styleCodes = List.of("ABCD");
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
+        assertThatThrownBy(() -> Style.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleNotFoundException.class);
     }
 
@@ -67,7 +67,7 @@ class StyleNameTest {
         List<String> styleCodes = List.of("C001", "C001");
 
         // when & then
-        assertThatThrownBy(() -> StyleName.findAllByCodes(styleCodes))
+        assertThatThrownBy(() -> Style.findAllByCodes(styleCodes))
                 .isInstanceOf(StyleDuplicateException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberMemberStyleJpaRepositoryTest.java
similarity index 64%
rename from src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/MemberMemberStyleJpaRepositoryTest.java
index 37255191..95071757 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/StyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberMemberStyleJpaRepositoryTest.java
@@ -3,11 +3,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleName;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.fixture.member.MemberFixture;
-import com.atwoz.member.infrastructure.info.style.StyleJpaRepository;
+import com.atwoz.member.infrastructure.info.style.MemberStyleJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -21,10 +21,10 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-class StyleJpaRepositoryTest {
+class MemberMemberStyleJpaRepositoryTest {
 
     @Autowired
-    private StyleJpaRepository styleJpaRepository;
+    private MemberStyleJpaRepository memberStyleJpaRepository;
 
     @Autowired
     private MemberJpaRepository memberJpaRepository;
@@ -39,15 +39,15 @@ void init() {
     @Test
     void 회원_스타일을_저장한다() {
         // given
-        StyleName styleName = StyleName.POSITIVE;
+        Style style = Style.POSITIVE;
         Long memberId = member.getId();
-        Style memberStyle = new Style(memberId, styleName);
+        MemberStyle memberStyle = new MemberStyle(memberId, style);
 
         // when
-        Style saveStyle = styleJpaRepository.save(memberStyle);
+        MemberStyle saveMemberStyle = memberStyleJpaRepository.save(memberStyle);
 
         // then
-        assertThat(saveStyle)
+        assertThat(saveMemberStyle)
                 .usingRecursiveComparison()
                 .isEqualTo(memberStyle);
     }
@@ -55,18 +55,18 @@ void init() {
     @Test
     void 회원_스타일을_조회한다() {
         // given
-        StyleName styleName = StyleName.POSITIVE;
+        Style style = Style.POSITIVE;
         Long memberId = member.getId();
-        Style memberStyle = new Style(memberId, styleName);
-        Style saveStyle = styleJpaRepository.save(memberStyle);
+        MemberStyle memberStyle = new MemberStyle(memberId, style);
+        MemberStyle saveMemberStyle = memberStyleJpaRepository.save(memberStyle);
 
         // when
-        List<Style> findMemberStyles = styleJpaRepository.findAllByMemberId(memberId);
+        List<MemberStyle> findMemberStyles = memberStyleJpaRepository.findAllByMemberId(memberId);
 
         // then
         assertSoftly(softly -> {
             softly.assertThat(findMemberStyles.size()).isEqualTo(1);
-            softly.assertThat(findMemberStyles).contains(saveStyle);
+            softly.assertThat(findMemberStyles).contains(saveMemberStyle);
         });
     }
 
@@ -74,13 +74,13 @@ void init() {
     void 회원_스타일_목록을_저장_및_조회한다() {
         // given
         Long memberId = member.getId();
-        List<Style> memberStyles = Stream.of(StyleName.POSITIVE, StyleName.GENTLE)
-                .map(styleName -> new Style(memberId, styleName))
-                .map(style -> styleJpaRepository.save(style))
+        List<MemberStyle> memberStyles = Stream.of(Style.POSITIVE, Style.GENTLE)
+                .map(style -> new MemberStyle(memberId, style))
+                .map(style -> memberStyleJpaRepository.save(style))
                 .toList();
 
         // when
-        List<Style> findMemberStyles = styleJpaRepository.findAllByMemberId(memberId);
+        List<MemberStyle> findMemberStyles = memberStyleJpaRepository.findAllByMemberId(memberId);
 
         // then
         assertSoftly(softly -> {
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
similarity index 54%
rename from src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
rename to src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
index 7b53e078..7f4c24f8 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/StyleFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
@@ -1,31 +1,31 @@
 package com.atwoz.member.infrastructure.info;
 
-import com.atwoz.member.domain.info.style.Style;
-import com.atwoz.member.domain.info.style.StyleRepository;
+import com.atwoz.member.domain.info.style.MemberStyle;
+import com.atwoz.member.domain.info.style.MemberStyleRepository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class StyleFakeRepository implements StyleRepository {
+public class MemberStyleFakeRepository implements MemberStyleRepository {
 
-    private final Map<Long, Style> map = new HashMap<>();
+    private final Map<Long, MemberStyle> map = new HashMap<>();
     private long id = 1L;
 
     @Override
-    public void save(final Style style) {
-        Style newStyle = Style.builder()
+    public void save(final MemberStyle style) {
+        MemberStyle newStyle = MemberStyle.builder()
                 .id(id)
                 .memberId(style.getMemberId())
-                .styleName(style.getStyleName())
+                .style(style.getStyle())
                 .build();
         map.put(id, newStyle);
         id++;
     }
 
     @Override
-    public void saveAll(final List<Style> styles) {
+    public void saveAll(final List<MemberStyle> styles) {
         styles.stream()
-                .map(style -> new Style(style.getMemberId(), style.getStyleName()))
+                .map(style -> new MemberStyle(style.getMemberId(), style.getStyle()))
                 .forEach(style -> map.put(id++, style));
     }
 
@@ -35,7 +35,7 @@ public void deleteStylesByMemberId(final Long memberId) {
     }
 
     @Override
-    public List<Style> findAllByMemberId(final Long memberId) {
+    public List<MemberStyle> findAllByMemberId(final Long memberId) {
         return map.values()
                 .stream()
                 .filter(style -> memberId.equals(style.getMemberId()))
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 2ab68e9e..1aeede04 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -3,8 +3,8 @@
 import static com.atwoz.helper.RestDocsHelper.customDocument;
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
-import static com.atwoz.member.domain.info.style.StyleName.GENTLE;
-import static com.atwoz.member.domain.info.style.StyleName.POSITIVE;
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.옵션_정보_조회_응답;

From 6bbdcb2e88be1a1e0776e6a927987d9aae98b9f4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 16:48:31 +0900
Subject: [PATCH 117/225] =?UTF-8?q?refactor:=20MemberStyle=20=EC=9D=B8?=
 =?UTF-8?q?=EC=9E=90=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 Style 인자를 MemberStyle로 변경
---
 .../domain/info/style/MemberStyleRepository.java |  4 ++--
 .../info/style/MemberStyleRepositoryImpl.java    |  8 ++++----
 .../info/MemberStyleFakeRepository.java          | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
index 9ba043e1..b02f4cc9 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
@@ -4,8 +4,8 @@
 
 public interface MemberStyleRepository {
 
-    void save(final MemberStyle style);
-    void saveAll(final List<MemberStyle> styles);
+    void save(final MemberStyle memberStyle);
+    void saveAll(final List<MemberStyle> memberStyles);
     void deleteStylesByMemberId(final Long memberId);
     List<MemberStyle> findAllByMemberId(Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java
index 9469628b..56f9d36f 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleRepositoryImpl.java
@@ -13,13 +13,13 @@ public class MemberStyleRepositoryImpl implements MemberStyleRepository {
     private final MemberStyleJpaRepository memberStyleJpaRepository;
 
     @Override
-    public void save(final MemberStyle style) {
-        memberStyleJpaRepository.save(style);
+    public void save(final MemberStyle memberStyle) {
+        memberStyleJpaRepository.save(memberStyle);
     }
 
     @Override
-    public void saveAll(final List<MemberStyle> styles) {
-        memberStyleJpaRepository.saveAll(styles);
+    public void saveAll(final List<MemberStyle> memberStyles) {
+        memberStyleJpaRepository.saveAll(memberStyles);
     }
 
     @Override
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
index 7f4c24f8..363908df 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
@@ -12,33 +12,33 @@ public class MemberStyleFakeRepository implements MemberStyleRepository {
     private long id = 1L;
 
     @Override
-    public void save(final MemberStyle style) {
+    public void save(final MemberStyle memberStyle) {
         MemberStyle newStyle = MemberStyle.builder()
                 .id(id)
-                .memberId(style.getMemberId())
-                .style(style.getStyle())
+                .memberId(memberStyle.getMemberId())
+                .style(memberStyle.getStyle())
                 .build();
         map.put(id, newStyle);
         id++;
     }
 
     @Override
-    public void saveAll(final List<MemberStyle> styles) {
-        styles.stream()
-                .map(style -> new MemberStyle(style.getMemberId(), style.getStyle()))
+    public void saveAll(final List<MemberStyle> memberStyles) {
+        memberStyles.stream()
+                .map(memberStyle -> new MemberStyle(memberStyle.getMemberId(), memberStyle.getStyle()))
                 .forEach(style -> map.put(id++, style));
     }
 
     @Override
     public void deleteStylesByMemberId(final Long memberId) {
-        map.values().removeIf(style -> memberId.equals(style.getMemberId()));
+        map.values().removeIf(memberStyle -> memberId.equals(memberStyle.getMemberId()));
     }
 
     @Override
     public List<MemberStyle> findAllByMemberId(final Long memberId) {
         return map.values()
                 .stream()
-                .filter(style -> memberId.equals(style.getMemberId()))
+                .filter(memberStyle -> memberId.equals(memberStyle.getMemberId()))
                 .toList();
     }
 }

From 737c4cbb78104630d9bc6b96d2f9d1353a001d31 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:01:38 +0900
Subject: [PATCH 118/225] =?UTF-8?q?refactor:=20Hobby,=20Style=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=8B=A4=ED=8C=A8=20=EC=98=88=EC=99=B8=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Hobby 조회 실패 예외 메서드명 변경, 내용 수정
- Style 조회 실패 예외 메서드명 변경, 내용 수정
---
 .../atwoz/member/domain/info/hobby/Hobby.java    |  4 ++--
 .../atwoz/member/domain/info/style/Style.java    |  4 ++--
 .../member/exception/MemberExceptionHandler.java | 16 ++++++++--------
 .../info/hobby/HobbyInvalidException.java        |  8 ++++++++
 .../info/hobby/HobbyNotFoundException.java       |  8 --------
 .../info/style/StyleInvalidException.java        |  8 ++++++++
 .../info/style/StyleNotFoundException.java       |  8 --------
 .../member/domain/info/hobby/HobbyTest.java      |  4 ++--
 .../member/domain/info/style/StyleTest.java      |  4 ++--
 9 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java
 delete mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java
 delete mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index 9ab307d9..9843511f 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.hobby;
 
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyInvalidException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import lombok.Getter;
 import java.util.Arrays;
@@ -92,7 +92,7 @@ private static Hobby findByCode(final String code) {
         return Arrays.stream(values())
                 .filter(hobbyName -> hobbyName.isSame(code))
                 .findFirst()
-                .orElseThrow(HobbyNotFoundException::new);
+                .orElseThrow(HobbyInvalidException::new);
     }
 
     private boolean isSame(final String code) {
diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index 58fe164b..d9976f4d 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.style;
 
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleInvalidException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import lombok.Getter;
 import java.util.Arrays;
@@ -83,7 +83,7 @@ private static Style findByCode(final String code) {
         return Arrays.stream(values())
                 .filter(styleName -> styleName.isSame(code))
                 .findFirst()
-                .orElseThrow(StyleNotFoundException::new);
+                .orElseThrow(StyleInvalidException::new);
     }
 
     private boolean isSame(final String code) {
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 7e029b29..3253f7b1 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -9,7 +9,7 @@
 import com.atwoz.member.exception.exceptions.auth.TokenInvalidException;
 import com.atwoz.member.exception.exceptions.auth.UnsupportedTokenException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyInvalidException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
 import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
@@ -25,7 +25,7 @@
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleInvalidException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import com.atwoz.member.exception.exceptions.member.MemberAlreadyExistedException;
 import com.atwoz.member.exception.exceptions.member.MemberNotFoundException;
@@ -102,9 +102,9 @@ public ResponseEntity<String> handleOAuthPlatformNotFountException(final OAuthPl
     }
 
     // info - hobby
-    @ExceptionHandler(HobbyNotFoundException.class)
-    public ResponseEntity<String> handleHobbyNotFoundException(final HobbyNotFoundException e) {
-        return getNotFoundResponse(e);
+    @ExceptionHandler(HobbyInvalidException.class)
+    public ResponseEntity<String> handleHobbyInvalidException(final HobbyInvalidException e) {
+        return getBadRequest(e);
     }
 
     @ExceptionHandler(HobbySizeException.class)
@@ -118,9 +118,9 @@ public ResponseEntity<String> handleHobbyDuplicationException(final HobbyDuplica
     }
 
     // info - style
-    @ExceptionHandler(StyleNotFoundException.class)
-    public ResponseEntity<String> handleStyleNotFoundException(final StyleNotFoundException e) {
-        return getNotFoundResponse(e);
+    @ExceptionHandler(StyleInvalidException.class)
+    public ResponseEntity<String> handleStyleInvalidException(final StyleInvalidException e) {
+        return getBadRequest(e);
     }
 
     @ExceptionHandler(StyleSizeException.class)
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java
new file mode 100644
index 00000000..caa6321a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.hobby;
+
+public class HobbyInvalidException extends RuntimeException {
+
+    public HobbyInvalidException() {
+        super("등록되지 않은 취미입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java
deleted file mode 100644
index 813716cd..00000000
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyNotFoundException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.member.exception.exceptions.info.hobby;
-
-public class HobbyNotFoundException extends RuntimeException {
-
-    public HobbyNotFoundException() {
-        super("취미를 찾을 수 없습니다.");
-    }
-}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java
new file mode 100644
index 00000000..84a7401c
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info.style;
+
+public class StyleInvalidException extends RuntimeException {
+
+    public StyleInvalidException() {
+        super("등록되지 않은 스타일입니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java
deleted file mode 100644
index 409683ad..00000000
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleNotFoundException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.atwoz.member.exception.exceptions.info.style;
-
-public class StyleNotFoundException extends RuntimeException {
-
-    public StyleNotFoundException() {
-        super("스타일을 찾을 수 없습니다.");
-    }
-}
diff --git a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
index bb8bb736..4f332085 100644
--- a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyNotFoundException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyInvalidException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -58,7 +58,7 @@ class HobbyTest {
 
         // when & then
         assertThatThrownBy(() -> Hobby.findAllByCodes(hobbyCodes))
-                .isInstanceOf(HobbyNotFoundException.class);
+                .isInstanceOf(HobbyInvalidException.class);
     }
 
     @Test
diff --git a/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java b/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
index b3588d15..25e4e865 100644
--- a/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleNotFoundException;
+import com.atwoz.member.exception.exceptions.info.style.StyleInvalidException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -58,7 +58,7 @@ class StyleTest {
 
         // when & then
         assertThatThrownBy(() -> Style.findAllByCodes(styleCodes))
-                .isInstanceOf(StyleNotFoundException.class);
+                .isInstanceOf(StyleInvalidException.class);
     }
 
     @Test

From 9ee676da415a47bca3b9cec7f0e28b4af7c8e2ea Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:03:07 +0900
Subject: [PATCH 119/225] =?UTF-8?q?refactor:=20InfoRepositoryImpl=20?=
 =?UTF-8?q?=EC=9A=A9=EC=96=B4=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoRepositoryImpl QStyle을 QMemberStyle로 변경
---
 .../member/infrastructure/info/InfoRepositoryImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
index e3a9d9f0..5c971895 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -1,13 +1,13 @@
 package com.atwoz.member.infrastructure.info;
 
 import static com.atwoz.member.domain.info.hobby.QMemberHobby.memberHobby;
+import static com.atwoz.member.domain.info.style.QMemberStyle.memberStyle;
 
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.QOption;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.QProfile;
-import com.atwoz.member.domain.info.style.QStyle;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
@@ -67,9 +67,9 @@ private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long membe
     }
 
     private List<StyleSearchResponse> selectStyleResponseByMemberId(final Long memberId) {
-        return queryFactory.select(QStyle.style)
-                .from(QStyle.style)
-                .where(QStyle.style.memberId.eq(memberId))
+        return queryFactory.select(memberStyle)
+                .from(memberStyle)
+                .where(memberStyle.memberId.eq(memberId))
                 .fetch()
                 .stream()
                 .map(StyleSearchResponse::from)

From e5b20dede9ec01299d5295fbccca0dfb3ebba8b7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:25:19 +0900
Subject: [PATCH 120/225] =?UTF-8?q?test:=20Drink=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Drink 테스트 작성
---
 .../member/domain/info/option/DrinkTest.java  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java b/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java
new file mode 100644
index 00000000..ce7393dd
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.option;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class DrinkTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String drinkName = "전혀 마시지 않음";
+
+        // when & then
+        assertDoesNotThrow(() -> Drink.findByName(drinkName));
+    }
+
+    @Test
+    void 올바른_음주_단계가_아니면_예외가_발생한다() {
+        // given
+        String drinkName = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Drink.findByName(drinkName))
+                .isInstanceOf(DrinkInvalidException.class);
+    }
+}

From 66ef872457e347727e0220a65e4839b8235e5b2d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:27:31 +0900
Subject: [PATCH 121/225] =?UTF-8?q?test:=20Graduate=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Graduate 테스트 작성
---
 .../domain/info/option/GraduateTest.java      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java b/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java
new file mode 100644
index 00000000..d02db91d
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.option;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class GraduateTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String graduateName = "로스쿨";
+
+        // when & then
+        assertDoesNotThrow(() -> Graduate.findByName(graduateName));
+    }
+
+    @Test
+    void 올바른_최종_학력이_아니면_예외가_발생한다() {
+        // given
+        String graduateName = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Graduate.findByName(graduateName))
+                .isInstanceOf(GraduateInvalidException.class);
+    }
+}

From c483c347824d2ddfd0669c494ea284087006e8fc Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:29:31 +0900
Subject: [PATCH 122/225] =?UTF-8?q?test:=20Mbti=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Mbti 테스트 작성
---
 .../member/domain/info/option/MbtiTest.java   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java b/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java
new file mode 100644
index 00000000..16dd82d8
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.option;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class MbtiTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String mbtiName = "INFJ";
+
+        // when & then
+        assertDoesNotThrow(() -> Mbti.findByName(mbtiName));
+    }
+
+    @Test
+    void 올바른_mbti가_아니면_예외가_발생한다() {
+        // given
+        String mbtiName = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Mbti.findByName(mbtiName))
+                .isInstanceOf(MbtiInvalidException.class);
+    }
+}

From 007cffcb0addd2e1ca83dbeb1b5625fe9bda7d54 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:31:26 +0900
Subject: [PATCH 123/225] =?UTF-8?q?test:=20Religion=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Religion 테스트 작성
---
 .../domain/info/option/ReligionTest.java      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java b/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java
new file mode 100644
index 00000000..fc20f325
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.option;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class ReligionTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String religionName = "기독교";
+
+        // when & then
+        assertDoesNotThrow(() -> Religion.findByName(religionName));
+    }
+
+    @Test
+    void 올바른_종교가_아니면_예외가_발생한다() {
+        // given
+        String religionName = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Religion.findByName(religionName))
+                .isInstanceOf(ReligionInvalidException.class);
+    }
+}

From b4c00f613dd0c9b1aea2bd6dd4cd5fcadcaeb024 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:33:17 +0900
Subject: [PATCH 124/225] =?UTF-8?q?test:=20Smoke=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Smoke 테스트 작성
---
 .../member/domain/info/option/SmokeTest.java  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java b/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java
new file mode 100644
index 00000000..6fa494a7
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.domain.info.option;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class SmokeTest {
+
+    @Test
+    void 올바른_선택_시_조회된다() {
+        // given
+        String smokeName = "비흡연";
+
+        // when & then
+        assertDoesNotThrow(() -> Smoke.findByName(smokeName));
+    }
+
+    @Test
+    void 올바른_흡연_단계가_아니면_예외가_발생한다() {
+        // given
+        String smokeName = "hello";
+
+        // when & then
+        assertThatThrownBy(() -> Smoke.findByName(smokeName))
+                .isInstanceOf(SmokeInvalidException.class);
+    }
+}

From 869dabf61cb846761f18de72bd15f2035fb25cd7 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:45:49 +0900
Subject: [PATCH 125/225] =?UTF-8?q?test:=20Profile=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile 테스트 작성 (수정 검증)
- 각 Fixture 메서드 생성, SuppressWarnings 추가
---
 .../domain/info/profile/ProfileTest.java      | 47 +++++++++++++++++++
 .../member/fixture/info/BodyFixture.java      | 13 ++++-
 .../atwoz/member/fixture/info/JobFixture.java |  5 ++
 .../member/fixture/info/LocationFixture.java  |  8 ++++
 .../member/fixture/info/PositionFixture.java  |  8 ++++
 5 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
new file mode 100644
index 00000000..9fa1aaab
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -0,0 +1,47 @@
+package com.atwoz.member.domain.info.profile;
+
+import static com.atwoz.member.fixture.info.BodyFixture.수정_body_생성;
+import static com.atwoz.member.fixture.info.BodyFixture.일반_body_생성;
+import static com.atwoz.member.fixture.info.JobFixture.수정_직업_생성;
+import static com.atwoz.member.fixture.info.JobFixture.일반_직업_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.수정_위치_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.일반_위치_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.수정_좌표_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.일반_좌표_생성;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class ProfileTest {
+
+    @Test
+    void 내용_수정_검증() {
+        // given
+        Long memberId = 1L;
+        Body body = 일반_body_생성();
+        Job job = 일반_직업_생성();
+        Location location = 일반_위치_생성();
+        Position position = 일반_좌표_생성();
+        Profile profile = new Profile(memberId, body, location, position, job);
+
+        Body updateBody = 수정_body_생성();
+        Job updateJob = 수정_직업_생성();
+        Location updateLocation = 수정_위치_생성();
+        Position updatePosition = 수정_좌표_생성();
+
+        // when
+        profile.updateContents(updateBody, updateLocation, updatePosition, updateJob);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(profile.getBody()).isEqualTo(updateBody);
+            softly.assertThat(profile.getJob()).isEqualTo(updateJob);
+            softly.assertThat(profile.getLocation()).isEqualTo(updateLocation);
+            softly.assertThat(profile.getPosition()).isEqualTo(updatePosition);
+        });
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
index 9fded201..ddbe6dce 100644
--- a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
@@ -5,13 +5,24 @@
 import com.atwoz.member.domain.info.profile.YearManager;
 import com.atwoz.member.infrastructure.info.FakeYearManager;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class BodyFixture {
 
     public static Body 일반_body_생성() {
         YearManager yearManager = new FakeYearManager();
         int birthYear = 2000;
         int height = 171;
+        Gender gender = Gender.MALE;
 
-        return new Body(yearManager, birthYear, height, Gender.MALE);
+        return new Body(yearManager, birthYear, height, gender);
+    }
+
+    public static Body 수정_body_생성() {
+        YearManager yearManager = new FakeYearManager();
+        int birthYear = 2001;
+        int height = 170;
+        Gender gender = Gender.FEMALE;
+
+        return new Body(yearManager, birthYear, height, gender);
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
index ed23b4bc..b147131c 100644
--- a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
@@ -2,9 +2,14 @@
 
 import com.atwoz.member.domain.info.profile.Job;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class JobFixture {
 
     public static Job 일반_직업_생성() {
         return Job.RESEARCH_AND_DEVELOP;
     }
+
+    public static Job 수정_직업_생성() {
+        return Job.ETC;
+    }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
index 9c5e39ae..f5965d88 100644
--- a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
@@ -2,6 +2,7 @@
 
 import com.atwoz.member.domain.info.profile.Location;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class LocationFixture {
 
     public static Location 일반_위치_생성() {
@@ -10,4 +11,11 @@ public class LocationFixture {
 
         return new Location(city, sector);
     }
+
+    public static Location 수정_위치_생성() {
+        String city = "경기도";
+        String sector = "성남시";
+
+        return new Location(city, sector);
+    }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
index 357748db..b6732b8e 100644
--- a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
@@ -3,6 +3,7 @@
 import com.atwoz.member.domain.info.profile.Position;
 import java.math.BigDecimal;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class PositionFixture {
 
     public static Position 일반_좌표_생성() {
@@ -11,4 +12,11 @@ public class PositionFixture {
 
         return new Position(latitude, longitude);
     }
+
+    public static Position 수정_좌표_생성() {
+        BigDecimal latitude = BigDecimal.valueOf(50);
+        BigDecimal longitude = BigDecimal.valueOf(160);
+
+        return new Position(latitude, longitude);
+    }
 }

From e3e396752723e944ccbb478fd59942929b94f1c4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:52:02 +0900
Subject: [PATCH 126/225] =?UTF-8?q?test:=20Option=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Option 테스트 작성 (수정)
- 전부 enum 타입이기에 Fixture 생성 대신 직접 생성 방식 선택
---
 .../member/domain/info/option/OptionTest.java | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/domain/info/option/OptionTest.java

diff --git a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
new file mode 100644
index 00000000..1c95009e
--- /dev/null
+++ b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
@@ -0,0 +1,43 @@
+package com.atwoz.member.domain.info.option;
+
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+public class OptionTest {
+
+    @Test
+    void 내용_수정_검증() {
+        // given
+        Long memberId = 1L;
+        Smoke smoke = Smoke.NEVER;
+        Religion religion = Religion.CHRIST;
+        Drink drink = Drink.NEVER;
+        Mbti mbti = Mbti.INFJ;
+        Graduate graduate = Graduate.SEOUL_FOURTH;
+
+        Option option = new Option(memberId, smoke, religion, drink, mbti, graduate);
+
+        Smoke updateSmoke = Smoke.ELECTRONIC;
+        Religion updateReligion = Religion.BUDDHA;
+        Drink updateDrink = Drink.ENJOY;
+        Mbti updateMbti = Mbti.ENFJ;
+        Graduate updateGraduate = Graduate.DOCTOR;
+
+        // when
+        option.updateContents(updateSmoke, updateReligion, updateDrink, updateMbti, updateGraduate);
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(option.getSmoke()).isEqualTo(updateSmoke);
+            softly.assertThat(option.getReligion()).isEqualTo(updateReligion);
+            softly.assertThat(option.getDrink()).isEqualTo(updateDrink);
+            softly.assertThat(option.getMbti()).isEqualTo(updateMbti);
+            softly.assertThat(option.getGraduate()).isEqualTo(updateGraduate);
+        });
+    }
+}

From bc7a3fd35ff9feff035441fd25c8ed007571fc52 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 17:58:51 +0900
Subject: [PATCH 127/225] =?UTF-8?q?refactor:=20MemberStyleJpaRepositoryTes?=
 =?UTF-8?q?t=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Member 중복 작성 삭제
---
 ...JpaRepositoryTest.java => MemberStyleJpaRepositoryTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/test/java/com/atwoz/member/infrastructure/info/{MemberMemberStyleJpaRepositoryTest.java => MemberStyleJpaRepositoryTest.java} (98%)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberMemberStyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/infrastructure/info/MemberMemberStyleJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
index 95071757..7f67fe05 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberMemberStyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
@@ -21,7 +21,7 @@
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @DataJpaTest
-class MemberMemberStyleJpaRepositoryTest {
+class MemberStyleJpaRepositoryTest {
 
     @Autowired
     private MemberStyleJpaRepository memberStyleJpaRepository;

From ba3cc017c9ae6160a532eeb7b1411e6306b2e573 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 19:41:21 +0900
Subject: [PATCH 128/225] =?UTF-8?q?refactor:=20MemberStyleJpaRepositoryTes?=
 =?UTF-8?q?t=20=EB=B3=80=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- map 안에서의 변수명 변경
---
 .../infrastructure/info/MemberStyleJpaRepositoryTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
index 7f67fe05..c1200d9b 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
@@ -76,7 +76,7 @@ void init() {
         Long memberId = member.getId();
         List<MemberStyle> memberStyles = Stream.of(Style.POSITIVE, Style.GENTLE)
                 .map(style -> new MemberStyle(memberId, style))
-                .map(style -> memberStyleJpaRepository.save(style))
+                .map(memberStyle -> memberStyleJpaRepository.save(memberStyle))
                 .toList();
 
         // when

From bcc9e299e9cad3f018632e8a3b091d10673b6494 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 19:41:40 +0900
Subject: [PATCH 129/225] =?UTF-8?q?refactor:=20MemberHobbyJpaRepositoryTes?=
 =?UTF-8?q?t=20=EB=B3=80=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- map 안에서의 변수명 변경
---
 .../infrastructure/info/MemberHobbyJpaRepositoryTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
index 3715cb23..3bd445f4 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
@@ -75,8 +75,8 @@ void init() {
         // given
         Long memberId = member.getId();
         List<MemberHobby> memberHobbies = Stream.of(Hobby.BICYCLE, Hobby.DANCE)
-                .map(hobbyName -> new MemberHobby(memberId, hobbyName))
-                .map(hobby -> hobbyJpaRepository.save(hobby))
+                .map(hobby -> new MemberHobby(memberId, hobby))
+                .map(memberHobby -> hobbyJpaRepository.save(memberHobby))
                 .toList();
 
         // when

From d2965cf35a81129095e28753d42b5ec6702ba720 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 19:45:48 +0900
Subject: [PATCH 130/225] =?UTF-8?q?refactor:=20MemberHobbyFakeRepository?=
 =?UTF-8?q?=20=EB=B3=80=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- forEach 안에서의 변수명 변경
---
 .../member/infrastructure/info/MemberHobbyFakeRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
index 157c05e5..70143655 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
@@ -26,7 +26,7 @@ public void save(final MemberHobby memberHobby) {
     public void saveAll(final List<MemberHobby> memberHobbies) {
         memberHobbies.stream()
                 .map(memberHobby -> new MemberHobby(memberHobby.getMemberId(), memberHobby.getHobby()))
-                .forEach(hobby -> map.put(id++, hobby));
+                .forEach(memberHobby -> map.put(id++, memberHobby));
     }
 
     @Override

From 00929b15cf90e532122304f17d1814694a6f860a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 19:47:59 +0900
Subject: [PATCH 131/225] =?UTF-8?q?refactor:=20MemberStyleFakeRepository?=
 =?UTF-8?q?=20=EB=B3=80=EC=88=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 저장 변수명 변경
- forEach 안에서의 변수명 변경
---
 .../infrastructure/info/MemberStyleFakeRepository.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
index 363908df..ca5f85f8 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
@@ -13,12 +13,12 @@ public class MemberStyleFakeRepository implements MemberStyleRepository {
 
     @Override
     public void save(final MemberStyle memberStyle) {
-        MemberStyle newStyle = MemberStyle.builder()
+        MemberStyle newMemberStyle = MemberStyle.builder()
                 .id(id)
                 .memberId(memberStyle.getMemberId())
                 .style(memberStyle.getStyle())
                 .build();
-        map.put(id, newStyle);
+        map.put(id, newMemberStyle);
         id++;
     }
 
@@ -26,7 +26,7 @@ public void save(final MemberStyle memberStyle) {
     public void saveAll(final List<MemberStyle> memberStyles) {
         memberStyles.stream()
                 .map(memberStyle -> new MemberStyle(memberStyle.getMemberId(), memberStyle.getStyle()))
-                .forEach(style -> map.put(id++, style));
+                .forEach(memberStyle -> map.put(id++, memberStyle));
     }
 
     @Override

From c3dbae3d833e518a608d1a06b6108d388487ce3b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 19:51:54 +0900
Subject: [PATCH 132/225] =?UTF-8?q?refactor:=20ProfileJpaRepositoryTest=20?=
 =?UTF-8?q?ignoringFields=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileJpaRepositoryTest 비교 시 ignoringFields 추가
---
 .../member/infrastructure/info/ProfileJpaRepositoryTest.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
index 080163ec..6aa07ac9 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
@@ -83,6 +83,7 @@ void init() {
             softly.assertThat(findProfile).isPresent();
             softly.assertThat(findProfile.get())
                     .usingRecursiveComparison()
+                    .ignoringFields("id")
                     .isEqualTo(saveProfile);
         });
     }

From 6a06503eab8bfd050f74d7edf9fc71e2068ae5b1 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 19:52:20 +0900
Subject: [PATCH 133/225] =?UTF-8?q?refactor:=20OptionJpaRepositoryTest=20i?=
 =?UTF-8?q?gnoringFields=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionJpaRepositoryTest 비교 시 ignoringFields 추가
---
 .../member/infrastructure/info/OptionJpaRepositoryTest.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
index 0998bab8..ae1a3a56 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
@@ -82,6 +82,7 @@ void init() {
             softly.assertThat(findOption).isPresent();
             softly.assertThat(findOption.get())
                     .usingRecursiveComparison()
+                    .ignoringFields("id")
                     .isEqualTo(saveOption);
         });
     }

From c940570e9281205ec1a638ecc3f7ba4e3fb6c23f Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 20:29:02 +0900
Subject: [PATCH 134/225] =?UTF-8?q?refactor:=20Hobby=20=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- filter에서의 변수명 수정
- isSameCode로 메서드명 변경, 진행 방식 수정
---
 .../java/com/atwoz/member/domain/info/hobby/Hobby.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index 9843511f..d56a4f28 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -80,7 +80,7 @@ private static void validateIsUniqueCodes(final List<String> codes) {
 
     private static void validateIsNotOverMaxSizeOfHobby(final List<String> codes) {
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> codes.contains(hobbyName.getCode()))
+                .filter(hobby -> codes.contains(hobby.getCode()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {
@@ -90,12 +90,12 @@ private static void validateIsNotOverMaxSizeOfHobby(final List<String> codes) {
 
     private static Hobby findByCode(final String code) {
         return Arrays.stream(values())
-                .filter(hobbyName -> hobbyName.isSame(code))
+                .filter(hobby -> hobby.isSameCode(code))
                 .findFirst()
                 .orElseThrow(HobbyInvalidException::new);
     }
 
-    private boolean isSame(final String code) {
-        return this.code.equals(code);
+    private boolean isSameCode(final String code) {
+        return code.equals(this.code);
     }
 }

From f755d7f317ecd0307f5b67c8117100c4e9847d31 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 20:29:23 +0900
Subject: [PATCH 135/225] =?UTF-8?q?refactor:=20Style=20=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- filter에서의 변수명 수정
- isSameCode로 메서드명 변경, 진행 방식 수정
---
 .../java/com/atwoz/member/domain/info/style/Style.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index d9976f4d..65dfdb22 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -71,7 +71,7 @@ public static void validateSize(final List<String> codes) {
         }
 
         int validSize = Arrays.stream(values())
-                .filter(hobbyName -> uniqueCodes.contains(hobbyName.getCode()))
+                .filter(style -> uniqueCodes.contains(style.getCode()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {
@@ -81,12 +81,12 @@ public static void validateSize(final List<String> codes) {
 
     private static Style findByCode(final String code) {
         return Arrays.stream(values())
-                .filter(styleName -> styleName.isSame(code))
+                .filter(style -> style.isSameCode(code))
                 .findFirst()
                 .orElseThrow(StyleInvalidException::new);
     }
 
-    private boolean isSame(final String code) {
-        return this.code.equals(code);
+    private boolean isSameCode(final String code) {
+        return code.equals(this.code);
     }
 }

From 6d99997a2611f1da6f9656436cfc5f2f586cc81e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 20:38:36 +0900
Subject: [PATCH 136/225] =?UTF-8?q?refactor:=20Enumerated=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 다른 클래스들과의 통일을 지키기 위해 Enumerated 위치 수정
---
 .../java/com/atwoz/member/domain/info/hobby/MemberHobby.java    | 2 +-
 .../java/com/atwoz/member/domain/info/style/MemberStyle.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
index bf1c8e87..353cad0e 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
@@ -29,8 +29,8 @@ public class MemberHobby {
     @Column(nullable = false)
     private Long memberId;
 
-    @Enumerated(value = EnumType.STRING)
     @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
     private Hobby hobby;
 
     public MemberHobby(final Long memberId, final Hobby hobby) {
diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
index 849c5a1b..c1e3eb36 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
@@ -29,8 +29,8 @@ public class MemberStyle {
     @Column(nullable = false)
     private Long memberId;
 
-    @Enumerated(value = EnumType.STRING)
     @Column(nullable = false)
+    @Enumerated(value = EnumType.STRING)
     private Style style;
 
     public MemberStyle(final Long memberId, final Style style) {

From 3869917be0823c34972a2b12dfef1cd92ded4e99 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 20:39:13 +0900
Subject: [PATCH 137/225] =?UTF-8?q?refactor:=20NoArgsConstructor=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- NoArgsConstructor 위치 수정
---
 src/main/java/com/atwoz/member/domain/info/option/Option.java   | 2 +-
 src/main/java/com/atwoz/member/domain/info/profile/Profile.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index b4a2ebd3..c9d6e6e3 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -15,8 +15,8 @@
 
 @Getter
 @EqualsAndHashCode(exclude = "id")
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "member_option")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 public class Option {
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 01ba1ab9..d8e253ad 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -16,8 +16,8 @@
 
 @Getter
 @EqualsAndHashCode(exclude = "id")
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "member_profile")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 public class Profile {
 

From 7e6568047405bde75e61ab13c0d922ad23a8461f Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 20:48:10 +0900
Subject: [PATCH 138/225] =?UTF-8?q?refactor:=20exists=20=EC=BF=BC=EB=A6=AC?=
 =?UTF-8?q?=20=EC=84=B1=EB=8A=A5=20=EA=B0=9C=EC=84=A0=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- exists를 활용하여 (스프링 데이터 JPA 메서드명) 조회되도록 수정
---
 .../infrastructure/info/option/OptionJpaRepository.java     | 4 +---
 .../infrastructure/info/option/OptionRepositoryImpl.java    | 2 +-
 .../infrastructure/info/profile/ProfileJpaRepository.java   | 6 ++----
 .../infrastructure/info/profile/ProfileRepositoryImpl.java  | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
index cdc894a4..5b17445c 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
@@ -2,13 +2,11 @@
 
 import com.atwoz.member.domain.info.option.Option;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import java.util.Optional;
 
 public interface OptionJpaRepository extends JpaRepository<Option, Long> {
 
     Optional<Option> findByMemberId(Long memberId);
 
-    @Query("select count(*) > 0 from Option o where o.memberId = :memberId")
-    boolean isExistMemberOption(final Long memberId);
+    boolean existsByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
index 5e84eff0..f17e9007 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionRepositoryImpl.java
@@ -24,6 +24,6 @@ public Optional<Option> findByMemberId(final Long memberId) {
 
     @Override
     public boolean isExistMemberOption(final Long memberId) {
-        return optionJpaRepository.isExistMemberOption(memberId);
+        return optionJpaRepository.existsByMemberId(memberId);
     }
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
index 793beab4..f081e4fa 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
@@ -2,13 +2,11 @@
 
 import com.atwoz.member.domain.info.profile.Profile;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import java.util.Optional;
 
 public interface ProfileJpaRepository extends JpaRepository<Profile, Long> {
 
     Optional<Profile> findByMemberId(final Long memberId);
-
-    @Query("select count(*) > 0 from Profile p where p.memberId = :memberId")
-    boolean isExistMemberOption(final Long memberId);
+    
+    boolean existsByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
index d302b365..19a90663 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileRepositoryImpl.java
@@ -24,6 +24,6 @@ public Optional<Profile> findByMemberId(final Long memberId) {
 
     @Override
     public boolean isExistMemberProfile(final Long memberId) {
-        return profileJpaRepository.isExistMemberOption(memberId);
+        return profileJpaRepository.existsByMemberId(memberId);
     }
 }

From bca409a5d93cb5c4de8251413b8cb8a0af0e4b1e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 21:00:48 +0900
Subject: [PATCH 139/225] =?UTF-8?q?refactor:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8?=
 =?UTF-8?q?=20RequiredArgsConstructor=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이벤트들의 통일을 위해 RequiredArgsConstructor 추가
---
 .../atwoz/member/application/event/OptionWroteEvent.java  | 8 ++------
 .../atwoz/member/application/event/ProfileWroteEvent.java | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java b/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
index c17f728b..524ee3f4 100644
--- a/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
@@ -3,16 +3,12 @@
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 @Getter
+@RequiredArgsConstructor
 public class OptionWroteEvent extends Event {
 
     private final Long memberId;
     private final OptionWriteRequest request;
-
-    public OptionWroteEvent(final Long memberId, final OptionWriteRequest request) {
-        super();
-        this.memberId = memberId;
-        this.request = request;
-    }
 }
diff --git a/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java b/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
index ee53158a..ea942f07 100644
--- a/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
@@ -3,16 +3,12 @@
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 @Getter
+@RequiredArgsConstructor
 public class ProfileWroteEvent extends Event {
 
     private final Long memberId;
     private final ProfileWriteRequest request;
-
-    public ProfileWroteEvent(final Long memberId, final ProfileWriteRequest request) {
-        super();
-        this.memberId = memberId;
-        this.request = request;
-    }
 }

From 8582f6ec232771ceb733567df1d98215751a32a8 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 21:17:28 +0900
Subject: [PATCH 140/225] =?UTF-8?q?refactor:=20OptionEventHandler=20?=
 =?UTF-8?q?=EA=B3=B5=EB=B0=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 다른 이벤트 핸들러와의 통일을 위해 공백 추가
---
 .../atwoz/member/application/info/option/OptionEventHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index 2e84b53b..ae525c36 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -16,6 +16,7 @@ public class OptionEventHandler {
     public void writeOption(final OptionWroteEvent event) {
         Long memberId = event.getMemberId();
         OptionWriteRequest request = event.getRequest();
+
         optionService.writeOption(memberId, request);
     }
 }

From 4a46263980c495fd995f8112a81af826a26493f5 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 21:19:21 +0900
Subject: [PATCH 141/225] =?UTF-8?q?refactor:=20Location,=20Position=20?=
 =?UTF-8?q?=ED=91=9C=ED=98=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Location 구를 구/군으로 수정
- Position 앞에 좌표 붙여지도록 수정
---
 .../info/dto/profile/LocationWriteRequest.java       |  2 +-
 .../member/ui/info/InfoControllerWebMvcTest.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
index 3e553b48..95385651 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
@@ -6,7 +6,7 @@ public record LocationWriteRequest(
         @NotBlank(message = "시/도가 작성되어야 합니다.")
         String city,
 
-        @NotBlank(message = "구가 작성되어야 합니다.")
+        @NotBlank(message = "구/군이 작성되어야 합니다.")
         String sector
 ) {
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 1aeede04..c62c697d 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -98,9 +98,9 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 fieldWithPath("profile.height").description("키"),
                                 fieldWithPath("profile.gender").description("성별"),
                                 fieldWithPath("profile.location.city").description("위치 (시/도)"),
-                                fieldWithPath("profile.location.sector").description("위치 (구)"),
-                                fieldWithPath("profile.position.latitude").description("위도"),
-                                fieldWithPath("profile.position.longitude").description("경도"),
+                                fieldWithPath("profile.location.sector").description("위치 (구/군)"),
+                                fieldWithPath("profile.position.latitude").description("좌표 (위도)"),
+                                fieldWithPath("profile.position.longitude").description("좌표 (경도)"),
                                 fieldWithPath("profile.job").description("직업 코드"),
                                 fieldWithPath("option.drink").description("음주 단계"),
                                 fieldWithPath("option.graduate").description("최종 학력"),
@@ -171,9 +171,9 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 fieldWithPath("profile.height").description("키"),
                                 fieldWithPath("profile.gender").description("성별"),
                                 fieldWithPath("profile.location.city").description("위치 (시/도)"),
-                                fieldWithPath("profile.location.sector").description("위치 (구)"),
-                                fieldWithPath("profile.position.latitude").description("위도"),
-                                fieldWithPath("profile.position.longitude").description("경도"),
+                                fieldWithPath("profile.location.sector").description("위치 (구/군)"),
+                                fieldWithPath("profile.position.latitude").description("좌표 (위도)"),
+                                fieldWithPath("profile.position.longitude").description("좌표 (경도)"),
                                 fieldWithPath("profile.job").description("직업 코드"),
                                 fieldWithPath("option.drink").description("음주 단계"),
                                 fieldWithPath("option.graduate").description("최종 학력"),

From 5b4bc027442dc92c19c3f59094c2cda892d4e869 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 21:30:42 +0900
Subject: [PATCH 142/225] =?UTF-8?q?refactor:=20ProfileFactory=20=EA=B3=B5?=
 =?UTF-8?q?=EB=B0=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 다른 Factory와의 통일을 위해 공백 추가
---
 .../atwoz/member/application/info/profile/ProfileFactory.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 754e7982..f228ab55 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -18,6 +18,7 @@ public static Profile of(final Long memberId, final ProfileWriteRequest request,
         Location location = createLocation(request.location());
         Position position = createPosition(request.position());
         Job job = createJob(request.job());
+
         return new Profile(memberId, body, location, position, job);
     }
 

From fced5f3ccfc472a70247779a7d6ae4c84afa6449 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 22:03:47 +0900
Subject: [PATCH 143/225] =?UTF-8?q?feat:=20info=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20DTO=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- info (profile, option, hobbies, styles) 수정 요청 DTO 정의
---
 .../info/dto/HobbyUpdateRequest.java          |  9 ++++++
 .../info/dto/InfoUpdateRequest.java           | 26 +++++++++++++++++
 .../info/dto/StyleUpdateRequest.java          |  9 ++++++
 .../info/dto/option/OptionUpdateRequest.java  | 21 ++++++++++++++
 .../dto/profile/LocationUpdateRequest.java    | 12 ++++++++
 .../dto/profile/PositionUpdateRequest.java    | 13 +++++++++
 .../dto/profile/ProfileUpdateRequest.java     | 28 +++++++++++++++++++
 7 files changed, 118 insertions(+)
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java

diff --git a/src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java
new file mode 100644
index 00000000..155da71c
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java
@@ -0,0 +1,9 @@
+package com.atwoz.member.application.info.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record HobbyUpdateRequest(
+        @NotBlank(message = "취미가 작성되어야 합니다.")
+        String hobby
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
new file mode 100644
index 00000000..6f9794b2
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
@@ -0,0 +1,26 @@
+package com.atwoz.member.application.info.dto;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import java.util.List;
+
+public record InfoUpdateRequest(
+        @Valid
+        @NotNull(message = "profile 요청이 있어야 합니다.")
+        ProfileWriteRequest profile,
+
+        @Valid
+        @NotNull(message = "option 요청이 있어야 합니다.")
+        OptionWriteRequest option,
+
+        @Valid
+        @NotNull(message = "취미 요청이 있어야 합니다.")
+        List<HobbyWriteRequest> hobbies,
+
+        @Valid
+        @NotNull(message = "스타일 요청이 있어야 합니다.")
+        List<StyleWriteRequest> styles
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java
new file mode 100644
index 00000000..a8ca7e1f
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java
@@ -0,0 +1,9 @@
+package com.atwoz.member.application.info.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record StyleUpdateRequest(
+        @NotBlank(message = "스타일이 작성되어야 합니다.")
+        String style
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
new file mode 100644
index 00000000..d49d0db3
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
@@ -0,0 +1,21 @@
+package com.atwoz.member.application.info.dto.option;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record OptionUpdateRequest(
+        @NotBlank(message = "음주가 작성되어야 합니다.")
+        String drink,
+
+        @NotBlank(message = "최종학력이 작성되어야 합니다.")
+        String graduate,
+
+        @NotBlank(message = "종교가 작성되어야 합니다.")
+        String religion,
+
+        @NotBlank(message = "흡연이 작성되어야 합니다.")
+        String smoke,
+
+        @NotBlank(message = "MBTI가 작성되어야 합니다.")
+        String mbti
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java
new file mode 100644
index 00000000..8b38ca3b
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java
@@ -0,0 +1,12 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record LocationUpdateRequest(
+        @NotBlank(message = "시/도가 작성되어야 합니다.")
+        String city,
+
+        @NotBlank(message = "구/군이 작성되어야 합니다.")
+        String sector
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java
new file mode 100644
index 00000000..a4c307a8
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import jakarta.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public record PositionUpdateRequest(
+        @NotNull(message = "위도가 있어야 합니다.")
+        BigDecimal latitude,
+
+        @NotNull(message = "경도가 있어야 합니다.")
+        BigDecimal longitude
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
new file mode 100644
index 00000000..4727cac3
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record ProfileUpdateRequest(
+        @NotNull(message = "출생년도가 작성되어야 합니다.")
+        Integer birthYear,
+
+        @NotNull(message = "키가 작성되어야 합니다.")
+        Integer height,
+
+        @NotBlank(message = "성별이 작성되어야 합니다.")
+        String gender,
+
+        @Valid
+        @NotNull(message = "위치가 작성되어야 합니다.")
+        LocationWriteRequest location,
+
+        @Valid
+        @NotNull(message = "위도-경도가 작성되어야 합니다.")
+        PositionWriteRequest position,
+
+        @NotBlank(message = "직업이 작성되어야 합니다.")
+        String job
+) {
+}

From 8a2b93b4a7509b6e299e9c4598ebb1d3fc4bdf49 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 22:05:46 +0900
Subject: [PATCH 144/225] =?UTF-8?q?feat:=20info=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=A0=95?=
 =?UTF-8?q?=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- info (profile, option, hobbies, styles) 수정 요청 이벤트 정의
- 관련 이벤트 핸들러 정의
- 기존 이벤트 패키지 분할
---
 .../application/event/info/HobbyUpdatedEvent.java  | 14 ++++++++++++++
 .../event/{ => info}/HobbyWroteEvent.java          |  2 +-
 .../application/event/info/OptionUpdatedEvent.java | 14 ++++++++++++++
 .../event/{ => info}/OptionWroteEvent.java         |  2 +-
 .../event/info/ProfileUpdatedEvent.java            | 14 ++++++++++++++
 .../event/{ => info}/ProfileWroteEvent.java        |  2 +-
 .../application/event/info/StyleUpdatedEvent.java  | 14 ++++++++++++++
 .../event/{ => info}/StyleWroteEvent.java          |  2 +-
 .../atwoz/member/application/info/InfoService.java |  8 ++++----
 .../application/info/hobby/HobbyEventHandler.java  |  9 ++++++++-
 .../info/option/OptionEventHandler.java            | 10 +++++++++-
 .../info/profile/ProfileEventHandler.java          | 10 +++++++++-
 .../application/info/style/StyleEventHandler.java  |  9 ++++++++-
 .../member/application/info/InfoServiceTest.java   |  8 ++++----
 14 files changed, 102 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java
 rename src/main/java/com/atwoz/member/application/event/{ => info}/HobbyWroteEvent.java (85%)
 create mode 100644 src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java
 rename src/main/java/com/atwoz/member/application/event/{ => info}/OptionWroteEvent.java (87%)
 create mode 100644 src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java
 rename src/main/java/com/atwoz/member/application/event/{ => info}/ProfileWroteEvent.java (87%)
 create mode 100644 src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java
 rename src/main/java/com/atwoz/member/application/event/{ => info}/StyleWroteEvent.java (85%)

diff --git a/src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java b/src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java
new file mode 100644
index 00000000..a7b5fdd4
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.application.event.info;
+
+import com.atwoz.global.event.Event;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor
+public class HobbyUpdatedEvent extends Event {
+
+    private final Long memberId;
+    private final List<String> hobbyCodes;
+}
diff --git a/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java b/src/main/java/com/atwoz/member/application/event/info/HobbyWroteEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
rename to src/main/java/com/atwoz/member/application/event/info/HobbyWroteEvent.java
index 6221f4c4..8e7d2df6 100644
--- a/src/main/java/com/atwoz/member/application/event/HobbyWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/info/HobbyWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event;
+package com.atwoz.member.application.event.info;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java b/src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java
new file mode 100644
index 00000000..d8671d6e
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.application.event.info;
+
+import com.atwoz.global.event.Event;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class OptionUpdatedEvent extends Event {
+
+    private final Long memberId;
+    private final OptionUpdateRequest request;
+}
diff --git a/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java b/src/main/java/com/atwoz/member/application/event/info/OptionWroteEvent.java
similarity index 87%
rename from src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
rename to src/main/java/com/atwoz/member/application/event/info/OptionWroteEvent.java
index 524ee3f4..36f06ed2 100644
--- a/src/main/java/com/atwoz/member/application/event/OptionWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/info/OptionWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event;
+package com.atwoz.member.application.event.info;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java b/src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java
new file mode 100644
index 00000000..6d288374
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.application.event.info;
+
+import com.atwoz.global.event.Event;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class ProfileUpdatedEvent extends Event {
+
+    private final Long memberId;
+    private final ProfileUpdateRequest request;
+}
diff --git a/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java b/src/main/java/com/atwoz/member/application/event/info/ProfileWroteEvent.java
similarity index 87%
rename from src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
rename to src/main/java/com/atwoz/member/application/event/info/ProfileWroteEvent.java
index ea942f07..44da64a4 100644
--- a/src/main/java/com/atwoz/member/application/event/ProfileWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/info/ProfileWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event;
+package com.atwoz.member.application.event.info;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java b/src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java
new file mode 100644
index 00000000..2e89733c
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.application.event.info;
+
+import com.atwoz.global.event.Event;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import java.util.List;
+
+@Getter
+@RequiredArgsConstructor
+public class StyleUpdatedEvent extends Event {
+
+    private final Long memberId;
+    private final List<String> styleCodes;
+}
diff --git a/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java b/src/main/java/com/atwoz/member/application/event/info/StyleWroteEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
rename to src/main/java/com/atwoz/member/application/event/info/StyleWroteEvent.java
index 4d1ca3c4..87530f3b 100644
--- a/src/main/java/com/atwoz/member/application/event/StyleWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/event/info/StyleWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event;
+package com.atwoz.member.application.event.info;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 74ca8ab7..b3904796 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -1,10 +1,10 @@
 package com.atwoz.member.application.info;
 
 import com.atwoz.global.event.Events;
-import com.atwoz.member.application.event.HobbyWroteEvent;
-import com.atwoz.member.application.event.OptionWroteEvent;
-import com.atwoz.member.application.event.ProfileWroteEvent;
-import com.atwoz.member.application.event.StyleWroteEvent;
+import com.atwoz.member.application.event.info.HobbyWroteEvent;
+import com.atwoz.member.application.event.info.OptionWroteEvent;
+import com.atwoz.member.application.event.info.ProfileWroteEvent;
+import com.atwoz.member.application.event.info.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
index 3fbcf837..e4ae781e 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.application.info.hobby;
 
-import com.atwoz.member.application.event.HobbyWroteEvent;
+import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
+import com.atwoz.member.application.event.info.HobbyWroteEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
@@ -19,4 +20,10 @@ public void writeHobbies(final HobbyWroteEvent event) {
 
         hobbyService.saveMemberHobbies(memberId, hobbyCodes);
     }
+
+    @EventListener
+    public void updateHobbies(final HobbyUpdatedEvent event) {
+        Long memberId = event.getMemberId();
+        List<String> hobbyCodes = event.getHobbyCodes();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index ae525c36..aa317e7c 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -1,6 +1,8 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.application.event.OptionWroteEvent;
+import com.atwoz.member.application.event.info.OptionUpdatedEvent;
+import com.atwoz.member.application.event.info.OptionWroteEvent;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
@@ -19,4 +21,10 @@ public void writeOption(final OptionWroteEvent event) {
 
         optionService.writeOption(memberId, request);
     }
+
+    @EventListener
+    public void updateOption(final OptionUpdatedEvent event) {
+        Long memberId = event.getMemberId();
+        OptionUpdateRequest request = event.getRequest();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
index 8d91be79..7e448193 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
@@ -1,6 +1,8 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.application.event.ProfileWroteEvent;
+import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
+import com.atwoz.member.application.event.info.ProfileWroteEvent;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
@@ -19,4 +21,10 @@ public void writeProfile(final ProfileWroteEvent event) {
 
         profileService.writeProfile(memberId, request);
     }
+
+    @EventListener
+    public void updateProfile(final ProfileUpdatedEvent event) {
+        Long memberId = event.getMemberId();
+        ProfileUpdateRequest request = event.getRequest();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
index 3a6445ea..43c64e9d 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.application.info.style;
 
-import com.atwoz.member.application.event.StyleWroteEvent;
+import com.atwoz.member.application.event.info.StyleUpdatedEvent;
+import com.atwoz.member.application.event.info.StyleWroteEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
@@ -19,4 +20,10 @@ public void writeHobbies(final StyleWroteEvent event) {
 
         styleService.saveMemberStyles(memberId, styleCodes);
     }
+
+    @EventListener
+    public void updateHobbies(final StyleUpdatedEvent event) {
+        Long memberId = event.getMemberId();
+        List<String> styleCodes = event.getStyleCodes();
+    }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index ddf18b08..480dc75b 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -8,10 +8,10 @@
 import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.event.HobbyWroteEvent;
-import com.atwoz.member.application.event.OptionWroteEvent;
-import com.atwoz.member.application.event.ProfileWroteEvent;
-import com.atwoz.member.application.event.StyleWroteEvent;
+import com.atwoz.member.application.event.info.HobbyWroteEvent;
+import com.atwoz.member.application.event.info.OptionWroteEvent;
+import com.atwoz.member.application.event.info.ProfileWroteEvent;
+import com.atwoz.member.application.event.info.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;

From b27b3984570162528ce1327d5c1ab48d0b2dc5ef Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 23:58:13 +0900
Subject: [PATCH 145/225] =?UTF-8?q?feat:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 스타일 삭제 메서드 제거, 수정에서만 사용하도록 변경
- 스타일 저장, 수정 메서드만 테스트되도록 수정
- 저장 메서드와 공유하는 코드 메서드화
---
 .../info/style/StyleEventHandler.java         |  2 +
 .../application/info/style/StyleService.java  | 15 ++++---
 .../member/domain/info/style/MemberStyle.java |  2 +
 .../application/info/StyleServiceTest.java    | 43 +++++++++++--------
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
index 43c64e9d..85c3820b 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -25,5 +25,7 @@ public void writeHobbies(final StyleWroteEvent event) {
     public void updateHobbies(final StyleUpdatedEvent event) {
         Long memberId = event.getMemberId();
         List<String> styleCodes = event.getStyleCodes();
+
+        styleService.updateMemberStyles(memberId, styleCodes);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
index 340b2801..9608b970 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleService.java
@@ -16,9 +16,12 @@ public class StyleService {
     private final MemberStyleRepository memberStyleRepository;
 
     @Transactional
-    public void saveMemberStyles(final Long memberId, final List<String> styleNames) {
-        deleteMemberStyles(memberId);
-        List<MemberStyle> memberStyles = Style.findAllByCodes(styleNames)
+    public void saveMemberStyles(final Long memberId, final List<String> styleCodes) {
+        saveMemberStylesByStyleCodes(memberId, styleCodes);
+    }
+
+    private void saveMemberStylesByStyleCodes(final Long memberId, final List<String> styleCodes) {
+        List<MemberStyle> memberStyles = Style.findAllByCodes(styleCodes)
                 .stream()
                 .map(style -> new MemberStyle(memberId, style))
                 .toList();
@@ -27,11 +30,9 @@ public void saveMemberStyles(final Long memberId, final List<String> styleNames)
     }
 
     @Transactional
-    public void deleteMemberStyles(final Long memberId) {
+    public void updateMemberStyles(final Long memberId, final List<String> styleCodes) {
         memberStyleRepository.deleteStylesByMemberId(memberId);
-    }
 
-    public List<MemberStyle> findMemberStyles(final Long memberId) {
-        return memberStyleRepository.findAllByMemberId(memberId);
+        saveMemberStylesByStyleCodes(memberId, styleCodes);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
index c1e3eb36..fb117434 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
@@ -11,10 +11,12 @@
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode(exclude = "id")
 @Table(name = "member_styles")
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
index 54f8d874..da971874 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
@@ -1,8 +1,11 @@
 package com.atwoz.member.application.info;
 
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POLITE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+import static com.atwoz.member.domain.info.style.Style.PROUD;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.style.StyleService;
 import com.atwoz.member.domain.info.style.MemberStyle;
@@ -32,40 +35,44 @@ void init() {
         // given
         Long memberId = 1L;
         List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
+        List<MemberStyle> expectedMemberStyles = List.of(
+                new MemberStyle(memberId, POSITIVE),
+                new MemberStyle(memberId, GENTLE)
+        );
 
         // when
         styleService.saveMemberStyles(memberId, styleCodes);
+        List<MemberStyle> saveMemberStyles = memberStyleRepository.findAllByMemberId(memberId);
 
         // then
-        List<MemberStyle> saveStyles = memberStyleRepository.findAllByMemberId(memberId);
-        assertThat(saveStyles.size()).isEqualTo(2);
+        assertThat(saveMemberStyles).containsAll(expectedMemberStyles);
     }
 
     @Test
-    void 회원의_모든_스타일을_삭제한다() {
+    void 회원의_스타일을_수정한다() {
         // given
         Long memberId = 1L;
         List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
-        styleService.saveMemberStyles(memberId, styleCodes);
-
-        // when
-        styleService.deleteMemberStyles(memberId);
-
-        // then
-        assertThat(memberStyleRepository.findAllByMemberId(memberId)).isEmpty();
-    }
+        List<String> updateStyleCodes = List.of(POLITE.getCode(), PROUD.getCode());
+        List<MemberStyle> originMemberStyles = List.of(
+                new MemberStyle(memberId, POSITIVE),
+                new MemberStyle(memberId, GENTLE)
+        );
+        List<MemberStyle> updateMemberStyles = List.of(
+                new MemberStyle(memberId, POLITE),
+                new MemberStyle(memberId, PROUD)
+        );
 
-    @Test
-    void 회원의_모든_스타일을_조회한다() {
-        // given
-        Long memberId = 1L;
-        List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
         styleService.saveMemberStyles(memberId, styleCodes);
 
         // when
-        List<MemberStyle> memberStyles = styleService.findMemberStyles(memberId);
+        styleService.updateMemberStyles(memberId, updateStyleCodes);
+        List<MemberStyle> saveMemberStyles = memberStyleRepository.findAllByMemberId(memberId);
 
         // then
-        assertThat(memberStyles.size()).isEqualTo(2);
+        assertSoftly(softly -> {
+            softly.assertThat(saveMemberStyles).doesNotContainAnyElementsOf(originMemberStyles);
+            softly.assertThat(saveMemberStyles).containsAll(updateMemberStyles);
+        });
     }
 }

From 9901c37061c596f0b0044b6b694083557002ec08 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Wed, 28 Feb 2024 23:59:30 +0900
Subject: [PATCH 146/225] =?UTF-8?q?refactor:=20StyleServiceTest=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberStyleServiceTest로 이름 변경
---
 .../info/{StyleServiceTest.java => MemberStyleServiceTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/test/java/com/atwoz/member/application/info/{StyleServiceTest.java => MemberStyleServiceTest.java} (98%)

diff --git a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
index da971874..c3550932 100644
--- a/src/test/java/com/atwoz/member/application/info/StyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
@@ -19,7 +19,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-class StyleServiceTest {
+class MemberStyleServiceTest {
 
     private StyleService styleService;
     private MemberStyleRepository memberStyleRepository;

From 0f4ee5747f9f7e3815c2e268e46fc16308eee4db Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 00:12:14 +0900
Subject: [PATCH 147/225] =?UTF-8?q?feat:=20=EC=B7=A8=EB=AF=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 기존 취미 삭제 메서드 제거, 수정에서만 사용하도록 변경
- 취미 저장, 수정 메서드만 테스트되도록 수정
- 저장 메서드와 공유하는 코드 메서드화
- HobbyService를 MemberHobbyService로 이름 변경
---
 .../info/hobby/HobbyEventHandler.java         |  6 ++-
 ...byService.java => MemberHobbyService.java} | 13 ++---
 .../member/domain/info/hobby/MemberHobby.java |  2 +
 .../com/atwoz/helper/MockBeanInjection.java   |  4 +-
 .../info/MemberHobbyServiceTest.java          | 51 +++++++++++--------
 5 files changed, 44 insertions(+), 32 deletions(-)
 rename src/main/java/com/atwoz/member/application/info/hobby/{HobbyService.java => MemberHobbyService.java} (73%)

diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
index e4ae781e..7a7d6a3b 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
@@ -11,19 +11,21 @@
 @Component
 public class HobbyEventHandler {
 
-    private final HobbyService hobbyService;
+    private final MemberHobbyService memberHobbyService;
 
     @EventListener
     public void writeHobbies(final HobbyWroteEvent event) {
         Long memberId = event.getMemberId();
         List<String> hobbyCodes = event.getHobbyCodes();
 
-        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
+        memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
     }
 
     @EventListener
     public void updateHobbies(final HobbyUpdatedEvent event) {
         Long memberId = event.getMemberId();
         List<String> hobbyCodes = event.getHobbyCodes();
+
+        memberHobbyService.updateMemberHobbies(memberId, hobbyCodes);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java b/src/main/java/com/atwoz/member/application/info/hobby/MemberHobbyService.java
similarity index 73%
rename from src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
rename to src/main/java/com/atwoz/member/application/info/hobby/MemberHobbyService.java
index 4af06286..63dcb9d6 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyService.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/MemberHobbyService.java
@@ -11,13 +11,16 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 @Service
-public class HobbyService {
+public class MemberHobbyService {
 
     private final MemberHobbyRepository memberHobbyRepository;
 
     @Transactional
     public void saveMemberHobbies(final Long memberId, final List<String> hobbyCodes) {
-        deleteMemberHobbies(memberId);
+        saveMemberHobbiesByHobbyCodes(memberId, hobbyCodes);
+    }
+
+    private void saveMemberHobbiesByHobbyCodes(final Long memberId, final List<String> hobbyCodes) {
         List<MemberHobby> memberHobbies = Hobby.findAllByCodes(hobbyCodes)
                 .stream()
                 .map(hobby -> new MemberHobby(memberId, hobby))
@@ -27,11 +30,9 @@ public void saveMemberHobbies(final Long memberId, final List<String> hobbyCodes
     }
 
     @Transactional
-    public void deleteMemberHobbies(final Long memberId) {
+    public void updateMemberHobbies(final Long memberId, final List<String> hobbyCodes) {
         memberHobbyRepository.deleteHobbiesByMemberId(memberId);
-    }
 
-    public List<MemberHobby> findMemberHobbies(final Long memberId) {
-        return memberHobbyRepository.findAllByMemberId(memberId);
+        saveMemberHobbiesByHobbyCodes(memberId, hobbyCodes);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
index 353cad0e..92932bfd 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
@@ -11,10 +11,12 @@
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
+@EqualsAndHashCode(exclude = "id")
 @Table(name = "member_hobbies")
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
diff --git a/src/test/java/com/atwoz/helper/MockBeanInjection.java b/src/test/java/com/atwoz/helper/MockBeanInjection.java
index d4b95828..b045118e 100644
--- a/src/test/java/com/atwoz/helper/MockBeanInjection.java
+++ b/src/test/java/com/atwoz/helper/MockBeanInjection.java
@@ -1,7 +1,7 @@
 package com.atwoz.helper;
 
 import com.atwoz.member.application.auth.AuthService;
-import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.member.application.info.hobby.MemberHobbyService;
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.application.info.profile.ProfileService;
 import com.atwoz.member.application.info.style.StyleService;
@@ -28,7 +28,7 @@ public class MockBeanInjection {
     protected AuthService authService;
 
     @MockBean
-    protected HobbyService hobbyService;
+    protected MemberHobbyService memberHobbyService;
 
     @MockBean
     protected OptionService optionService;
diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index 93f5ff6f..b3686887 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -1,10 +1,13 @@
 package com.atwoz.member.application.info;
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WALK;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
+import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.hobby.HobbyService;
+import com.atwoz.member.application.info.hobby.MemberHobbyService;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
 import com.atwoz.member.infrastructure.info.MemberHobbyFakeRepository;
@@ -18,13 +21,13 @@
 @SuppressWarnings("NonAsciiCharacters")
 class MemberHobbyServiceTest {
 
-    private HobbyService hobbyService;
+    private MemberHobbyService memberHobbyService;
     private MemberHobbyRepository memberHobbyRepository;
 
     @BeforeEach
     void init() {
         memberHobbyRepository = new MemberHobbyFakeRepository();
-        hobbyService = new HobbyService(memberHobbyRepository);
+        memberHobbyService = new MemberHobbyService(memberHobbyRepository);
     }
 
     @Test
@@ -32,40 +35,44 @@ void init() {
         // given
         Long memberId = 1L;
         List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
+        List<MemberHobby> expectedMemberHobbies = List.of(
+                new MemberHobby(memberId, WINE),
+                new MemberHobby(memberId, COOK)
+        );
 
         // when
-        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
+        memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // then
         List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
-        assertThat(saveMemberHobbies.size()).isEqualTo(hobbyCodes.size());
+        assertThat(saveMemberHobbies).containsAll(expectedMemberHobbies);
     }
 
     @Test
-    void 회원의_모든_취미를_삭제한다() {
+    void 회원의_취미를_수정한다() {
         // given
         Long memberId = 1L;
         List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
-        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
+        List<String> updateHobbyCodes = List.of(WALK.getCode(), WRITE.getCode());
+        List<MemberHobby> originMemberHobbies = List.of(
+                new MemberHobby(memberId, WINE),
+                new MemberHobby(memberId, COOK)
+        );
+        List<MemberHobby> updateMemberHobbies = List.of(
+                new MemberHobby(memberId, WALK),
+                new MemberHobby(memberId, WRITE)
+        );
 
-        // when
-        hobbyService.deleteMemberHobbies(memberId);
-
-        // then
-        assertThat(memberHobbyRepository.findAllByMemberId(memberId)).isEmpty();
-    }
-
-    @Test
-    void 회원의_모든_취미를_조회한다() {
-        // given
-        Long memberId = 1L;
-        List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
-        hobbyService.saveMemberHobbies(memberId, hobbyCodes);
+        memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
         // when
-        List<MemberHobby> memberHobbies = hobbyService.findMemberHobbies(memberId);
+        memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes);
 
         // then
-        assertThat(memberHobbies.size()).isEqualTo(hobbyCodes.size());
+        List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
+        assertSoftly(softly -> {
+            softly.assertThat(saveMemberHobbies).doesNotContainAnyElementsOf(originMemberHobbies);
+            softly.assertThat(saveMemberHobbies).containsAll(updateMemberHobbies);
+        });
     }
 }

From 756fd8c7da4f5ce34d961694ee9949d29b68dca2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 00:13:42 +0900
Subject: [PATCH 148/225] =?UTF-8?q?refactor:=20StyleService=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- StyleService를 MemberStyle로 이름 변경
---
 .../{StyleService.java => MemberStyleService.java} |  2 +-
 .../application/info/style/StyleEventHandler.java  |  6 +++---
 .../java/com/atwoz/helper/MockBeanInjection.java   |  4 ++--
 ...Test.java => MemberMemberStyleServiceTest.java} | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename src/main/java/com/atwoz/member/application/info/style/{StyleService.java => MemberStyleService.java} (97%)
 rename src/test/java/com/atwoz/member/application/info/{MemberStyleServiceTest.java => MemberMemberStyleServiceTest.java} (85%)

diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleService.java b/src/main/java/com/atwoz/member/application/info/style/MemberStyleService.java
similarity index 97%
rename from src/main/java/com/atwoz/member/application/info/style/StyleService.java
rename to src/main/java/com/atwoz/member/application/info/style/MemberStyleService.java
index 9608b970..189abad4 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleService.java
+++ b/src/main/java/com/atwoz/member/application/info/style/MemberStyleService.java
@@ -11,7 +11,7 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 @Service
-public class StyleService {
+public class MemberStyleService {
 
     private final MemberStyleRepository memberStyleRepository;
 
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
index 85c3820b..5c8689c9 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -11,14 +11,14 @@
 @Component
 public class StyleEventHandler {
 
-    private final StyleService styleService;
+    private final MemberStyleService memberStyleService;
 
     @EventListener
     public void writeHobbies(final StyleWroteEvent event) {
         Long memberId = event.getMemberId();
         List<String> styleCodes = event.getStyleCodes();
 
-        styleService.saveMemberStyles(memberId, styleCodes);
+        memberStyleService.saveMemberStyles(memberId, styleCodes);
     }
 
     @EventListener
@@ -26,6 +26,6 @@ public void updateHobbies(final StyleUpdatedEvent event) {
         Long memberId = event.getMemberId();
         List<String> styleCodes = event.getStyleCodes();
 
-        styleService.updateMemberStyles(memberId, styleCodes);
+        memberStyleService.updateMemberStyles(memberId, styleCodes);
     }
 }
diff --git a/src/test/java/com/atwoz/helper/MockBeanInjection.java b/src/test/java/com/atwoz/helper/MockBeanInjection.java
index b045118e..507dd820 100644
--- a/src/test/java/com/atwoz/helper/MockBeanInjection.java
+++ b/src/test/java/com/atwoz/helper/MockBeanInjection.java
@@ -4,7 +4,7 @@
 import com.atwoz.member.application.info.hobby.MemberHobbyService;
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.application.info.profile.ProfileService;
-import com.atwoz.member.application.info.style.StyleService;
+import com.atwoz.member.application.info.style.MemberStyleService;
 import com.atwoz.member.domain.auth.TokenProvider;
 import com.atwoz.member.ui.auth.interceptor.LoginValidCheckerInterceptor;
 import com.atwoz.member.ui.auth.interceptor.ParseMemberIdFromTokenInterceptor;
@@ -37,7 +37,7 @@ public class MockBeanInjection {
     protected ProfileService profileService;
 
     @MockBean
-    protected StyleService styleService;
+    protected MemberStyleService memberStyleService;
 
     @MockBean
     protected OAuthProperties oAuthProperties;
diff --git a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberMemberStyleServiceTest.java
similarity index 85%
rename from src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/MemberMemberStyleServiceTest.java
index c3550932..27f23a83 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberMemberStyleServiceTest.java
@@ -7,7 +7,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.style.StyleService;
+import com.atwoz.member.application.info.style.MemberStyleService;
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.MemberStyleRepository;
 import com.atwoz.member.infrastructure.info.MemberStyleFakeRepository;
@@ -19,15 +19,15 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-class MemberStyleServiceTest {
+class MemberMemberStyleServiceTest {
 
-    private StyleService styleService;
+    private MemberStyleService memberStyleService;
     private MemberStyleRepository memberStyleRepository;
 
     @BeforeEach
     void init() {
         memberStyleRepository = new MemberStyleFakeRepository();
-        styleService = new StyleService(memberStyleRepository);
+        memberStyleService = new MemberStyleService(memberStyleRepository);
     }
 
     @Test
@@ -41,7 +41,7 @@ void init() {
         );
 
         // when
-        styleService.saveMemberStyles(memberId, styleCodes);
+        memberStyleService.saveMemberStyles(memberId, styleCodes);
         List<MemberStyle> saveMemberStyles = memberStyleRepository.findAllByMemberId(memberId);
 
         // then
@@ -63,10 +63,10 @@ void init() {
                 new MemberStyle(memberId, PROUD)
         );
 
-        styleService.saveMemberStyles(memberId, styleCodes);
+        memberStyleService.saveMemberStyles(memberId, styleCodes);
 
         // when
-        styleService.updateMemberStyles(memberId, updateStyleCodes);
+        memberStyleService.updateMemberStyles(memberId, updateStyleCodes);
         List<MemberStyle> saveMemberStyles = memberStyleRepository.findAllByMemberId(memberId);
 
         // then

From 6a1d0eac141083ff8a2744d27e0d1295e8faaeb2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 00:15:53 +0900
Subject: [PATCH 149/225] =?UTF-8?q?refactor:=20MemberHobbyServiceTest=20th?=
 =?UTF-8?q?en=20=EB=B3=80=EC=88=98=20=EC=9C=84=EC=B9=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 리포지터리 조회 변수를 when절로 이동
---
 .../atwoz/member/application/info/MemberHobbyServiceTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index b3686887..34c7f1d6 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -42,9 +42,9 @@ void init() {
 
         // when
         memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
+        List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
 
         // then
-        List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
         assertThat(saveMemberHobbies).containsAll(expectedMemberHobbies);
     }
 
@@ -67,9 +67,9 @@ void init() {
 
         // when
         memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes);
+        List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
 
         // then
-        List<MemberHobby> saveMemberHobbies = memberHobbyRepository.findAllByMemberId(memberId);
         assertSoftly(softly -> {
             softly.assertThat(saveMemberHobbies).doesNotContainAnyElementsOf(originMemberHobbies);
             softly.assertThat(saveMemberHobbies).containsAll(updateMemberHobbies);

From b7f58943a9fb9aae0f4cb62c6d7ed7edbd165c4e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 00:16:37 +0900
Subject: [PATCH 150/225] =?UTF-8?q?refactor:=20MemberStyleServiceTest=20?=
 =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 클래스 이름 Member 중복 삭제
---
 ...rMemberStyleServiceTest.java => MemberStyleServiceTest.java} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/test/java/com/atwoz/member/application/info/{MemberMemberStyleServiceTest.java => MemberStyleServiceTest.java} (98%)

diff --git a/src/test/java/com/atwoz/member/application/info/MemberMemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/application/info/MemberMemberStyleServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
index 27f23a83..4fba9dbf 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberMemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
@@ -19,7 +19,7 @@
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-class MemberMemberStyleServiceTest {
+class MemberStyleServiceTest {
 
     private MemberStyleService memberStyleService;
     private MemberStyleRepository memberStyleRepository;

From 8dfcf4d6a90adf2f4781351b10c32a20765be51f Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 00:42:25 +0900
Subject: [PATCH 151/225] =?UTF-8?q?feat:=20Option=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionFactory 수정 Option 생성 메서드 추가, 기존 메서드명 변경
- OptionUpdateRequestFixture 생성
- Option 저장, 수정 메서드만 테스트되도록 수정
---
 .../info/option/OptionEventHandler.java       |  2 +
 .../info/option/OptionFactory.java            | 13 ++++++-
 .../info/option/OptionService.java            | 20 ++++++----
 .../application/info/OptionServiceTest.java   | 37 ++++++++-----------
 .../request/OptionUpdateRequestFixture.java   | 27 ++++++++++++++
 5 files changed, 69 insertions(+), 30 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index aa317e7c..a222ea6c 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -26,5 +26,7 @@ public void writeOption(final OptionWroteEvent event) {
     public void updateOption(final OptionUpdatedEvent event) {
         Long memberId = event.getMemberId();
         OptionUpdateRequest request = event.getRequest();
+
+        optionService.updateOption(memberId, request);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index 09a2dad2..5d311feb 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.option;
 
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
@@ -10,7 +11,17 @@
 
 public class OptionFactory {
 
-    public static Option of(final Long memberId, final OptionWriteRequest request) {
+    public static Option createNewOption(final Long memberId, final OptionWriteRequest request) {
+        Smoke smoke = Smoke.findByName(request.smoke());
+        Religion religion = Religion.findByName(request.religion());
+        Drink drink = Drink.findByName(request.drink());
+        Mbti mbti = Mbti.findByName(request.mbti());
+        Graduate graduate = Graduate.findByName(request.graduate());
+
+        return new Option(memberId, smoke, religion, drink, mbti, graduate);
+    }
+
+    public static Option createUpdateOption(final Long memberId, final OptionUpdateRequest request) {
         Smoke smoke = Smoke.findByName(request.smoke());
         Religion religion = Religion.findByName(request.religion());
         Drink drink = Drink.findByName(request.drink());
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index ef7d39cb..b7419db9 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.option;
 
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
@@ -17,12 +18,22 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = OptionFactory.of(memberId, request);
+        Option newOption = OptionFactory.createNewOption(memberId, request);
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
-            return;
         }
+    }
+
+    private Option findByMemberId(final Long memberId) {
+        return optionRepository.findByMemberId(memberId)
+                .orElseThrow(OptionNotFoundException::new);
+    }
+
+    @Transactional
+    public void updateOption(final Long memberId, final OptionUpdateRequest request) {
         Option existOption = findByMemberId(memberId);
+        Option newOption = OptionFactory.createUpdateOption(memberId, request);
+
         existOption.updateContents(
                 newOption.getSmoke(),
                 newOption.getReligion(),
@@ -31,9 +42,4 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
                 newOption.getGraduate()
         );
     }
-
-    public Option findByMemberId(final Long memberId) {
-        return optionRepository.findByMemberId(memberId)
-                .orElseThrow(OptionNotFoundException::new);
-    }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 17e47029..ef4b80ce 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,16 +1,16 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.option.OptionFactory;
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
-import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.infrastructure.info.OptionFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -36,7 +36,7 @@ void init() {
         Long memberId = 1L;
 
         OptionWriteRequest request = 옵션_생성_요청();
-        Option expectedOption = OptionFactory.of(memberId, request);
+        Option expectedOption = OptionFactory.createNewOption(memberId, request);
 
         // when
         optionService.writeOption(memberId, request);
@@ -44,38 +44,31 @@ void init() {
         // then
         assertSoftly(softly -> {
             softly.assertThat(optionRepository.isExistMemberOption(memberId)).isTrue();
-            softly.assertThat(optionRepository.findByMemberId(memberId)).isPresent();
             softly.assertThat(optionRepository.findByMemberId(memberId).get())
                     .usingRecursiveComparison()
+                    .ignoringFields("id")
                     .isEqualTo(expectedOption);
         });
     }
 
     @Test
-    void option을_조회한다() {
+    void option을_수정한다() {
         // given
         Long memberId = 1L;
 
-        OptionWriteRequest request = 옵션_생성_요청();
-        
-        optionService.writeOption(memberId, request);
-        Option expectedOption = OptionFactory.of(memberId, request);
+        OptionUpdateRequest updateRequest = 옵션_수정_요청();
+        Option exprectedOption = OptionFactory.createUpdateOption(memberId, updateRequest);
+
+        OptionWriteRequest writeRequest = 옵션_생성_요청();
+        optionService.writeOption(memberId, writeRequest);
 
         // when
-        Option memberOption = optionService.findByMemberId(memberId);
+        optionService.updateOption(memberId, updateRequest);
 
         // then
-        assertThat(memberOption).usingRecursiveComparison()
-                .isEqualTo(expectedOption);
-    }
-
-    @Test
-    void 처음에는_option이_존재하지_않는다() {
-        // given
-        Long memberId = 1L;
-
-        // when & then
-        assertThatThrownBy(() -> optionService.findByMemberId(memberId))
-                .isInstanceOf(OptionNotFoundException.class);
+        assertThat(optionRepository.findByMemberId(memberId).get())
+                .usingRecursiveComparison()
+                .ignoringFields("id")
+                .isEqualTo(exprectedOption);
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
new file mode 100644
index 00000000..553d5eab
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
@@ -0,0 +1,27 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+
+public class OptionUpdateRequestFixture {
+
+    public static OptionUpdateRequest 옵션_수정_요청() {
+        String drink = Drink.ENJOY.getName();
+        String graduate = Graduate.DOCTOR.getName();
+        String religion = Religion.BUDDHA.getName();
+        String smoke = Smoke.ELECTRONIC.getName();
+        String mbti = Mbti.ISFJ.name();
+
+        return new OptionUpdateRequest(
+                drink,
+                graduate,
+                religion,
+                smoke,
+                mbti
+        );
+    }
+}

From 5cba3d30d0288fbe5acf64dd5192231370d1d713 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 01:11:02 +0900
Subject: [PATCH 152/225] =?UTF-8?q?feat:=20InfoService=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- info (profile, option, hobbies, styles) 이벤트 발신 메서드 작성
- 수정 요청 DTO 오류 수정
---
 .../member/application/info/InfoService.java  | 33 +++++++++++++++++++
 .../info/dto/InfoUpdateRequest.java           | 12 +++----
 .../dto/profile/ProfileUpdateRequest.java     |  4 +--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index b3904796..744d171c 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -1,12 +1,19 @@
 package com.atwoz.member.application.info;
 
 import com.atwoz.global.event.Events;
+import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
 import com.atwoz.member.application.event.info.HobbyWroteEvent;
+import com.atwoz.member.application.event.info.OptionUpdatedEvent;
 import com.atwoz.member.application.event.info.OptionWroteEvent;
+import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
 import com.atwoz.member.application.event.info.ProfileWroteEvent;
+import com.atwoz.member.application.event.info.StyleUpdatedEvent;
 import com.atwoz.member.application.event.info.StyleWroteEvent;
+import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleUpdateRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
@@ -48,6 +55,32 @@ private List<String> extractStyleNamesFromInfoWriteRequest(final InfoWriteReques
                 .toList();
     }
 
+    @Transactional
+    public void updateInfo(final Long memberId, final InfoUpdateRequest request) {
+        List<String> hobbyCodes = extractHobbyNamesFromInfoUpdateRequest(request);
+        List<String> styleCodes = extractStyleNamesFromInfoUpdateRequest(request);
+
+        Events.raise(new ProfileUpdatedEvent(memberId, request.profile()));
+        Events.raise(new OptionUpdatedEvent(memberId, request.option()));
+
+        Events.raise(new HobbyUpdatedEvent(memberId, hobbyCodes));
+        Events.raise(new StyleUpdatedEvent(memberId, styleCodes));
+    }
+
+    private List<String> extractHobbyNamesFromInfoUpdateRequest(final InfoUpdateRequest request) {
+        return request.hobbies()
+                .stream()
+                .map(HobbyUpdateRequest::hobby)
+                .toList();
+    }
+
+    private List<String> extractStyleNamesFromInfoUpdateRequest(final InfoUpdateRequest request) {
+        return request.styles()
+                .stream()
+                .map(StyleUpdateRequest::style)
+                .toList();
+    }
+
     public InfoSearchResponse findInfo(final Long memberId) {
         return infoRepository.findByMemberId(memberId);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
index 6f9794b2..d2b7c480 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.dto;
 
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
@@ -9,18 +9,18 @@
 public record InfoUpdateRequest(
         @Valid
         @NotNull(message = "profile 요청이 있어야 합니다.")
-        ProfileWriteRequest profile,
+        ProfileUpdateRequest profile,
 
         @Valid
         @NotNull(message = "option 요청이 있어야 합니다.")
-        OptionWriteRequest option,
+        OptionUpdateRequest option,
 
         @Valid
         @NotNull(message = "취미 요청이 있어야 합니다.")
-        List<HobbyWriteRequest> hobbies,
+        List<HobbyUpdateRequest> hobbies,
 
         @Valid
         @NotNull(message = "스타일 요청이 있어야 합니다.")
-        List<StyleWriteRequest> styles
+        List<StyleUpdateRequest> styles
 ) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
index 4727cac3..b69a3f35 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
@@ -16,11 +16,11 @@ public record ProfileUpdateRequest(
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        LocationWriteRequest location,
+        LocationUpdateRequest location,
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        PositionWriteRequest position,
+        PositionUpdateRequest position,
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
         String job

From 8f66dae41745a86276184ae8c83afa01cdce9ecf Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 01:19:48 +0900
Subject: [PATCH 153/225] =?UTF-8?q?refactor:=20Fixture=EC=97=90=20Suppress?=
 =?UTF-8?q?Warnings=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 가독성을 위해 Fixture에 SuppressWarnings 추가
---
 .../fixture/info/dto/request/LocationWriteRequestFixture.java    | 1 +
 .../fixture/info/dto/request/OptionUpdateRequestFixture.java     | 1 +
 .../fixture/info/dto/request/OptionWriteRequestFixture.java      | 1 +
 .../fixture/info/dto/request/PositionWriteRequestFixture.java    | 1 +
 .../fixture/info/dto/request/ProfileWriteRequestFixture.java     | 1 +
 .../fixture/info/dto/response/LocationSearchResponseFixture.java | 1 +
 .../fixture/info/dto/response/OptionSearchResponseFixture.java   | 1 +
 .../fixture/info/dto/response/PositionSearchResponseFixture.java | 1 +
 .../fixture/info/dto/response/ProfileSearchResponseFixture.java  | 1 +
 9 files changed, 9 insertions(+)

diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
index 9ee9b5ab..88f27801 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
@@ -2,6 +2,7 @@
 
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class LocationWriteRequestFixture {
 
     public static LocationWriteRequest 위치_생성_요청() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
index 553d5eab..a66aa20d 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
@@ -7,6 +7,7 @@
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class OptionUpdateRequestFixture {
 
     public static OptionUpdateRequest 옵션_수정_요청() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
index de7d5dd1..28110aa9 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
@@ -7,6 +7,7 @@
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class OptionWriteRequestFixture {
 
     public static OptionWriteRequest 옵션_생성_요청() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
index 7c0950e1..c1086077 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
@@ -3,6 +3,7 @@
 import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
 import java.math.BigDecimal;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class PositionWriteRequestFixture {
 
     public static PositionWriteRequest 좌표_생성_요청() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
index d0b1b9fe..d9904693 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
@@ -9,6 +9,7 @@
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class ProfileWriteRequestFixture {
 
     public static ProfileWriteRequest 프로필_생성_요청() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
index b8cd7b07..b7b1bd13 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
@@ -2,6 +2,7 @@
 
 import com.atwoz.member.ui.info.dto.profile.LocationSearchResponse;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class LocationSearchResponseFixture {
 
     public static LocationSearchResponse 위치_정보_조회_응답() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
index 49bd837e..4f74a9ac 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
@@ -7,6 +7,7 @@
 import com.atwoz.member.domain.info.option.Smoke;
 import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class OptionSearchResponseFixture {
 
     public static OptionSearchResponse 옵션_정보_조회_응답() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
index 854ed2af..a78fcef4 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
@@ -3,6 +3,7 @@
 import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
 import java.math.BigDecimal;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class PositionSearchResponseFixture {
 
     public static PositionSearchResponse 좌표_정보_조회_응답() {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
index e1f61e72..792bb228 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
@@ -9,6 +9,7 @@
 import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
 import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
 
+@SuppressWarnings("NonAsciiCharacters")
 public class ProfileSearchResponseFixture {
 
     public static ProfileSearchResponse 프로필_정보_조회_응답() {

From 616c4728729d6a552b6b4dd2caf7400d58e6b557 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 03:43:11 +0900
Subject: [PATCH 154/225] =?UTF-8?q?refactor:=20HobbyInvalid=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 문법에 맞게 클래스 이름 수정
---
 src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java | 4 ++--
 .../com/atwoz/member/exception/MemberExceptionHandler.java  | 6 +++---
 ...obbyInvalidException.java => InvalidHobbyException.java} | 4 ++--
 .../java/com/atwoz/member/domain/info/hobby/HobbyTest.java  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/hobby/{HobbyInvalidException.java => InvalidHobbyException.java} (55%)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
index d56a4f28..ad7d6f2e 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/Hobby.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.hobby;
 
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyInvalidException;
+import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import lombok.Getter;
 import java.util.Arrays;
@@ -92,7 +92,7 @@ private static Hobby findByCode(final String code) {
         return Arrays.stream(values())
                 .filter(hobby -> hobby.isSameCode(code))
                 .findFirst()
-                .orElseThrow(HobbyInvalidException::new);
+                .orElseThrow(InvalidHobbyException::new);
     }
 
     private boolean isSameCode(final String code) {
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 3253f7b1..5693e8fb 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -9,7 +9,7 @@
 import com.atwoz.member.exception.exceptions.auth.TokenInvalidException;
 import com.atwoz.member.exception.exceptions.auth.UnsupportedTokenException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyInvalidException;
+import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
 import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
@@ -102,8 +102,8 @@ public ResponseEntity<String> handleOAuthPlatformNotFountException(final OAuthPl
     }
 
     // info - hobby
-    @ExceptionHandler(HobbyInvalidException.class)
-    public ResponseEntity<String> handleHobbyInvalidException(final HobbyInvalidException e) {
+    @ExceptionHandler(InvalidHobbyException.class)
+    public ResponseEntity<String> handleHobbyInvalidException(final InvalidHobbyException e) {
         return getBadRequest(e);
     }
 
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/InvalidHobbyException.java
similarity index 55%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/hobby/InvalidHobbyException.java
index caa6321a..b1c2d7b6 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/HobbyInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/hobby/InvalidHobbyException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.hobby;
 
-public class HobbyInvalidException extends RuntimeException {
+public class InvalidHobbyException extends RuntimeException {
 
-    public HobbyInvalidException() {
+    public InvalidHobbyException() {
         super("등록되지 않은 취미입니다.");
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
index 4f332085..3f303233 100644
--- a/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/hobby/HobbyTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
-import com.atwoz.member.exception.exceptions.info.hobby.HobbyInvalidException;
+import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -58,7 +58,7 @@ class HobbyTest {
 
         // when & then
         assertThatThrownBy(() -> Hobby.findAllByCodes(hobbyCodes))
-                .isInstanceOf(HobbyInvalidException.class);
+                .isInstanceOf(InvalidHobbyException.class);
     }
 
     @Test

From f1e6f8f1c964be1524232642271d745fbabad82c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 03:44:32 +0900
Subject: [PATCH 155/225] =?UTF-8?q?refactor:=20DrinkInvalid=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 문법에 맞게 클래스 이름 수정
---
 .../java/com/atwoz/member/domain/info/option/Drink.java     | 4 ++--
 .../com/atwoz/member/exception/MemberExceptionHandler.java  | 6 +++---
 ...rinkInvalidException.java => InvalidDrinkException.java} | 4 ++--
 .../java/com/atwoz/member/domain/info/option/DrinkTest.java | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/option/{DrinkInvalidException.java => InvalidDrinkException.java} (56%)

diff --git a/src/main/java/com/atwoz/member/domain/info/option/Drink.java b/src/main/java/com/atwoz/member/domain/info/option/Drink.java
index b693c865..919ac6c1 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Drink.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Drink.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidDrinkException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -23,6 +23,6 @@ public static Drink findByName(final String name) {
         return Arrays.stream(values())
                 .filter(drink -> name.equals(drink.getName()))
                 .findFirst()
-                .orElseThrow(DrinkInvalidException::new);
+                .orElseThrow(InvalidDrinkException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 5693e8fb..982f3805 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -11,7 +11,7 @@
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
 import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
-import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidDrinkException;
 import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
 import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
@@ -175,8 +175,8 @@ public ResponseEntity<String> handleOptionNotFoundException(final OptionNotFound
         return getNotFoundResponse(e);
     }
 
-    @ExceptionHandler(DrinkInvalidException.class)
-    public ResponseEntity<String> handleDrinkNInvalidException(final DrinkInvalidException e) {
+    @ExceptionHandler(InvalidDrinkException.class)
+    public ResponseEntity<String> handleDrinkNInvalidException(final InvalidDrinkException e) {
         return getBadRequest(e);
     }
 
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidDrinkException.java
similarity index 56%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidDrinkException.java
index 6aeedeb3..ad2eac5d 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/option/DrinkInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidDrinkException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.option;
 
-public class DrinkInvalidException extends RuntimeException {
+public class InvalidDrinkException extends RuntimeException {
 
-    public DrinkInvalidException() {
+    public InvalidDrinkException() {
         super("등록되지 않은 음주 단계입니다.");
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java b/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java
index ce7393dd..42920c04 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/DrinkTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.option.DrinkInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidDrinkException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ public class DrinkTest {
 
         // when & then
         assertThatThrownBy(() -> Drink.findByName(drinkName))
-                .isInstanceOf(DrinkInvalidException.class);
+                .isInstanceOf(InvalidDrinkException.class);
     }
 }

From d69db5c675abb12a93d4cae3ee17dbc3dcc2e8f3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 03:54:43 +0900
Subject: [PATCH 156/225] =?UTF-8?q?refactor:=20=ED=81=B4=EB=9E=98=EC=8A=A4?=
 =?UTF-8?q?=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 문법에 맞지 않는 클래스 이름들 수정
---
 .../member/domain/info/option/Graduate.java   |  4 +--
 .../atwoz/member/domain/info/option/Mbti.java |  4 +--
 .../member/domain/info/option/Religion.java   |  4 +--
 .../member/domain/info/option/Smoke.java      |  4 +--
 .../member/domain/info/profile/Gender.java    |  4 +--
 .../atwoz/member/domain/info/profile/Job.java |  4 +--
 .../exception/MemberExceptionHandler.java     | 36 +++++++++----------
 ...ion.java => InvalidGraduateException.java} |  4 +--
 ...ception.java => InvalidMbtiException.java} |  4 +--
 ...ion.java => InvalidReligionException.java} |  4 +--
 ...eption.java => InvalidSmokeException.java} |  4 +--
 ...xception.java => InvalidJobException.java} |  4 +--
 ...ption.java => InvalidGenderException.java} |  4 +--
 .../domain/info/option/GraduateTest.java      |  4 +--
 .../member/domain/info/option/MbtiTest.java   |  4 +--
 .../domain/info/option/ReligionTest.java      |  4 +--
 .../member/domain/info/option/SmokeTest.java  |  4 +--
 .../domain/info/profile/GenderTest.java       |  4 +--
 .../member/domain/info/profile/JobTest.java   |  4 +--
 19 files changed, 54 insertions(+), 54 deletions(-)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/option/{GraduateInvalidException.java => InvalidGraduateException.java} (55%)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/option/{MbtiInvalidException.java => InvalidMbtiException.java} (55%)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/option/{ReligionInvalidException.java => InvalidReligionException.java} (54%)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/option/{SmokeInvalidException.java => InvalidSmokeException.java} (56%)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/profile/{JobInvalidException.java => InvalidJobException.java} (56%)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/{GenderInvalidException.java => InvalidGenderException.java} (56%)

diff --git a/src/main/java/com/atwoz/member/domain/info/option/Graduate.java b/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
index a783d932..84fe1c3c 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Graduate.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidGraduateException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -27,6 +27,6 @@ public static Graduate findByName(final String name) {
         return Arrays.stream(values())
                 .filter(graduate -> name.equals(graduate.getName()))
                 .findFirst()
-                .orElseThrow(GraduateInvalidException::new);
+                .orElseThrow(InvalidGraduateException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Mbti.java b/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
index 6fd3c260..a924fb74 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Mbti.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidMbtiException;
 import java.util.Arrays;
 
 public enum Mbti {
@@ -26,6 +26,6 @@ public static Mbti findByName(final String name) {
         return Arrays.stream(values())
                 .filter(mbti -> name.equals(mbti.name()))
                 .findFirst()
-                .orElseThrow(MbtiInvalidException::new);
+                .orElseThrow(InvalidMbtiException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Religion.java b/src/main/java/com/atwoz/member/domain/info/option/Religion.java
index ed813fae..7aeecad6 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Religion.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Religion.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidReligionException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -23,6 +23,6 @@ public static Religion findByName(final String name) {
         return Arrays.stream(values())
                 .filter(religion -> name.equals(religion.getName()))
                 .findFirst()
-                .orElseThrow(ReligionInvalidException::new);
+                .orElseThrow(InvalidReligionException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Smoke.java b/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
index 890b0bf6..60bb7b12 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Smoke.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidSmokeException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -23,6 +23,6 @@ public static Smoke findByName(final String name) {
         return Arrays.stream(values())
                 .filter(smoke -> name.equals(smoke.getName()))
                 .findFirst()
-                .orElseThrow(SmokeInvalidException::new);
+                .orElseThrow(InvalidSmokeException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java b/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
index 0ecfe45f..89dda389 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
+import com.atwoz.member.exception.exceptions.info.profile.body.InvalidGenderException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -20,6 +20,6 @@ public static Gender findByName(final String name) {
         return Arrays.stream(values())
                 .filter(gender -> name.equals(gender.getName()))
                 .findFirst()
-                .orElseThrow(GenderInvalidException::new);
+                .orElseThrow(InvalidGenderException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
index 37744c88..37f9281e 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.exception.exceptions.info.profile.JobInvalidException;
+import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
 import lombok.Getter;
 import java.util.Arrays;
 
@@ -40,7 +40,7 @@ public static Job findByCode(final String code) {
         return Arrays.stream(values())
                 .filter(job -> job.isSame(code))
                 .findFirst()
-                .orElseThrow(JobInvalidException::new);
+                .orElseThrow(InvalidJobException::new);
     }
 
     private boolean isSame(final String code) {
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 982f3805..6e42c38b 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -12,15 +12,15 @@
 import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.info.option.InvalidDrinkException;
-import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
-import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidGraduateException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidMbtiException;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
-import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
-import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
-import com.atwoz.member.exception.exceptions.info.profile.JobInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidReligionException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidSmokeException;
+import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
-import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
+import com.atwoz.member.exception.exceptions.info.profile.body.InvalidGenderException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
@@ -149,8 +149,8 @@ public ResponseEntity<String> handleHeightRangeException(final HeightRangeExcept
         return getBadRequest(e);
     }
 
-    @ExceptionHandler(GenderInvalidException.class)
-    public ResponseEntity<String> handleGenderInvalidException(final GenderInvalidException e) {
+    @ExceptionHandler(InvalidGenderException.class)
+    public ResponseEntity<String> handleGenderInvalidException(final InvalidGenderException e) {
         return getBadRequest(e);
     }
 
@@ -164,8 +164,8 @@ public ResponseEntity<String> handleLongitudeRangeException(final LongitudeRange
         return getBadRequest(e);
     }
 
-    @ExceptionHandler(JobInvalidException.class)
-    public ResponseEntity<String> handleJobInvalidException(final JobInvalidException e) {
+    @ExceptionHandler(InvalidJobException.class)
+    public ResponseEntity<String> handleJobInvalidException(final InvalidJobException e) {
         return getBadRequest(e);
     }
 
@@ -180,23 +180,23 @@ public ResponseEntity<String> handleDrinkNInvalidException(final InvalidDrinkExc
         return getBadRequest(e);
     }
 
-    @ExceptionHandler(GraduateInvalidException.class)
-    public ResponseEntity<String> handleGraduateInvalidException(final GraduateInvalidException e) {
+    @ExceptionHandler(InvalidGraduateException.class)
+    public ResponseEntity<String> handleGraduateInvalidException(final InvalidGraduateException e) {
         return getBadRequest(e);
     }
 
-    @ExceptionHandler(MbtiInvalidException.class)
-    public ResponseEntity<String> handleMbtiInvalidException(final MbtiInvalidException e) {
+    @ExceptionHandler(InvalidMbtiException.class)
+    public ResponseEntity<String> handleMbtiInvalidException(final InvalidMbtiException e) {
         return getBadRequest(e);
     }
 
-    @ExceptionHandler(SmokeInvalidException.class)
-    public ResponseEntity<String> handleSmokeInvalidException(final SmokeInvalidException e) {
+    @ExceptionHandler(InvalidSmokeException.class)
+    public ResponseEntity<String> handleSmokeInvalidException(final InvalidSmokeException e) {
         return getBadRequest(e);
     }
 
-    @ExceptionHandler(ReligionInvalidException.class)
-    public ResponseEntity<String> handleReligionInvalidException(final ReligionInvalidException e) {
+    @ExceptionHandler(InvalidReligionException.class)
+    public ResponseEntity<String> handleReligionInvalidException(final InvalidReligionException e) {
         return getBadRequest(e);
     }
 
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidGraduateException.java
similarity index 55%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidGraduateException.java
index e374110b..b9ff1c9d 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/option/GraduateInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidGraduateException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.option;
 
-public class GraduateInvalidException extends RuntimeException {
+public class InvalidGraduateException extends RuntimeException {
 
-    public GraduateInvalidException() {
+    public InvalidGraduateException() {
         super("등록되지 않은 최종 학력입니다.");
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidMbtiException.java
similarity index 55%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidMbtiException.java
index adf2eac1..d786e80f 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/option/MbtiInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidMbtiException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.option;
 
-public class MbtiInvalidException extends RuntimeException {
+public class InvalidMbtiException extends RuntimeException {
 
-    public MbtiInvalidException() {
+    public InvalidMbtiException() {
         super("등록되지 않은 MBTI입니다.");
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidReligionException.java
similarity index 54%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidReligionException.java
index 75a5734d..9457f4cf 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/option/ReligionInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidReligionException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.option;
 
-public class ReligionInvalidException extends RuntimeException {
+public class InvalidReligionException extends RuntimeException {
 
-    public ReligionInvalidException() {
+    public InvalidReligionException() {
         super("등록되지 않은 종교입니다.");
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidSmokeException.java
similarity index 56%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidSmokeException.java
index 68fb8b00..b727a2ff 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/option/SmokeInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/option/InvalidSmokeException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.option;
 
-public class SmokeInvalidException extends RuntimeException {
+public class InvalidSmokeException extends RuntimeException {
 
-    public SmokeInvalidException() {
+    public InvalidSmokeException() {
         super("등록되지 않은 흡연 단계입니다.");
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/InvalidJobException.java
similarity index 56%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/profile/InvalidJobException.java
index 60d49d21..324821bc 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/JobInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/InvalidJobException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.profile;
 
-public class JobInvalidException extends RuntimeException {
+public class InvalidJobException extends RuntimeException {
 
-    public JobInvalidException() {
+    public InvalidJobException() {
         super("직업을 찾을 수 없습니다.");
     }
 }
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/InvalidGenderException.java
similarity index 56%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/InvalidGenderException.java
index 348db4ce..d2eac4a3 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/GenderInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/body/InvalidGenderException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.profile.body;
 
-public class GenderInvalidException extends RuntimeException {
+public class InvalidGenderException extends RuntimeException {
 
-    public GenderInvalidException() {
+    public InvalidGenderException() {
         super("등록되지 않은 성별입니다.");
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java b/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java
index d02db91d..39bca0f8 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/GraduateTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.option.GraduateInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidGraduateException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ public class GraduateTest {
 
         // when & then
         assertThatThrownBy(() -> Graduate.findByName(graduateName))
-                .isInstanceOf(GraduateInvalidException.class);
+                .isInstanceOf(InvalidGraduateException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java b/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java
index 16dd82d8..87349f3e 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/MbtiTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.option.MbtiInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidMbtiException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ public class MbtiTest {
 
         // when & then
         assertThatThrownBy(() -> Mbti.findByName(mbtiName))
-                .isInstanceOf(MbtiInvalidException.class);
+                .isInstanceOf(InvalidMbtiException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java b/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java
index fc20f325..21492b51 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/ReligionTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.option.ReligionInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidReligionException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ public class ReligionTest {
 
         // when & then
         assertThatThrownBy(() -> Religion.findByName(religionName))
-                .isInstanceOf(ReligionInvalidException.class);
+                .isInstanceOf(InvalidReligionException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java b/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java
index 6fa494a7..8a3671d2 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/SmokeTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.option.SmokeInvalidException;
+import com.atwoz.member.exception.exceptions.info.option.InvalidSmokeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ public class SmokeTest {
 
         // when & then
         assertThatThrownBy(() -> Smoke.findByName(smokeName))
-                .isInstanceOf(SmokeInvalidException.class);
+                .isInstanceOf(InvalidSmokeException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
index a01120ce..98dd04ea 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.profile.body.GenderInvalidException;
+import com.atwoz.member.exception.exceptions.info.profile.body.InvalidGenderException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ class GenderTest {
 
         // when & then
         assertThatThrownBy(() -> Gender.findByName(genderName))
-                .isInstanceOf(GenderInvalidException.class);
+                .isInstanceOf(InvalidGenderException.class);
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
index e8502000..0939744f 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.exception.exceptions.info.profile.JobInvalidException;
+import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -28,6 +28,6 @@ public class JobTest {
 
         // when & then
         assertThatThrownBy(() -> Job.findByCode(jobCode))
-                .isInstanceOf(JobInvalidException.class);
+                .isInstanceOf(InvalidJobException.class);
     }
 }

From 84c2e6137cf42268752bf3c05a46e53bc065581a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 03:55:40 +0900
Subject: [PATCH 157/225] =?UTF-8?q?refactor:=20MemberStyleRepository=20fin?=
 =?UTF-8?q?al=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 메서드 인자 final 추가
---
 .../atwoz/member/domain/info/style/MemberStyleRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
index b02f4cc9..843d598a 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyleRepository.java
@@ -7,5 +7,5 @@ public interface MemberStyleRepository {
     void save(final MemberStyle memberStyle);
     void saveAll(final List<MemberStyle> memberStyles);
     void deleteStylesByMemberId(final Long memberId);
-    List<MemberStyle> findAllByMemberId(Long memberId);
+    List<MemberStyle> findAllByMemberId(final Long memberId);
 }

From 57303b23d6fee5dc946f9528eecc4d1f1e220747 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 04:00:15 +0900
Subject: [PATCH 158/225] =?UTF-8?q?refactor:=20PositionTest=20=EC=9D=B8?=
 =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 예외 검증 시 double 인자로 검증되도록 수정
---
 .../member/domain/info/profile/PositionTest.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
index d98e2a53..1f7ca98c 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
@@ -27,11 +27,11 @@ class PositionTest {
     }
 
     @ParameterizedTest(name = "위도가 {0}인 경우")
-    @ValueSource(ints = {-100, 100})
-    void 위도_제한을_벗어나면_예외가_발생한다(final int lat) {
+    @ValueSource(doubles = {-100.23, 100.34})
+    void 위도_제한을_벗어나면_예외가_발생한다(final double lat) {
         // given
         BigDecimal latitude = BigDecimal.valueOf(lat);
-        BigDecimal longitude = BigDecimal.valueOf(130);
+        BigDecimal longitude = BigDecimal.valueOf(130.21);
 
         // when & then
         assertThatThrownBy(() -> new Position(latitude, longitude))
@@ -39,10 +39,10 @@ class PositionTest {
     }
 
     @ParameterizedTest(name = "경도가 {0}인 경우")
-    @ValueSource(ints = {-200, 200})
-    void 경도_제한을_벗어나면_예외가_발생한다(final int lon) {
+    @ValueSource(doubles = {-200.29, 200.57})
+    void 경도_제한을_벗어나면_예외가_발생한다(final double lon) {
         // given
-        BigDecimal latitude = BigDecimal.valueOf(40);
+        BigDecimal latitude = BigDecimal.valueOf(40.34);
         BigDecimal longitude = BigDecimal.valueOf(lon);
 
         // when & then

From 9c369dcc6bc8929f6866ab9615323c933bbb806b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 10:30:59 +0900
Subject: [PATCH 159/225] =?UTF-8?q?feat:=20InfoController=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=20=EB=A9=94=EC=84=9C=EB=93=9C=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoController 정보 수정 메서드 구현
- 정보 수정 테스트 구현
- 테스트 문서 반영
---
 src/docs/asciidoc/info.adoc                   |  9 +++
 .../atwoz/member/ui/info/InfoController.java  | 10 +++
 .../request/LocationUpdateRequestFixture.java | 14 ++++
 .../request/PositionUpdateRequestFixture.java | 15 +++++
 .../request/ProfileUpdateRequestFixture.java  | 32 +++++++++
 .../ui/info/InfoControllerWebMvcTest.java     | 65 +++++++++++++++++++
 6 files changed, 145 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java

diff --git a/src/docs/asciidoc/info.adoc b/src/docs/asciidoc/info.adoc
index c399a8de..c6160e07 100644
--- a/src/docs/asciidoc/info.adoc
+++ b/src/docs/asciidoc/info.adoc
@@ -17,6 +17,15 @@ include::{snippets}/info-controller-web-mvc-test/write_info/request-fields.adoc[
 ==== 응답
 include::{snippets}/info-controller-web-mvc-test/write_info/http-response.adoc[]
 
+=== 회원 정보 수정
+
+==== 요청
+include::{snippets}/info-controller-web-mvc-test/update_info/http-request.adoc[]
+include::{snippets}/info-controller-web-mvc-test/update_info/request-headers.adoc[]
+
+==== 응답
+include::{snippets}/info-controller-web-mvc-test/update_info/http-response.adoc[]
+
 === 회원 정보 조회
 
 ==== 요청
diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
index 9b9ca4c1..019d0247 100644
--- a/src/main/java/com/atwoz/member/ui/info/InfoController.java
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.ui.info;
 
 import com.atwoz.member.application.info.InfoService;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.ui.auth.support.auth.AuthMember;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
@@ -9,6 +10,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +31,14 @@ public ResponseEntity<Void> writeInfo(@AuthMember final Long memberId,
                 .build();
     }
 
+    @PatchMapping
+    public ResponseEntity<Void> updateInfo(@AuthMember final Long memberId,
+                                           @Valid @RequestBody final InfoUpdateRequest request) {
+        infoService.updateInfo(memberId, request);
+        return ResponseEntity.ok()
+                .build();
+    }
+
     @GetMapping
     public ResponseEntity<InfoSearchResponse> findInfo(@AuthMember final Long memberId) {
         InfoSearchResponse response = infoService.findInfo(memberId);
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
new file mode 100644
index 00000000..8604ce58
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import com.atwoz.member.application.info.dto.profile.LocationUpdateRequest;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class LocationUpdateRequestFixture {
+
+    public static LocationUpdateRequest 위치_수정_요청() {
+        String city = "경기도";
+        String sector = "성남시";
+
+        return new LocationUpdateRequest(city, sector);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
new file mode 100644
index 00000000..c4e64f34
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
@@ -0,0 +1,15 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import com.atwoz.member.application.info.dto.profile.PositionUpdateRequest;
+import java.math.BigDecimal;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class PositionUpdateRequestFixture {
+
+    public static PositionUpdateRequest 좌표_수정_요청() {
+        BigDecimal latitude = BigDecimal.valueOf(60.2);
+        BigDecimal longitude = BigDecimal.valueOf(130.3);
+
+        return new PositionUpdateRequest(latitude, longitude);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
new file mode 100644
index 00000000..81c71821
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
@@ -0,0 +1,32 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.fixture.info.dto.request.LocationUpdateRequestFixture.위치_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.PositionUpdateRequestFixture.좌표_수정_요청;
+
+import com.atwoz.member.application.info.dto.profile.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.PositionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class ProfileUpdateRequestFixture {
+
+    public static ProfileUpdateRequest 프로필_수정_요청() {
+        int birthYear = 2001;
+        int height = 170;
+        String gender = Gender.FEMALE.getName();
+        LocationUpdateRequest locationUpdateRequest = 위치_수정_요청();
+        PositionUpdateRequest positionUpdateRequest = 좌표_수정_요청();
+        String job = Job.LAW.getCode();
+
+        return new ProfileUpdateRequest(
+                birthYear,
+                height,
+                gender,
+                locationUpdateRequest,
+                positionUpdateRequest,
+                job
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index c62c697d..4732cafa 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -2,10 +2,16 @@
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
+import static com.atwoz.member.domain.info.hobby.Hobby.GOLF;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
+import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+import static com.atwoz.member.domain.info.style.Style.PURE;
+import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.옵션_정보_조회_응답;
 import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.프로필_정보_조회_응답;
@@ -18,6 +24,7 @@
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -25,10 +32,15 @@
 
 import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.application.info.InfoService;
+import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleUpdateRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
@@ -115,6 +127,59 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                 ));
     }
 
+    @Test
+    void 회원_정보를_수정한다() throws Exception {
+        // given
+        String bearerToken = "Bearer token";
+
+        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
+        OptionUpdateRequest optionUpdateRequest = 옵션_수정_요청();
+
+        List<HobbyUpdateRequest> hobbies = List.of(
+                new HobbyUpdateRequest(DRAMA.getCode()),
+                new HobbyUpdateRequest(WRITE.getCode())
+        );
+
+        List<StyleUpdateRequest> styles = List.of(
+                new StyleUpdateRequest(PURE.getCode()),
+                new StyleUpdateRequest(GOLF.getCode())
+        );
+
+        InfoUpdateRequest infoWriteRequest = new InfoUpdateRequest(profileUpdateRequest, optionUpdateRequest, hobbies, styles);
+
+        // when & then
+        mockMvc.perform(patch("/api/info")
+                        .header(AUTHORIZATION, bearerToken)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(infoWriteRequest)))
+                .andExpect(status().isOk())
+                .andDo(print())
+                .andDo(customDocument("update_info",
+                        requestHeaders(
+                                headerWithName("Authorization").description("유저 토큰 정보")
+                        ),
+                        requestFields(
+                                fieldWithPath("profile.birthYear").description("출생년도"),
+                                fieldWithPath("profile.height").description("키"),
+                                fieldWithPath("profile.gender").description("성별"),
+                                fieldWithPath("profile.location.city").description("위치 (시/도)"),
+                                fieldWithPath("profile.location.sector").description("위치 (구/군)"),
+                                fieldWithPath("profile.position.latitude").description("좌표 (위도)"),
+                                fieldWithPath("profile.position.longitude").description("좌표 (경도)"),
+                                fieldWithPath("profile.job").description("직업 코드"),
+                                fieldWithPath("option.drink").description("음주 단계"),
+                                fieldWithPath("option.graduate").description("최종 학력"),
+                                fieldWithPath("option.religion").description("종교"),
+                                fieldWithPath("option.smoke").description("흡연 단계"),
+                                fieldWithPath("option.mbti").description("MBTI"),
+                                fieldWithPath("hobbies").description("취미 목록"),
+                                fieldWithPath("hobbies[].hobby").description("취미 코드"),
+                                fieldWithPath("styles").description("스타일 목록"),
+                                fieldWithPath("styles[].style").description("스타일 코드")
+                        )
+                ));
+    }
+
     @Test
     void 회원_정보를_조회한다() throws Exception {
         // given

From fca4ffbfede14e78400f5b7934be0799628511ef Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 10:48:27 +0900
Subject: [PATCH 160/225] =?UTF-8?q?refactor:=20StyleInvalid=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 문법에 맞게 클래스 이름 수정
---
 src/main/java/com/atwoz/member/domain/info/style/Style.java | 4 ++--
 .../com/atwoz/member/exception/MemberExceptionHandler.java  | 6 +++---
 ...tyleInvalidException.java => InvalidStyleException.java} | 4 ++--
 .../java/com/atwoz/member/domain/info/style/StyleTest.java  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/style/{StyleInvalidException.java => InvalidStyleException.java} (56%)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index 65dfdb22..24d6ff0f 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.style;
 
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleInvalidException;
+import com.atwoz.member.exception.exceptions.info.style.InvalidStyleException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import lombok.Getter;
 import java.util.Arrays;
@@ -83,7 +83,7 @@ private static Style findByCode(final String code) {
         return Arrays.stream(values())
                 .filter(style -> style.isSameCode(code))
                 .findFirst()
-                .orElseThrow(StyleInvalidException::new);
+                .orElseThrow(InvalidStyleException::new);
     }
 
     private boolean isSameCode(final String code) {
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 6e42c38b..47c881f7 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -25,7 +25,7 @@
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleInvalidException;
+import com.atwoz.member.exception.exceptions.info.style.InvalidStyleException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import com.atwoz.member.exception.exceptions.member.MemberAlreadyExistedException;
 import com.atwoz.member.exception.exceptions.member.MemberNotFoundException;
@@ -118,8 +118,8 @@ public ResponseEntity<String> handleHobbyDuplicationException(final HobbyDuplica
     }
 
     // info - style
-    @ExceptionHandler(StyleInvalidException.class)
-    public ResponseEntity<String> handleStyleInvalidException(final StyleInvalidException e) {
+    @ExceptionHandler(InvalidStyleException.class)
+    public ResponseEntity<String> handleStyleInvalidException(final InvalidStyleException e) {
         return getBadRequest(e);
     }
 
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/style/InvalidStyleException.java
similarity index 56%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/style/InvalidStyleException.java
index 84a7401c..9b283a3d 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/style/StyleInvalidException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/style/InvalidStyleException.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.exception.exceptions.info.style;
 
-public class StyleInvalidException extends RuntimeException {
+public class InvalidStyleException extends RuntimeException {
 
-    public StyleInvalidException() {
+    public InvalidStyleException() {
         super("등록되지 않은 스타일입니다.");
     }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java b/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
index 25e4e865..8529c441 100644
--- a/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/style/StyleTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
-import com.atwoz.member.exception.exceptions.info.style.StyleInvalidException;
+import com.atwoz.member.exception.exceptions.info.style.InvalidStyleException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -58,7 +58,7 @@ class StyleTest {
 
         // when & then
         assertThatThrownBy(() -> Style.findAllByCodes(styleCodes))
-                .isInstanceOf(StyleInvalidException.class);
+                .isInstanceOf(InvalidStyleException.class);
     }
 
     @Test

From e916d1bec302f6a991208ad04e20ff4a5895a690 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 10:49:18 +0900
Subject: [PATCH 161/225] =?UTF-8?q?test:=20InfoServiceTest=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoServiceTest 정보 수정 테스트 작성
- InfoServiceTest Fixture 생성
---
 .../application/info/InfoServiceTest.java     | 64 ++++++++++---------
 .../dto/request/InfoUpdateRequestFixture.java | 40 ++++++++++++
 .../dto/request/InfoWriteRequestFixture.java  | 40 ++++++++++++
 3 files changed, 114 insertions(+), 30 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 480dc75b..9e651654 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -1,22 +1,19 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
-import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
-import static com.atwoz.member.domain.info.style.Style.GENTLE;
-import static com.atwoz.member.domain.info.style.Style.POSITIVE;
-import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.정보_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.정보_생성_요청;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
 import com.atwoz.member.application.event.info.HobbyWroteEvent;
+import com.atwoz.member.application.event.info.OptionUpdatedEvent;
 import com.atwoz.member.application.event.info.OptionWroteEvent;
+import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
 import com.atwoz.member.application.event.info.ProfileWroteEvent;
+import com.atwoz.member.application.event.info.StyleUpdatedEvent;
 import com.atwoz.member.application.event.info.StyleWroteEvent;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -24,7 +21,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.event.ApplicationEvents;
 import org.springframework.test.context.event.RecordApplicationEvents;
-import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -42,25 +38,7 @@ class InfoServiceTest {
     void 모든_정보를_저장한다() {
         // given
         Long memberId = 1L;
-        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
-        OptionWriteRequest optionWriteRequest = 옵션_생성_요청();
-
-        List<HobbyWriteRequest> hobbyWriteRequests = List.of(
-            new HobbyWriteRequest(WINE.getCode()),
-            new HobbyWriteRequest(COOK.getCode())
-        );
-
-        List<StyleWriteRequest> styleWriteRequests = List.of(
-            new StyleWriteRequest(POSITIVE.getCode()),
-            new StyleWriteRequest(GENTLE.getCode())
-        );
-
-        InfoWriteRequest request = new InfoWriteRequest(
-                profileWriteRequest,
-                optionWriteRequest,
-                hobbyWriteRequests,
-                styleWriteRequests
-        );
+        InfoWriteRequest request = 정보_생성_요청();
 
         // when
         infoService.writeInfo(memberId, request);
@@ -78,4 +56,30 @@ class InfoServiceTest {
             softly.assertThat(styleWroteEventCount).isEqualTo(1);
         });
     }
+
+    @Test
+    void 모든_정보를_수정한다() {
+        // given
+        Long memberId = 1L;
+        InfoWriteRequest infoWriteRequest = 정보_생성_요청();
+        InfoUpdateRequest infoUpdateRequest = 정보_수정_요청();
+
+        infoService.writeInfo(memberId, infoWriteRequest);
+
+        // when
+        infoService.updateInfo(memberId, infoUpdateRequest);
+
+        // then
+        int profileUpdatedEventCount = (int) events.stream(ProfileUpdatedEvent.class).count();
+        int optionUpdatedEventCount = (int) events.stream(OptionUpdatedEvent.class).count();
+        int hobbyUpdatedEventCount = (int) events.stream(HobbyUpdatedEvent.class).count();
+        int styleUpdatedEventCount = (int) events.stream(StyleUpdatedEvent.class).count();
+
+        assertSoftly(softly -> {
+            softly.assertThat(profileUpdatedEventCount).isEqualTo(1);
+            softly.assertThat(optionUpdatedEventCount).isEqualTo(1);
+            softly.assertThat(hobbyUpdatedEventCount).isEqualTo(1);
+            softly.assertThat(styleUpdatedEventCount).isEqualTo(1);
+        });
+    }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
new file mode 100644
index 00000000..f3abf39c
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
@@ -0,0 +1,40 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
+import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
+import static com.atwoz.member.domain.info.style.Style.FASHION;
+import static com.atwoz.member.domain.info.style.Style.PURE;
+import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
+
+import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
+import com.atwoz.member.application.info.dto.StyleUpdateRequest;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class InfoUpdateRequestFixture {
+
+    public static InfoUpdateRequest 정보_수정_요청() {
+        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
+        OptionUpdateRequest optionUpdateRequest = 옵션_수정_요청();
+
+        List<HobbyUpdateRequest> hobbies = List.of(
+                new HobbyUpdateRequest(DRAMA.getCode()),
+                new HobbyUpdateRequest(WRITE.getCode())
+        );
+        List<StyleUpdateRequest> styles = List.of(
+                new StyleUpdateRequest(PURE.getCode()),
+                new StyleUpdateRequest(FASHION.getCode())
+        );
+
+        return new InfoUpdateRequest(
+                profileUpdateRequest,
+                optionUpdateRequest,
+                hobbies,
+                styles
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
new file mode 100644
index 00000000..b41eea25
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
@@ -0,0 +1,40 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
+
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class InfoWriteRequestFixture {
+
+    public static InfoWriteRequest 정보_생성_요청() {
+        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
+        OptionWriteRequest optionWriteRequest = 옵션_생성_요청();
+
+        List<HobbyWriteRequest> hobbyWriteRequests = List.of(
+                new HobbyWriteRequest(WINE.getCode()),
+                new HobbyWriteRequest(COOK.getCode())
+        );
+        List<StyleWriteRequest> styleWriteRequests = List.of(
+                new StyleWriteRequest(POSITIVE.getCode()),
+                new StyleWriteRequest(GENTLE.getCode())
+        );
+
+        return new InfoWriteRequest(
+                profileWriteRequest,
+                optionWriteRequest,
+                hobbyWriteRequests,
+                styleWriteRequests
+        );
+    }
+}

From a9597b8ce9701b02b0c71c8d5e7974f12ad0d36c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 10:53:43 +0900
Subject: [PATCH 162/225] =?UTF-8?q?docs:=20InfoController=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20response=20field=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoController 수정 response field 추가
---
 src/docs/asciidoc/info.adoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/docs/asciidoc/info.adoc b/src/docs/asciidoc/info.adoc
index c6160e07..67e1e934 100644
--- a/src/docs/asciidoc/info.adoc
+++ b/src/docs/asciidoc/info.adoc
@@ -22,6 +22,7 @@ include::{snippets}/info-controller-web-mvc-test/write_info/http-response.adoc[]
 ==== 요청
 include::{snippets}/info-controller-web-mvc-test/update_info/http-request.adoc[]
 include::{snippets}/info-controller-web-mvc-test/update_info/request-headers.adoc[]
+include::{snippets}/info-controller-web-mvc-test/update_info/request-fields.adoc[]
 
 ==== 응답
 include::{snippets}/info-controller-web-mvc-test/update_info/http-response.adoc[]

From 89b38c5f3c53ce65a139b6878b4c13293ecb33a4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 10:58:13 +0900
Subject: [PATCH 163/225] =?UTF-8?q?refactor:=20InfoControllerWebMvcTest=20?=
 =?UTF-8?q?Fixture=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoContollerWebMvcTest 조회 Fixture 추가
- 용어 오타 수정
---
 .../response/InfoSearchResponseFixture.java   | 35 ++++++++
 .../ui/info/InfoControllerWebMvcTest.java     | 80 ++-----------------
 2 files changed, 42 insertions(+), 73 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java

diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
new file mode 100644
index 00000000..5b946afa
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
@@ -0,0 +1,35 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.옵션_정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.프로필_정보_조회_응답;
+
+import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class InfoSearchResponseFixture {
+
+    public static InfoSearchResponse 정보_조회_응답() {
+        ProfileSearchResponse profileSearchResponse = 프로필_정보_조회_응답();
+        OptionSearchResponse optionSearchResponse = 옵션_정보_조회_응답();
+
+        List<HobbySearchResponse> hobbies = List.of(
+                new HobbySearchResponse(WINE.getCode()),
+                new HobbySearchResponse(COOK.getCode())
+        );
+        List<StyleSearchResponse> styles = List.of(
+                new StyleSearchResponse(POSITIVE.getCode()),
+                new StyleSearchResponse(GENTLE.getCode())
+        );
+
+        return new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbies, styles);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 4732cafa..465858e1 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,20 +1,9 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
-import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
-import static com.atwoz.member.domain.info.hobby.Hobby.GOLF;
-import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
-import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
-import static com.atwoz.member.domain.info.style.Style.GENTLE;
-import static com.atwoz.member.domain.info.style.Style.POSITIVE;
-import static com.atwoz.member.domain.info.style.Style.PURE;
-import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
-import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.옵션_정보_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.프로필_정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.정보_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.정보_조회_응답;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
@@ -32,21 +21,9 @@
 
 import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.application.info.InfoService;
-import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
-import com.atwoz.member.ui.info.dto.StyleSearchResponse;
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
@@ -57,7 +34,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
-import java.util.List;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -78,21 +54,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_작성한다() throws Exception {
         // given
         String bearerToken = "Bearer token";
-
-        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
-        OptionWriteRequest optionWriteRequest = 옵션_생성_요청();
-
-        List<HobbyWriteRequest> hobbies = List.of(
-                new HobbyWriteRequest(WINE.getCode()),
-                new HobbyWriteRequest(COOK.getCode())
-        );
-
-        List<StyleWriteRequest> styles = List.of(
-                new StyleWriteRequest(POSITIVE.getCode()),
-                new StyleWriteRequest(GENTLE.getCode())
-        );
-
-        InfoWriteRequest infoWriteRequest = new InfoWriteRequest(profileWriteRequest, optionWriteRequest, hobbies, styles);
+        InfoWriteRequest infoWriteRequest = 정보_생성_요청();
 
         // when & then
         mockMvc.perform(post("/api/info")
@@ -131,27 +93,13 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_수정한다() throws Exception {
         // given
         String bearerToken = "Bearer token";
-
-        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
-        OptionUpdateRequest optionUpdateRequest = 옵션_수정_요청();
-
-        List<HobbyUpdateRequest> hobbies = List.of(
-                new HobbyUpdateRequest(DRAMA.getCode()),
-                new HobbyUpdateRequest(WRITE.getCode())
-        );
-
-        List<StyleUpdateRequest> styles = List.of(
-                new StyleUpdateRequest(PURE.getCode()),
-                new StyleUpdateRequest(GOLF.getCode())
-        );
-
-        InfoUpdateRequest infoWriteRequest = new InfoUpdateRequest(profileUpdateRequest, optionUpdateRequest, hobbies, styles);
+        InfoUpdateRequest infoUpdateRequest = 정보_수정_요청();
 
         // when & then
         mockMvc.perform(patch("/api/info")
                         .header(AUTHORIZATION, bearerToken)
                         .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(infoWriteRequest)))
+                        .content(objectMapper.writeValueAsString(infoUpdateRequest)))
                 .andExpect(status().isOk())
                 .andDo(print())
                 .andDo(customDocument("update_info",
@@ -184,21 +132,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_조회한다() throws Exception {
         // given
         String bearerToken = "Bearer token";
-
-        ProfileSearchResponse profileSearchResponse = 프로필_정보_조회_응답();
-        OptionSearchResponse optionSearchResponse = 옵션_정보_조회_응답();
-
-        List<HobbySearchResponse> hobbies = List.of(
-                new HobbySearchResponse(WINE.getCode()),
-                new HobbySearchResponse(COOK.getCode())
-        );
-
-        List<StyleSearchResponse> styles = List.of(
-                new StyleSearchResponse(POSITIVE.getCode()),
-                new StyleSearchResponse(GENTLE.getCode())
-        );
-
-        InfoSearchResponse infoSearchResponse = new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbies, styles);
+        InfoSearchResponse infoSearchResponse = 정보_조회_응답();
 
         when(infoService.findInfo(any())).thenReturn(infoSearchResponse);
 

From e2bc9bc82df66398e66ee716907ed520ef6e9494 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 11:15:07 +0900
Subject: [PATCH 164/225] =?UTF-8?q?test:=20InfoServiceTest=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 테스트 격리 (IntegrationHelper) 추가
- 좌표 요청/응답 Fixture 오류 수정
---
 .../application/info/InfoServiceTest.java     | 23 ++++++++++++++++---
 .../request/PositionWriteRequestFixture.java  |  4 ++--
 .../PositionSearchResponseFixture.java        |  4 ++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 9e651654..d2a5732e 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -2,8 +2,11 @@
 
 import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.정보_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.정보_조회_응답;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.helper.IntegrationHelper;
 import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
 import com.atwoz.member.application.event.info.HobbyWroteEvent;
 import com.atwoz.member.application.event.info.OptionUpdatedEvent;
@@ -14,19 +17,18 @@
 import com.atwoz.member.application.event.info.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.event.ApplicationEvents;
 import org.springframework.test.context.event.RecordApplicationEvents;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
-@SpringBootTest
 @RecordApplicationEvents
-class InfoServiceTest {
+class InfoServiceTest extends IntegrationHelper {
 
     @Autowired
     private InfoService infoService;
@@ -82,4 +84,19 @@ class InfoServiceTest {
             softly.assertThat(styleUpdatedEventCount).isEqualTo(1);
         });
     }
+
+    @Test
+    void 모든_정보를_조회한다() {
+        // given
+        Long memberId = 1L;
+        InfoWriteRequest request = 정보_생성_요청();
+        infoService.writeInfo(memberId, request);
+        InfoSearchResponse expectedInfoSearchResponse = 정보_조회_응답();
+
+        // when
+        InfoSearchResponse infoSearchResponse = infoService.findInfo(memberId);
+
+        // then
+        assertThat(infoSearchResponse).isEqualTo(expectedInfoSearchResponse);
+    }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
index c1086077..b017f598 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
@@ -7,8 +7,8 @@
 public class PositionWriteRequestFixture {
 
     public static PositionWriteRequest 좌표_생성_요청() {
-        BigDecimal latitude = BigDecimal.valueOf(70.3);
-        BigDecimal longitude = BigDecimal.valueOf(140.3);
+        BigDecimal latitude = BigDecimal.valueOf(70.39);
+        BigDecimal longitude = BigDecimal.valueOf(140.38);
 
         return new PositionWriteRequest(latitude, longitude);
     }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
index a78fcef4..f78f3f0e 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
@@ -7,8 +7,8 @@
 public class PositionSearchResponseFixture {
 
     public static PositionSearchResponse 좌표_정보_조회_응답() {
-        BigDecimal latitude = BigDecimal.valueOf(70.3);
-        BigDecimal longitude = BigDecimal.valueOf(140.3);
+        BigDecimal latitude = BigDecimal.valueOf(70.39);
+        BigDecimal longitude = BigDecimal.valueOf(140.38);
 
         return new PositionSearchResponse(latitude, longitude);
     }

From 18b204123375ab1ad8b0a9b8670d29a765ac4b2b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 11:17:03 +0900
Subject: [PATCH 165/225] =?UTF-8?q?refactor:=20ProfileServiceTest=20ignori?=
 =?UTF-8?q?ngFields=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileServiceTest 저장 검증 시 ignoringFields 추가
---
 .../com/atwoz/member/application/info/ProfileServiceTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index fbfa3725..91506476 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -50,6 +50,7 @@ void init() {
             softly.assertThat(profileRepository.findByMemberId(memberId)).isPresent();
             softly.assertThat(profileRepository.findByMemberId(memberId).get())
                     .usingRecursiveComparison()
+                    .ignoringFields("id")
                     .isEqualTo(expectedProfile);
         });
     }

From 73107c3c9d5d9f03f0433ffd845644a06ffdf3f2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 11:58:47 +0900
Subject: [PATCH 166/225] =?UTF-8?q?refactor:=20=EC=9D=B8=ED=84=B0=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=9D=B8=EC=9E=90=20final=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberStyleJpaRepository, OptionJpaRepository final 인자 추가
---
 .../member/infrastructure/info/option/OptionJpaRepository.java  | 2 +-
 .../infrastructure/info/style/MemberStyleJpaRepository.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
index 5b17445c..4d62ee67 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
@@ -6,7 +6,7 @@
 
 public interface OptionJpaRepository extends JpaRepository<Option, Long> {
 
-    Optional<Option> findByMemberId(Long memberId);
+    Optional<Option> findByMemberId(final Long memberId);
 
     boolean existsByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
index 9f6365e9..ba1301cc 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
@@ -7,5 +7,5 @@
 public interface MemberStyleJpaRepository extends JpaRepository<MemberStyle, Long> {
 
     void deleteByMemberId(final Long memberId);
-    List<MemberStyle> findAllByMemberId(Long memberId);
+    List<MemberStyle> findAllByMemberId(final Long memberId);
 }

From 36121100b25e66bcc7daa19b274f5578c06d8891 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 12:10:44 +0900
Subject: [PATCH 167/225] =?UTF-8?q?refactor:=20OptionFactory=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionFactory 메서드 통일하여 하나의 메서드만으로 생성되도록 수정
---
 .../info/option/OptionFactory.java            | 29 +++++++------------
 .../info/option/OptionService.java            | 18 ++++++++++--
 .../application/info/OptionServiceTest.java   | 18 ++++++++++--
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index 5d311feb..abfdf45d 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -1,7 +1,5 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
@@ -11,22 +9,17 @@
 
 public class OptionFactory {
 
-    public static Option createNewOption(final Long memberId, final OptionWriteRequest request) {
-        Smoke smoke = Smoke.findByName(request.smoke());
-        Religion religion = Religion.findByName(request.religion());
-        Drink drink = Drink.findByName(request.drink());
-        Mbti mbti = Mbti.findByName(request.mbti());
-        Graduate graduate = Graduate.findByName(request.graduate());
-
-        return new Option(memberId, smoke, religion, drink, mbti, graduate);
-    }
-
-    public static Option createUpdateOption(final Long memberId, final OptionUpdateRequest request) {
-        Smoke smoke = Smoke.findByName(request.smoke());
-        Religion religion = Religion.findByName(request.religion());
-        Drink drink = Drink.findByName(request.drink());
-        Mbti mbti = Mbti.findByName(request.mbti());
-        Graduate graduate = Graduate.findByName(request.graduate());
+    public static Option createOption(final Long memberId,
+                                      final String smokeName,
+                                      final String religionName,
+                                      final String drinkName,
+                                      final String mbtiName,
+                                      final String graduateName) {
+        Smoke smoke = Smoke.findByName(smokeName);
+        Religion religion = Religion.findByName(religionName);
+        Drink drink = Drink.findByName(drinkName);
+        Mbti mbti = Mbti.findByName(mbtiName);
+        Graduate graduate = Graduate.findByName(graduateName);
 
         return new Option(memberId, smoke, religion, drink, mbti, graduate);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index b7419db9..6e0b5bc8 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -18,7 +18,14 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = OptionFactory.createNewOption(memberId, request);
+        Option newOption = OptionFactory.createOption(
+                memberId,
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
+        );
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
         }
@@ -32,7 +39,14 @@ private Option findByMemberId(final Long memberId) {
     @Transactional
     public void updateOption(final Long memberId, final OptionUpdateRequest request) {
         Option existOption = findByMemberId(memberId);
-        Option newOption = OptionFactory.createUpdateOption(memberId, request);
+        Option newOption = OptionFactory.createOption(
+                memberId,
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
+        );
 
         existOption.updateContents(
                 newOption.getSmoke(),
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index ef4b80ce..cd7aa1d8 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -36,7 +36,14 @@ void init() {
         Long memberId = 1L;
 
         OptionWriteRequest request = 옵션_생성_요청();
-        Option expectedOption = OptionFactory.createNewOption(memberId, request);
+        Option expectedOption = OptionFactory.createOption(
+                memberId,
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
+        );
 
         // when
         optionService.writeOption(memberId, request);
@@ -57,7 +64,14 @@ void init() {
         Long memberId = 1L;
 
         OptionUpdateRequest updateRequest = 옵션_수정_요청();
-        Option exprectedOption = OptionFactory.createUpdateOption(memberId, updateRequest);
+        Option exprectedOption = OptionFactory.createOption(
+                memberId,
+                updateRequest.smoke(),
+                updateRequest.religion(),
+                updateRequest.drink(),
+                updateRequest.mbti(),
+                updateRequest.graduate()
+        );
 
         OptionWriteRequest writeRequest = 옵션_생성_요청();
         optionService.writeOption(memberId, writeRequest);

From 9494c63a75d8b5d50a516390d76bb7e0e492a3ed Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 12:12:55 +0900
Subject: [PATCH 168/225] =?UTF-8?q?feat:=20ProfileService=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileService 수정 메서드 구현
- ProfileFactory 메서드 추가
- ProfileServiceTest 저장, 수정만 검증하도록 수정
---
 .../info/profile/ProfileFactory.java          | 53 +++++++++++++------
 .../info/profile/ProfileService.java          | 26 ++++-----
 .../application/info/ProfileServiceTest.java  | 32 +++++------
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index f228ab55..260be5d7 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -1,7 +1,10 @@
 package com.atwoz.member.application.info.profile;
 
+import com.atwoz.member.application.info.dto.profile.LocationUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.PositionUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Gender;
@@ -10,35 +13,53 @@
 import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.YearManager;
+import java.math.BigDecimal;
 
 public class ProfileFactory {
 
-    public static Profile of(final Long memberId, final ProfileWriteRequest request, final YearManager yearManager) {
-        Body body = createMemberBody(request, yearManager);
-        Location location = createLocation(request.location());
-        Position position = createPosition(request.position());
-        Job job = createJob(request.job());
+    public static Profile createNewProfile(final Long memberId,
+                                           final ProfileWriteRequest request,
+                                           final YearManager yearManager) {
+        int birthYear = request.birthYear();
+        int height = request.height();
+        Gender gender = Gender.findByName(request.gender());
+        Body body = new Body(yearManager, birthYear, height, gender);
+
+        LocationWriteRequest locationWriteRequest = request.location();
+        String city = locationWriteRequest.city();
+        String sector = locationWriteRequest.sector();
+        Location location = new Location(city, sector);
+
+        PositionWriteRequest positionWriteRequest = request.position();
+        BigDecimal latitude = positionWriteRequest.latitude();
+        BigDecimal longitude = positionWriteRequest.longitude();
+        Position position = new Position(latitude, longitude);
+
+        Job job = Job.findByCode(request.job());
 
         return new Profile(memberId, body, location, position, job);
     }
 
-    private static Body createMemberBody(final ProfileWriteRequest request, final YearManager yearManager) {
+    public static Profile createUpdateProfile(final Long memberId,
+                                              final ProfileUpdateRequest request,
+                                              final YearManager yearManager) {
         int birthYear = request.birthYear();
         int height = request.height();
         Gender gender = Gender.findByName(request.gender());
+        Body body = new Body(yearManager, birthYear, height, gender);
 
-        return new Body(yearManager, birthYear, height, gender);
-    }
+        LocationUpdateRequest locationUpdateRequest = request.location();
+        String city = locationUpdateRequest.city();
+        String sector = locationUpdateRequest.sector();
+        Location location = new Location(city, sector);
 
-    private static Location createLocation(final LocationWriteRequest request) {
-        return new Location(request.city(), request.sector());
-    }
+        PositionUpdateRequest positionUpdateRequest = request.position();
+        BigDecimal latitude = positionUpdateRequest.latitude();
+        BigDecimal longitude = positionUpdateRequest.longitude();
+        Position position = new Position(latitude, longitude);
 
-    private static Position createPosition(final PositionWriteRequest request) {
-        return new Position(request.latitude(), request.longitude());
-    }
+        Job job = Job.findByCode(request.job());
 
-    private static Job createJob(final String code) {
-        return Job.findByCode(code);
+        return new Profile(memberId, body, location, position, job);
     }
 }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 6aba9fa3..4c250598 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.profile;
 
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
@@ -19,14 +20,22 @@ public class ProfileService {
 
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
-        Profile newProfile = ProfileFactory.of(memberId, request, yearManager);
-
-        if (!isMemberProfileExist(memberId)) {
+        Profile newProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
+        if (!profileRepository.isExistMemberProfile(memberId)) {
             profileRepository.save(newProfile);
-            return;
         }
+    }
 
+    private Profile findByMemberId(final Long memberId) {
+        return profileRepository.findByMemberId(memberId)
+                .orElseThrow(ProfileNotFoundException::new);
+    }
+
+    @Transactional
+    public void updateProfile(final Long memberId, final ProfileUpdateRequest request) {
         Profile existProfile = findByMemberId(memberId);
+        Profile newProfile = ProfileFactory.createUpdateProfile(memberId, request, yearManager);
+
         existProfile.updateContents(
                 newProfile.getBody(),
                 newProfile.getLocation(),
@@ -34,13 +43,4 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
                 newProfile.getJob()
         );
     }
-
-    private boolean isMemberProfileExist(final Long memberId) {
-        return profileRepository.isExistMemberProfile(memberId);
-    }
-
-    public Profile findByMemberId(final Long memberId) {
-        return profileRepository.findByMemberId(memberId)
-                .orElseThrow(ProfileNotFoundException::new);
-    }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 91506476..f866f423 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,17 +1,17 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.application.info.profile.ProfileFactory;
 import com.atwoz.member.application.info.profile.ProfileService;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
 import com.atwoz.member.domain.info.profile.YearManager;
-import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.infrastructure.info.FakeYearManager;
 import com.atwoz.member.infrastructure.info.ProfileFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,7 +40,7 @@ void init() {
         Long memberId = 1L;
         ProfileWriteRequest request = 프로필_생성_요청();
 
-        Profile expectedProfile = ProfileFactory.of(memberId, request, yearManager);
+        Profile expectedProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
 
         // when
         profileService.writeProfile(memberId, request);
@@ -56,29 +56,23 @@ void init() {
     }
 
     @Test
-    void profile을_조회한다() {
+    void profile을_수정한다() {
         // given
         Long memberId = 1L;
-        ProfileWriteRequest request = 프로필_생성_요청();
 
-        profileService.writeProfile(memberId, request);
-        Profile expectedProfile = ProfileFactory.of(memberId, request, yearManager);
+        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
+        Profile expectedProfile = ProfileFactory.createUpdateProfile(memberId, profileUpdateRequest, yearManager);
+
+        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
+        profileService.writeProfile(memberId, profileWriteRequest);
 
         // when
-        Profile findProfile = profileService.findByMemberId(memberId);
+        profileService.updateProfile(memberId, profileUpdateRequest);
 
         // then
-        assertThat(findProfile).usingRecursiveComparison()
+        assertThat(profileRepository.findByMemberId(memberId).get())
+                .usingRecursiveComparison()
+                .ignoringFields("id")
                 .isEqualTo(expectedProfile);
     }
-
-    @Test
-    void 처음에는_profile이_존재하지_않는다() {
-        // given
-        Long memberId = 1L;
-
-        // when & then
-        assertThatThrownBy(() -> profileService.findByMemberId(memberId))
-                .isInstanceOf(ProfileNotFoundException.class);
-    }
 }

From af7d92cc2843d05aa10692e9bf9258f9d7d9e2ec Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 12:39:35 +0900
Subject: [PATCH 169/225] =?UTF-8?q?fix:=20ProfileEventHandler=20=EC=84=9C?=
 =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=ED=98=B8=EC=B6=9C=20=EB=93=B1=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileEventHandler 수정 이벤트 서비스 호출 등록 수정
---
 .../member/application/info/profile/ProfileEventHandler.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
index 7e448193..969741fb 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
@@ -26,5 +26,7 @@ public void writeProfile(final ProfileWroteEvent event) {
     public void updateProfile(final ProfileUpdatedEvent event) {
         Long memberId = event.getMemberId();
         ProfileUpdateRequest request = event.getRequest();
+
+        profileService.updateProfile(memberId, request);
     }
 }

From 9a4eee7ab4069e0dd8c379ba7ccb7d5bbd5a0185 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 12:50:33 +0900
Subject: [PATCH 170/225] =?UTF-8?q?refactor:=20OptionFactory=20request=20?=
 =?UTF-8?q?=EC=B6=94=EC=83=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionFactory 메서드 통일을 위해 OptionRequest 인터페이스 등록
- 레코드를 클래스로 수정
---
 .../info/dto/option/OptionRequest.java        | 10 +++++++++
 .../info/dto/option/OptionUpdateRequest.java  | 18 +++++++++------
 .../info/dto/option/OptionWriteRequest.java   | 18 +++++++++------
 .../info/option/OptionFactory.java            | 18 ++++++---------
 .../info/option/OptionService.java            | 18 ++-------------
 .../application/info/OptionServiceTest.java   | 22 ++++---------------
 6 files changed, 45 insertions(+), 59 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java

diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java
new file mode 100644
index 00000000..6b2ebbe1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java
@@ -0,0 +1,10 @@
+package com.atwoz.member.application.info.dto.option;
+
+public interface OptionRequest {
+
+    String getDrink();
+    String getGraduate();
+    String getReligion();
+    String getSmoke();
+    String getMbti();
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
index d49d0db3..ceaa387c 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
@@ -1,21 +1,25 @@
 package com.atwoz.member.application.info.dto.option;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class OptionUpdateRequest implements OptionRequest {
 
-public record OptionUpdateRequest(
         @NotBlank(message = "음주가 작성되어야 합니다.")
-        String drink,
+        private String drink;
 
         @NotBlank(message = "최종학력이 작성되어야 합니다.")
-        String graduate,
+        private String graduate;
 
         @NotBlank(message = "종교가 작성되어야 합니다.")
-        String religion,
+        private String religion;
 
         @NotBlank(message = "흡연이 작성되어야 합니다.")
-        String smoke,
+        private String smoke;
 
         @NotBlank(message = "MBTI가 작성되어야 합니다.")
-        String mbti
-) {
+        private String mbti;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
index 056d909c..d1b57602 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
@@ -1,21 +1,25 @@
 package com.atwoz.member.application.info.dto.option;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class OptionWriteRequest implements OptionRequest {
 
-public record OptionWriteRequest(
         @NotBlank(message = "음주가 작성되어야 합니다.")
-        String drink,
+        String drink;
 
         @NotBlank(message = "최종학력이 작성되어야 합니다.")
-        String graduate,
+        String graduate;
 
         @NotBlank(message = "종교가 작성되어야 합니다.")
-        String religion,
+        String religion;
 
         @NotBlank(message = "흡연이 작성되어야 합니다.")
-        String smoke,
+        String smoke;
 
         @NotBlank(message = "MBTI가 작성되어야 합니다.")
-        String mbti
-) {
+        String mbti;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index abfdf45d..07f45e5d 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.option;
 
+import com.atwoz.member.application.info.dto.option.OptionRequest;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
@@ -9,17 +10,12 @@
 
 public class OptionFactory {
 
-    public static Option createOption(final Long memberId,
-                                      final String smokeName,
-                                      final String religionName,
-                                      final String drinkName,
-                                      final String mbtiName,
-                                      final String graduateName) {
-        Smoke smoke = Smoke.findByName(smokeName);
-        Religion religion = Religion.findByName(religionName);
-        Drink drink = Drink.findByName(drinkName);
-        Mbti mbti = Mbti.findByName(mbtiName);
-        Graduate graduate = Graduate.findByName(graduateName);
+    public static Option createOption(final Long memberId, final OptionRequest optionRequest) {
+        Smoke smoke = Smoke.findByName(optionRequest.getSmoke());
+        Religion religion = Religion.findByName(optionRequest.getReligion());
+        Drink drink = Drink.findByName(optionRequest.getDrink());
+        Mbti mbti = Mbti.findByName(optionRequest.getMbti());
+        Graduate graduate = Graduate.findByName(optionRequest.getGraduate());
 
         return new Option(memberId, smoke, religion, drink, mbti, graduate);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 6e0b5bc8..e707e0b7 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -18,14 +18,7 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = OptionFactory.createOption(
-                memberId,
-                request.smoke(),
-                request.religion(),
-                request.drink(),
-                request.mbti(),
-                request.graduate()
-        );
+        Option newOption = OptionFactory.createOption(memberId, request);
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
         }
@@ -39,14 +32,7 @@ private Option findByMemberId(final Long memberId) {
     @Transactional
     public void updateOption(final Long memberId, final OptionUpdateRequest request) {
         Option existOption = findByMemberId(memberId);
-        Option newOption = OptionFactory.createOption(
-                memberId,
-                request.smoke(),
-                request.religion(),
-                request.drink(),
-                request.mbti(),
-                request.graduate()
-        );
+        Option newOption = OptionFactory.createOption(memberId, request);
 
         existOption.updateContents(
                 newOption.getSmoke(),
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index cd7aa1d8..cf6c6eed 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -35,18 +35,11 @@ void init() {
         // given
         Long memberId = 1L;
 
-        OptionWriteRequest request = 옵션_생성_요청();
-        Option expectedOption = OptionFactory.createOption(
-                memberId,
-                request.smoke(),
-                request.religion(),
-                request.drink(),
-                request.mbti(),
-                request.graduate()
-        );
+        OptionWriteRequest writeRequest = 옵션_생성_요청();
+        Option expectedOption = OptionFactory.createOption(memberId, writeRequest);
 
         // when
-        optionService.writeOption(memberId, request);
+        optionService.writeOption(memberId, writeRequest);
 
         // then
         assertSoftly(softly -> {
@@ -64,14 +57,7 @@ void init() {
         Long memberId = 1L;
 
         OptionUpdateRequest updateRequest = 옵션_수정_요청();
-        Option exprectedOption = OptionFactory.createOption(
-                memberId,
-                updateRequest.smoke(),
-                updateRequest.religion(),
-                updateRequest.drink(),
-                updateRequest.mbti(),
-                updateRequest.graduate()
-        );
+        Option exprectedOption = OptionFactory.createOption(memberId, updateRequest);
 
         OptionWriteRequest writeRequest = 옵션_생성_요청();
         optionService.writeOption(memberId, writeRequest);

From 50612de4a8fb9d2051a65876985fcc1ac3099a9b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 13:02:30 +0900
Subject: [PATCH 171/225] =?UTF-8?q?refactor:=20ProfileFactory=20request=20?=
 =?UTF-8?q?=EC=B6=94=EC=83=81=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileFactory 메서드 통일을 위해 ProfileRequest 인터페이스 및 하위 속성 인터페이스 등록
- 레코드를 클래스로 수정
---
 .../dto/profile/LocationUpdateRequest.java    | 12 ----
 .../dto/profile/LocationWriteRequest.java     | 12 ----
 .../dto/profile/PositionUpdateRequest.java    | 13 -----
 .../dto/profile/PositionWriteRequest.java     | 13 -----
 .../info/dto/profile/ProfileRequest.java      | 14 +++++
 .../dto/profile/ProfileUpdateRequest.java     | 25 ++++++---
 .../info/dto/profile/ProfileWriteRequest.java | 25 ++++++---
 .../dto/profile/location/LocationRequest.java |  7 +++
 .../location/LocationUpdateRequest.java       | 19 +++++++
 .../location/LocationWriteRequest.java        | 19 +++++++
 .../dto/profile/position/PositionRequest.java |  9 +++
 .../position/PositionUpdateRequest.java       | 20 +++++++
 .../position/PositionWriteRequest.java        | 20 +++++++
 .../info/profile/ProfileFactory.java          | 56 +++++--------------
 .../info/profile/ProfileService.java          |  4 +-
 .../application/info/ProfileServiceTest.java  |  4 +-
 .../request/LocationUpdateRequestFixture.java |  2 +-
 .../request/LocationWriteRequestFixture.java  |  2 +-
 .../request/PositionUpdateRequestFixture.java |  2 +-
 .../request/PositionWriteRequestFixture.java  |  2 +-
 .../request/ProfileUpdateRequestFixture.java  |  4 +-
 .../request/ProfileWriteRequestFixture.java   |  4 +-
 22 files changed, 168 insertions(+), 120 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java

diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java
deleted file mode 100644
index 8b38ca3b..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationUpdateRequest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.atwoz.member.application.info.dto.profile;
-
-import jakarta.validation.constraints.NotBlank;
-
-public record LocationUpdateRequest(
-        @NotBlank(message = "시/도가 작성되어야 합니다.")
-        String city,
-
-        @NotBlank(message = "구/군이 작성되어야 합니다.")
-        String sector
-) {
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
deleted file mode 100644
index 95385651..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/LocationWriteRequest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.atwoz.member.application.info.dto.profile;
-
-import jakarta.validation.constraints.NotBlank;
-
-public record LocationWriteRequest(
-        @NotBlank(message = "시/도가 작성되어야 합니다.")
-        String city,
-
-        @NotBlank(message = "구/군이 작성되어야 합니다.")
-        String sector
-) {
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java
deleted file mode 100644
index a4c307a8..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionUpdateRequest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.application.info.dto.profile;
-
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-public record PositionUpdateRequest(
-        @NotNull(message = "위도가 있어야 합니다.")
-        BigDecimal latitude,
-
-        @NotNull(message = "경도가 있어야 합니다.")
-        BigDecimal longitude
-) {
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
deleted file mode 100644
index 00a2f658..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/PositionWriteRequest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atwoz.member.application.info.dto.profile;
-
-import jakarta.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-public record PositionWriteRequest(
-        @NotNull(message = "위도가 있어야 합니다.")
-        BigDecimal latitude,
-
-        @NotNull(message = "경도가 있어야 합니다.")
-        BigDecimal longitude
-){
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java
new file mode 100644
index 00000000..c14dd594
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.application.info.dto.profile;
+
+import com.atwoz.member.application.info.dto.profile.location.LocationRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionRequest;
+
+public interface ProfileRequest {
+
+    Integer getBirthYear();
+    Integer getHeight();
+    String getGender();
+    LocationRequest getLocation();
+    PositionRequest getPosition();
+    String getJob();
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
index b69a3f35..a0c43a5a 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
@@ -1,28 +1,37 @@
 package com.atwoz.member.application.info.dto.profile;
 
+import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class ProfileUpdateRequest implements ProfileRequest {
 
-public record ProfileUpdateRequest(
         @NotNull(message = "출생년도가 작성되어야 합니다.")
-        Integer birthYear,
+        Integer birthYear;
 
         @NotNull(message = "키가 작성되어야 합니다.")
-        Integer height,
+        Integer height;
 
         @NotBlank(message = "성별이 작성되어야 합니다.")
-        String gender,
+        String gender;
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        LocationUpdateRequest location,
+        LocationUpdateRequest location;
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        PositionUpdateRequest position,
+        PositionUpdateRequest position;
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
-        String job
-) {
+        String job;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index d8002528..e60a1549 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -1,28 +1,37 @@
 package com.atwoz.member.application.info.dto.profile;
 
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class ProfileWriteRequest implements ProfileRequest {
 
-public record ProfileWriteRequest(
         @NotNull(message = "출생년도가 작성되어야 합니다.")
-        Integer birthYear,
+        Integer birthYear;
 
         @NotNull(message = "키가 작성되어야 합니다.")
-        Integer height,
+        Integer height;
 
         @NotBlank(message = "성별이 작성되어야 합니다.")
-        String gender,
+        String gender;
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        LocationWriteRequest location,
+        LocationWriteRequest location;
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        PositionWriteRequest position,
+        PositionWriteRequest position;
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
-        String job
-){
+        String job;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java
new file mode 100644
index 00000000..a43e36c9
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java
@@ -0,0 +1,7 @@
+package com.atwoz.member.application.info.dto.profile.location;
+
+public interface LocationRequest {
+
+    String getCity();
+    String getSector();
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
new file mode 100644
index 00000000..26207a19
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
@@ -0,0 +1,19 @@
+package com.atwoz.member.application.info.dto.profile.location;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class LocationUpdateRequest implements LocationRequest {
+
+        @NotBlank(message = "시/도가 작성되어야 합니다.")
+        String city;
+
+        @NotBlank(message = "구/군이 작성되어야 합니다.")
+        String sector;
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
new file mode 100644
index 00000000..73cdd574
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
@@ -0,0 +1,19 @@
+package com.atwoz.member.application.info.dto.profile.location;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class LocationWriteRequest implements LocationRequest {
+
+        @NotBlank(message = "시/도가 작성되어야 합니다.")
+        String city;
+
+        @NotBlank(message = "구/군이 작성되어야 합니다.")
+        String sector;
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java
new file mode 100644
index 00000000..b49085ee
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java
@@ -0,0 +1,9 @@
+package com.atwoz.member.application.info.dto.profile.position;
+
+import java.math.BigDecimal;
+
+public interface PositionRequest {
+
+    BigDecimal getLatitude();
+    BigDecimal getLongitude();
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
new file mode 100644
index 00000000..43634203
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
@@ -0,0 +1,20 @@
+package com.atwoz.member.application.info.dto.profile.position;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class PositionUpdateRequest implements PositionRequest {
+
+        @NotNull(message = "위도가 있어야 합니다.")
+        BigDecimal latitude;
+
+        @NotNull(message = "경도가 있어야 합니다.")
+        BigDecimal longitude;
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
new file mode 100644
index 00000000..20805bd8
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
@@ -0,0 +1,20 @@
+package com.atwoz.member.application.info.dto.profile.position;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class PositionWriteRequest implements PositionRequest {
+
+        @NotNull(message = "위도가 있어야 합니다.")
+        BigDecimal latitude;
+
+        @NotNull(message = "경도가 있어야 합니다.")
+        BigDecimal longitude;
+}
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index 260be5d7..e76004d0 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -1,11 +1,8 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.application.info.dto.profile.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.PositionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionRequest;
 import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
@@ -17,48 +14,23 @@
 
 public class ProfileFactory {
 
-    public static Profile createNewProfile(final Long memberId,
-                                           final ProfileWriteRequest request,
-                                           final YearManager yearManager) {
-        int birthYear = request.birthYear();
-        int height = request.height();
-        Gender gender = Gender.findByName(request.gender());
+    public static Profile createProfile(final Long memberId, final ProfileRequest request, final YearManager yearManager) {
+        int birthYear = request.getBirthYear();
+        int height = request.getHeight();
+        Gender gender = Gender.findByName(request.getGender());
         Body body = new Body(yearManager, birthYear, height, gender);
 
-        LocationWriteRequest locationWriteRequest = request.location();
-        String city = locationWriteRequest.city();
-        String sector = locationWriteRequest.sector();
+        LocationRequest locationWriteRequest = request.getLocation();
+        String city = locationWriteRequest.getCity();
+        String sector = locationWriteRequest.getSector();
         Location location = new Location(city, sector);
 
-        PositionWriteRequest positionWriteRequest = request.position();
-        BigDecimal latitude = positionWriteRequest.latitude();
-        BigDecimal longitude = positionWriteRequest.longitude();
+        PositionRequest positionWriteRequest = request.getPosition();
+        BigDecimal latitude = positionWriteRequest.getLatitude();
+        BigDecimal longitude = positionWriteRequest.getLongitude();
         Position position = new Position(latitude, longitude);
 
-        Job job = Job.findByCode(request.job());
-
-        return new Profile(memberId, body, location, position, job);
-    }
-
-    public static Profile createUpdateProfile(final Long memberId,
-                                              final ProfileUpdateRequest request,
-                                              final YearManager yearManager) {
-        int birthYear = request.birthYear();
-        int height = request.height();
-        Gender gender = Gender.findByName(request.gender());
-        Body body = new Body(yearManager, birthYear, height, gender);
-
-        LocationUpdateRequest locationUpdateRequest = request.location();
-        String city = locationUpdateRequest.city();
-        String sector = locationUpdateRequest.sector();
-        Location location = new Location(city, sector);
-
-        PositionUpdateRequest positionUpdateRequest = request.position();
-        BigDecimal latitude = positionUpdateRequest.latitude();
-        BigDecimal longitude = positionUpdateRequest.longitude();
-        Position position = new Position(latitude, longitude);
-
-        Job job = Job.findByCode(request.job());
+        Job job = Job.findByCode(request.getJob());
 
         return new Profile(memberId, body, location, position, job);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 4c250598..63e045c7 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -20,7 +20,7 @@ public class ProfileService {
 
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
-        Profile newProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
+        Profile newProfile = ProfileFactory.createProfile(memberId, request, yearManager);
         if (!profileRepository.isExistMemberProfile(memberId)) {
             profileRepository.save(newProfile);
         }
@@ -34,7 +34,7 @@ private Profile findByMemberId(final Long memberId) {
     @Transactional
     public void updateProfile(final Long memberId, final ProfileUpdateRequest request) {
         Profile existProfile = findByMemberId(memberId);
-        Profile newProfile = ProfileFactory.createUpdateProfile(memberId, request, yearManager);
+        Profile newProfile = ProfileFactory.createProfile(memberId, request, yearManager);
 
         existProfile.updateContents(
                 newProfile.getBody(),
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index f866f423..7627cb49 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -40,7 +40,7 @@ void init() {
         Long memberId = 1L;
         ProfileWriteRequest request = 프로필_생성_요청();
 
-        Profile expectedProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
+        Profile expectedProfile = ProfileFactory.createProfile(memberId, request, yearManager);
 
         // when
         profileService.writeProfile(memberId, request);
@@ -61,7 +61,7 @@ void init() {
         Long memberId = 1L;
 
         ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
-        Profile expectedProfile = ProfileFactory.createUpdateProfile(memberId, profileUpdateRequest, yearManager);
+        Profile expectedProfile = ProfileFactory.createProfile(memberId, profileUpdateRequest, yearManager);
 
         ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
         profileService.writeProfile(memberId, profileWriteRequest);
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
index 8604ce58..342224ae 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationUpdateRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
index 88f27801..ac29eb33 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationWriteRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
index c4e64f34..319b557f 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.PositionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
 import java.math.BigDecimal;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
index b017f598..a3e2001b 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
 import java.math.BigDecimal;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
index 81c71821..8ea0b005 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
@@ -3,8 +3,8 @@
 import static com.atwoz.member.fixture.info.dto.request.LocationUpdateRequestFixture.위치_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.PositionUpdateRequestFixture.좌표_수정_요청;
 
-import com.atwoz.member.application.info.dto.profile.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.PositionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
index d9904693..e40b049d 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
@@ -3,8 +3,8 @@
 import static com.atwoz.member.fixture.info.dto.request.LocationWriteRequestFixture.위치_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.PositionWriteRequestFixture.좌표_생성_요청;
 
-import com.atwoz.member.application.info.dto.profile.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.PositionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;

From 83241e137632cb8a56bd014a31b1d8e8c0ae92c2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 13:03:40 +0900
Subject: [PATCH 172/225] =?UTF-8?q?fix:=20OptionRequest=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=EC=B2=B4=20DTO=20=EA=B8=B0=EB=B3=B8=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=EC=9E=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionRequest 구현체 DTO 기본 생성자 추가
---
 .../application/info/dto/option/OptionUpdateRequest.java       | 3 +++
 .../member/application/info/dto/option/OptionWriteRequest.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
index ceaa387c..6cf1de2d 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
@@ -1,10 +1,13 @@
 package com.atwoz.member.application.info.dto.option;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 public class OptionUpdateRequest implements OptionRequest {
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
index d1b57602..74533b68 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
@@ -1,10 +1,13 @@
 package com.atwoz.member.application.info.dto.option;
 
 import jakarta.validation.constraints.NotBlank;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 public class OptionWriteRequest implements OptionRequest {
 

From 77dcc60317c0c9f87a9719bfb00c86c89b38978b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 13:22:29 +0900
Subject: [PATCH 173/225] =?UTF-8?q?refactor:=20Request=20private=20?=
 =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Request 필드에 private 속성 추가 통일
---
 .../info/dto/option/OptionWriteRequest.java          | 10 +++++-----
 .../info/dto/profile/ProfileUpdateRequest.java       | 12 ++++++------
 .../info/dto/profile/ProfileWriteRequest.java        | 12 ++++++------
 .../dto/profile/location/LocationUpdateRequest.java  |  4 ++--
 .../dto/profile/location/LocationWriteRequest.java   |  4 ++--
 .../dto/profile/position/PositionUpdateRequest.java  |  4 ++--
 .../dto/profile/position/PositionWriteRequest.java   |  4 ++--
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
index 74533b68..66421425 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
@@ -12,17 +12,17 @@
 public class OptionWriteRequest implements OptionRequest {
 
         @NotBlank(message = "음주가 작성되어야 합니다.")
-        String drink;
+        private String drink;
 
         @NotBlank(message = "최종학력이 작성되어야 합니다.")
-        String graduate;
+        private String graduate;
 
         @NotBlank(message = "종교가 작성되어야 합니다.")
-        String religion;
+        private String religion;
 
         @NotBlank(message = "흡연이 작성되어야 합니다.")
-        String smoke;
+        private String smoke;
 
         @NotBlank(message = "MBTI가 작성되어야 합니다.")
-        String mbti;
+        private String mbti;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
index a0c43a5a..5f3033f4 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
@@ -16,22 +16,22 @@
 public class ProfileUpdateRequest implements ProfileRequest {
 
         @NotNull(message = "출생년도가 작성되어야 합니다.")
-        Integer birthYear;
+        private Integer birthYear;
 
         @NotNull(message = "키가 작성되어야 합니다.")
-        Integer height;
+        private Integer height;
 
         @NotBlank(message = "성별이 작성되어야 합니다.")
-        String gender;
+        private String gender;
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        LocationUpdateRequest location;
+        private LocationUpdateRequest location;
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        PositionUpdateRequest position;
+        private PositionUpdateRequest position;
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
-        String job;
+        private String job;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index e60a1549..4393c1d7 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -16,22 +16,22 @@
 public class ProfileWriteRequest implements ProfileRequest {
 
         @NotNull(message = "출생년도가 작성되어야 합니다.")
-        Integer birthYear;
+        private Integer birthYear;
 
         @NotNull(message = "키가 작성되어야 합니다.")
-        Integer height;
+        private Integer height;
 
         @NotBlank(message = "성별이 작성되어야 합니다.")
-        String gender;
+        private String gender;
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        LocationWriteRequest location;
+        private LocationWriteRequest location;
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        PositionWriteRequest position;
+        private PositionWriteRequest position;
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
-        String job;
+        private String job;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
index 26207a19..577b02cd 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
@@ -12,8 +12,8 @@
 public class LocationUpdateRequest implements LocationRequest {
 
         @NotBlank(message = "시/도가 작성되어야 합니다.")
-        String city;
+        private String city;
 
         @NotBlank(message = "구/군이 작성되어야 합니다.")
-        String sector;
+        private String sector;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
index 73cdd574..d68a08f9 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
@@ -12,8 +12,8 @@
 public class LocationWriteRequest implements LocationRequest {
 
         @NotBlank(message = "시/도가 작성되어야 합니다.")
-        String city;
+        private String city;
 
         @NotBlank(message = "구/군이 작성되어야 합니다.")
-        String sector;
+        private String sector;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
index 43634203..7b22a4a7 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
@@ -13,8 +13,8 @@
 public class PositionUpdateRequest implements PositionRequest {
 
         @NotNull(message = "위도가 있어야 합니다.")
-        BigDecimal latitude;
+        private BigDecimal latitude;
 
         @NotNull(message = "경도가 있어야 합니다.")
-        BigDecimal longitude;
+        private BigDecimal longitude;
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
index 20805bd8..6200c1e4 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
@@ -13,8 +13,8 @@
 public class PositionWriteRequest implements PositionRequest {
 
         @NotNull(message = "위도가 있어야 합니다.")
-        BigDecimal latitude;
+        private BigDecimal latitude;
 
         @NotNull(message = "경도가 있어야 합니다.")
-        BigDecimal longitude;
+        private BigDecimal longitude;
 }

From 989fffac138bbf1b3276d8336eaa7b7a54a4fa08 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 13:22:44 +0900
Subject: [PATCH 174/225] =?UTF-8?q?refactor:=20Job=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 통일성을 위해 조회 메서드명 수정
---
 src/main/java/com/atwoz/member/domain/info/profile/Job.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
index 37f9281e..ba07e2c2 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Job.java
@@ -38,12 +38,12 @@ public enum Job {
 
     public static Job findByCode(final String code) {
         return Arrays.stream(values())
-                .filter(job -> job.isSame(code))
+                .filter(job -> job.isSameCode(code))
                 .findFirst()
                 .orElseThrow(InvalidJobException::new);
     }
 
-    private boolean isSame(final String code) {
+    private boolean isSameCode(final String code) {
         return this.code.equals(code);
     }
 }

From 8495097d273a7e545588569be7aa4170182f011e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 13:34:11 +0900
Subject: [PATCH 175/225] =?UTF-8?q?refactor:=20HobbyJpaRepository=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 통일성을 위해 MemberHobbyJpaRepository로 이름 수정
---
 ...pository.java => MemberHobbyJpaRepository.java} |  2 +-
 .../info/hobby/MemberHobbyRepositoryImpl.java      | 10 +++++-----
 .../info/MemberHobbyJpaRepositoryTest.java         | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename src/main/java/com/atwoz/member/infrastructure/info/hobby/{HobbyJpaRepository.java => MemberHobbyJpaRepository.java} (78%)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
similarity index 78%
rename from src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
rename to src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
index 7281f703..9ff81ca5 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/HobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
@@ -4,7 +4,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 
-public interface HobbyJpaRepository extends JpaRepository<MemberHobby, Long> {
+public interface MemberHobbyJpaRepository extends JpaRepository<MemberHobby, Long> {
 
     void deleteByMemberId(final Long memberId);
 
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java
index 244bca37..a8e8ad02 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyRepositoryImpl.java
@@ -10,25 +10,25 @@
 @Repository
 public class MemberHobbyRepositoryImpl implements MemberHobbyRepository {
 
-    private final HobbyJpaRepository hobbyJpaRepository;
+    private final MemberHobbyJpaRepository memberHobbyJpaRepository;
 
     @Override
     public void save(final MemberHobby memberHobby) {
-        hobbyJpaRepository.save(memberHobby);
+        memberHobbyJpaRepository.save(memberHobby);
     }
 
     @Override
     public void saveAll(final List<MemberHobby> memberHobbies) {
-        hobbyJpaRepository.saveAll(memberHobbies);
+        memberHobbyJpaRepository.saveAll(memberHobbies);
     }
 
     @Override
     public void deleteHobbiesByMemberId(final Long memberId) {
-        hobbyJpaRepository.deleteByMemberId(memberId);
+        memberHobbyJpaRepository.deleteByMemberId(memberId);
     }
 
     @Override
     public List<MemberHobby> findAllByMemberId(final Long memberId) {
-        return hobbyJpaRepository.findAllByMemberId(memberId);
+        return memberHobbyJpaRepository.findAllByMemberId(memberId);
     }
 }
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
index 3bd445f4..b17e538f 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
@@ -7,7 +7,7 @@
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.fixture.member.MemberFixture;
-import com.atwoz.member.infrastructure.info.hobby.HobbyJpaRepository;
+import com.atwoz.member.infrastructure.info.hobby.MemberHobbyJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -24,7 +24,7 @@
 class MemberHobbyJpaRepositoryTest {
 
     @Autowired
-    private HobbyJpaRepository hobbyJpaRepository;
+    private MemberHobbyJpaRepository memberHobbyJpaRepository;
 
     @Autowired
     private MemberJpaRepository memberJpaRepository;
@@ -44,7 +44,7 @@ void init() {
         MemberHobby memberHobby = new MemberHobby(memberId, hobby);
 
         // when
-        MemberHobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
+        MemberHobby saveMemberHobby = memberHobbyJpaRepository.save(memberHobby);
 
         // then
         assertThat(saveMemberHobby)
@@ -58,10 +58,10 @@ void init() {
         Hobby hobby = Hobby.ANIMATION;
         Long memberId = member.getId();
         MemberHobby memberHobby = new MemberHobby(memberId, hobby);
-        MemberHobby saveMemberHobby = hobbyJpaRepository.save(memberHobby);
+        MemberHobby saveMemberHobby = memberHobbyJpaRepository.save(memberHobby);
 
         // when
-        List<MemberHobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
+        List<MemberHobby> findMemberHobbies = memberHobbyJpaRepository.findAllByMemberId(memberId);
 
         // then
         assertSoftly(softly -> {
@@ -76,11 +76,11 @@ void init() {
         Long memberId = member.getId();
         List<MemberHobby> memberHobbies = Stream.of(Hobby.BICYCLE, Hobby.DANCE)
                 .map(hobby -> new MemberHobby(memberId, hobby))
-                .map(memberHobby -> hobbyJpaRepository.save(memberHobby))
+                .map(memberHobby -> memberHobbyJpaRepository.save(memberHobby))
                 .toList();
 
         // when
-        List<MemberHobby> findMemberHobbies = hobbyJpaRepository.findAllByMemberId(memberId);
+        List<MemberHobby> findMemberHobbies = memberHobbyJpaRepository.findAllByMemberId(memberId);
 
         // then
         assertSoftly(softly -> {

From 3f77b04492c3616a2cd2ca575186a641037b39e2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 17:09:39 +0900
Subject: [PATCH 176/225] =?UTF-8?q?refactor:=20Style=20=EA=B2=80=EC=A6=9D?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EB=B6=84=ED=95=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Style 검증 코드 메서드 분할
---
 .../atwoz/member/domain/info/style/Style.java   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index 24d6ff0f..e2398871 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,7 +1,8 @@
 package com.atwoz.member.domain.info.style;
 
-import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.info.style.InvalidStyleException;
+import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import lombok.Getter;
 import java.util.Arrays;
@@ -61,17 +62,27 @@ public static List<Style> findAllByCodes(final List<String> codes) {
     }
 
     public static void validateSize(final List<String> codes) {
+        validateIsNotEmptyCodes(codes);
+        validateIsUniqueCodes(codes);
+        validateIsNotOverMaxSizeOfStyle(codes);
+    }
+
+    private static void validateIsNotEmptyCodes(final List<String> codes) {
         if (codes.isEmpty()) {
-            throw new StyleSizeException();
+            throw new HobbySizeException();
         }
+    }
 
+    private static void validateIsUniqueCodes(final List<String> codes) {
         Set<String> uniqueCodes = new HashSet<>(codes);
         if (uniqueCodes.size() != codes.size()) {
             throw new StyleDuplicateException();
         }
+    }
 
+    private static void validateIsNotOverMaxSizeOfStyle(final List<String> codes) {
         int validSize = Arrays.stream(values())
-                .filter(style -> uniqueCodes.contains(style.getCode()))
+                .filter(style -> codes.contains(style.getCode()))
                 .toList()
                 .size();
         if (validSize > MAX_SIZE) {

From a961677548fab0210c5351ae3d9467c5deaddd16 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 17:18:29 +0900
Subject: [PATCH 177/225] =?UTF-8?q?refactor:=20=EC=9D=91=EB=8B=B5=20DTO=20?=
 =?UTF-8?q?=EA=B3=B5=EB=B0=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 통일성을 위해 응답 DTO들의 메서드 전 공백 추가
---
 .../atwoz/member/ui/info/dto/option/OptionSearchResponse.java    | 1 +
 .../atwoz/member/ui/info/dto/profile/LocationSearchResponse.java | 1 +
 .../atwoz/member/ui/info/dto/profile/PositionSearchResponse.java | 1 +
 .../atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
index 8e6da532..5ff4d669 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
@@ -19,6 +19,7 @@ public record OptionSearchResponse(
 
         String mbti
 ) {
+
     public static OptionSearchResponse from(final Option option) {
         Drink drink = option.getDrink();
         Graduate graduate = option.getGraduate();
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
index c871b64d..87fc76bb 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
@@ -8,6 +8,7 @@ public record LocationSearchResponse(
 
         String sector
 ) {
+
     public static LocationSearchResponse from(final Location location) {
         return new LocationSearchResponse(location.getCity(), location.getSector());
     }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
index 6d7b8ef1..6f26ba33 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
@@ -9,6 +9,7 @@ public record PositionSearchResponse(
 
         BigDecimal longitude
 ) {
+
     public static PositionSearchResponse from(final Position position) {
         return new PositionSearchResponse(position.getLatitude(), position.getLongitude());
     }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index f42385b5..bef06375 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -21,6 +21,7 @@ public record ProfileSearchResponse(
 
         String job
 ) {
+
     public static ProfileSearchResponse from(final Profile profile) {
         Body body = profile.getBody();
         int age = body.getAge();

From 9db653496a1dbca9235ef7502fc842a346dc5600 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 17:23:08 +0900
Subject: [PATCH 178/225] =?UTF-8?q?refactor:=20JpaRepositoryTest=20ignorin?=
 =?UTF-8?q?gFields=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberHobbyJpaRepositoryTest ignoringFields 추가
- MemberStyleJpaRepositoryTest ignoringFields 추가
---
 .../member/infrastructure/info/MemberHobbyJpaRepositoryTest.java | 1 +
 .../member/infrastructure/info/MemberStyleJpaRepositoryTest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
index b17e538f..79d84189 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
@@ -49,6 +49,7 @@ void init() {
         // then
         assertThat(saveMemberHobby)
                 .usingRecursiveComparison()
+                .ignoringFields("id")
                 .isEqualTo(memberHobby);
     }
 
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
index c1200d9b..2a424143 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
@@ -49,6 +49,7 @@ void init() {
         // then
         assertThat(saveMemberStyle)
                 .usingRecursiveComparison()
+                .ignoringFields("id")
                 .isEqualTo(memberStyle);
     }
 

From 2ff647c13c5a39440b40742ffdd2722d59f15876 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 17:24:18 +0900
Subject: [PATCH 179/225] =?UTF-8?q?fix:=20Style=20=EA=B2=80=EC=A6=9D=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Style 검증 예외 수정
---
 src/main/java/com/atwoz/member/domain/info/style/Style.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/style/Style.java b/src/main/java/com/atwoz/member/domain/info/style/Style.java
index e2398871..8f4b87d1 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/Style.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/Style.java
@@ -1,6 +1,5 @@
 package com.atwoz.member.domain.info.style;
 
-import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
 import com.atwoz.member.exception.exceptions.info.style.InvalidStyleException;
 import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
 import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
@@ -69,7 +68,7 @@ public static void validateSize(final List<String> codes) {
 
     private static void validateIsNotEmptyCodes(final List<String> codes) {
         if (codes.isEmpty()) {
-            throw new HobbySizeException();
+            throw new StyleSizeException();
         }
     }
 

From 5804df56b43c801a738aa6a55a7f902871c058ee Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 19:45:58 +0900
Subject: [PATCH 180/225] =?UTF-8?q?refactor:=20AllArgsConstructor=20access?=
 =?UTF-8?q?=20=EB=8B=A8=EA=B3=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AllArgsConstructor access 단계 PRIVATE으로 모두 수정
---
 .../java/com/atwoz/member/domain/info/hobby/MemberHobby.java    | 2 +-
 .../java/com/atwoz/member/domain/info/style/MemberStyle.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
index 92932bfd..ff1e387f 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/MemberHobby.java
@@ -18,7 +18,7 @@
 @Getter
 @EqualsAndHashCode(exclude = "id")
 @Table(name = "member_hobbies")
-@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Builder
 @Entity
diff --git a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
index fb117434..1932a413 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/MemberStyle.java
@@ -18,7 +18,7 @@
 @Getter
 @EqualsAndHashCode(exclude = "id")
 @Table(name = "member_styles")
-@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Builder
 @Entity

From ccf0e67504530f069a565c9505fa6e562719935f Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 19:51:27 +0900
Subject: [PATCH 181/225] =?UTF-8?q?refactor:=20ProfileServiceTest=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EA=B2=80=EC=A6=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ProfileServiceTest 예외 검증 추가
- findMemberById 메서드 위치 수정
- 테스트 메서드명 한글화 통일
---
 .../info/profile/ProfileService.java            | 10 +++++-----
 .../application/info/ProfileServiceTest.java    | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 63e045c7..fff69cf6 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -26,11 +26,6 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
         }
     }
 
-    private Profile findByMemberId(final Long memberId) {
-        return profileRepository.findByMemberId(memberId)
-                .orElseThrow(ProfileNotFoundException::new);
-    }
-
     @Transactional
     public void updateProfile(final Long memberId, final ProfileUpdateRequest request) {
         Profile existProfile = findByMemberId(memberId);
@@ -43,4 +38,9 @@ public void updateProfile(final Long memberId, final ProfileUpdateRequest reques
                 newProfile.getJob()
         );
     }
+
+    private Profile findByMemberId(final Long memberId) {
+        return profileRepository.findByMemberId(memberId)
+                .orElseThrow(ProfileNotFoundException::new);
+    }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 7627cb49..4f357be2 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -3,6 +3,7 @@
 import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
@@ -12,6 +13,7 @@
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
 import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.infrastructure.info.FakeYearManager;
 import com.atwoz.member.infrastructure.info.ProfileFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,7 +37,7 @@ void init() {
     }
 
     @Test
-    void profile을_저장한다() {
+    void 프로필을_저장한다() {
         // given
         Long memberId = 1L;
         ProfileWriteRequest request = 프로필_생성_요청();
@@ -56,7 +58,7 @@ void init() {
     }
 
     @Test
-    void profile을_수정한다() {
+    void 프로필을_수정한다() {
         // given
         Long memberId = 1L;
 
@@ -75,4 +77,15 @@ void init() {
                 .ignoringFields("id")
                 .isEqualTo(expectedProfile);
     }
+
+    @Test
+    void 프로필이_없을_때_수정을_시도하면_예외가_발생한다() {
+        // given
+        Long memberId = 1L;
+        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
+
+        // when & then
+        assertThatThrownBy(() -> profileService.updateProfile(memberId, profileUpdateRequest))
+                .isInstanceOf(ProfileNotFoundException.class);
+    }
 }

From 6e6998a808287e048df7640534d1d01a26daa9e3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Thu, 29 Feb 2024 19:54:00 +0900
Subject: [PATCH 182/225] =?UTF-8?q?refactor:=20OptionServiceTest=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EA=B2=80=EC=A6=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionServiceTest 예외 검증 추가
- findMemberById 메서드 위치 수정
- 테스트 메서드명 한글화 통일
---
 .../application/info/option/OptionService.java  | 10 +++++-----
 .../application/info/OptionServiceTest.java     | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index e707e0b7..5031194a 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -24,11 +24,6 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
         }
     }
 
-    private Option findByMemberId(final Long memberId) {
-        return optionRepository.findByMemberId(memberId)
-                .orElseThrow(OptionNotFoundException::new);
-    }
-
     @Transactional
     public void updateOption(final Long memberId, final OptionUpdateRequest request) {
         Option existOption = findByMemberId(memberId);
@@ -42,4 +37,9 @@ public void updateOption(final Long memberId, final OptionUpdateRequest request)
                 newOption.getGraduate()
         );
     }
+
+    private Option findByMemberId(final Long memberId) {
+        return optionRepository.findByMemberId(memberId)
+                .orElseThrow(OptionNotFoundException::new);
+    }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index cf6c6eed..ffcf6204 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -3,6 +3,7 @@
 import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
@@ -11,6 +12,7 @@
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
+import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.infrastructure.info.OptionFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -31,7 +33,7 @@ void init() {
     }
 
     @Test
-    void option을_저장한다() {
+    void 옵션을_저장한다() {
         // given
         Long memberId = 1L;
 
@@ -52,7 +54,7 @@ void init() {
     }
 
     @Test
-    void option을_수정한다() {
+    void 옵션을_수정한다() {
         // given
         Long memberId = 1L;
 
@@ -71,4 +73,15 @@ void init() {
                 .ignoringFields("id")
                 .isEqualTo(exprectedOption);
     }
+
+    @Test
+    void 옵션이_없을_때_수정을_시도하면_예외가_발생한다() {
+        // given
+        Long memberId = 1L;
+        OptionUpdateRequest updateRequest = 옵션_수정_요청();
+
+        // when & then
+        assertThatThrownBy(() -> optionService.updateOption(memberId, updateRequest))
+                .isInstanceOf(OptionNotFoundException.class);
+    }
 }

From 6bb85dbc363eff43f3bdf3d91b501ec513dafe51 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 11:40:43 +0900
Subject: [PATCH 183/225] =?UTF-8?q?refactor:=20InfoService=20MockBeanInjec?=
 =?UTF-8?q?tion=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoService MockBean을 MockBeanInjection으로 이동
---
 src/test/java/com/atwoz/helper/MockBeanInjection.java       | 6 +++++-
 .../com/atwoz/member/ui/info/InfoControllerWebMvcTest.java  | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/test/java/com/atwoz/helper/MockBeanInjection.java b/src/test/java/com/atwoz/helper/MockBeanInjection.java
index 507dd820..f0b467d9 100644
--- a/src/test/java/com/atwoz/helper/MockBeanInjection.java
+++ b/src/test/java/com/atwoz/helper/MockBeanInjection.java
@@ -1,6 +1,7 @@
 package com.atwoz.helper;
 
 import com.atwoz.member.application.auth.AuthService;
+import com.atwoz.member.application.info.InfoService;
 import com.atwoz.member.application.info.hobby.MemberHobbyService;
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.application.info.profile.ProfileService;
@@ -28,7 +29,7 @@ public class MockBeanInjection {
     protected AuthService authService;
 
     @MockBean
-    protected MemberHobbyService memberHobbyService;
+    protected InfoService infoService;
 
     @MockBean
     protected OptionService optionService;
@@ -36,6 +37,9 @@ public class MockBeanInjection {
     @MockBean
     protected ProfileService profileService;
 
+    @MockBean
+    protected MemberHobbyService memberHobbyService;
+
     @MockBean
     protected MemberStyleService memberStyleService;
 
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 465858e1..af061920 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -20,7 +20,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.atwoz.helper.MockBeanInjection;
-import com.atwoz.member.application.info.InfoService;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
@@ -31,7 +30,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -44,9 +42,6 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
-    private InfoService infoService;
-
     @Autowired
     private ObjectMapper objectMapper;
 

From cef53419e5d15578ba855d4a9b66dcb42b27ff0b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 11:45:53 +0900
Subject: [PATCH 184/225] =?UTF-8?q?refactor:=20MemberRepository=20?=
 =?UTF-8?q?=EC=9D=98=EC=A1=B4=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AuthControllerWebMvcTest MemberRepository 의존 삭제
---
 .../com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
index f28ebea6..8e725850 100644
--- a/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
@@ -12,7 +12,6 @@
 
 import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.application.auth.dto.LoginRequest;
-import com.atwoz.member.domain.member.MemberRepository;
 import com.atwoz.member.infrastructure.auth.dto.OAuthProviderRequest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -21,7 +20,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -37,9 +35,6 @@ class AuthControllerWebMvcTest extends MockBeanInjection {
     @Autowired
     private ObjectMapper objectMapper;
 
-    @MockBean
-    private MemberRepository memberRepository;
-
     @Test
     void 로그인을_진행한다() throws Exception {
         // given

From b53a6d19355ff4e0b2165ec77b1a2d9b8b3170f2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 11:50:02 +0900
Subject: [PATCH 185/225] =?UTF-8?q?refactor:=20DTO=20=EA=B3=B5=EB=B0=B1=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- DTO들의 공백 삭제
---
 .../com/atwoz/member/ui/info/dto/HobbySearchResponse.java   | 1 -
 .../com/atwoz/member/ui/info/dto/StyleSearchResponse.java   | 1 -
 .../member/ui/info/dto/option/OptionSearchResponse.java     | 5 -----
 .../member/ui/info/dto/profile/LocationSearchResponse.java  | 2 --
 .../member/ui/info/dto/profile/PositionSearchResponse.java  | 2 --
 .../member/ui/info/dto/profile/ProfileSearchResponse.java   | 6 ------
 6 files changed, 17 deletions(-)

diff --git a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
index 09d2a134..6a3c6b14 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
@@ -4,7 +4,6 @@
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 
 public record HobbySearchResponse(
-
         String hobby
 ) {
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
index 51783afc..6b08a76d 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
@@ -4,7 +4,6 @@
 import com.atwoz.member.domain.info.style.Style;
 
 public record StyleSearchResponse(
-
         String style
 ) {
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
index 5ff4d669..d7bcaea8 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
@@ -8,15 +8,10 @@
 import com.atwoz.member.domain.info.option.Smoke;
 
 public record OptionSearchResponse(
-
         String drink,
-
         String graduate,
-
         String religion,
-
         String smoke,
-
         String mbti
 ) {
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
index 87fc76bb..1d83d110 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
@@ -3,9 +3,7 @@
 import com.atwoz.member.domain.info.profile.Location;
 
 public record LocationSearchResponse(
-
         String city,
-
         String sector
 ) {
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
index 6f26ba33..154ada8c 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
@@ -4,9 +4,7 @@
 import java.math.BigDecimal;
 
 public record PositionSearchResponse(
-
         BigDecimal latitude,
-
         BigDecimal longitude
 ) {
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index bef06375..bd101d67 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -8,17 +8,11 @@
 import com.atwoz.member.domain.info.profile.Profile;
 
 public record ProfileSearchResponse(
-
         int age,
-
         int height,
-
         String gender,
-
         LocationSearchResponse location,
-
         PositionSearchResponse position,
-
         String job
 ) {
 

From 90d982ff5b10639b6e6f33fd54c6cd47be8ed3e5 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 12:11:25 +0900
Subject: [PATCH 186/225] =?UTF-8?q?refactor:=20Request=20DTO=20=EC=9D=B8?=
 =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Request DTO 인터페이스 삭제, 레코드로 복구
---
 .../info/dto/option/OptionRequest.java        | 10 ----
 .../info/dto/option/OptionUpdateRequest.java  | 21 +++-----
 .../info/dto/option/OptionWriteRequest.java   | 21 +++-----
 .../info/dto/profile/ProfileRequest.java      | 14 -----
 .../dto/profile/ProfileUpdateRequest.java     | 23 +++-----
 .../info/dto/profile/ProfileWriteRequest.java | 23 +++-----
 .../dto/profile/location/LocationRequest.java |  7 ---
 .../location/LocationUpdateRequest.java       | 15 ++----
 .../location/LocationWriteRequest.java        | 15 ++----
 .../dto/profile/position/PositionRequest.java |  9 ----
 .../position/PositionUpdateRequest.java       | 15 ++----
 .../position/PositionWriteRequest.java        | 15 ++----
 .../info/option/OptionFactory.java            | 25 ++++++---
 .../info/option/OptionService.java            |  4 +-
 .../info/profile/ProfileFactory.java          | 52 ++++++++++++++-----
 .../info/profile/ProfileService.java          |  4 +-
 .../application/info/OptionServiceTest.java   |  4 +-
 .../application/info/ProfileServiceTest.java  |  4 +-
 18 files changed, 110 insertions(+), 171 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java
 delete mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java

diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java
deleted file mode 100644
index 6b2ebbe1..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionRequest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.atwoz.member.application.info.dto.option;
-
-public interface OptionRequest {
-
-    String getDrink();
-    String getGraduate();
-    String getReligion();
-    String getSmoke();
-    String getMbti();
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
index 6cf1de2d..d49d0db3 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
@@ -1,28 +1,21 @@
 package com.atwoz.member.application.info.dto.option;
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class OptionUpdateRequest implements OptionRequest {
 
+public record OptionUpdateRequest(
         @NotBlank(message = "음주가 작성되어야 합니다.")
-        private String drink;
+        String drink,
 
         @NotBlank(message = "최종학력이 작성되어야 합니다.")
-        private String graduate;
+        String graduate,
 
         @NotBlank(message = "종교가 작성되어야 합니다.")
-        private String religion;
+        String religion,
 
         @NotBlank(message = "흡연이 작성되어야 합니다.")
-        private String smoke;
+        String smoke,
 
         @NotBlank(message = "MBTI가 작성되어야 합니다.")
-        private String mbti;
+        String mbti
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
index 66421425..056d909c 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
@@ -1,28 +1,21 @@
 package com.atwoz.member.application.info.dto.option;
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class OptionWriteRequest implements OptionRequest {
 
+public record OptionWriteRequest(
         @NotBlank(message = "음주가 작성되어야 합니다.")
-        private String drink;
+        String drink,
 
         @NotBlank(message = "최종학력이 작성되어야 합니다.")
-        private String graduate;
+        String graduate,
 
         @NotBlank(message = "종교가 작성되어야 합니다.")
-        private String religion;
+        String religion,
 
         @NotBlank(message = "흡연이 작성되어야 합니다.")
-        private String smoke;
+        String smoke,
 
         @NotBlank(message = "MBTI가 작성되어야 합니다.")
-        private String mbti;
+        String mbti
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java
deleted file mode 100644
index c14dd594..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileRequest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.atwoz.member.application.info.dto.profile;
-
-import com.atwoz.member.application.info.dto.profile.location.LocationRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionRequest;
-
-public interface ProfileRequest {
-
-    Integer getBirthYear();
-    Integer getHeight();
-    String getGender();
-    LocationRequest getLocation();
-    PositionRequest getPosition();
-    String getJob();
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
index 5f3033f4..3866968a 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
@@ -5,33 +5,26 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class ProfileUpdateRequest implements ProfileRequest {
 
+public record ProfileUpdateRequest(
         @NotNull(message = "출생년도가 작성되어야 합니다.")
-        private Integer birthYear;
+        Integer birthYear,
 
         @NotNull(message = "키가 작성되어야 합니다.")
-        private Integer height;
+        Integer height,
 
         @NotBlank(message = "성별이 작성되어야 합니다.")
-        private String gender;
+        String gender,
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        private LocationUpdateRequest location;
+        LocationUpdateRequest location,
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        private PositionUpdateRequest position;
+        PositionUpdateRequest position,
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
-        private String job;
+        String job
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index 4393c1d7..8d1c7e0e 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -5,33 +5,26 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class ProfileWriteRequest implements ProfileRequest {
 
+public record ProfileWriteRequest(
         @NotNull(message = "출생년도가 작성되어야 합니다.")
-        private Integer birthYear;
+        Integer birthYear,
 
         @NotNull(message = "키가 작성되어야 합니다.")
-        private Integer height;
+        Integer height,
 
         @NotBlank(message = "성별이 작성되어야 합니다.")
-        private String gender;
+        String gender,
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
-        private LocationWriteRequest location;
+        LocationWriteRequest location,
 
         @Valid
         @NotNull(message = "위도-경도가 작성되어야 합니다.")
-        private PositionWriteRequest position;
+        PositionWriteRequest position,
 
         @NotBlank(message = "직업이 작성되어야 합니다.")
-        private String job;
+        String job
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java
deleted file mode 100644
index a43e36c9..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationRequest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.atwoz.member.application.info.dto.profile.location;
-
-public interface LocationRequest {
-
-    String getCity();
-    String getSector();
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
index 577b02cd..37c8f3a2 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
@@ -1,19 +1,12 @@
 package com.atwoz.member.application.info.dto.profile.location;
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class LocationUpdateRequest implements LocationRequest {
 
+public record LocationUpdateRequest(
         @NotBlank(message = "시/도가 작성되어야 합니다.")
-        private String city;
+        String city,
 
         @NotBlank(message = "구/군이 작성되어야 합니다.")
-        private String sector;
+        String sector
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
index d68a08f9..d1639cd2 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
@@ -1,19 +1,12 @@
 package com.atwoz.member.application.info.dto.profile.location;
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class LocationWriteRequest implements LocationRequest {
 
+public record LocationWriteRequest(
         @NotBlank(message = "시/도가 작성되어야 합니다.")
-        private String city;
+        String city,
 
         @NotBlank(message = "구/군이 작성되어야 합니다.")
-        private String sector;
+        String sector
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java
deleted file mode 100644
index b49085ee..00000000
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionRequest.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.atwoz.member.application.info.dto.profile.position;
-
-import java.math.BigDecimal;
-
-public interface PositionRequest {
-
-    BigDecimal getLatitude();
-    BigDecimal getLongitude();
-}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
index 7b22a4a7..3985ab04 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
@@ -1,20 +1,13 @@
 package com.atwoz.member.application.info.dto.profile.position;
 
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import java.math.BigDecimal;
 
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class PositionUpdateRequest implements PositionRequest {
-
+public record PositionUpdateRequest(
         @NotNull(message = "위도가 있어야 합니다.")
-        private BigDecimal latitude;
+        BigDecimal latitude,
 
         @NotNull(message = "경도가 있어야 합니다.")
-        private BigDecimal longitude;
+        BigDecimal longitude
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
index 6200c1e4..51738c2b 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
@@ -1,20 +1,13 @@
 package com.atwoz.member.application.info.dto.profile.position;
 
 import jakarta.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import java.math.BigDecimal;
 
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class PositionWriteRequest implements PositionRequest {
-
+public record PositionWriteRequest(
         @NotNull(message = "위도가 있어야 합니다.")
-        private BigDecimal latitude;
+        BigDecimal latitude,
 
         @NotNull(message = "경도가 있어야 합니다.")
-        private BigDecimal longitude;
+        BigDecimal longitude
+) {
 }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
index 07f45e5d..42f319ee 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.application.info.dto.option.OptionRequest;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
@@ -10,12 +11,22 @@
 
 public class OptionFactory {
 
-    public static Option createOption(final Long memberId, final OptionRequest optionRequest) {
-        Smoke smoke = Smoke.findByName(optionRequest.getSmoke());
-        Religion religion = Religion.findByName(optionRequest.getReligion());
-        Drink drink = Drink.findByName(optionRequest.getDrink());
-        Mbti mbti = Mbti.findByName(optionRequest.getMbti());
-        Graduate graduate = Graduate.findByName(optionRequest.getGraduate());
+    public static Option createNewOption(final Long memberId, final OptionWriteRequest request) {
+        Smoke smoke = Smoke.findByName(request.smoke());
+        Religion religion = Religion.findByName(request.religion());
+        Drink drink = Drink.findByName(request.drink());
+        Mbti mbti = Mbti.findByName(request.mbti());
+        Graduate graduate = Graduate.findByName(request.graduate());
+
+        return new Option(memberId, smoke, religion, drink, mbti, graduate);
+    }
+
+    public static Option createUpdatedOption(final Long memberId, final OptionUpdateRequest request) {
+        Smoke smoke = Smoke.findByName(request.smoke());
+        Religion religion = Religion.findByName(request.religion());
+        Drink drink = Drink.findByName(request.drink());
+        Mbti mbti = Mbti.findByName(request.mbti());
+        Graduate graduate = Graduate.findByName(request.graduate());
 
         return new Option(memberId, smoke, religion, drink, mbti, graduate);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 5031194a..52e662d5 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -18,7 +18,7 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = OptionFactory.createOption(memberId, request);
+        Option newOption = OptionFactory.createNewOption(memberId, request);
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
         }
@@ -27,7 +27,7 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
     @Transactional
     public void updateOption(final Long memberId, final OptionUpdateRequest request) {
         Option existOption = findByMemberId(memberId);
-        Option newOption = OptionFactory.createOption(memberId, request);
+        Option newOption = OptionFactory.createUpdatedOption(memberId, request);
 
         existOption.updateContents(
                 newOption.getSmoke(),
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
index e76004d0..cf7f4ef7 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
@@ -1,8 +1,11 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.application.info.dto.profile.ProfileRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
 import com.atwoz.member.domain.info.profile.Body;
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
@@ -14,23 +17,44 @@
 
 public class ProfileFactory {
 
-    public static Profile createProfile(final Long memberId, final ProfileRequest request, final YearManager yearManager) {
-        int birthYear = request.getBirthYear();
-        int height = request.getHeight();
-        Gender gender = Gender.findByName(request.getGender());
+    public static Profile createNewProfile(final Long memberId, final ProfileWriteRequest request, final YearManager yearManager) {
+        int birthYear = request.birthYear();
+        int height = request.height();
+        Gender gender = Gender.findByName(request.gender());
         Body body = new Body(yearManager, birthYear, height, gender);
 
-        LocationRequest locationWriteRequest = request.getLocation();
-        String city = locationWriteRequest.getCity();
-        String sector = locationWriteRequest.getSector();
+        LocationWriteRequest locationWriteRequest = request.location();
+        String city = locationWriteRequest.city();
+        String sector = locationWriteRequest.sector();
         Location location = new Location(city, sector);
 
-        PositionRequest positionWriteRequest = request.getPosition();
-        BigDecimal latitude = positionWriteRequest.getLatitude();
-        BigDecimal longitude = positionWriteRequest.getLongitude();
+        PositionWriteRequest positionWriteRequest = request.position();
+        BigDecimal latitude = positionWriteRequest.latitude();
+        BigDecimal longitude = positionWriteRequest.longitude();
         Position position = new Position(latitude, longitude);
 
-        Job job = Job.findByCode(request.getJob());
+        Job job = Job.findByCode(request.job());
+
+        return new Profile(memberId, body, location, position, job);
+    }
+
+    public static Profile createUpdatedProfile(final Long memberId, final ProfileUpdateRequest request, final YearManager yearManager) {
+        int birthYear = request.birthYear();
+        int height = request.height();
+        Gender gender = Gender.findByName(request.gender());
+        Body body = new Body(yearManager, birthYear, height, gender);
+
+        LocationUpdateRequest locationUpdateRequest = request.location();
+        String city = locationUpdateRequest.city();
+        String sector = locationUpdateRequest.sector();
+        Location location = new Location(city, sector);
+
+        PositionUpdateRequest positionUpdateRequest = request.position();
+        BigDecimal latitude = positionUpdateRequest.latitude();
+        BigDecimal longitude = positionUpdateRequest.longitude();
+        Position position = new Position(latitude, longitude);
+
+        Job job = Job.findByCode(request.job());
 
         return new Profile(memberId, body, location, position, job);
     }
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index fff69cf6..a324a106 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -20,7 +20,7 @@ public class ProfileService {
 
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
-        Profile newProfile = ProfileFactory.createProfile(memberId, request, yearManager);
+        Profile newProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
         if (!profileRepository.isExistMemberProfile(memberId)) {
             profileRepository.save(newProfile);
         }
@@ -29,7 +29,7 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
     @Transactional
     public void updateProfile(final Long memberId, final ProfileUpdateRequest request) {
         Profile existProfile = findByMemberId(memberId);
-        Profile newProfile = ProfileFactory.createProfile(memberId, request, yearManager);
+        Profile newProfile = ProfileFactory.createUpdatedProfile(memberId, request, yearManager);
 
         existProfile.updateContents(
                 newProfile.getBody(),
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index ffcf6204..a0315e61 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -38,7 +38,7 @@ void init() {
         Long memberId = 1L;
 
         OptionWriteRequest writeRequest = 옵션_생성_요청();
-        Option expectedOption = OptionFactory.createOption(memberId, writeRequest);
+        Option expectedOption = OptionFactory.createNewOption(memberId, writeRequest);
 
         // when
         optionService.writeOption(memberId, writeRequest);
@@ -59,7 +59,7 @@ void init() {
         Long memberId = 1L;
 
         OptionUpdateRequest updateRequest = 옵션_수정_요청();
-        Option exprectedOption = OptionFactory.createOption(memberId, updateRequest);
+        Option exprectedOption = OptionFactory.createUpdatedOption(memberId, updateRequest);
 
         OptionWriteRequest writeRequest = 옵션_생성_요청();
         optionService.writeOption(memberId, writeRequest);
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 4f357be2..43d52277 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -42,7 +42,7 @@ void init() {
         Long memberId = 1L;
         ProfileWriteRequest request = 프로필_생성_요청();
 
-        Profile expectedProfile = ProfileFactory.createProfile(memberId, request, yearManager);
+        Profile expectedProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
 
         // when
         profileService.writeProfile(memberId, request);
@@ -63,7 +63,7 @@ void init() {
         Long memberId = 1L;
 
         ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
-        Profile expectedProfile = ProfileFactory.createProfile(memberId, profileUpdateRequest, yearManager);
+        Profile expectedProfile = ProfileFactory.createUpdatedProfile(memberId, profileUpdateRequest, yearManager);
 
         ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
         profileService.writeProfile(memberId, profileWriteRequest);

From 4c393ed71a52c3dc20421208c3aff593b6d17ac6 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 13:41:45 +0900
Subject: [PATCH 187/225] =?UTF-8?q?refactor:=20Q=ED=8C=8C=EC=9D=BC=20stati?=
 =?UTF-8?q?c=20import=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Q파일 static import 등록
---
 .../infrastructure/info/InfoRepositoryImpl.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
index 5c971895..852eccfb 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -1,13 +1,13 @@
 package com.atwoz.member.infrastructure.info;
 
 import static com.atwoz.member.domain.info.hobby.QMemberHobby.memberHobby;
+import static com.atwoz.member.domain.info.option.QOption.option;
+import static com.atwoz.member.domain.info.profile.QProfile.profile;
 import static com.atwoz.member.domain.info.style.QMemberStyle.memberStyle;
 
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.domain.info.option.QOption;
 import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.domain.info.profile.QProfile;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
@@ -41,17 +41,17 @@ public InfoSearchResponse findByMemberId(final Long memberId) {
     }
 
     private Profile selectProfileByMemberId(final Long memberId) {
-        return Optional.ofNullable(queryFactory.select(QProfile.profile)
-                .from(QProfile.profile)
-                .where(QProfile.profile.memberId.eq(memberId))
+        return Optional.ofNullable(queryFactory.select(profile)
+                .from(profile)
+                .where(profile.memberId.eq(memberId))
                 .fetchOne())
                 .orElseThrow(ProfileNotFoundException::new);
     }
 
     private Option selectOptionByMemberId(final Long memberId) {
-        return Optional.ofNullable(queryFactory.select(QOption.option)
-                .from(QOption.option)
-                .where(QOption.option.memberId.eq(memberId))
+        return Optional.ofNullable(queryFactory.select(option)
+                .from(option)
+                .where(option.memberId.eq(memberId))
                 .fetchOne())
                 .orElseThrow(OptionNotFoundException::new);
     }

From 517401b57709a1890026e839570c0267d74bba3d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 13:56:37 +0900
Subject: [PATCH 188/225] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=9A=A9=EC=96=B4=20=EA=B5=AC=EB=B6=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 테스트 문맥을 파악할 수 있도록 회원 용어 추가되도록 수정
---
 .../application/info/InfoServiceTest.java     | 22 ++++++-------
 .../application/info/OptionServiceTest.java   | 12 +++----
 .../application/info/ProfileServiceTest.java  | 12 +++----
 .../domain/info/profile/ProfileTest.java      | 32 +++++++++----------
 .../member/fixture/info/BodyFixture.java      |  4 +--
 .../atwoz/member/fixture/info/JobFixture.java |  4 +--
 .../member/fixture/info/LocationFixture.java  |  4 +--
 .../member/fixture/info/PositionFixture.java  |  4 +--
 .../dto/request/InfoUpdateRequestFixture.java | 10 +++---
 .../dto/request/InfoWriteRequestFixture.java  | 10 +++---
 .../request/LocationUpdateRequestFixture.java |  2 +-
 .../request/LocationWriteRequestFixture.java  |  2 +-
 .../request/OptionUpdateRequestFixture.java   |  2 +-
 .../request/OptionWriteRequestFixture.java    |  2 +-
 .../request/PositionUpdateRequestFixture.java |  2 +-
 .../request/PositionWriteRequestFixture.java  |  2 +-
 .../request/ProfileUpdateRequestFixture.java  | 10 +++---
 .../request/ProfileWriteRequestFixture.java   | 10 +++---
 .../response/InfoSearchResponseFixture.java   | 10 +++---
 .../LocationSearchResponseFixture.java        |  2 +-
 .../response/OptionSearchResponseFixture.java |  2 +-
 .../PositionSearchResponseFixture.java        |  2 +-
 .../ProfileSearchResponseFixture.java         | 10 +++---
 .../info/ProfileJpaRepositoryTest.java        | 16 +++++-----
 .../ui/info/InfoControllerWebMvcTest.java     | 12 +++----
 25 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index d2a5732e..e5dba277 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.정보_생성_요청;
-import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.회원_정보_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
@@ -37,10 +37,10 @@ class InfoServiceTest extends IntegrationHelper {
     private ApplicationEvents events;
     
     @Test
-    void 모든_정보를_저장한다() {
+    void 회원의_모든_정보를_저장한다() {
         // given
         Long memberId = 1L;
-        InfoWriteRequest request = 정보_생성_요청();
+        InfoWriteRequest request = 회원_정보_생성_요청();
 
         // when
         infoService.writeInfo(memberId, request);
@@ -60,11 +60,11 @@ class InfoServiceTest extends IntegrationHelper {
     }
 
     @Test
-    void 모든_정보를_수정한다() {
+    void 회원의_모든_정보를_수정한다() {
         // given
         Long memberId = 1L;
-        InfoWriteRequest infoWriteRequest = 정보_생성_요청();
-        InfoUpdateRequest infoUpdateRequest = 정보_수정_요청();
+        InfoWriteRequest infoWriteRequest = 회원_정보_생성_요청();
+        InfoUpdateRequest infoUpdateRequest = 회원_정보_수정_요청();
 
         infoService.writeInfo(memberId, infoWriteRequest);
 
@@ -86,12 +86,12 @@ class InfoServiceTest extends IntegrationHelper {
     }
 
     @Test
-    void 모든_정보를_조회한다() {
+    void 회원의_모든_정보를_조회한다() {
         // given
         Long memberId = 1L;
-        InfoWriteRequest request = 정보_생성_요청();
+        InfoWriteRequest request = 회원_정보_생성_요청();
         infoService.writeInfo(memberId, request);
-        InfoSearchResponse expectedInfoSearchResponse = 정보_조회_응답();
+        InfoSearchResponse expectedInfoSearchResponse = 회원_정보_조회_응답();
 
         // when
         InfoSearchResponse infoSearchResponse = infoService.findInfo(memberId);
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index a0315e61..2a231e29 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.회원_옵션_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -37,7 +37,7 @@ void init() {
         // given
         Long memberId = 1L;
 
-        OptionWriteRequest writeRequest = 옵션_생성_요청();
+        OptionWriteRequest writeRequest = 회원_옵션_생성_요청();
         Option expectedOption = OptionFactory.createNewOption(memberId, writeRequest);
 
         // when
@@ -58,10 +58,10 @@ void init() {
         // given
         Long memberId = 1L;
 
-        OptionUpdateRequest updateRequest = 옵션_수정_요청();
+        OptionUpdateRequest updateRequest = 회원_옵션_수정_요청();
         Option exprectedOption = OptionFactory.createUpdatedOption(memberId, updateRequest);
 
-        OptionWriteRequest writeRequest = 옵션_생성_요청();
+        OptionWriteRequest writeRequest = 회원_옵션_생성_요청();
         optionService.writeOption(memberId, writeRequest);
 
         // when
@@ -78,7 +78,7 @@ void init() {
     void 옵션이_없을_때_수정을_시도하면_예외가_발생한다() {
         // given
         Long memberId = 1L;
-        OptionUpdateRequest updateRequest = 옵션_수정_요청();
+        OptionUpdateRequest updateRequest = 회원_옵션_수정_요청();
 
         // when & then
         assertThatThrownBy(() -> optionService.updateOption(memberId, updateRequest))
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 43d52277..685d37e7 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.회원_프로필_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -40,7 +40,7 @@ void init() {
     void 프로필을_저장한다() {
         // given
         Long memberId = 1L;
-        ProfileWriteRequest request = 프로필_생성_요청();
+        ProfileWriteRequest request = 회원_프로필_생성_요청();
 
         Profile expectedProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
 
@@ -62,10 +62,10 @@ void init() {
         // given
         Long memberId = 1L;
 
-        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
+        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
         Profile expectedProfile = ProfileFactory.createUpdatedProfile(memberId, profileUpdateRequest, yearManager);
 
-        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
+        ProfileWriteRequest profileWriteRequest = 회원_프로필_생성_요청();
         profileService.writeProfile(memberId, profileWriteRequest);
 
         // when
@@ -82,7 +82,7 @@ void init() {
     void 프로필이_없을_때_수정을_시도하면_예외가_발생한다() {
         // given
         Long memberId = 1L;
-        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
+        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
 
         // when & then
         assertThatThrownBy(() -> profileService.updateProfile(memberId, profileUpdateRequest))
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
index 9fa1aaab..76beede4 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -1,13 +1,13 @@
 package com.atwoz.member.domain.info.profile;
 
-import static com.atwoz.member.fixture.info.BodyFixture.수정_body_생성;
-import static com.atwoz.member.fixture.info.BodyFixture.일반_body_생성;
-import static com.atwoz.member.fixture.info.JobFixture.수정_직업_생성;
-import static com.atwoz.member.fixture.info.JobFixture.일반_직업_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.수정_위치_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.일반_위치_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.수정_좌표_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.일반_좌표_생성;
+import static com.atwoz.member.fixture.info.BodyFixture.회원_수정_body_생성;
+import static com.atwoz.member.fixture.info.BodyFixture.회원_일반_body_생성;
+import static com.atwoz.member.fixture.info.JobFixture.회원_수정_직업_생성;
+import static com.atwoz.member.fixture.info.JobFixture.회원_일반_직업_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.회원_수정_위치_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.회원_일반_위치_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.회원_수정_좌표_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.회원_일반_좌표_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -22,16 +22,16 @@ public class ProfileTest {
     void 내용_수정_검증() {
         // given
         Long memberId = 1L;
-        Body body = 일반_body_생성();
-        Job job = 일반_직업_생성();
-        Location location = 일반_위치_생성();
-        Position position = 일반_좌표_생성();
+        Body body = 회원_일반_body_생성();
+        Job job = 회원_일반_직업_생성();
+        Location location = 회원_일반_위치_생성();
+        Position position = 회원_일반_좌표_생성();
         Profile profile = new Profile(memberId, body, location, position, job);
 
-        Body updateBody = 수정_body_생성();
-        Job updateJob = 수정_직업_생성();
-        Location updateLocation = 수정_위치_생성();
-        Position updatePosition = 수정_좌표_생성();
+        Body updateBody = 회원_수정_body_생성();
+        Job updateJob = 회원_수정_직업_생성();
+        Location updateLocation = 회원_수정_위치_생성();
+        Position updatePosition = 회원_수정_좌표_생성();
 
         // when
         profile.updateContents(updateBody, updateLocation, updatePosition, updateJob);
diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
index ddbe6dce..4860b34a 100644
--- a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
@@ -8,7 +8,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class BodyFixture {
 
-    public static Body 일반_body_생성() {
+    public static Body 회원_일반_body_생성() {
         YearManager yearManager = new FakeYearManager();
         int birthYear = 2000;
         int height = 171;
@@ -17,7 +17,7 @@ public class BodyFixture {
         return new Body(yearManager, birthYear, height, gender);
     }
 
-    public static Body 수정_body_생성() {
+    public static Body 회원_수정_body_생성() {
         YearManager yearManager = new FakeYearManager();
         int birthYear = 2001;
         int height = 170;
diff --git a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
index b147131c..7a755888 100644
--- a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
@@ -5,11 +5,11 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class JobFixture {
 
-    public static Job 일반_직업_생성() {
+    public static Job 회원_일반_직업_생성() {
         return Job.RESEARCH_AND_DEVELOP;
     }
 
-    public static Job 수정_직업_생성() {
+    public static Job 회원_수정_직업_생성() {
         return Job.ETC;
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
index f5965d88..4a1fc9c8 100644
--- a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
@@ -5,14 +5,14 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationFixture {
 
-    public static Location 일반_위치_생성() {
+    public static Location 회원_일반_위치_생성() {
         String city = "서울시";
         String sector = "강남구";
 
         return new Location(city, sector);
     }
 
-    public static Location 수정_위치_생성() {
+    public static Location 회원_수정_위치_생성() {
         String city = "경기도";
         String sector = "성남시";
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
index b6732b8e..6f196263 100644
--- a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
@@ -6,14 +6,14 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class PositionFixture {
 
-    public static Position 일반_좌표_생성() {
+    public static Position 회원_일반_좌표_생성() {
         BigDecimal latitude = BigDecimal.valueOf(40);
         BigDecimal longitude = BigDecimal.valueOf(170);
 
         return new Position(latitude, longitude);
     }
 
-    public static Position 수정_좌표_생성() {
+    public static Position 회원_수정_좌표_생성() {
         BigDecimal latitude = BigDecimal.valueOf(50);
         BigDecimal longitude = BigDecimal.valueOf(160);
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
index f3abf39c..57438a23 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
@@ -4,8 +4,8 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 import static com.atwoz.member.domain.info.style.Style.FASHION;
 import static com.atwoz.member.domain.info.style.Style.PURE;
-import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.옵션_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.프로필_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.회원_프로필_수정_요청;
 
 import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
@@ -17,9 +17,9 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class InfoUpdateRequestFixture {
 
-    public static InfoUpdateRequest 정보_수정_요청() {
-        ProfileUpdateRequest profileUpdateRequest = 프로필_수정_요청();
-        OptionUpdateRequest optionUpdateRequest = 옵션_수정_요청();
+    public static InfoUpdateRequest 회원_정보_수정_요청() {
+        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
+        OptionUpdateRequest optionUpdateRequest = 회원_옵션_수정_요청();
 
         List<HobbyUpdateRequest> hobbies = List.of(
                 new HobbyUpdateRequest(DRAMA.getCode()),
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
index b41eea25..16d7ac95 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
@@ -4,8 +4,8 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
-import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.회원_옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.회원_프로필_생성_요청;
 
 import com.atwoz.member.application.info.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
@@ -17,9 +17,9 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class InfoWriteRequestFixture {
 
-    public static InfoWriteRequest 정보_생성_요청() {
-        ProfileWriteRequest profileWriteRequest = 프로필_생성_요청();
-        OptionWriteRequest optionWriteRequest = 옵션_생성_요청();
+    public static InfoWriteRequest 회원_정보_생성_요청() {
+        ProfileWriteRequest profileWriteRequest = 회원_프로필_생성_요청();
+        OptionWriteRequest optionWriteRequest = 회원_옵션_생성_요청();
 
         List<HobbyWriteRequest> hobbyWriteRequests = List.of(
                 new HobbyWriteRequest(WINE.getCode()),
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
index 342224ae..9c986f3d 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
@@ -5,7 +5,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationUpdateRequestFixture {
 
-    public static LocationUpdateRequest 위치_수정_요청() {
+    public static LocationUpdateRequest 회원_위치_수정_요청() {
         String city = "경기도";
         String sector = "성남시";
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
index ac29eb33..cfd2dfed 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
@@ -5,7 +5,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationWriteRequestFixture {
 
-    public static LocationWriteRequest 위치_생성_요청() {
+    public static LocationWriteRequest 회원_위치_생성_요청() {
         String city = "서울시";
         String sector = "강남구";
         
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
index a66aa20d..12b4e5cf 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
@@ -10,7 +10,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionUpdateRequestFixture {
 
-    public static OptionUpdateRequest 옵션_수정_요청() {
+    public static OptionUpdateRequest 회원_옵션_수정_요청() {
         String drink = Drink.ENJOY.getName();
         String graduate = Graduate.DOCTOR.getName();
         String religion = Religion.BUDDHA.getName();
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
index 28110aa9..6c3802d3 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
@@ -10,7 +10,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionWriteRequestFixture {
 
-    public static OptionWriteRequest 옵션_생성_요청() {
+    public static OptionWriteRequest 회원_옵션_생성_요청() {
         String drink = Drink.NEVER.getName();
         String graduate = Graduate.SEOUL_FOURTH.getName();
         String religion = Religion.CHRIST.getName();
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
index 319b557f..cba4e0e8 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
@@ -6,7 +6,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class PositionUpdateRequestFixture {
 
-    public static PositionUpdateRequest 좌표_수정_요청() {
+    public static PositionUpdateRequest 회원_좌표_수정_요청() {
         BigDecimal latitude = BigDecimal.valueOf(60.2);
         BigDecimal longitude = BigDecimal.valueOf(130.3);
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
index a3e2001b..c7715fba 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
@@ -6,7 +6,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class PositionWriteRequestFixture {
 
-    public static PositionWriteRequest 좌표_생성_요청() {
+    public static PositionWriteRequest 회원_좌표_생성_요청() {
         BigDecimal latitude = BigDecimal.valueOf(70.39);
         BigDecimal longitude = BigDecimal.valueOf(140.38);
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
index 8ea0b005..1bf64589 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import static com.atwoz.member.fixture.info.dto.request.LocationUpdateRequestFixture.위치_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.PositionUpdateRequestFixture.좌표_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.LocationUpdateRequestFixture.회원_위치_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.PositionUpdateRequestFixture.회원_좌표_수정_요청;
 
 import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
@@ -12,12 +12,12 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileUpdateRequestFixture {
 
-    public static ProfileUpdateRequest 프로필_수정_요청() {
+    public static ProfileUpdateRequest 회원_프로필_수정_요청() {
         int birthYear = 2001;
         int height = 170;
         String gender = Gender.FEMALE.getName();
-        LocationUpdateRequest locationUpdateRequest = 위치_수정_요청();
-        PositionUpdateRequest positionUpdateRequest = 좌표_수정_요청();
+        LocationUpdateRequest locationUpdateRequest = 회원_위치_수정_요청();
+        PositionUpdateRequest positionUpdateRequest = 회원_좌표_수정_요청();
         String job = Job.LAW.getCode();
 
         return new ProfileUpdateRequest(
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
index e40b049d..2e7facbc 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import static com.atwoz.member.fixture.info.dto.request.LocationWriteRequestFixture.위치_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.PositionWriteRequestFixture.좌표_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.LocationWriteRequestFixture.회원_위치_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.PositionWriteRequestFixture.회원_좌표_생성_요청;
 
 import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
@@ -12,12 +12,12 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileWriteRequestFixture {
 
-    public static ProfileWriteRequest 프로필_생성_요청() {
+    public static ProfileWriteRequest 회원_프로필_생성_요청() {
         int birthYear = 2000;
         int height = 171;
         String gender = Gender.MALE.getName();
-        LocationWriteRequest locationWriteRequest = 위치_생성_요청();
-        PositionWriteRequest positionWriteRequest = 좌표_생성_요청();
+        LocationWriteRequest locationWriteRequest = 회원_위치_생성_요청();
+        PositionWriteRequest positionWriteRequest = 회원_좌표_생성_요청();
         String job = Job.RESEARCH_AND_DEVELOP.getCode();
 
         return new ProfileWriteRequest(
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
index 5b946afa..6f9c034c 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
@@ -4,8 +4,8 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
-import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.옵션_정보_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.프로필_정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
 
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
@@ -17,9 +17,9 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class InfoSearchResponseFixture {
 
-    public static InfoSearchResponse 정보_조회_응답() {
-        ProfileSearchResponse profileSearchResponse = 프로필_정보_조회_응답();
-        OptionSearchResponse optionSearchResponse = 옵션_정보_조회_응답();
+    public static InfoSearchResponse 회원_정보_조회_응답() {
+        ProfileSearchResponse profileSearchResponse = 회원_프로필_조회_응답();
+        OptionSearchResponse optionSearchResponse = 회원_옵션_조회_응답();
 
         List<HobbySearchResponse> hobbies = List.of(
                 new HobbySearchResponse(WINE.getCode()),
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
index b7b1bd13..03a987e0 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
@@ -5,7 +5,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationSearchResponseFixture {
 
-    public static LocationSearchResponse 위치_정보_조회_응답() {
+    public static LocationSearchResponse 회원_위치_조회_응답() {
         String city = "서울시";
         String sector = "강남구";
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
index 4f74a9ac..879cc0fc 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
@@ -10,7 +10,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionSearchResponseFixture {
 
-    public static OptionSearchResponse 옵션_정보_조회_응답() {
+    public static OptionSearchResponse 회원_옵션_조회_응답() {
         String drink = Drink.NEVER.getName();
         String graduate = Graduate.SEOUL_FOURTH.getName();
         String religion = Religion.CHRIST.getName();
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
index f78f3f0e..ad523a13 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
@@ -6,7 +6,7 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class PositionSearchResponseFixture {
 
-    public static PositionSearchResponse 좌표_정보_조회_응답() {
+    public static PositionSearchResponse 회원_좌표_조회_응답() {
         BigDecimal latitude = BigDecimal.valueOf(70.39);
         BigDecimal longitude = BigDecimal.valueOf(140.38);
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
index 792bb228..baba5437 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info.dto.response;
 
-import static com.atwoz.member.fixture.info.dto.response.LocationSearchResponseFixture.위치_정보_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.PositionSearchResponseFixture.좌표_정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.LocationSearchResponseFixture.회원_위치_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.PositionSearchResponseFixture.회원_좌표_조회_응답;
 
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
@@ -12,12 +12,12 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileSearchResponseFixture {
 
-    public static ProfileSearchResponse 프로필_정보_조회_응답() {
+    public static ProfileSearchResponse 회원_프로필_조회_응답() {
         int age = 24;
         int height = 171;
         String gender = Gender.MALE.getName();
-        LocationSearchResponse locationSearchResponse = 위치_정보_조회_응답();
-        PositionSearchResponse positionSearchResponse = 좌표_정보_조회_응답();
+        LocationSearchResponse locationSearchResponse = 회원_위치_조회_응답();
+        PositionSearchResponse positionSearchResponse = 회원_좌표_조회_응답();
         String job = Job.RESEARCH_AND_DEVELOP.getCode();
 
         return new ProfileSearchResponse(
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
index 6aa07ac9..9c9fbe4a 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
@@ -46,10 +46,10 @@ void init() {
     void profile을_저장한다() {
         // given
         Long memberId = member.getId();
-        Body body = BodyFixture.일반_body_생성();
-        Location location = LocationFixture.일반_위치_생성();
-        Position position = PositionFixture.일반_좌표_생성();
-        Job job = JobFixture.일반_직업_생성();
+        Body body = BodyFixture.회원_일반_body_생성();
+        Location location = LocationFixture.회원_일반_위치_생성();
+        Position position = PositionFixture.회원_일반_좌표_생성();
+        Job job = JobFixture.회원_일반_직업_생성();
 
         Profile newProfile = new Profile(memberId, body, location, position, job);
 
@@ -67,10 +67,10 @@ void init() {
     void profile을_조회한다() {
         // given
         Long memberId = member.getId();
-        Body body = BodyFixture.일반_body_생성();
-        Location location = LocationFixture.일반_위치_생성();
-        Position position = PositionFixture.일반_좌표_생성();
-        Job job = JobFixture.일반_직업_생성();
+        Body body = BodyFixture.회원_일반_body_생성();
+        Location location = LocationFixture.회원_일반_위치_생성();
+        Position position = PositionFixture.회원_일반_좌표_생성();
+        Job job = JobFixture.회원_일반_직업_생성();
 
         Profile newProfile = new Profile(memberId, body, location, position, job);
         Profile saveProfile = profileJpaRepository.save(newProfile);
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index af061920..ea3ae94f 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.정보_생성_요청;
-import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.정보_조회_응답;
+import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.회원_정보_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
@@ -49,7 +49,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_작성한다() throws Exception {
         // given
         String bearerToken = "Bearer token";
-        InfoWriteRequest infoWriteRequest = 정보_생성_요청();
+        InfoWriteRequest infoWriteRequest = 회원_정보_생성_요청();
 
         // when & then
         mockMvc.perform(post("/api/info")
@@ -88,7 +88,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_수정한다() throws Exception {
         // given
         String bearerToken = "Bearer token";
-        InfoUpdateRequest infoUpdateRequest = 정보_수정_요청();
+        InfoUpdateRequest infoUpdateRequest = 회원_정보_수정_요청();
 
         // when & then
         mockMvc.perform(patch("/api/info")
@@ -127,7 +127,7 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
     void 회원_정보를_조회한다() throws Exception {
         // given
         String bearerToken = "Bearer token";
-        InfoSearchResponse infoSearchResponse = 정보_조회_응답();
+        InfoSearchResponse infoSearchResponse = 회원_정보_조회_응답();
 
         when(infoService.findInfo(any())).thenReturn(infoSearchResponse);
 

From 64049bea7b20b9ab2b304c58f1b491ceb3297ec4 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 16:53:29 +0900
Subject: [PATCH 189/225] =?UTF-8?q?test:=20InfoController=20=EC=9D=B8?=
 =?UTF-8?q?=EC=88=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/InfoControllerAcceptanceFixture.java | 66 +++++++++++++++++++
 .../ui/info/InfoControllerAcceptanceTest.java | 50 ++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
 create mode 100644 src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java

diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
new file mode 100644
index 00000000..004a2e96
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
@@ -0,0 +1,66 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.member.fixture.member.MemberFixture.일반_유저_생성;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.atwoz.helper.IntegrationHelper;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.domain.member.MemberRepository;
+import com.atwoz.member.infrastructure.auth.JwtTokenProvider;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.ExtractableResponse;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+class InfoControllerAcceptanceFixture extends IntegrationHelper {
+
+    private static final String BASIC_URL = "http://localhost:";
+
+    @Autowired
+    private JwtTokenProvider jwtTokenProvider;
+
+    @Autowired
+    private MemberRepository memberRepository;
+
+    protected Member 회원_생성() {
+        return memberRepository.save(일반_유저_생성());
+    }
+
+    protected String 토큰_생성(final String email) {
+        return jwtTokenProvider.createTokenWith(email);
+    }
+
+    protected ExtractableResponse 회원_정보를_생성한다(final String token, final InfoWriteRequest request, final String url) {
+        return RestAssured.given().log().all()
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .contentType(ContentType.JSON)
+                .body(request)
+                .post(url)
+                .then().log().all()
+                .extract();
+    }
+
+    protected void 회원_정보_생성_검증(final ExtractableResponse response) {
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED.value());
+    }
+
+    protected ExtractableResponse 회원_정보를_조회한다(final String token, final String url) {
+        return RestAssured.given().log().all()
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .when()
+                .get(url)
+                .then().log().all()
+                .extract();
+    }
+
+    protected void 회원_정보_조회_결과_검증(final ExtractableResponse response) {
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
+    }
+}
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
new file mode 100644
index 00000000..9f742ec9
--- /dev/null
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
@@ -0,0 +1,50 @@
+package com.atwoz.member.ui.info;
+
+import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.회원_정보_생성_요청;
+
+import com.atwoz.member.domain.member.Member;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+class InfoControllerAcceptanceTest extends InfoControllerAcceptanceFixture {
+
+    private static final String 회원_정보_생성_요청_url = "/api/info";
+    private static final String 회원_정보_조회_요청_url = "/api/info";
+
+    private Member 회원;
+    private String 토큰;
+
+    @BeforeEach
+    void init() {
+        회원 = 회원_생성();
+        토큰 = 토큰_생성(회원.getEmail());
+    }
+
+    @Test
+    void 회원의_정보를_생성한다() {
+        // given
+        var 회원_정보_생성_요청서 = 회원_정보_생성_요청();
+
+        // when
+        var 회원_정보_생성_요청_결과 = 회원_정보를_생성한다(토큰, 회원_정보_생성_요청서, 회원_정보_생성_요청_url);
+
+        // then
+        회원_정보_생성_검증(회원_정보_생성_요청_결과);
+    }
+
+    @Test
+    void 회원의_정보를_조회한다() {
+        // given
+        var 회원_정보_생성_요청 = 회원_정보를_생성한다(토큰, 회원_정보_생성_요청(), 회원_정보_생성_요청_url);
+
+        // when
+        var 회원_정보_조회_결과 = 회원_정보를_조회한다(토큰, 회원_정보_조회_요청_url);
+
+        // then
+        회원_정보_조회_결과_검증(회원_정보_조회_결과);
+    }
+}

From 35d1ec154bea2e83d7fc49e6361692d283b40d73 Mon Sep 17 00:00:00 2001
From: sosow0212 <sosow0212@naver.com>
Date: Fri, 1 Mar 2024 16:56:55 +0900
Subject: [PATCH 190/225] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/com/atwoz/helper/IntegrationHelper.java           | 2 +-
 .../com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/atwoz/helper/IntegrationHelper.java b/src/test/java/com/atwoz/helper/IntegrationHelper.java
index 2c0ec06c..00c75a45 100644
--- a/src/test/java/com/atwoz/helper/IntegrationHelper.java
+++ b/src/test/java/com/atwoz/helper/IntegrationHelper.java
@@ -20,7 +20,7 @@ public class IntegrationHelper extends AbstractTestExecutionListener {
     private JdbcTemplate jdbcTemplate;
 
     @BeforeEach
-    void init() {
+    void initIntegrationHelper() {
         RestAssured.port = this.port;
         validateH2Database();
         List<String> truncateAllTablesQuery = jdbcTemplate.queryForList("SELECT CONCAT('TRUNCATE TABLE ', TABLE_NAME, ';') AS q FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'PUBLIC'", String.class);
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
index 9f742ec9..84e7200a 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
@@ -19,7 +19,7 @@ class InfoControllerAcceptanceTest extends InfoControllerAcceptanceFixture {
     private String 토큰;
 
     @BeforeEach
-    void init() {
+    void setup() {
         회원 = 회원_생성();
         토큰 = 토큰_생성(회원.getEmail());
     }

From e1db46e4b7023a4cd237e07629afd923a7d9ecdf Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 17:53:34 +0900
Subject: [PATCH 191/225] =?UTF-8?q?refactor:=20Profile,=20Option,=20Member?=
 =?UTF-8?q?Hobby,=20MemberStyle=20Fixture=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 코드 중복 제거를 위해 Profile, Option, MemberHobby, MemberStyle Fixture 추가
---
 .../info/MemberHobbyServiceTest.java          | 17 ++++--------
 .../info/MemberStyleServiceTest.java          | 17 ++++--------
 .../member/domain/info/option/OptionTest.java | 10 ++-----
 .../domain/info/profile/ProfileTest.java      | 12 ++-------
 .../fixture/info/MemberHobbiesFixture.java    | 25 ++++++++++++++++++
 .../fixture/info/MemberStylesFixture.java     | 25 ++++++++++++++++++
 .../member/fixture/info/OptionFixture.java    | 23 ++++++++++++++++
 .../member/fixture/info/ProfileFixture.java   | 26 +++++++++++++++++++
 8 files changed, 113 insertions(+), 42 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java

diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index 34c7f1d6..7f39bfe2 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -4,6 +4,8 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.WALK;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
+import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_수정_취미_생성;
+import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_일반_취미_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
@@ -35,10 +37,7 @@ void init() {
         // given
         Long memberId = 1L;
         List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
-        List<MemberHobby> expectedMemberHobbies = List.of(
-                new MemberHobby(memberId, WINE),
-                new MemberHobby(memberId, COOK)
-        );
+        List<MemberHobby> expectedMemberHobbies = 회원_일반_취미_생성();
 
         // when
         memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
@@ -54,14 +53,8 @@ void init() {
         Long memberId = 1L;
         List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
         List<String> updateHobbyCodes = List.of(WALK.getCode(), WRITE.getCode());
-        List<MemberHobby> originMemberHobbies = List.of(
-                new MemberHobby(memberId, WINE),
-                new MemberHobby(memberId, COOK)
-        );
-        List<MemberHobby> updateMemberHobbies = List.of(
-                new MemberHobby(memberId, WALK),
-                new MemberHobby(memberId, WRITE)
-        );
+        List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
+        List<MemberHobby> updateMemberHobbies = 회원_수정_취미_생성();
 
         memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
 
diff --git a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
index 4fba9dbf..1fff1dbf 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
@@ -4,6 +4,8 @@
 import static com.atwoz.member.domain.info.style.Style.POLITE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.domain.info.style.Style.PROUD;
+import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_수정_스타일_생성;
+import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
@@ -35,10 +37,7 @@ void init() {
         // given
         Long memberId = 1L;
         List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
-        List<MemberStyle> expectedMemberStyles = List.of(
-                new MemberStyle(memberId, POSITIVE),
-                new MemberStyle(memberId, GENTLE)
-        );
+        List<MemberStyle> expectedMemberStyles = 회원_일반_스타일_생성();
 
         // when
         memberStyleService.saveMemberStyles(memberId, styleCodes);
@@ -54,14 +53,8 @@ void init() {
         Long memberId = 1L;
         List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
         List<String> updateStyleCodes = List.of(POLITE.getCode(), PROUD.getCode());
-        List<MemberStyle> originMemberStyles = List.of(
-                new MemberStyle(memberId, POSITIVE),
-                new MemberStyle(memberId, GENTLE)
-        );
-        List<MemberStyle> updateMemberStyles = List.of(
-                new MemberStyle(memberId, POLITE),
-                new MemberStyle(memberId, PROUD)
-        );
+        List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
+        List<MemberStyle> updateMemberStyles = 회원_수정_스타일_생성();
 
         memberStyleService.saveMemberStyles(memberId, styleCodes);
 
diff --git a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
index 1c95009e..316516c1 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.domain.info.option;
 
+import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -13,14 +14,7 @@ public class OptionTest {
     @Test
     void 내용_수정_검증() {
         // given
-        Long memberId = 1L;
-        Smoke smoke = Smoke.NEVER;
-        Religion religion = Religion.CHRIST;
-        Drink drink = Drink.NEVER;
-        Mbti mbti = Mbti.INFJ;
-        Graduate graduate = Graduate.SEOUL_FOURTH;
-
-        Option option = new Option(memberId, smoke, religion, drink, mbti, graduate);
+        Option option = 회원_일반_옵션_생성();
 
         Smoke updateSmoke = Smoke.ELECTRONIC;
         Religion updateReligion = Religion.BUDDHA;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
index 76beede4..f8385132 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -1,13 +1,10 @@
 package com.atwoz.member.domain.info.profile;
 
 import static com.atwoz.member.fixture.info.BodyFixture.회원_수정_body_생성;
-import static com.atwoz.member.fixture.info.BodyFixture.회원_일반_body_생성;
 import static com.atwoz.member.fixture.info.JobFixture.회원_수정_직업_생성;
-import static com.atwoz.member.fixture.info.JobFixture.회원_일반_직업_생성;
 import static com.atwoz.member.fixture.info.LocationFixture.회원_수정_위치_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.회원_일반_위치_생성;
 import static com.atwoz.member.fixture.info.PositionFixture.회원_수정_좌표_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.회원_일반_좌표_생성;
+import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -21,12 +18,7 @@ public class ProfileTest {
     @Test
     void 내용_수정_검증() {
         // given
-        Long memberId = 1L;
-        Body body = 회원_일반_body_생성();
-        Job job = 회원_일반_직업_생성();
-        Location location = 회원_일반_위치_생성();
-        Position position = 회원_일반_좌표_생성();
-        Profile profile = new Profile(memberId, body, location, position, job);
+        Profile profile = 회원_일반_프로필_생성();
 
         Body updateBody = 회원_수정_body_생성();
         Job updateJob = 회원_수정_직업_생성();
diff --git a/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java b/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
new file mode 100644
index 00000000..af398f7c
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
@@ -0,0 +1,25 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.hobby.Hobby;
+import com.atwoz.member.domain.info.hobby.MemberHobby;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class MemberHobbiesFixture {
+
+    public static List<MemberHobby> 회원_일반_취미_생성() {
+        Long memberId = 1L;
+        return List.of(
+                new MemberHobby(memberId, Hobby.WINE),
+                new MemberHobby(memberId, Hobby.COOK)
+        );
+    }
+
+    public static List<MemberHobby> 회원_수정_취미_생성() {
+        Long memberId = 1L;
+        return List.of(
+                new MemberHobby(memberId, Hobby.WALK),
+                new MemberHobby(memberId, Hobby.WRITE)
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java b/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
new file mode 100644
index 00000000..30182336
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
@@ -0,0 +1,25 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.style.MemberStyle;
+import com.atwoz.member.domain.info.style.Style;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class MemberStylesFixture {
+
+    public static List<MemberStyle> 회원_일반_스타일_생성() {
+        Long memberId = 1L;
+        return List.of(
+                new MemberStyle(memberId, Style.POSITIVE),
+                new MemberStyle(memberId, Style.GENTLE)
+        );
+    }
+
+    public static List<MemberStyle> 회원_수정_스타일_생성() {
+        Long memberId = 1L;
+        return List.of(
+                new MemberStyle(memberId, Style.POLITE),
+                new MemberStyle(memberId, Style.PROUD)
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java b/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
new file mode 100644
index 00000000..705258b7
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
@@ -0,0 +1,23 @@
+package com.atwoz.member.fixture.info;
+
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class OptionFixture {
+
+    public static Option 회원_일반_옵션_생성() {
+        Long memberId = 1L;
+        Smoke smoke = Smoke.NEVER;
+        Religion religion = Religion.CHRIST;
+        Drink drink = Drink.NEVER;
+        Mbti mbti = Mbti.INFJ;
+        Graduate graduate = Graduate.SEOUL_FOURTH;
+
+        return new Option(memberId, smoke, religion, drink, mbti, graduate);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java b/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
new file mode 100644
index 00000000..3c7c6635
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
@@ -0,0 +1,26 @@
+package com.atwoz.member.fixture.info;
+
+import static com.atwoz.member.fixture.info.BodyFixture.회원_일반_body_생성;
+import static com.atwoz.member.fixture.info.JobFixture.회원_일반_직업_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.회원_일반_위치_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.회원_일반_좌표_생성;
+
+import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.Profile;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class ProfileFixture {
+
+    public static Profile 회원_일반_프로필_생성() {
+        Long memberId = 1L;
+        Body body = 회원_일반_body_생성();
+        Job job = 회원_일반_직업_생성();
+        Location location = 회원_일반_위치_생성();
+        Position position = 회원_일반_좌표_생성();
+
+        return new Profile(memberId, body, location, position, job);
+    }
+}

From cfff6cc613f46444c2ccb73e78893f663121ebf2 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 17:54:18 +0900
Subject: [PATCH 192/225] =?UTF-8?q?refactor:=20=EC=9D=B8=EC=88=98=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20given=20Fixture=20=EC=9D=B4?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 인수 테스트 given 절의 데이터를 Fixture로 변경
---
 .../info/InfoControllerAcceptanceFixture.java | 29 +++++++++++++++++--
 .../ui/info/InfoControllerAcceptanceTest.java |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
index 004a2e96..759087db 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
@@ -1,10 +1,18 @@
 package com.atwoz.member.ui.info;
 
+import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_일반_취미_생성;
+import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
+import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
+import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
 import static com.atwoz.member.fixture.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.atwoz.helper.IntegrationHelper;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
+import com.atwoz.member.domain.info.option.OptionRepository;
+import com.atwoz.member.domain.info.profile.ProfileRepository;
+import com.atwoz.member.domain.info.style.MemberStyleRepository;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.domain.member.MemberRepository;
 import com.atwoz.member.infrastructure.auth.JwtTokenProvider;
@@ -21,14 +29,24 @@
 @SuppressWarnings("NonAsciiCharacters")
 class InfoControllerAcceptanceFixture extends IntegrationHelper {
 
-    private static final String BASIC_URL = "http://localhost:";
-
     @Autowired
     private JwtTokenProvider jwtTokenProvider;
 
     @Autowired
     private MemberRepository memberRepository;
 
+    @Autowired
+    private ProfileRepository profileRepository;
+
+    @Autowired
+    private OptionRepository optionRepository;
+
+    @Autowired
+    private MemberHobbyRepository memberHobbyRepository;
+
+    @Autowired
+    private MemberStyleRepository memberStyleRepository;
+
     protected Member 회원_생성() {
         return memberRepository.save(일반_유저_생성());
     }
@@ -51,6 +69,13 @@ class InfoControllerAcceptanceFixture extends IntegrationHelper {
         assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED.value());
     }
 
+    protected void 회원_정보_생성() {
+        profileRepository.save(회원_일반_프로필_생성());
+        optionRepository.save(회원_일반_옵션_생성());
+        memberHobbyRepository.saveAll(회원_일반_취미_생성());
+        memberStyleRepository.saveAll(회원_일반_스타일_생성());
+    }
+
     protected ExtractableResponse 회원_정보를_조회한다(final String token, final String url) {
         return RestAssured.given().log().all()
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
index 84e7200a..26fbc86e 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
@@ -39,7 +39,7 @@ void setup() {
     @Test
     void 회원의_정보를_조회한다() {
         // given
-        var 회원_정보_생성_요청 = 회원_정보를_생성한다(토큰, 회원_정보_생성_요청(), 회원_정보_생성_요청_url);
+        회원_정보_생성();
 
         // when
         var 회원_정보_조회_결과 = 회원_정보를_조회한다(토큰, 회원_정보_조회_요청_url);

From 6e8bd28ee6975dae84bb871d0d2b78b527021c7c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 22:10:11 +0900
Subject: [PATCH 193/225] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=9A=94=EC=B2=AD=20Fixture=20=EA=B5=AC=EC=A1=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- API 문서에서 사용되는 데이터와 동일하게 이용되도록 수정
- RequestFixture를 만든 뒤 생성/수정 데이터가 사용되도록 수정
---
 .../application/info/InfoServiceTest.java     |  4 +-
 .../info/MemberHobbyServiceTest.java          |  4 +-
 .../info/MemberStyleServiceTest.java          |  6 +-
 .../application/info/OptionServiceTest.java   |  4 +-
 .../application/info/ProfileServiceTest.java  |  4 +-
 .../atwoz/member/fixture/info/JobFixture.java |  2 +-
 .../fixture/info/MemberHobbiesFixture.java    |  2 +-
 .../fixture/info/MemberStylesFixture.java     |  4 +-
 .../member/fixture/info/PositionFixture.java  |  8 +--
 .../dto/request/HobbiesRequestFixture.java    | 28 ++++++++++
 .../info/dto/request/InfoRequestFixture.java  | 56 +++++++++++++++++++
 .../dto/request/InfoUpdateRequestFixture.java | 40 -------------
 .../dto/request/InfoWriteRequestFixture.java  | 40 -------------
 ...xture.java => LocationRequestFixture.java} | 10 +++-
 .../request/LocationWriteRequestFixture.java  | 14 -----
 ...Fixture.java => OptionRequestFixture.java} | 19 ++++++-
 .../request/OptionWriteRequestFixture.java    | 28 ----------
 ...xture.java => PositionRequestFixture.java} | 10 +++-
 .../request/PositionWriteRequestFixture.java  | 15 -----
 .../dto/request/ProfileRequestFixture.java    | 55 ++++++++++++++++++
 .../request/ProfileUpdateRequestFixture.java  | 32 -----------
 .../request/ProfileWriteRequestFixture.java   | 32 -----------
 .../dto/request/StylesRequestFixture.java     | 28 ++++++++++
 .../HobbiesSearchResponseFixture.java         | 18 ++++++
 .../response/InfoSearchResponseFixture.java   | 16 ++----
 .../response/StylesSearchResponseFixture.java | 18 ++++++
 .../ui/info/InfoControllerWebMvcTest.java     |  4 +-
 27 files changed, 264 insertions(+), 237 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
 rename src/test/java/com/atwoz/member/fixture/info/dto/request/{LocationUpdateRequestFixture.java => LocationRequestFixture.java} (54%)
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
 rename src/test/java/com/atwoz/member/fixture/info/dto/request/{OptionUpdateRequestFixture.java => OptionRequestFixture.java} (60%)
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
 rename src/test/java/com/atwoz/member/fixture/info/dto/request/{PositionUpdateRequestFixture.java => PositionRequestFixture.java} (55%)
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
 delete mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index e5dba277..790105bb 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.회원_정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_수정_요청;
 import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index 7f39bfe2..a8ec949d 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
-import static com.atwoz.member.domain.info.hobby.Hobby.WALK;
+import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_수정_취미_생성;
@@ -52,7 +52,7 @@ void init() {
         // given
         Long memberId = 1L;
         List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
-        List<String> updateHobbyCodes = List.of(WALK.getCode(), WRITE.getCode());
+        List<String> updateHobbyCodes = List.of(DRAMA.getCode(), WRITE.getCode());
         List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
         List<MemberHobby> updateMemberHobbies = 회원_수정_취미_생성();
 
diff --git a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
index 1fff1dbf..98cc1359 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.application.info;
 
+import static com.atwoz.member.domain.info.style.Style.FASHION;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
-import static com.atwoz.member.domain.info.style.Style.POLITE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
-import static com.atwoz.member.domain.info.style.Style.PROUD;
+import static com.atwoz.member.domain.info.style.Style.PURE;
 import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_수정_스타일_생성;
 import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -52,7 +52,7 @@ void init() {
         // given
         Long memberId = 1L;
         List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
-        List<String> updateStyleCodes = List.of(POLITE.getCode(), PROUD.getCode());
+        List<String> updateStyleCodes = List.of(PURE.getCode(), FASHION.getCode());
         List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
         List<MemberStyle> updateMemberStyles = 회원_수정_스타일_생성();
 
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 2a231e29..f9b3c85d 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.회원_옵션_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.회원_옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 685d37e7..90da9082 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.회원_프로필_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.회원_프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_생성_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
diff --git a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
index 7a755888..f16ee8b7 100644
--- a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
@@ -10,6 +10,6 @@ public class JobFixture {
     }
 
     public static Job 회원_수정_직업_생성() {
-        return Job.ETC;
+        return Job.LAW;
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java b/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
index af398f7c..c061028e 100644
--- a/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
@@ -18,7 +18,7 @@ public class MemberHobbiesFixture {
     public static List<MemberHobby> 회원_수정_취미_생성() {
         Long memberId = 1L;
         return List.of(
-                new MemberHobby(memberId, Hobby.WALK),
+                new MemberHobby(memberId, Hobby.DRAMA),
                 new MemberHobby(memberId, Hobby.WRITE)
         );
     }
diff --git a/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java b/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
index 30182336..fae79af3 100644
--- a/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
@@ -18,8 +18,8 @@ public class MemberStylesFixture {
     public static List<MemberStyle> 회원_수정_스타일_생성() {
         Long memberId = 1L;
         return List.of(
-                new MemberStyle(memberId, Style.POLITE),
-                new MemberStyle(memberId, Style.PROUD)
+                new MemberStyle(memberId, Style.PURE),
+                new MemberStyle(memberId, Style.FASHION)
         );
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
index 6f196263..084de147 100644
--- a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
@@ -7,15 +7,15 @@
 public class PositionFixture {
 
     public static Position 회원_일반_좌표_생성() {
-        BigDecimal latitude = BigDecimal.valueOf(40);
-        BigDecimal longitude = BigDecimal.valueOf(170);
+        BigDecimal latitude = BigDecimal.valueOf(70.39);
+        BigDecimal longitude = BigDecimal.valueOf(140.38);
 
         return new Position(latitude, longitude);
     }
 
     public static Position 회원_수정_좌표_생성() {
-        BigDecimal latitude = BigDecimal.valueOf(50);
-        BigDecimal longitude = BigDecimal.valueOf(160);
+        BigDecimal latitude = BigDecimal.valueOf(60.2);
+        BigDecimal longitude = BigDecimal.valueOf(130.3);
 
         return new Position(latitude, longitude);
     }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
new file mode 100644
index 00000000..66a2fc36
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
+import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
+
+import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class HobbiesRequestFixture {
+
+    public static List<HobbyWriteRequest> 회원_취미_생성_요청() {
+        return List.of(
+                new HobbyWriteRequest(WINE.getCode()),
+                new HobbyWriteRequest(COOK.getCode())
+        );
+    }
+
+    public static List<HobbyUpdateRequest> 회원_취미_수정_요청() {
+        return List.of(
+                new HobbyUpdateRequest(DRAMA.getCode()),
+                new HobbyUpdateRequest(WRITE.getCode())
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
new file mode 100644
index 00000000..ba619f95
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
@@ -0,0 +1,56 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.fixture.info.dto.request.HobbiesRequestFixture.회원_취미_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.HobbiesRequestFixture.회원_취미_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_수정_요청;
+
+import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
+import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.application.info.dto.StyleUpdateRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class InfoRequestFixture {
+
+    public static InfoWriteRequest 회원_정보_생성_요청() {
+        ProfileWriteRequest profileWriteRequest = 회원_프로필_생성_요청();
+        OptionWriteRequest optionWriteRequest = 회원_옵션_생성_요청();
+
+        List<HobbyWriteRequest> hobbyWriteRequests = 회원_취미_생성_요청();
+        List<StyleWriteRequest> styleWriteRequests = 회원_스타일_생성_요청();
+
+        return new InfoWriteRequest(
+                profileWriteRequest,
+                optionWriteRequest,
+                hobbyWriteRequests,
+                styleWriteRequests
+        );
+    }
+
+    public static InfoUpdateRequest 회원_정보_수정_요청() {
+        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
+        OptionUpdateRequest optionUpdateRequest = 회원_옵션_수정_요청();
+
+        List<HobbyUpdateRequest> hobbies = 회원_취미_수정_요청();
+        List<StyleUpdateRequest> styles = 회원_스타일_수정_요청();
+
+        return new InfoUpdateRequest(
+                profileUpdateRequest,
+                optionUpdateRequest,
+                hobbies,
+                styles
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
deleted file mode 100644
index 57438a23..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoUpdateRequestFixture.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
-import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
-import static com.atwoz.member.domain.info.style.Style.FASHION;
-import static com.atwoz.member.domain.info.style.Style.PURE;
-import static com.atwoz.member.fixture.info.dto.request.OptionUpdateRequestFixture.회원_옵션_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileUpdateRequestFixture.회원_프로필_수정_요청;
-
-import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.InfoUpdateRequest;
-import com.atwoz.member.application.info.dto.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import java.util.List;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class InfoUpdateRequestFixture {
-
-    public static InfoUpdateRequest 회원_정보_수정_요청() {
-        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
-        OptionUpdateRequest optionUpdateRequest = 회원_옵션_수정_요청();
-
-        List<HobbyUpdateRequest> hobbies = List.of(
-                new HobbyUpdateRequest(DRAMA.getCode()),
-                new HobbyUpdateRequest(WRITE.getCode())
-        );
-        List<StyleUpdateRequest> styles = List.of(
-                new StyleUpdateRequest(PURE.getCode()),
-                new StyleUpdateRequest(FASHION.getCode())
-        );
-
-        return new InfoUpdateRequest(
-                profileUpdateRequest,
-                optionUpdateRequest,
-                hobbies,
-                styles
-        );
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
deleted file mode 100644
index 16d7ac95..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoWriteRequestFixture.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
-import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
-import static com.atwoz.member.domain.info.style.Style.GENTLE;
-import static com.atwoz.member.domain.info.style.Style.POSITIVE;
-import static com.atwoz.member.fixture.info.dto.request.OptionWriteRequestFixture.회원_옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileWriteRequestFixture.회원_프로필_생성_요청;
-
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
-import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import java.util.List;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class InfoWriteRequestFixture {
-
-    public static InfoWriteRequest 회원_정보_생성_요청() {
-        ProfileWriteRequest profileWriteRequest = 회원_프로필_생성_요청();
-        OptionWriteRequest optionWriteRequest = 회원_옵션_생성_요청();
-
-        List<HobbyWriteRequest> hobbyWriteRequests = List.of(
-                new HobbyWriteRequest(WINE.getCode()),
-                new HobbyWriteRequest(COOK.getCode())
-        );
-        List<StyleWriteRequest> styleWriteRequests = List.of(
-                new StyleWriteRequest(POSITIVE.getCode()),
-                new StyleWriteRequest(GENTLE.getCode())
-        );
-
-        return new InfoWriteRequest(
-                profileWriteRequest,
-                optionWriteRequest,
-                hobbyWriteRequests,
-                styleWriteRequests
-        );
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
similarity index 54%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
index 9c986f3d..f3b270aa 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
@@ -1,9 +1,17 @@
 package com.atwoz.member.fixture.info.dto.request;
 
 import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
-public class LocationUpdateRequestFixture {
+public class LocationRequestFixture {
+
+    public static LocationWriteRequest 회원_위치_생성_요청() {
+        String city = "서울시";
+        String sector = "강남구";
+
+        return new LocationWriteRequest(city, sector);
+    }
 
     public static LocationUpdateRequest 회원_위치_수정_요청() {
         String city = "경기도";
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
deleted file mode 100644
index cfd2dfed..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationWriteRequestFixture.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class LocationWriteRequestFixture {
-
-    public static LocationWriteRequest 회원_위치_생성_요청() {
-        String city = "서울시";
-        String sector = "강남구";
-        
-        return new LocationWriteRequest(city, sector);
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
similarity index 60%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
index 12b4e5cf..a5e9c6f6 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.fixture.info.dto.request;
 
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
@@ -8,7 +9,23 @@
 import com.atwoz.member.domain.info.option.Smoke;
 
 @SuppressWarnings("NonAsciiCharacters")
-public class OptionUpdateRequestFixture {
+public class OptionRequestFixture {
+
+    public static OptionWriteRequest 회원_옵션_생성_요청() {
+        String drink = Drink.NEVER.getName();
+        String graduate = Graduate.SEOUL_FOURTH.getName();
+        String religion = Religion.CHRIST.getName();
+        String smoke = Smoke.NEVER.getName();
+        String mbti = Mbti.INFJ.name();
+
+        return new OptionWriteRequest(
+                drink,
+                graduate,
+                religion,
+                smoke,
+                mbti
+        );
+    }
 
     public static OptionUpdateRequest 회원_옵션_수정_요청() {
         String drink = Drink.ENJOY.getName();
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
deleted file mode 100644
index 6c3802d3..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionWriteRequestFixture.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.domain.info.option.Drink;
-import com.atwoz.member.domain.info.option.Graduate;
-import com.atwoz.member.domain.info.option.Mbti;
-import com.atwoz.member.domain.info.option.Religion;
-import com.atwoz.member.domain.info.option.Smoke;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class OptionWriteRequestFixture {
-
-    public static OptionWriteRequest 회원_옵션_생성_요청() {
-        String drink = Drink.NEVER.getName();
-        String graduate = Graduate.SEOUL_FOURTH.getName();
-        String religion = Religion.CHRIST.getName();
-        String smoke = Smoke.NEVER.getName();
-        String mbti = Mbti.INFJ.name();
-
-        return new OptionWriteRequest(
-                drink,
-                graduate,
-                religion,
-                smoke,
-                mbti
-        );
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
similarity index 55%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
index cba4e0e8..53130ef3 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionUpdateRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
@@ -1,10 +1,18 @@
 package com.atwoz.member.fixture.info.dto.request;
 
 import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
 import java.math.BigDecimal;
 
 @SuppressWarnings("NonAsciiCharacters")
-public class PositionUpdateRequestFixture {
+public class PositionRequestFixture {
+
+    public static PositionWriteRequest 회원_좌표_생성_요청() {
+        BigDecimal latitude = BigDecimal.valueOf(70.39);
+        BigDecimal longitude = BigDecimal.valueOf(140.38);
+
+        return new PositionWriteRequest(latitude, longitude);
+    }
 
     public static PositionUpdateRequest 회원_좌표_수정_요청() {
         BigDecimal latitude = BigDecimal.valueOf(60.2);
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
deleted file mode 100644
index c7715fba..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionWriteRequestFixture.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
-import java.math.BigDecimal;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class PositionWriteRequestFixture {
-
-    public static PositionWriteRequest 회원_좌표_생성_요청() {
-        BigDecimal latitude = BigDecimal.valueOf(70.39);
-        BigDecimal longitude = BigDecimal.valueOf(140.38);
-
-        return new PositionWriteRequest(latitude, longitude);
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
new file mode 100644
index 00000000..5a73f6f8
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
@@ -0,0 +1,55 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.fixture.info.dto.request.LocationRequestFixture.회원_위치_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.LocationRequestFixture.회원_위치_수정_요청;
+import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_수정_요청;
+
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class ProfileRequestFixture {
+
+    public static ProfileWriteRequest 회원_프로필_생성_요청() {
+        int birthYear = 2000;
+        int height = 171;
+        String gender = Gender.MALE.getName();
+        LocationWriteRequest locationWriteRequest = 회원_위치_생성_요청();
+        PositionWriteRequest positionWriteRequest = 회원_좌표_생성_요청();
+        String job = Job.RESEARCH_AND_DEVELOP.getCode();
+
+        return new ProfileWriteRequest(
+                birthYear,
+                height,
+                gender,
+                locationWriteRequest,
+                positionWriteRequest,
+                job
+        );
+    }
+
+    public static ProfileUpdateRequest 회원_프로필_수정_요청() {
+        int birthYear = 2001;
+        int height = 170;
+        String gender = Gender.FEMALE.getName();
+        LocationUpdateRequest locationUpdateRequest = 회원_위치_수정_요청();
+        PositionUpdateRequest positionUpdateRequest = 회원_좌표_수정_요청();
+        String job = Job.LAW.getCode();
+
+        return new ProfileUpdateRequest(
+                birthYear,
+                height,
+                gender,
+                locationUpdateRequest,
+                positionUpdateRequest,
+                job
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
deleted file mode 100644
index 1bf64589..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileUpdateRequestFixture.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import static com.atwoz.member.fixture.info.dto.request.LocationUpdateRequestFixture.회원_위치_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.PositionUpdateRequestFixture.회원_좌표_수정_요청;
-
-import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.domain.info.profile.Gender;
-import com.atwoz.member.domain.info.profile.Job;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class ProfileUpdateRequestFixture {
-
-    public static ProfileUpdateRequest 회원_프로필_수정_요청() {
-        int birthYear = 2001;
-        int height = 170;
-        String gender = Gender.FEMALE.getName();
-        LocationUpdateRequest locationUpdateRequest = 회원_위치_수정_요청();
-        PositionUpdateRequest positionUpdateRequest = 회원_좌표_수정_요청();
-        String job = Job.LAW.getCode();
-
-        return new ProfileUpdateRequest(
-                birthYear,
-                height,
-                gender,
-                locationUpdateRequest,
-                positionUpdateRequest,
-                job
-        );
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
deleted file mode 100644
index 2e7facbc..00000000
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileWriteRequestFixture.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import static com.atwoz.member.fixture.info.dto.request.LocationWriteRequestFixture.회원_위치_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.PositionWriteRequestFixture.회원_좌표_생성_요청;
-
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.domain.info.profile.Gender;
-import com.atwoz.member.domain.info.profile.Job;
-
-@SuppressWarnings("NonAsciiCharacters")
-public class ProfileWriteRequestFixture {
-
-    public static ProfileWriteRequest 회원_프로필_생성_요청() {
-        int birthYear = 2000;
-        int height = 171;
-        String gender = Gender.MALE.getName();
-        LocationWriteRequest locationWriteRequest = 회원_위치_생성_요청();
-        PositionWriteRequest positionWriteRequest = 회원_좌표_생성_요청();
-        String job = Job.RESEARCH_AND_DEVELOP.getCode();
-
-        return new ProfileWriteRequest(
-                birthYear,
-                height,
-                gender,
-                locationWriteRequest,
-                positionWriteRequest,
-                job
-        );
-    }
-}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
new file mode 100644
index 00000000..985e14aa
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
@@ -0,0 +1,28 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import static com.atwoz.member.domain.info.style.Style.FASHION;
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+import static com.atwoz.member.domain.info.style.Style.PURE;
+
+import com.atwoz.member.application.info.dto.StyleUpdateRequest;
+import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class StylesRequestFixture {
+
+    public static List<StyleWriteRequest> 회원_스타일_생성_요청() {
+        return List.of(
+                new StyleWriteRequest(POSITIVE.getCode()),
+                new StyleWriteRequest(GENTLE.getCode())
+        );
+    }
+
+    public static List<StyleUpdateRequest> 회원_스타일_수정_요청() {
+        return List.of(
+                new StyleUpdateRequest(PURE.getCode()),
+                new StyleUpdateRequest(FASHION.getCode())
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
new file mode 100644
index 00000000..e7da291d
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
@@ -0,0 +1,18 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
+
+import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class HobbiesSearchResponseFixture {
+
+    public static List<HobbySearchResponse> 회원_취미_조회_응답() {
+        return List.of(
+                new HobbySearchResponse(WINE.getCode()),
+                new HobbySearchResponse(COOK.getCode())
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
index 6f9c034c..8abc6dbe 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
@@ -1,11 +1,9 @@
 package com.atwoz.member.fixture.info.dto.response;
 
-import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
-import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
-import static com.atwoz.member.domain.info.style.Style.GENTLE;
-import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+import static com.atwoz.member.fixture.info.dto.response.HobbiesSearchResponseFixture.회원_취미_조회_응답;
 import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
 import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
 
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
@@ -21,14 +19,8 @@ public class InfoSearchResponseFixture {
         ProfileSearchResponse profileSearchResponse = 회원_프로필_조회_응답();
         OptionSearchResponse optionSearchResponse = 회원_옵션_조회_응답();
 
-        List<HobbySearchResponse> hobbies = List.of(
-                new HobbySearchResponse(WINE.getCode()),
-                new HobbySearchResponse(COOK.getCode())
-        );
-        List<StyleSearchResponse> styles = List.of(
-                new StyleSearchResponse(POSITIVE.getCode()),
-                new StyleSearchResponse(GENTLE.getCode())
-        );
+        List<HobbySearchResponse> hobbies = 회원_취미_조회_응답();
+        List<StyleSearchResponse> styles = 회원_스타일_조회_응답();
 
         return new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbies, styles);
     }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
new file mode 100644
index 00000000..d96a7d65
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
@@ -0,0 +1,18 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import static com.atwoz.member.domain.info.style.Style.GENTLE;
+import static com.atwoz.member.domain.info.style.Style.POSITIVE;
+
+import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import java.util.List;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class StylesSearchResponseFixture {
+
+    public static List<StyleSearchResponse> 회원_스타일_조회_응답() {
+        return List.of(
+                new StyleSearchResponse(POSITIVE.getCode()),
+                new StyleSearchResponse(GENTLE.getCode())
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index ea3ae94f..dc8cbc3d 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.fixture.info.dto.request.InfoUpdateRequestFixture.회원_정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_수정_요청;
 import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;

From 1e41618863fd9cb63d5854a42cceab52fc61c398 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Fri, 1 Mar 2024 22:37:42 +0900
Subject: [PATCH 194/225] =?UTF-8?q?refactor:=20Querydsl=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=EC=B2=B4=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoRepositoryImpl과 JPAQueryFactory 분리되도록 수정
---
 .../info/InfoQueryRepository.java             | 76 +++++++++++++++++++
 .../info/InfoRepositoryImpl.java              | 64 +---------------
 2 files changed, 78 insertions(+), 62 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
new file mode 100644
index 00000000..1969edfe
--- /dev/null
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
@@ -0,0 +1,76 @@
+package com.atwoz.member.infrastructure.info;
+
+import static com.atwoz.member.domain.info.hobby.QMemberHobby.memberHobby;
+import static com.atwoz.member.domain.info.option.QOption.option;
+import static com.atwoz.member.domain.info.profile.QProfile.profile;
+import static com.atwoz.member.domain.info.style.QMemberStyle.memberStyle;
+
+import com.atwoz.member.domain.info.option.Option;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
+import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
+import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+import java.util.Optional;
+
+@RequiredArgsConstructor
+@Repository
+public class InfoQueryRepository {
+
+    private final JPAQueryFactory queryFactory;
+
+    public InfoSearchResponse findByMemberId(final Long memberId) {
+        Profile profile = selectProfileByMemberId(memberId);
+        Option option = selectOptionByMemberId(memberId);
+        ProfileSearchResponse profileSearchResponse = ProfileSearchResponse.from(profile);
+        OptionSearchResponse optionSearchResponse = OptionSearchResponse.from(option);
+
+        List<HobbySearchResponse> hobbyCodes = selectHobbyResponseByMemberId(memberId);
+        List<StyleSearchResponse> styleCodes = selectStyleResponseByMemberId(memberId);
+
+        return new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbyCodes, styleCodes);
+    }
+
+    private Profile selectProfileByMemberId(final Long memberId) {
+        return Optional.ofNullable(queryFactory.select(profile)
+                        .from(profile)
+                        .where(profile.memberId.eq(memberId))
+                        .fetchOne())
+                .orElseThrow(ProfileNotFoundException::new);
+    }
+
+    private Option selectOptionByMemberId(final Long memberId) {
+        return Optional.ofNullable(queryFactory.select(option)
+                        .from(option)
+                        .where(option.memberId.eq(memberId))
+                        .fetchOne())
+                .orElseThrow(OptionNotFoundException::new);
+    }
+
+    private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long memberId) {
+        return queryFactory.select(memberHobby)
+                .from(memberHobby)
+                .where(memberHobby.memberId.eq(memberId))
+                .fetch()
+                .stream()
+                .map(HobbySearchResponse::from)
+                .toList();
+    }
+
+    private List<StyleSearchResponse> selectStyleResponseByMemberId(final Long memberId) {
+        return queryFactory.select(memberStyle)
+                .from(memberStyle)
+                .where(memberStyle.memberId.eq(memberId))
+                .fetch()
+                .stream()
+                .map(StyleSearchResponse::from)
+                .toList();
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
index 852eccfb..7c386538 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -1,78 +1,18 @@
 package com.atwoz.member.infrastructure.info;
 
-import static com.atwoz.member.domain.info.hobby.QMemberHobby.memberHobby;
-import static com.atwoz.member.domain.info.option.QOption.option;
-import static com.atwoz.member.domain.info.profile.QProfile.profile;
-import static com.atwoz.member.domain.info.style.QMemberStyle.memberStyle;
-
 import com.atwoz.member.domain.info.InfoRepository;
-import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
-import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
-import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
-import com.atwoz.member.ui.info.dto.StyleSearchResponse;
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
-import java.util.List;
-import java.util.Optional;
 
 @RequiredArgsConstructor
 @Repository
 public class InfoRepositoryImpl implements InfoRepository {
 
-    private final JPAQueryFactory queryFactory;
+    private final InfoQueryRepository infoQueryRepository;
 
     @Override
     public InfoSearchResponse findByMemberId(final Long memberId) {
-        Profile profile = selectProfileByMemberId(memberId);
-        Option option = selectOptionByMemberId(memberId);
-        ProfileSearchResponse profileSearchResponse = ProfileSearchResponse.from(profile);
-        OptionSearchResponse optionSearchResponse = OptionSearchResponse.from(option);
-
-        List<HobbySearchResponse> hobbyCodes = selectHobbyResponseByMemberId(memberId);
-        List<StyleSearchResponse> styleCodes = selectStyleResponseByMemberId(memberId);
-
-        return new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbyCodes, styleCodes);
-    }
-
-    private Profile selectProfileByMemberId(final Long memberId) {
-        return Optional.ofNullable(queryFactory.select(profile)
-                .from(profile)
-                .where(profile.memberId.eq(memberId))
-                .fetchOne())
-                .orElseThrow(ProfileNotFoundException::new);
-    }
-
-    private Option selectOptionByMemberId(final Long memberId) {
-        return Optional.ofNullable(queryFactory.select(option)
-                .from(option)
-                .where(option.memberId.eq(memberId))
-                .fetchOne())
-                .orElseThrow(OptionNotFoundException::new);
-    }
-
-    private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long memberId) {
-        return queryFactory.select(memberHobby)
-                .from(memberHobby)
-                .where(memberHobby.memberId.eq(memberId))
-                .fetch()
-                .stream()
-                .map(HobbySearchResponse::from)
-                .toList();
-    }
-
-    private List<StyleSearchResponse> selectStyleResponseByMemberId(final Long memberId) {
-        return queryFactory.select(memberStyle)
-                .from(memberStyle)
-                .where(memberStyle.memberId.eq(memberId))
-                .fetch()
-                .stream()
-                .map(StyleSearchResponse::from)
-                .toList();
+        return infoQueryRepository.findByMemberId(memberId);
     }
 }

From 1efb1f6e58b105ba41466b7f3cedf207d8d9a03b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 2 Mar 2024 03:53:07 +0900
Subject: [PATCH 195/225] =?UTF-8?q?refactor:=20MemberHobby,=20MemberStyle?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EC=BF=BC=EB=A6=AC=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberHobby, MemberStyle 삭제 쿼리 개선
---
 .../infrastructure/info/hobby/MemberHobbyJpaRepository.java  | 4 ++++
 .../infrastructure/info/style/MemberStyleJpaRepository.java  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
index 9ff81ca5..75e9ba15 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
@@ -2,10 +2,14 @@
 
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import java.util.List;
 
 public interface MemberHobbyJpaRepository extends JpaRepository<MemberHobby, Long> {
 
+    @Modifying
+    @Query("delete from MemberHobby mh where mh.memberId = :memberId")
     void deleteByMemberId(final Long memberId);
 
     List<MemberHobby> findAllByMemberId(final Long memberId);
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
index ba1301cc..1307ac77 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
@@ -2,10 +2,15 @@
 
 import com.atwoz.member.domain.info.style.MemberStyle;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import java.util.List;
 
 public interface MemberStyleJpaRepository extends JpaRepository<MemberStyle, Long> {
 
+    @Modifying
+    @Query("delete from MemberStyle ms where ms.memberId = :memberId")
     void deleteByMemberId(final Long memberId);
+
     List<MemberStyle> findAllByMemberId(final Long memberId);
 }

From 654235e20ed0cd6147810bfb657b4cdd88735710 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 2 Mar 2024 04:03:07 +0900
Subject: [PATCH 196/225] =?UTF-8?q?test:=20InfoController=20=EC=9D=B8?=
 =?UTF-8?q?=EC=88=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 회원 정보 조회 예외 검증 추가
- 회원 정보 수정 검증 추가
- 회원 정보 수정 예외 검증 추가
---
 .../info/InfoControllerAcceptanceFixture.java | 41 ++++++++++++++++++-
 .../ui/info/InfoControllerAcceptanceTest.java | 38 ++++++++++++++++-
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
index 759087db..5133069c 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
@@ -1,13 +1,19 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_일반_취미_생성;
+import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
 import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
 import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
-import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
+import static com.atwoz.member.fixture.info.dto.response.HobbiesSearchResponseFixture.회원_취미_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
 import static com.atwoz.member.fixture.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.helper.IntegrationHelper;
+import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
 import com.atwoz.member.domain.info.option.OptionRepository;
@@ -16,6 +22,7 @@
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.domain.member.MemberRepository;
 import com.atwoz.member.infrastructure.auth.JwtTokenProvider;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.ExtractableResponse;
@@ -76,6 +83,25 @@ class InfoControllerAcceptanceFixture extends IntegrationHelper {
         memberStyleRepository.saveAll(회원_일반_스타일_생성());
     }
 
+    protected ExtractableResponse 회원_정보를_수정한다(final String token, final InfoUpdateRequest request, final String url) {
+        return RestAssured.given().log().all()
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .contentType(ContentType.JSON)
+                .body(request)
+                .when()
+                .patch(url)
+                .then().log().all()
+                .extract();
+    }
+
+    protected void 회원_정보_수정_검증(final ExtractableResponse response) {
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
+    }
+
+    protected void 회원_정보_수정_예외_검증(final ExtractableResponse response) {
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.NOT_FOUND.value());
+    }
+
     protected ExtractableResponse 회원_정보를_조회한다(final String token, final String url) {
         return RestAssured.given().log().all()
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
@@ -86,6 +112,17 @@ class InfoControllerAcceptanceFixture extends IntegrationHelper {
     }
 
     protected void 회원_정보_조회_결과_검증(final ExtractableResponse response) {
-        assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
+        InfoSearchResponse result = response.as(InfoSearchResponse.class);
+        assertSoftly(softly -> {
+            softly.assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
+            softly.assertThat(result.profile()).isEqualTo(회원_프로필_조회_응답());
+            softly.assertThat(result.option()).isEqualTo(회원_옵션_조회_응답());
+            softly.assertThat(result.hobbies()).isEqualTo(회원_취미_조회_응답());
+            softly.assertThat(result.styles()).isEqualTo(회원_스타일_조회_응답());
+        });
+    }
+
+    protected void 회원_정보_조회_결과_예외_검증(final ExtractableResponse response) {
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.NOT_FOUND.value());
     }
 }
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
index 26fbc86e..110951d7 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
@@ -1,6 +1,7 @@
 package com.atwoz.member.ui.info;
 
-import static com.atwoz.member.fixture.info.dto.request.InfoWriteRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_수정_요청;
 
 import com.atwoz.member.domain.member.Member;
 import org.junit.jupiter.api.BeforeEach;
@@ -13,6 +14,7 @@
 class InfoControllerAcceptanceTest extends InfoControllerAcceptanceFixture {
 
     private static final String 회원_정보_생성_요청_url = "/api/info";
+    private static final String 회원_정보_수정_요청_url = "/api/info";
     private static final String 회원_정보_조회_요청_url = "/api/info";
 
     private Member 회원;
@@ -36,6 +38,31 @@ void setup() {
         회원_정보_생성_검증(회원_정보_생성_요청_결과);
     }
 
+    @Test
+    void 회원의_정보를_수정한다() {
+        // given
+        회원_정보_생성();
+        var 회원_정보_수정_요청서 = 회원_정보_수정_요청();
+
+        // when
+        var 회원_정보_수정_요청_결과 = 회원_정보를_수정한다(토큰, 회원_정보_수정_요청서, 회원_정보_수정_요청_url);
+
+        // then
+        회원_정보_수정_검증(회원_정보_수정_요청_결과);
+    }
+
+    @Test
+    void 회원_정보가_없으면_수정할_수_없다() {
+        // given
+        var 회원_정보_수정_요청서 = 회원_정보_수정_요청();
+
+        // when
+        var 회원_정보_수정_요청_결과 = 회원_정보를_수정한다(토큰, 회원_정보_수정_요청서, 회원_정보_수정_요청_url);
+
+        // then
+        회원_정보_수정_예외_검증(회원_정보_수정_요청_결과);
+    }
+
     @Test
     void 회원의_정보를_조회한다() {
         // given
@@ -47,4 +74,13 @@ void setup() {
         // then
         회원_정보_조회_결과_검증(회원_정보_조회_결과);
     }
+
+    @Test
+    void 회원_정보가_없으면_조회할_수_없다() {
+        // when
+        var 회원_정보_조회_결과 = 회원_정보를_조회한다(토큰, 회원_정보_조회_요청_url);
+
+        // then
+        회원_정보_조회_결과_예외_검증(회원_정보_조회_결과);
+    }
 }

From d6eacb397b539a25f65c3b8da1a98551bf588805 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 2 Mar 2024 11:35:32 +0900
Subject: [PATCH 197/225] =?UTF-8?q?refactor:=20InfoSearchResponse=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoSearchResponse 예외를 서비스 계층으로 이동
- 관련 예외 추가
---
 .../member/application/info/InfoService.java  |  4 +++-
 .../member/domain/info/InfoRepository.java    |  3 ++-
 .../exception/MemberExceptionHandler.java     |  7 ++++++
 .../info/InfoNotFoundException.java           |  8 +++++++
 .../info/InfoQueryRepository.java             | 24 +++++++++++--------
 .../info/InfoRepositoryImpl.java              |  3 ++-
 6 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/exception/exceptions/info/InfoNotFoundException.java

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 744d171c..b8d0454f 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -16,6 +16,7 @@
 import com.atwoz.member.application.info.dto.StyleUpdateRequest;
 import com.atwoz.member.application.info.dto.StyleWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;
+import com.atwoz.member.exception.exceptions.info.InfoNotFoundException;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -82,6 +83,7 @@ private List<String> extractStyleNamesFromInfoUpdateRequest(final InfoUpdateRequ
     }
 
     public InfoSearchResponse findInfo(final Long memberId) {
-        return infoRepository.findByMemberId(memberId);
+        return infoRepository.findByMemberId(memberId)
+                .orElseThrow(InfoNotFoundException::new);
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/InfoRepository.java b/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
index dbf6fe0a..bf7e2975 100644
--- a/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
@@ -1,8 +1,9 @@
 package com.atwoz.member.domain.info;
 
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import java.util.Optional;
 
 public interface InfoRepository {
 
-    InfoSearchResponse findByMemberId(final Long memberId);
+    Optional<InfoSearchResponse> findByMemberId(final Long memberId);
 }
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 47c881f7..568dd5e5 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -8,6 +8,7 @@
 import com.atwoz.member.exception.exceptions.auth.TokenFormInvalidException;
 import com.atwoz.member.exception.exceptions.auth.TokenInvalidException;
 import com.atwoz.member.exception.exceptions.auth.UnsupportedTokenException;
+import com.atwoz.member.exception.exceptions.info.InfoNotFoundException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
 import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
@@ -200,6 +201,12 @@ public ResponseEntity<String> handleReligionInvalidException(final InvalidReligi
         return getBadRequest(e);
     }
 
+    // info
+    @ExceptionHandler(InfoNotFoundException.class)
+    public ResponseEntity<String> handleInfoNotFoundException(final InfoNotFoundException e) {
+        return getNotFoundResponse(e);
+    }
+
     private ResponseEntity<String> getNotFoundResponse(final Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
                 .body(e.getMessage());
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/InfoNotFoundException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/InfoNotFoundException.java
new file mode 100644
index 00000000..06493c45
--- /dev/null
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/InfoNotFoundException.java
@@ -0,0 +1,8 @@
+package com.atwoz.member.exception.exceptions.info;
+
+public class InfoNotFoundException extends RuntimeException {
+
+    public InfoNotFoundException() {
+        super("회원 정보가 저장되지 않았습니다.");
+    }
+}
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
index 1969edfe..384c34be 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
@@ -7,8 +7,6 @@
 
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
-import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import com.atwoz.member.ui.info.dto.StyleSearchResponse;
@@ -26,32 +24,38 @@ public class InfoQueryRepository {
 
     private final JPAQueryFactory queryFactory;
 
-    public InfoSearchResponse findByMemberId(final Long memberId) {
+    public Optional<InfoSearchResponse> findByMemberId(final Long memberId) {
         Profile profile = selectProfileByMemberId(memberId);
+        if (profile == null) {
+            return Optional.empty();
+        }
+
         Option option = selectOptionByMemberId(memberId);
+        if (option == null) {
+            return Optional.empty();
+        }
+
         ProfileSearchResponse profileSearchResponse = ProfileSearchResponse.from(profile);
         OptionSearchResponse optionSearchResponse = OptionSearchResponse.from(option);
 
         List<HobbySearchResponse> hobbyCodes = selectHobbyResponseByMemberId(memberId);
         List<StyleSearchResponse> styleCodes = selectStyleResponseByMemberId(memberId);
 
-        return new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbyCodes, styleCodes);
+        return Optional.of(new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbyCodes, styleCodes));
     }
 
     private Profile selectProfileByMemberId(final Long memberId) {
-        return Optional.ofNullable(queryFactory.select(profile)
+        return queryFactory.select(profile)
                         .from(profile)
                         .where(profile.memberId.eq(memberId))
-                        .fetchOne())
-                .orElseThrow(ProfileNotFoundException::new);
+                        .fetchOne();
     }
 
     private Option selectOptionByMemberId(final Long memberId) {
-        return Optional.ofNullable(queryFactory.select(option)
+        return queryFactory.select(option)
                         .from(option)
                         .where(option.memberId.eq(memberId))
-                        .fetchOne())
-                .orElseThrow(OptionNotFoundException::new);
+                        .fetchOne();
     }
 
     private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
index 7c386538..18788ef0 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -4,6 +4,7 @@
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Repository
@@ -12,7 +13,7 @@ public class InfoRepositoryImpl implements InfoRepository {
     private final InfoQueryRepository infoQueryRepository;
 
     @Override
-    public InfoSearchResponse findByMemberId(final Long memberId) {
+    public Optional<InfoSearchResponse> findByMemberId(final Long memberId) {
         return infoQueryRepository.findByMemberId(memberId);
     }
 }

From c6b71479616f8c5d6b849e988a5bf7d85d6819d8 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 2 Mar 2024 14:55:13 +0900
Subject: [PATCH 198/225] =?UTF-8?q?refactor:=20InfoServiceTest=20=EC=9D=B4?=
 =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20mock=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoServiceTest 이벤트 mock 처리 방식으로 수정
- ApplicationEventPublisher mock 등록
- 조회 전용 fake 리포지터리 등록 (값 저장 메서드가 없기에 고정적으로 반환하도록 설정)
---
 .../application/info/InfoServiceTest.java     | 67 +++++++++++--------
 .../info/InfoFakeRepository.java              | 19 ++++++
 2 files changed, 59 insertions(+), 27 deletions(-)
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java

diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 790105bb..c4f85a52 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -5,11 +5,14 @@
 import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-import com.atwoz.helper.IntegrationHelper;
+import com.atwoz.global.event.Events;
 import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
 import com.atwoz.member.application.event.info.HobbyWroteEvent;
-import com.atwoz.member.application.event.info.OptionUpdatedEvent;
 import com.atwoz.member.application.event.info.OptionWroteEvent;
 import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
 import com.atwoz.member.application.event.info.ProfileWroteEvent;
@@ -17,25 +20,37 @@
 import com.atwoz.member.application.event.info.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
+import com.atwoz.member.domain.info.InfoRepository;
+import com.atwoz.member.infrastructure.info.InfoFakeRepository;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.event.ApplicationEvents;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.test.context.event.RecordApplicationEvents;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 @RecordApplicationEvents
-class InfoServiceTest extends IntegrationHelper {
+class InfoServiceTest {
 
-    @Autowired
     private InfoService infoService;
 
-    @Autowired
-    private ApplicationEvents events;
-    
+    private InfoRepository infoRepository;
+
+    @MockBean
+    private ApplicationEventPublisher eventPublisher;
+
+    @BeforeEach
+    void init() {
+        infoRepository = new InfoFakeRepository();
+        infoService = new InfoService(infoRepository);
+        eventPublisher = mock(ApplicationEventPublisher.class);
+        Events.setPublisher(eventPublisher);
+    }
+
     @Test
     void 회원의_모든_정보를_저장한다() {
         // given
@@ -46,16 +61,15 @@ class InfoServiceTest extends IntegrationHelper {
         infoService.writeInfo(memberId, request);
 
         // then
-        int profileWroteEventCount = (int) events.stream(ProfileWroteEvent.class).count();
-        int optionWroteEventCount = (int) events.stream(OptionWroteEvent.class).count();
-        int hobbyWroteEventCount = (int) events.stream(HobbyWroteEvent.class).count();
-        int styleWroteEventCount = (int) events.stream(StyleWroteEvent.class).count();
-
         assertSoftly(softly -> {
-            softly.assertThat(profileWroteEventCount).isEqualTo(1);
-            softly.assertThat(optionWroteEventCount).isEqualTo(1);
-            softly.assertThat(hobbyWroteEventCount).isEqualTo(1);
-            softly.assertThat(styleWroteEventCount).isEqualTo(1);
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(ProfileWroteEvent.class)))
+                    .doesNotThrowAnyException();
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(OptionWroteEvent.class)))
+                    .doesNotThrowAnyException();
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(HobbyWroteEvent.class)))
+                    .doesNotThrowAnyException();
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(StyleWroteEvent.class)))
+                    .doesNotThrowAnyException();
         });
     }
 
@@ -72,16 +86,15 @@ class InfoServiceTest extends IntegrationHelper {
         infoService.updateInfo(memberId, infoUpdateRequest);
 
         // then
-        int profileUpdatedEventCount = (int) events.stream(ProfileUpdatedEvent.class).count();
-        int optionUpdatedEventCount = (int) events.stream(OptionUpdatedEvent.class).count();
-        int hobbyUpdatedEventCount = (int) events.stream(HobbyUpdatedEvent.class).count();
-        int styleUpdatedEventCount = (int) events.stream(StyleUpdatedEvent.class).count();
-
         assertSoftly(softly -> {
-            softly.assertThat(profileUpdatedEventCount).isEqualTo(1);
-            softly.assertThat(optionUpdatedEventCount).isEqualTo(1);
-            softly.assertThat(hobbyUpdatedEventCount).isEqualTo(1);
-            softly.assertThat(styleUpdatedEventCount).isEqualTo(1);
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(ProfileUpdatedEvent.class)))
+                    .doesNotThrowAnyException();
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(ProfileUpdatedEvent.class)))
+                    .doesNotThrowAnyException();
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(HobbyUpdatedEvent.class)))
+                    .doesNotThrowAnyException();
+            softly.assertThatCode(() -> verify(eventPublisher, times(1)).publishEvent(any(StyleUpdatedEvent.class)))
+                    .doesNotThrowAnyException();
         });
     }
 
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
new file mode 100644
index 00000000..efbdafe1
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
@@ -0,0 +1,19 @@
+package com.atwoz.member.infrastructure.info;
+
+import static com.atwoz.member.fixture.info.dto.response.HobbiesSearchResponseFixture.회원_취미_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
+import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
+
+import com.atwoz.member.domain.info.InfoRepository;
+import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import java.util.Optional;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class InfoFakeRepository implements InfoRepository {
+
+    @Override
+    public Optional<InfoSearchResponse> findByMemberId(final Long memberId) {
+        return Optional.of(new InfoSearchResponse(회원_프로필_조회_응답(), 회원_옵션_조회_응답(), 회원_취미_조회_응답(), 회원_스타일_조회_응답()));
+    }
+}

From 34f4d3f2911a251aff202f9937f7d6ed6307d742 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 2 Mar 2024 15:31:40 +0900
Subject: [PATCH 199/225] =?UTF-8?q?refactor:=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=8B=9C=20=EB=A6=AC=ED=8F=AC?=
 =?UTF-8?q?=EC=A7=80=ED=84=B0=EB=A6=AC=EB=A5=BC=20=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 수정 테스트의 기본값을 만들 때 리포지터리를 이용하도록 수정
- OptionServiceTest 변수명 오타 수정
- ProfileFixture 수정 전용 객체 메서드 정의
- OptionFixture 수정 전용 객체 메서드 정의
---
 .../application/info/MemberHobbyServiceTest.java  |  5 ++---
 .../application/info/MemberStyleServiceTest.java  |  5 ++---
 .../application/info/OptionServiceTest.java       | 13 +++++++------
 .../application/info/ProfileServiceTest.java      | 15 +++++++--------
 .../atwoz/member/fixture/info/OptionFixture.java  | 11 +++++++++++
 .../atwoz/member/fixture/info/ProfileFixture.java | 14 ++++++++++++++
 6 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index a8ec949d..e210658b 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -51,12 +51,11 @@ void init() {
     void 회원의_취미를_수정한다() {
         // given
         Long memberId = 1L;
-        List<String> hobbyCodes = List.of(WINE.getCode(), COOK.getCode());
-        List<String> updateHobbyCodes = List.of(DRAMA.getCode(), WRITE.getCode());
         List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
         List<MemberHobby> updateMemberHobbies = 회원_수정_취미_생성();
+        List<String> updateHobbyCodes = List.of(DRAMA.getCode(), WRITE.getCode());
 
-        memberHobbyService.saveMemberHobbies(memberId, hobbyCodes);
+        memberHobbyRepository.saveAll(originMemberHobbies);
 
         // when
         memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes);
diff --git a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
index 98cc1359..ee1f573d 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
@@ -51,12 +51,11 @@ void init() {
     void 회원의_스타일을_수정한다() {
         // given
         Long memberId = 1L;
-        List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode());
-        List<String> updateStyleCodes = List.of(PURE.getCode(), FASHION.getCode());
         List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
         List<MemberStyle> updateMemberStyles = 회원_수정_스타일_생성();
+        List<String> updateStyleCodes = List.of(PURE.getCode(), FASHION.getCode());
 
-        memberStyleService.saveMemberStyles(memberId, styleCodes);
+        memberStyleRepository.saveAll(originMemberStyles);
 
         // when
         memberStyleService.updateMemberStyles(memberId, updateStyleCodes);
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index f9b3c85d..9ee50ef2 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,7 +1,9 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.info.OptionFixture.회원_수정_옵션_생성;
+import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
 import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -57,12 +59,11 @@ void init() {
     void 옵션을_수정한다() {
         // given
         Long memberId = 1L;
+        Option option = 회원_일반_옵션_생성();
+        optionRepository.save(option);
 
+        Option expectedOption = 회원_수정_옵션_생성();
         OptionUpdateRequest updateRequest = 회원_옵션_수정_요청();
-        Option exprectedOption = OptionFactory.createUpdatedOption(memberId, updateRequest);
-
-        OptionWriteRequest writeRequest = 회원_옵션_생성_요청();
-        optionService.writeOption(memberId, writeRequest);
 
         // when
         optionService.updateOption(memberId, updateRequest);
@@ -71,7 +72,7 @@ void init() {
         assertThat(optionRepository.findByMemberId(memberId).get())
                 .usingRecursiveComparison()
                 .ignoringFields("id")
-                .isEqualTo(exprectedOption);
+                .isEqualTo(expectedOption);
     }
 
     @Test
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 90da9082..e4251b64 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,14 +1,15 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.info.ProfileFixture.회원_수정_프로필_생성;
+import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
 import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_수정_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.application.info.profile.ProfileFactory;
 import com.atwoz.member.application.info.profile.ProfileService;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
@@ -41,8 +42,7 @@ void init() {
         // given
         Long memberId = 1L;
         ProfileWriteRequest request = 회원_프로필_생성_요청();
-
-        Profile expectedProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
+        Profile expectedProfile = 회원_일반_프로필_생성();
 
         // when
         profileService.writeProfile(memberId, request);
@@ -61,12 +61,11 @@ void init() {
     void 프로필을_수정한다() {
         // given
         Long memberId = 1L;
+        Profile profile = 회원_일반_프로필_생성();
+        profileRepository.save(profile);
 
+        Profile expectedProfile = 회원_수정_프로필_생성();
         ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
-        Profile expectedProfile = ProfileFactory.createUpdatedProfile(memberId, profileUpdateRequest, yearManager);
-
-        ProfileWriteRequest profileWriteRequest = 회원_프로필_생성_요청();
-        profileService.writeProfile(memberId, profileWriteRequest);
 
         // when
         profileService.updateProfile(memberId, profileUpdateRequest);
diff --git a/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java b/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
index 705258b7..f0bcb8c3 100644
--- a/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
@@ -20,4 +20,15 @@ public class OptionFixture {
 
         return new Option(memberId, smoke, religion, drink, mbti, graduate);
     }
+
+    public static Option 회원_수정_옵션_생성() {
+        Long memberId = 1L;
+        Smoke smoke = Smoke.ELECTRONIC;
+        Religion religion = Religion.BUDDHA;
+        Drink drink = Drink.ENJOY;
+        Mbti mbti = Mbti.ISFJ;
+        Graduate graduate = Graduate.DOCTOR;
+
+        return new Option(memberId, smoke, religion, drink, mbti, graduate);
+    }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java b/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
index 3c7c6635..27e7a5e0 100644
--- a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
@@ -1,8 +1,12 @@
 package com.atwoz.member.fixture.info;
 
+import static com.atwoz.member.fixture.info.BodyFixture.회원_수정_body_생성;
 import static com.atwoz.member.fixture.info.BodyFixture.회원_일반_body_생성;
+import static com.atwoz.member.fixture.info.JobFixture.회원_수정_직업_생성;
 import static com.atwoz.member.fixture.info.JobFixture.회원_일반_직업_생성;
+import static com.atwoz.member.fixture.info.LocationFixture.회원_수정_위치_생성;
 import static com.atwoz.member.fixture.info.LocationFixture.회원_일반_위치_생성;
+import static com.atwoz.member.fixture.info.PositionFixture.회원_수정_좌표_생성;
 import static com.atwoz.member.fixture.info.PositionFixture.회원_일반_좌표_생성;
 
 import com.atwoz.member.domain.info.profile.Body;
@@ -23,4 +27,14 @@ public class ProfileFixture {
 
         return new Profile(memberId, body, location, position, job);
     }
+
+    public static Profile 회원_수정_프로필_생성() {
+        Long memberId = 1L;
+        Body body = 회원_수정_body_생성();
+        Job job = 회원_수정_직업_생성();
+        Location location = 회원_수정_위치_생성();
+        Position position = 회원_수정_좌표_생성();
+
+        return new Profile(memberId, body, location, position, job);
+    }
 }

From 9b12d095ddeb0157ef96eedc6987f2c9c51e5195 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sat, 2 Mar 2024 15:45:35 +0900
Subject: [PATCH 200/225] =?UTF-8?q?refactor:=20OptionFactory=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- OptionFactory 제거
- Option 정적 팩터리 메서드로 대체
---
 .../info/option/OptionFactory.java            | 33 -------------------
 .../info/option/OptionService.java            | 19 +++++++++--
 .../member/domain/info/option/Option.java     | 15 +++++++++
 .../application/info/OptionServiceTest.java   | 10 ++++--
 4 files changed, 40 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/java/com/atwoz/member/application/info/option/OptionFactory.java

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java b/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
deleted file mode 100644
index 42f319ee..00000000
--- a/src/main/java/com/atwoz/member/application/info/option/OptionFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.atwoz.member.application.info.option;
-
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.domain.info.option.Drink;
-import com.atwoz.member.domain.info.option.Graduate;
-import com.atwoz.member.domain.info.option.Mbti;
-import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.domain.info.option.Religion;
-import com.atwoz.member.domain.info.option.Smoke;
-
-public class OptionFactory {
-
-    public static Option createNewOption(final Long memberId, final OptionWriteRequest request) {
-        Smoke smoke = Smoke.findByName(request.smoke());
-        Religion religion = Religion.findByName(request.religion());
-        Drink drink = Drink.findByName(request.drink());
-        Mbti mbti = Mbti.findByName(request.mbti());
-        Graduate graduate = Graduate.findByName(request.graduate());
-
-        return new Option(memberId, smoke, religion, drink, mbti, graduate);
-    }
-
-    public static Option createUpdatedOption(final Long memberId, final OptionUpdateRequest request) {
-        Smoke smoke = Smoke.findByName(request.smoke());
-        Religion religion = Religion.findByName(request.religion());
-        Drink drink = Drink.findByName(request.drink());
-        Mbti mbti = Mbti.findByName(request.mbti());
-        Graduate graduate = Graduate.findByName(request.graduate());
-
-        return new Option(memberId, smoke, religion, drink, mbti, graduate);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 52e662d5..e402166e 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -18,7 +18,15 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = OptionFactory.createNewOption(memberId, request);
+        Option newOption = Option.of(
+                memberId,
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
+        );
+
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
         }
@@ -27,7 +35,14 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
     @Transactional
     public void updateOption(final Long memberId, final OptionUpdateRequest request) {
         Option existOption = findByMemberId(memberId);
-        Option newOption = OptionFactory.createUpdatedOption(memberId, request);
+        Option newOption = Option.of(
+                memberId,
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
+        );
 
         existOption.updateContents(
                 newOption.getSmoke(),
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index c9d6e6e3..7398b7f6 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -68,4 +68,19 @@ public void updateContents(final Smoke smoke,
         this.mbti = mbti;
         this.graduate = graduate;
     }
+
+    public static Option of(final Long memberId,
+                            final String smokeName,
+                            final String religionName,
+                            final String drinkName,
+                            final String mbtiName,
+                            final String graduateName) {
+        Smoke smoke = Smoke.findByName(smokeName);
+        Religion religion = Religion.findByName(religionName);
+        Drink drink = Drink.findByName(drinkName);
+        Mbti mbti = Mbti.findByName(mbtiName);
+        Graduate graduate = Graduate.findByName(graduateName);
+
+        return new Option(memberId, smoke, religion, drink, mbti, graduate);
+    }
 }
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 9ee50ef2..42b6fcd7 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -10,7 +10,6 @@
 
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.option.OptionFactory;
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
@@ -40,7 +39,14 @@ void init() {
         Long memberId = 1L;
 
         OptionWriteRequest writeRequest = 회원_옵션_생성_요청();
-        Option expectedOption = OptionFactory.createNewOption(memberId, writeRequest);
+        Option expectedOption = Option.of(
+                memberId,
+                writeRequest.smoke(),
+                writeRequest.religion(),
+                writeRequest.drink(),
+                writeRequest.mbti(),
+                writeRequest.graduate()
+        );
 
         // when
         optionService.writeOption(memberId, writeRequest);

From 6ad674996bc9bb46c8f1af4b1a30aea1e2acd827 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 01:54:38 +0900
Subject: [PATCH 201/225] =?UTF-8?q?refactor:=20Profile,=20Option=20?=
 =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=B0=A9=EC=8B=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 새로운 엔티티를 받아서 자신의 도메인 로직에서 수정하도록 변경
---
 .../member/application/info/option/OptionService.java    | 9 +--------
 .../member/application/info/profile/ProfileService.java  | 8 +-------
 .../java/com/atwoz/member/domain/info/option/Option.java | 8 ++++++++
 .../com/atwoz/member/domain/info/profile/Profile.java    | 7 +++++++
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index e402166e..d27a481b 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -43,14 +43,7 @@ public void updateOption(final Long memberId, final OptionUpdateRequest request)
                 request.mbti(),
                 request.graduate()
         );
-
-        existOption.updateContents(
-                newOption.getSmoke(),
-                newOption.getReligion(),
-                newOption.getDrink(),
-                newOption.getMbti(),
-                newOption.getGraduate()
-        );
+        existOption.updateContentsFrom(newOption);
     }
 
     private Option findByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index a324a106..8dda43d2 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -30,13 +30,7 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
     public void updateProfile(final Long memberId, final ProfileUpdateRequest request) {
         Profile existProfile = findByMemberId(memberId);
         Profile newProfile = ProfileFactory.createUpdatedProfile(memberId, request, yearManager);
-
-        existProfile.updateContents(
-                newProfile.getBody(),
-                newProfile.getLocation(),
-                newProfile.getPosition(),
-                newProfile.getJob()
-        );
+        existProfile.updateContentsFrom(newProfile);
     }
 
     private Profile findByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index 7398b7f6..c2f31df0 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -83,4 +83,12 @@ public static Option of(final Long memberId,
 
         return new Option(memberId, smoke, religion, drink, mbti, graduate);
     }
+
+    public void updateContentsFrom(final Option newOption) {
+        this.smoke = newOption.getSmoke();
+        this.religion = newOption.getReligion();
+        this.drink = newOption.getDrink();
+        this.mbti = newOption.getMbti();
+        this.graduate = newOption.getGraduate();
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index d8e253ad..ec876f3d 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -58,4 +58,11 @@ public void updateContents(final Body body, final Location location, final Posit
         this.position = position;
         this.job = job;
     }
+
+    public void updateContentsFrom(final Profile newProfile) {
+        this.body = newProfile.getBody();
+        this.location = newProfile.getLocation();
+        this.position = newProfile.getPosition();
+        this.job = newProfile.getJob();
+    }
 }

From 920fad83596cbbf91a7138045f76693eefcf4c27 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 02:51:18 +0900
Subject: [PATCH 202/225] =?UTF-8?q?refactor:=20Option=20=EB=82=B4=EB=B6=80?=
 =?UTF-8?q?=20DTO=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Option에서 생성/수정을 할 때 도메인 전용 DTO를 이용하도록 수정
- 요구하는 곳이 도메인이므로 도메인 내부에 DTO 패키지 정의
- 테스트 코드 수정
---
 .../info/option/OptionService.java            | 24 +++--------
 .../member/domain/info/option/Option.java     | 41 +++++++------------
 .../option/dto/InnerOptionUpdateRequest.java  | 22 ++++++++++
 .../option/dto/InnerOptionWriteRequest.java   | 24 +++++++++++
 .../application/info/OptionServiceTest.java   | 11 ++---
 .../member/domain/info/option/OptionTest.java | 21 ++++------
 .../dto/request/OptionRequestFixture.java     | 17 ++++++++
 7 files changed, 96 insertions(+), 64 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java

diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index d27a481b..05112075 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -4,6 +4,8 @@
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -18,15 +20,8 @@ public class OptionService {
 
     @Transactional
     public void writeOption(final Long memberId, final OptionWriteRequest request) {
-        Option newOption = Option.of(
-                memberId,
-                request.smoke(),
-                request.religion(),
-                request.drink(),
-                request.mbti(),
-                request.graduate()
-        );
-
+        InnerOptionWriteRequest optionWriteRequest = InnerOptionWriteRequest.of(memberId, request);
+        Option newOption = Option.createFrom(optionWriteRequest);
         if (!optionRepository.isExistMemberOption(memberId)) {
             optionRepository.save(newOption);
         }
@@ -34,16 +29,9 @@ public void writeOption(final Long memberId, final OptionWriteRequest request) {
 
     @Transactional
     public void updateOption(final Long memberId, final OptionUpdateRequest request) {
+        InnerOptionUpdateRequest optionUpdateRequest = InnerOptionUpdateRequest.from(request);
         Option existOption = findByMemberId(memberId);
-        Option newOption = Option.of(
-                memberId,
-                request.smoke(),
-                request.religion(),
-                request.drink(),
-                request.mbti(),
-                request.graduate()
-        );
-        existOption.updateContentsFrom(newOption);
+        existOption.updateContentsFrom(optionUpdateRequest);
     }
 
     private Option findByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index c2f31df0..4298c1e5 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.domain.info.option;
 
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -54,14 +56,6 @@ public Option(final Long memberId,
                   final Mbti mbti,
                   final Graduate graduate) {
         this.memberId = memberId;
-        updateContents(smoke, religion, drink, mbti, graduate);
-    }
-
-    public void updateContents(final Smoke smoke,
-                               final Religion religion,
-                               final Drink drink,
-                               final Mbti mbti,
-                               final Graduate graduate) {
         this.smoke = smoke;
         this.religion = religion;
         this.drink = drink;
@@ -69,26 +63,21 @@ public void updateContents(final Smoke smoke,
         this.graduate = graduate;
     }
 
-    public static Option of(final Long memberId,
-                            final String smokeName,
-                            final String religionName,
-                            final String drinkName,
-                            final String mbtiName,
-                            final String graduateName) {
-        Smoke smoke = Smoke.findByName(smokeName);
-        Religion religion = Religion.findByName(religionName);
-        Drink drink = Drink.findByName(drinkName);
-        Mbti mbti = Mbti.findByName(mbtiName);
-        Graduate graduate = Graduate.findByName(graduateName);
+    public static Option createFrom(final InnerOptionWriteRequest request) {
+        Smoke smoke = Smoke.findByName(request.smokeName());
+        Religion religion = Religion.findByName(request.religionName());
+        Drink drink = Drink.findByName(request.drinkName());
+        Mbti mbti = Mbti.findByName(request.mbtiName());
+        Graduate graduate = Graduate.findByName(request.graduateName());
 
-        return new Option(memberId, smoke, religion, drink, mbti, graduate);
+        return new Option(request.memberId(), smoke, religion, drink, mbti, graduate);
     }
 
-    public void updateContentsFrom(final Option newOption) {
-        this.smoke = newOption.getSmoke();
-        this.religion = newOption.getReligion();
-        this.drink = newOption.getDrink();
-        this.mbti = newOption.getMbti();
-        this.graduate = newOption.getGraduate();
+    public void updateContentsFrom(final InnerOptionUpdateRequest request) {
+        this.smoke = Smoke.findByName(request.smokeName());
+        this.religion = Religion.findByName(request.religionName());
+        this.drink = Drink.findByName(request.drinkName());
+        this.mbti = Mbti.findByName(request.mbtiName());
+        this.graduate = Graduate.findByName(request.graduateName());
     }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
new file mode 100644
index 00000000..8498f7ff
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
@@ -0,0 +1,22 @@
+package com.atwoz.member.domain.info.option.dto;
+
+import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+
+public record InnerOptionUpdateRequest(
+        String smokeName,
+        String religionName,
+        String drinkName,
+        String mbtiName,
+        String graduateName
+) {
+
+    public static InnerOptionUpdateRequest from(final OptionUpdateRequest request) {
+        return new InnerOptionUpdateRequest(
+          request.smoke(),
+          request.religion(),
+          request.drink(),
+          request.mbti(),
+          request.graduate()
+        );
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
new file mode 100644
index 00000000..ea14700a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
@@ -0,0 +1,24 @@
+package com.atwoz.member.domain.info.option.dto;
+
+import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+
+public record InnerOptionWriteRequest(
+        Long memberId,
+        String smokeName,
+        String religionName,
+        String drinkName,
+        String mbtiName,
+        String graduateName
+) {
+
+    public static InnerOptionWriteRequest of(final Long memberId, final OptionWriteRequest request) {
+        return new InnerOptionWriteRequest(
+                memberId,
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
+        );
+    }
+}
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index 42b6fcd7..b8db66b5 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -13,6 +13,7 @@
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
+import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.infrastructure.info.OptionFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
@@ -39,14 +40,8 @@ void init() {
         Long memberId = 1L;
 
         OptionWriteRequest writeRequest = 회원_옵션_생성_요청();
-        Option expectedOption = Option.of(
-                memberId,
-                writeRequest.smoke(),
-                writeRequest.religion(),
-                writeRequest.drink(),
-                writeRequest.mbti(),
-                writeRequest.graduate()
-        );
+        InnerOptionWriteRequest innerOptionWriteRequest = InnerOptionWriteRequest.of(memberId, writeRequest);
+        Option expectedOption = Option.createFrom(innerOptionWriteRequest);
 
         // when
         optionService.writeOption(memberId, writeRequest);
diff --git a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
index 316516c1..d6dcc937 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
@@ -1,8 +1,10 @@
 package com.atwoz.member.domain.info.option;
 
 import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
+import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청_내부;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -15,23 +17,18 @@ public class OptionTest {
     void 내용_수정_검증() {
         // given
         Option option = 회원_일반_옵션_생성();
-
-        Smoke updateSmoke = Smoke.ELECTRONIC;
-        Religion updateReligion = Religion.BUDDHA;
-        Drink updateDrink = Drink.ENJOY;
-        Mbti updateMbti = Mbti.ENFJ;
-        Graduate updateGraduate = Graduate.DOCTOR;
+        InnerOptionUpdateRequest request = 회원_옵션_수정_요청_내부();
 
         // when
-        option.updateContents(updateSmoke, updateReligion, updateDrink, updateMbti, updateGraduate);
+        option.updateContentsFrom(request);
 
         // then
         assertSoftly(softly -> {
-            softly.assertThat(option.getSmoke()).isEqualTo(updateSmoke);
-            softly.assertThat(option.getReligion()).isEqualTo(updateReligion);
-            softly.assertThat(option.getDrink()).isEqualTo(updateDrink);
-            softly.assertThat(option.getMbti()).isEqualTo(updateMbti);
-            softly.assertThat(option.getGraduate()).isEqualTo(updateGraduate);
+            softly.assertThat(option.getSmoke().getName()).isEqualTo(request.smokeName());
+            softly.assertThat(option.getReligion().getName()).isEqualTo(request.religionName());
+            softly.assertThat(option.getDrink().getName()).isEqualTo(request.drinkName());
+            softly.assertThat(option.getMbti().name()).isEqualTo(request.mbtiName());
+            softly.assertThat(option.getGraduate().getName()).isEqualTo(request.graduateName());
         });
     }
 }
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
index a5e9c6f6..16deae6c 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
@@ -7,6 +7,7 @@
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionRequestFixture {
@@ -42,4 +43,20 @@ public class OptionRequestFixture {
                 mbti
         );
     }
+
+    public static InnerOptionUpdateRequest 회원_옵션_수정_요청_내부() {
+        String smoke = Smoke.ELECTRONIC.getName();
+        String religion = Religion.BUDDHA.getName();
+        String drink = Drink.ENJOY.getName();
+        String mbti = Mbti.ISFJ.name();
+        String graduate = Graduate.DOCTOR.getName();
+
+        return new InnerOptionUpdateRequest(
+                smoke,
+                religion,
+                drink,
+                mbti,
+                graduate
+        );
+    }
 }

From 3cf519b10f9990632a5b810328344a0a208e4b76 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 11:51:07 +0900
Subject: [PATCH 203/225] =?UTF-8?q?refactor:=20ProfileFactory=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile에서 생성/수정을 할 때 도메인 전용 DTO를 이용하도록 수정
- 요구하는 곳이 도메인이므로 도메인 내부에 DTO 패키지 정의
- 테스트 코드 수정
- Fixture 구조 수정
- DTO 패키지 분리
---
 .../member/application/info/InfoService.java  |  8 +--
 .../info/dto/InfoUpdateRequest.java           |  2 +
 .../info/dto/InfoWriteRequest.java            |  2 +
 .../dto/{ => hobby}/HobbyUpdateRequest.java   |  2 +-
 .../dto/{ => hobby}/HobbyWriteRequest.java    |  2 +-
 .../dto/profile/ProfileUpdateRequest.java     | 12 ++--
 .../info/dto/profile/ProfileWriteRequest.java | 12 ++--
 .../dto/profile/body/BodyUpdateRequest.java   | 16 +++++
 .../dto/profile/body/BodyWriteRequest.java    | 16 +++++
 .../dto/{ => style}/StyleUpdateRequest.java   |  2 +-
 .../dto/{ => style}/StyleWriteRequest.java    |  2 +-
 .../info/option/OptionService.java            |  4 +-
 .../info/profile/ProfileFactory.java          | 61 -------------------
 .../info/profile/ProfileService.java          |  9 ++-
 .../option}/InnerOptionUpdateRequest.java     |  2 +-
 .../option}/InnerOptionWriteRequest.java      |  2 +-
 .../profile/InnerProfileUpdateRequest.java    | 29 +++++++++
 .../dto/profile/InnerProfileWriteRequest.java | 29 +++++++++
 .../profile/body/InnerBodyUpdateRequest.java  | 16 +++++
 .../profile/body/InnerBodyWriteRequest.java   | 16 +++++
 .../location/InnerLocationUpdateRequest.java  | 13 ++++
 .../location/InnerLocationWriteRequest.java   | 13 ++++
 .../position/InnerPositionUpdateRequest.java  | 14 +++++
 .../position/InnerPositionWriteRequest.java   | 14 +++++
 .../member/domain/info/option/Option.java     |  4 +-
 .../member/domain/info/profile/Body.java      | 12 ++++
 .../member/domain/info/profile/Location.java  | 10 +++
 .../member/domain/info/profile/Position.java  | 10 +++
 .../member/domain/info/profile/Profile.java   | 21 +++++--
 .../info/dto/profile/BodySearchResponse.java  | 14 +++++
 .../dto/profile/ProfileSearchResponse.java    | 13 +---
 .../application/info/OptionServiceTest.java   |  2 +-
 .../member/domain/info/option/OptionTest.java |  2 +-
 .../info/dto/request/BodyRequestFixture.java  | 25 ++++++++
 .../dto/request/HobbiesRequestFixture.java    |  4 +-
 .../info/dto/request/InfoRequestFixture.java  |  8 +--
 .../dto/request/OptionRequestFixture.java     |  2 +-
 .../dto/request/ProfileRequestFixture.java    | 21 +++----
 .../dto/request/StylesRequestFixture.java     |  4 +-
 .../response/BodySearchResponseFixture.java   | 19 ++++++
 .../ProfileSearchResponseFixture.java         | 11 ++--
 .../ui/info/InfoControllerWebMvcTest.java     | 27 ++++----
 42 files changed, 355 insertions(+), 152 deletions(-)
 rename src/main/java/com/atwoz/member/application/info/dto/{ => hobby}/HobbyUpdateRequest.java (77%)
 rename src/main/java/com/atwoz/member/application/info/dto/{ => hobby}/HobbyWriteRequest.java (77%)
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java
 rename src/main/java/com/atwoz/member/application/info/dto/{ => style}/StyleUpdateRequest.java (77%)
 rename src/main/java/com/atwoz/member/application/info/dto/{ => style}/StyleWriteRequest.java (77%)
 delete mode 100644 src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
 rename src/main/java/com/atwoz/member/domain/info/{option/dto => dto/option}/InnerOptionUpdateRequest.java (91%)
 rename src/main/java/com/atwoz/member/domain/info/{option/dto => dto/option}/InnerOptionWriteRequest.java (92%)
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java
 create mode 100644 src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
 create mode 100644 src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index b8d0454f..df1cf45a 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -9,12 +9,12 @@
 import com.atwoz.member.application.event.info.ProfileWroteEvent;
 import com.atwoz.member.application.event.info.StyleUpdatedEvent;
 import com.atwoz.member.application.event.info.StyleWroteEvent;
-import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
+import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
+import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.exception.exceptions.info.InfoNotFoundException;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
index d2b7c480..8a600de6 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
@@ -1,7 +1,9 @@
 package com.atwoz.member.application.info.dto;
 
+import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
index 251175a7..256b97e2 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
@@ -1,7 +1,9 @@
 package com.atwoz.member.application.info.dto;
 
+import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyUpdateRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyUpdateRequest.java
index 155da71c..15242fdc 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/HobbyUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto;
+package com.atwoz.member.application.info.dto.hobby;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyWriteRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyWriteRequest.java
index 008bb48b..36a21970 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/HobbyWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto;
+package com.atwoz.member.application.info.dto.hobby;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
index 3866968a..d39ab1ae 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.dto.profile;
 
+import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
 import jakarta.validation.Valid;
@@ -7,14 +8,9 @@
 import jakarta.validation.constraints.NotNull;
 
 public record ProfileUpdateRequest(
-        @NotNull(message = "출생년도가 작성되어야 합니다.")
-        Integer birthYear,
-
-        @NotNull(message = "키가 작성되어야 합니다.")
-        Integer height,
-
-        @NotBlank(message = "성별이 작성되어야 합니다.")
-        String gender,
+        @Valid
+        @NotNull(message = "신체 정보가 작성되어야 합니다.")
+        BodyUpdateRequest body,
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
index 8d1c7e0e..0cf8fab2 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.application.info.dto.profile;
 
+import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
 import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
 import jakarta.validation.Valid;
@@ -7,14 +8,9 @@
 import jakarta.validation.constraints.NotNull;
 
 public record ProfileWriteRequest(
-        @NotNull(message = "출생년도가 작성되어야 합니다.")
-        Integer birthYear,
-
-        @NotNull(message = "키가 작성되어야 합니다.")
-        Integer height,
-
-        @NotBlank(message = "성별이 작성되어야 합니다.")
-        String gender,
+        @Valid
+        @NotNull(message = "신체 정보가 작성되어야 합니다.")
+        BodyWriteRequest body,
 
         @Valid
         @NotNull(message = "위치가 작성되어야 합니다.")
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java
new file mode 100644
index 00000000..8adda7ea
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java
@@ -0,0 +1,16 @@
+package com.atwoz.member.application.info.dto.profile.body;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record BodyUpdateRequest(
+        @NotNull(message = "출생년도가 작성되어야 합니다.")
+        Integer birthYear,
+
+        @NotNull(message = "키가 작성되어야 합니다.")
+        Integer height,
+
+        @NotBlank(message = "성별이 작성되어야 합니다.")
+        String gender
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java
new file mode 100644
index 00000000..39ec9726
--- /dev/null
+++ b/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java
@@ -0,0 +1,16 @@
+package com.atwoz.member.application.info.dto.profile.body;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record BodyWriteRequest(
+        @NotNull(message = "출생년도가 작성되어야 합니다.")
+        Integer birthYear,
+
+        @NotNull(message = "키가 작성되어야 합니다.")
+        Integer height,
+
+        @NotBlank(message = "성별이 작성되어야 합니다.")
+        String gender
+) {
+}
diff --git a/src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/style/StyleUpdateRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/dto/style/StyleUpdateRequest.java
index a8ca7e1f..baf28506 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/StyleUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/style/StyleUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto;
+package com.atwoz.member.application.info.dto.style;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/style/StyleWriteRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/dto/style/StyleWriteRequest.java
index f5c6e054..b4f4d25e 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/StyleWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/style/StyleWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto;
+package com.atwoz.member.application.info.dto.style;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 05112075..1713d511 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -4,8 +4,8 @@
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
-import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
-import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
deleted file mode 100644
index cf7f4ef7..00000000
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.atwoz.member.application.info.profile;
-
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
-import com.atwoz.member.domain.info.profile.Body;
-import com.atwoz.member.domain.info.profile.Gender;
-import com.atwoz.member.domain.info.profile.Job;
-import com.atwoz.member.domain.info.profile.Location;
-import com.atwoz.member.domain.info.profile.Position;
-import com.atwoz.member.domain.info.profile.Profile;
-import com.atwoz.member.domain.info.profile.YearManager;
-import java.math.BigDecimal;
-
-public class ProfileFactory {
-
-    public static Profile createNewProfile(final Long memberId, final ProfileWriteRequest request, final YearManager yearManager) {
-        int birthYear = request.birthYear();
-        int height = request.height();
-        Gender gender = Gender.findByName(request.gender());
-        Body body = new Body(yearManager, birthYear, height, gender);
-
-        LocationWriteRequest locationWriteRequest = request.location();
-        String city = locationWriteRequest.city();
-        String sector = locationWriteRequest.sector();
-        Location location = new Location(city, sector);
-
-        PositionWriteRequest positionWriteRequest = request.position();
-        BigDecimal latitude = positionWriteRequest.latitude();
-        BigDecimal longitude = positionWriteRequest.longitude();
-        Position position = new Position(latitude, longitude);
-
-        Job job = Job.findByCode(request.job());
-
-        return new Profile(memberId, body, location, position, job);
-    }
-
-    public static Profile createUpdatedProfile(final Long memberId, final ProfileUpdateRequest request, final YearManager yearManager) {
-        int birthYear = request.birthYear();
-        int height = request.height();
-        Gender gender = Gender.findByName(request.gender());
-        Body body = new Body(yearManager, birthYear, height, gender);
-
-        LocationUpdateRequest locationUpdateRequest = request.location();
-        String city = locationUpdateRequest.city();
-        String sector = locationUpdateRequest.sector();
-        Location location = new Location(city, sector);
-
-        PositionUpdateRequest positionUpdateRequest = request.position();
-        BigDecimal latitude = positionUpdateRequest.latitude();
-        BigDecimal longitude = positionUpdateRequest.longitude();
-        Position position = new Position(latitude, longitude);
-
-        Job job = Job.findByCode(request.job());
-
-        return new Profile(memberId, body, location, position, job);
-    }
-}
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 8dda43d2..4edc44bf 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -2,9 +2,11 @@
 
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.domain.info.dto.profile.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
 import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.dto.profile.InnerProfileWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -20,7 +22,8 @@ public class ProfileService {
 
     @Transactional
     public void writeProfile(final Long memberId, final ProfileWriteRequest request) {
-        Profile newProfile = ProfileFactory.createNewProfile(memberId, request, yearManager);
+        InnerProfileWriteRequest profileWriteRequest = InnerProfileWriteRequest.of(memberId, yearManager, request);
+        Profile newProfile = Profile.createFrom(profileWriteRequest);
         if (!profileRepository.isExistMemberProfile(memberId)) {
             profileRepository.save(newProfile);
         }
@@ -28,9 +31,9 @@ public void writeProfile(final Long memberId, final ProfileWriteRequest request)
 
     @Transactional
     public void updateProfile(final Long memberId, final ProfileUpdateRequest request) {
+        InnerProfileUpdateRequest profileUpdateRequest = InnerProfileUpdateRequest.of(memberId, yearManager, request);
         Profile existProfile = findByMemberId(memberId);
-        Profile newProfile = ProfileFactory.createUpdatedProfile(memberId, request, yearManager);
-        existProfile.updateContentsFrom(newProfile);
+        existProfile.updateContentsFrom(profileUpdateRequest);
     }
 
     private Profile findByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionUpdateRequest.java
similarity index 91%
rename from src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionUpdateRequest.java
index 8498f7ff..78943426 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.option.dto;
+package com.atwoz.member.domain.info.dto.option;
 
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionWriteRequest.java
similarity index 92%
rename from src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionWriteRequest.java
index ea14700a..85ad7d19 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.option.dto;
+package com.atwoz.member.domain.info.dto.option;
 
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java
new file mode 100644
index 00000000..664fc4d8
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.domain.info.dto.profile;
+
+import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.body.InnerBodyUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.location.InnerLocationUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.position.InnerPositionUpdateRequest;
+import com.atwoz.member.domain.info.profile.YearManager;
+
+public record InnerProfileUpdateRequest(
+        Long memberId,
+        InnerBodyUpdateRequest body,
+        InnerLocationUpdateRequest location,
+        InnerPositionUpdateRequest position,
+        String jobCode
+) {
+
+    public static InnerProfileUpdateRequest of(
+            final Long memberId,
+            final YearManager yearManager,
+            final ProfileUpdateRequest request) {
+        return new InnerProfileUpdateRequest(
+                memberId,
+                InnerBodyUpdateRequest.of(yearManager, request.body()),
+                InnerLocationUpdateRequest.from(request.location()),
+                InnerPositionUpdateRequest.from(request.position()),
+                request.job()
+        );
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java
new file mode 100644
index 00000000..2cc05ac0
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java
@@ -0,0 +1,29 @@
+package com.atwoz.member.domain.info.dto.profile;
+
+import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.domain.info.dto.profile.body.InnerBodyWriteRequest;
+import com.atwoz.member.domain.info.dto.profile.location.InnerLocationWriteRequest;
+import com.atwoz.member.domain.info.dto.profile.position.InnerPositionWriteRequest;
+import com.atwoz.member.domain.info.profile.YearManager;
+
+public record InnerProfileWriteRequest(
+        Long memberId,
+        InnerBodyWriteRequest body,
+        InnerLocationWriteRequest location,
+        InnerPositionWriteRequest position,
+        String jobCode
+) {
+
+    public static InnerProfileWriteRequest of(
+            final Long memberId,
+            final YearManager yearManager,
+            final ProfileWriteRequest request) {
+        return new InnerProfileWriteRequest(
+                memberId,
+                InnerBodyWriteRequest.of(yearManager, request.body()),
+                InnerLocationWriteRequest.from(request.location()),
+                InnerPositionWriteRequest.from(request.position()),
+                request.job()
+        );
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java
new file mode 100644
index 00000000..6bcd0ba1
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java
@@ -0,0 +1,16 @@
+package com.atwoz.member.domain.info.dto.profile.body;
+
+import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
+import com.atwoz.member.domain.info.profile.YearManager;
+
+public record InnerBodyUpdateRequest(
+        YearManager yearManager,
+        int birthYear,
+        int height,
+        String gender
+) {
+
+    public static InnerBodyUpdateRequest of(final YearManager yearManager, final BodyUpdateRequest request) {
+        return new InnerBodyUpdateRequest(yearManager, request.birthYear(), request.height(), request.gender());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java
new file mode 100644
index 00000000..9214cd17
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java
@@ -0,0 +1,16 @@
+package com.atwoz.member.domain.info.dto.profile.body;
+
+import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
+import com.atwoz.member.domain.info.profile.YearManager;
+
+public record InnerBodyWriteRequest(
+        YearManager yearManager,
+        int birthYear,
+        int height,
+        String gender
+) {
+
+    public static InnerBodyWriteRequest of(final YearManager yearManager, final BodyWriteRequest request) {
+        return new InnerBodyWriteRequest(yearManager, request.birthYear(), request.height(), request.gender());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java
new file mode 100644
index 00000000..fc0b526a
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.info.dto.profile.location;
+
+import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+
+public record InnerLocationUpdateRequest(
+        String city,
+        String sector
+) {
+
+    public static InnerLocationUpdateRequest from(final LocationUpdateRequest request) {
+        return new InnerLocationUpdateRequest(request.city(), request.sector());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java
new file mode 100644
index 00000000..391b07d9
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java
@@ -0,0 +1,13 @@
+package com.atwoz.member.domain.info.dto.profile.location;
+
+import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+
+public record InnerLocationWriteRequest(
+        String city,
+        String sector
+) {
+
+    public static InnerLocationWriteRequest from(final LocationWriteRequest request) {
+        return new InnerLocationWriteRequest(request.city(), request.sector());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java
new file mode 100644
index 00000000..f692adb6
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.domain.info.dto.profile.position;
+
+import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
+import java.math.BigDecimal;
+
+public record InnerPositionUpdateRequest(
+        BigDecimal latitude,
+        BigDecimal longitude
+) {
+
+    public static InnerPositionUpdateRequest from(final PositionUpdateRequest request) {
+        return new InnerPositionUpdateRequest(request.latitude(), request.longitude());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java
new file mode 100644
index 00000000..d8dd6a98
--- /dev/null
+++ b/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.domain.info.dto.profile.position;
+
+import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
+import java.math.BigDecimal;
+
+public record InnerPositionWriteRequest(
+        BigDecimal latitude,
+        BigDecimal longitude
+) {
+
+    public static InnerPositionWriteRequest from(final PositionWriteRequest request) {
+        return new InnerPositionWriteRequest(request.latitude(), request.longitude());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index 4298c1e5..af2fdd0d 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
-import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionWriteRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
index c1249158..8d39cbd8 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Body.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.domain.info.profile;
 
+import com.atwoz.member.domain.info.dto.profile.body.InnerBodyUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.body.InnerBodyWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import jakarta.persistence.Column;
@@ -54,4 +56,14 @@ private int calculateAgeFromYear(final YearManager yearManager, final int birthY
         }
         return memberAge;
     }
+
+    public static Body createFrom(final InnerBodyWriteRequest request) {
+        Gender gender = Gender.findByName(request.gender());
+        return new Body(request.yearManager(), request.birthYear(), request.height(), gender);
+    }
+
+    public static Body updateContentsFrom(final InnerBodyUpdateRequest request) {
+        Gender gender = Gender.findByName(request.gender());
+        return new Body(request.yearManager(), request.birthYear(), request.height(), gender);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Location.java b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
index bf613e0c..35bfcfe4 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Location.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Location.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.domain.info.profile;
 
+import com.atwoz.member.domain.info.dto.profile.location.InnerLocationUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.location.InnerLocationWriteRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
@@ -23,4 +25,12 @@ public Location(final String city, final String sector) {
         this.city = city;
         this.sector = sector;
     }
+
+    public static Location createFrom(final InnerLocationWriteRequest request) {
+        return new Location(request.city(), request.sector());
+    }
+
+    public static Location updateContentsFrom(final InnerLocationUpdateRequest request) {
+        return new Location(request.city(), request.sector());
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Position.java b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
index 1198d5e7..b9185b25 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Position.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Position.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.domain.info.profile;
 
+import com.atwoz.member.domain.info.dto.profile.position.InnerPositionUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.position.InnerPositionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import jakarta.persistence.Embeddable;
@@ -42,4 +44,12 @@ private static void validateLongitude(final BigDecimal longitude) {
             throw new LongitudeRangeException();
         }
     }
+
+    public static Position createFrom(final InnerPositionWriteRequest position) {
+        return new Position(position.latitude(), position.longitude());
+    }
+
+    public static Position updateContentsFrom(final InnerPositionUpdateRequest position) {
+        return new Position(position.latitude(), position.longitude());
+    }
 }
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index ec876f3d..a60f75c4 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.domain.info.profile;
 
+import com.atwoz.member.domain.info.dto.profile.InnerProfileUpdateRequest;
+import com.atwoz.member.domain.info.dto.profile.InnerProfileWriteRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -59,10 +61,19 @@ public void updateContents(final Body body, final Location location, final Posit
         this.job = job;
     }
 
-    public void updateContentsFrom(final Profile newProfile) {
-        this.body = newProfile.getBody();
-        this.location = newProfile.getLocation();
-        this.position = newProfile.getPosition();
-        this.job = newProfile.getJob();
+    public static Profile createFrom(final InnerProfileWriteRequest request) {
+        Body body = Body.createFrom(request.body());
+        Location location = Location.createFrom(request.location());
+        Position position = Position.createFrom(request.position());
+        Job job = Job.findByCode(request.jobCode());
+
+        return new Profile(request.memberId(), body, location, position, job);
+    }
+
+    public void updateContentsFrom(final InnerProfileUpdateRequest request) {
+        this.body = Body.updateContentsFrom(request.body());
+        this.location = Location.updateContentsFrom(request.location());
+        this.position = Position.updateContentsFrom(request.position());
+        this.job = Job.findByCode(request.jobCode());
     }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
new file mode 100644
index 00000000..26e67351
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
@@ -0,0 +1,14 @@
+package com.atwoz.member.ui.info.dto.profile;
+
+import com.atwoz.member.domain.info.profile.Body;
+
+public record BodySearchResponse(
+        int age,
+        int height,
+        String gender
+) {
+
+    public static BodySearchResponse from(final Body body) {
+        return new BodySearchResponse(body.getAge(), body.getHeight(), body.getGender().getName());
+    }
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index bd101d67..bdf80fe3 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -1,16 +1,13 @@
 package com.atwoz.member.ui.info.dto.profile;
 
 import com.atwoz.member.domain.info.profile.Body;
-import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
 import com.atwoz.member.domain.info.profile.Location;
 import com.atwoz.member.domain.info.profile.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 
 public record ProfileSearchResponse(
-        int age,
-        int height,
-        String gender,
+        BodySearchResponse body,
         LocationSearchResponse location,
         PositionSearchResponse position,
         String job
@@ -18,18 +15,12 @@ public record ProfileSearchResponse(
 
     public static ProfileSearchResponse from(final Profile profile) {
         Body body = profile.getBody();
-        int age = body.getAge();
-        int height = body.getHeight();
-        Gender gender = body.getGender();
-
         Location location = profile.getLocation();
         Position position = profile.getPosition();
         Job job = profile.getJob();
 
         return new ProfileSearchResponse(
-                age,
-                height,
-                gender.getName(),
+                BodySearchResponse.from(body),
                 LocationSearchResponse.from(location),
                 PositionSearchResponse.from(position),
                 job.getCode()
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index b8db66b5..c43a1b09 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -13,7 +13,7 @@
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
-import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.infrastructure.info.OptionFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
index d6dcc937..75a143bf 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
@@ -4,7 +4,7 @@
 import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청_내부;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
new file mode 100644
index 00000000..be49a044
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
@@ -0,0 +1,25 @@
+package com.atwoz.member.fixture.info.dto.request;
+
+import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
+import com.atwoz.member.domain.info.profile.Gender;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class BodyRequestFixture {
+
+    public static BodyWriteRequest 회원_신체_정보_생성_요청() {
+        int birthYear = 2000;
+        int height = 171;
+        String gender = Gender.MALE.getName();
+
+        return new BodyWriteRequest(birthYear, height, gender);
+    }
+
+    public static BodyUpdateRequest 회원_신체_정보_수정_요청() {
+        int birthYear = 2001;
+        int height = 170;
+        String gender = Gender.FEMALE.getName();
+
+        return new BodyUpdateRequest(birthYear, height, gender);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
index 66a2fc36..963bf6c1 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
@@ -5,8 +5,8 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 
-import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
+import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
index ba619f95..e2d14cfc 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
@@ -9,12 +9,12 @@
 import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_수정_요청;
 
-import com.atwoz.member.application.info.dto.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
+import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
+import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
index 16deae6c..810c81e4 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
@@ -7,7 +7,7 @@
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
index 5a73f6f8..69a7b6da 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
@@ -1,5 +1,7 @@
 package com.atwoz.member.fixture.info.dto.request;
 
+import static com.atwoz.member.fixture.info.dto.request.BodyRequestFixture.회원_신체_정보_생성_요청;
+import static com.atwoz.member.fixture.info.dto.request.BodyRequestFixture.회원_신체_정보_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.LocationRequestFixture.회원_위치_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.LocationRequestFixture.회원_위치_수정_요청;
 import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_생성_요청;
@@ -7,28 +9,25 @@
 
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
+import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
 import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
 import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
-import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileRequestFixture {
 
     public static ProfileWriteRequest 회원_프로필_생성_요청() {
-        int birthYear = 2000;
-        int height = 171;
-        String gender = Gender.MALE.getName();
+        BodyWriteRequest bodyWriteRequest = 회원_신체_정보_생성_요청();
         LocationWriteRequest locationWriteRequest = 회원_위치_생성_요청();
         PositionWriteRequest positionWriteRequest = 회원_좌표_생성_요청();
         String job = Job.RESEARCH_AND_DEVELOP.getCode();
 
         return new ProfileWriteRequest(
-                birthYear,
-                height,
-                gender,
+                bodyWriteRequest,
                 locationWriteRequest,
                 positionWriteRequest,
                 job
@@ -36,17 +35,13 @@ public class ProfileRequestFixture {
     }
 
     public static ProfileUpdateRequest 회원_프로필_수정_요청() {
-        int birthYear = 2001;
-        int height = 170;
-        String gender = Gender.FEMALE.getName();
+        BodyUpdateRequest bodyUpdateRequest = 회원_신체_정보_수정_요청();
         LocationUpdateRequest locationUpdateRequest = 회원_위치_수정_요청();
         PositionUpdateRequest positionUpdateRequest = 회원_좌표_수정_요청();
         String job = Job.LAW.getCode();
 
         return new ProfileUpdateRequest(
-                birthYear,
-                height,
-                gender,
+                bodyUpdateRequest,
                 locationUpdateRequest,
                 positionUpdateRequest,
                 job
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
index 985e14aa..578e1ccc 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
@@ -5,8 +5,8 @@
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.domain.info.style.Style.PURE;
 
-import com.atwoz.member.application.info.dto.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
+import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
new file mode 100644
index 00000000..0a9a1738
--- /dev/null
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
@@ -0,0 +1,19 @@
+package com.atwoz.member.fixture.info.dto.response;
+
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.ui.info.dto.profile.BodySearchResponse;
+
+public record BodySearchResponseFixture(
+        int age,
+        int height,
+        String gender
+) {
+
+    public static BodySearchResponse 회원_신체_정보_조회_응답() {
+        int age = 24;
+        int height = 171;
+        String gender = Gender.MALE.getName();
+
+        return new BodySearchResponse(age, height, gender);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
index baba5437..2035628f 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
@@ -1,10 +1,11 @@
 package com.atwoz.member.fixture.info.dto.response;
 
+import static com.atwoz.member.fixture.info.dto.response.BodySearchResponseFixture.회원_신체_정보_조회_응답;
 import static com.atwoz.member.fixture.info.dto.response.LocationSearchResponseFixture.회원_위치_조회_응답;
 import static com.atwoz.member.fixture.info.dto.response.PositionSearchResponseFixture.회원_좌표_조회_응답;
 
-import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.ui.info.dto.profile.BodySearchResponse;
 import com.atwoz.member.ui.info.dto.profile.LocationSearchResponse;
 import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
 import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
@@ -13,17 +14,13 @@
 public class ProfileSearchResponseFixture {
 
     public static ProfileSearchResponse 회원_프로필_조회_응답() {
-        int age = 24;
-        int height = 171;
-        String gender = Gender.MALE.getName();
+        BodySearchResponse bodySearchResponse = 회원_신체_정보_조회_응답();
         LocationSearchResponse locationSearchResponse = 회원_위치_조회_응답();
         PositionSearchResponse positionSearchResponse = 회원_좌표_조회_응답();
         String job = Job.RESEARCH_AND_DEVELOP.getCode();
 
         return new ProfileSearchResponse(
-                age,
-                height,
-                gender,
+                bodySearchResponse,
                 locationSearchResponse,
                 positionSearchResponse,
                 job
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index dc8cbc3d..3577c869 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -63,9 +63,10 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 headerWithName("Authorization").description("유저 토큰 정보")
                         ),
                         requestFields(
-                                fieldWithPath("profile.birthYear").description("출생년도"),
-                                fieldWithPath("profile.height").description("키"),
-                                fieldWithPath("profile.gender").description("성별"),
+                                fieldWithPath("profile.body").description("신체 정보"),
+                                fieldWithPath("profile.body.birthYear").description("출생년도"),
+                                fieldWithPath("profile.body.height").description("키"),
+                                fieldWithPath("profile.body.gender").description("성별"),
                                 fieldWithPath("profile.location.city").description("위치 (시/도)"),
                                 fieldWithPath("profile.location.sector").description("위치 (구/군)"),
                                 fieldWithPath("profile.position.latitude").description("좌표 (위도)"),
@@ -102,9 +103,10 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 headerWithName("Authorization").description("유저 토큰 정보")
                         ),
                         requestFields(
-                                fieldWithPath("profile.birthYear").description("출생년도"),
-                                fieldWithPath("profile.height").description("키"),
-                                fieldWithPath("profile.gender").description("성별"),
+                                fieldWithPath("profile.body").description("신체 정보"),
+                                fieldWithPath("profile.body.birthYear").description("출생년도"),
+                                fieldWithPath("profile.body.height").description("키"),
+                                fieldWithPath("profile.body.gender").description("성별"),
                                 fieldWithPath("profile.location.city").description("위치 (시/도)"),
                                 fieldWithPath("profile.location.sector").description("위치 (구/군)"),
                                 fieldWithPath("profile.position.latitude").description("좌표 (위도)"),
@@ -136,8 +138,10 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                         .header(AUTHORIZATION, bearerToken))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("profile").exists())
-                .andExpect(jsonPath("profile.height").exists())
-                .andExpect(jsonPath("profile.gender").exists())
+                .andExpect(jsonPath("profile.body").exists())
+                .andExpect(jsonPath("profile.body.age").exists())
+                .andExpect(jsonPath("profile.body.height").exists())
+                .andExpect(jsonPath("profile.body.gender").exists())
                 .andExpect(jsonPath("profile.location").exists())
                 .andExpect(jsonPath("profile.location.city").exists())
                 .andExpect(jsonPath("profile.location.sector").exists())
@@ -161,9 +165,10 @@ class InfoControllerWebMvcTest extends MockBeanInjection {
                                 headerWithName("Authorization").description("유저 토큰 정보")
                         ),
                         responseFields(
-                                fieldWithPath("profile.age").description("나이"),
-                                fieldWithPath("profile.height").description("키"),
-                                fieldWithPath("profile.gender").description("성별"),
+                                fieldWithPath("profile.body").description("신체 정보"),
+                                fieldWithPath("profile.body.age").description("나이"),
+                                fieldWithPath("profile.body.height").description("키"),
+                                fieldWithPath("profile.body.gender").description("성별"),
                                 fieldWithPath("profile.location.city").description("위치 (시/도)"),
                                 fieldWithPath("profile.location.sector").description("위치 (구/군)"),
                                 fieldWithPath("profile.position.latitude").description("좌표 (위도)"),

From c9aae3059ead555b44287fa0dfe41c1b78ee9343 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 11:58:23 +0900
Subject: [PATCH 204/225] =?UTF-8?q?refactor:=20BodySearchResponseFixture?=
 =?UTF-8?q?=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A1=9C=20=EB=B3=B5=EA=B5=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BodySearchResponseFixture 클래스화
---
 .../info/dto/response/BodySearchResponseFixture.java       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
index 0a9a1738..a61492ab 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
@@ -3,11 +3,8 @@
 import com.atwoz.member.domain.info.profile.Gender;
 import com.atwoz.member.ui.info.dto.profile.BodySearchResponse;
 
-public record BodySearchResponseFixture(
-        int age,
-        int height,
-        String gender
-) {
+@SuppressWarnings("NonAsciiCharacters")
+public class BodySearchResponseFixture {
 
     public static BodySearchResponse 회원_신체_정보_조회_응답() {
         int age = 24;

From 087c30466b8a0aebdb1d249f1b4131c3a09dab08 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 17:08:22 +0900
Subject: [PATCH 205/225] =?UTF-8?q?refactor:=20Profile,=20Option=20?=
 =?UTF-8?q?=EC=A1=B0=EC=9D=B8=20=EC=A1=B0=ED=9A=8C=20=EB=B0=A9=EC=8B=9D?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Profile, Option 조회 시 한 번에 조회되도록 조인
- ProfileAndOptionSearchResponse 정의
---
 .../info/InfoQueryRepository.java             | 52 +++++++++----------
 .../ui/info/dto/InfoSearchResponse.java       | 11 ++++
 .../dto/ProfileAndOptionSearchResponse.java   | 33 ++++++++++++
 .../info/dto/option/OptionSearchResponse.java | 14 ++---
 .../dto/profile/ProfileSearchResponse.java    | 27 ++++------
 5 files changed, 86 insertions(+), 51 deletions(-)
 create mode 100644 src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
index 384c34be..e363b49d 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
@@ -5,13 +5,11 @@
 import static com.atwoz.member.domain.info.profile.QProfile.profile;
 import static com.atwoz.member.domain.info.style.QMemberStyle.memberStyle;
 
-import com.atwoz.member.domain.info.option.Option;
-import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.ui.info.dto.HobbySearchResponse;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
 import com.atwoz.member.ui.info.dto.StyleSearchResponse;
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -25,37 +23,35 @@ public class InfoQueryRepository {
     private final JPAQueryFactory queryFactory;
 
     public Optional<InfoSearchResponse> findByMemberId(final Long memberId) {
-        Profile profile = selectProfileByMemberId(memberId);
-        if (profile == null) {
-            return Optional.empty();
-        }
+        Optional<ProfileAndOptionSearchResponse> profileAndOptionSearchResponse = Optional.ofNullable(queryFactory
+                .select(Projections.fields(ProfileAndOptionSearchResponse.class,
+                        profile.body.age.as("age"),
+                        profile.body.height.as("height"),
+                        profile.body.gender.as("gender"),
+                        profile.job.as("job"),
+                        profile.location.city.as("city"),
+                        profile.location.sector.as("sector"),
+                        profile.position.latitude.as("latitude"),
+                        profile.position.longitude.as("longitude"),
+                        option.drink.as("drink"),
+                        option.graduate.as("graduate"),
+                        option.mbti.as("mbti"),
+                        option.religion.as("religion"),
+                        option.smoke.as("smoke")))
+                .from(profile)
+                .join(option)
+                .on(profile.memberId.eq(option.memberId))
+                .where(profile.memberId.eq(memberId))
+                .fetchOne());
 
-        Option option = selectOptionByMemberId(memberId);
-        if (option == null) {
+        if (profileAndOptionSearchResponse.isEmpty()) {
             return Optional.empty();
         }
 
-        ProfileSearchResponse profileSearchResponse = ProfileSearchResponse.from(profile);
-        OptionSearchResponse optionSearchResponse = OptionSearchResponse.from(option);
-
         List<HobbySearchResponse> hobbyCodes = selectHobbyResponseByMemberId(memberId);
         List<StyleSearchResponse> styleCodes = selectStyleResponseByMemberId(memberId);
 
-        return Optional.of(new InfoSearchResponse(profileSearchResponse, optionSearchResponse, hobbyCodes, styleCodes));
-    }
-
-    private Profile selectProfileByMemberId(final Long memberId) {
-        return queryFactory.select(profile)
-                        .from(profile)
-                        .where(profile.memberId.eq(memberId))
-                        .fetchOne();
-    }
-
-    private Option selectOptionByMemberId(final Long memberId) {
-        return queryFactory.select(option)
-                        .from(option)
-                        .where(option.memberId.eq(memberId))
-                        .fetchOne();
+        return Optional.of(InfoSearchResponse.of(profileAndOptionSearchResponse.get(), hobbyCodes, styleCodes));
     }
 
     private List<HobbySearchResponse> selectHobbyResponseByMemberId(final Long memberId) {
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
index d35f19b5..14af6419 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
@@ -10,4 +10,15 @@ public record InfoSearchResponse(
     List<HobbySearchResponse> hobbies,
     List<StyleSearchResponse> styles
 ) {
+
+    public static InfoSearchResponse of(
+            final ProfileAndOptionSearchResponse profileAndOptionSearchResponse,
+            final List<HobbySearchResponse> hobbies,
+            final List<StyleSearchResponse> styles
+    ) {
+        ProfileSearchResponse profile = ProfileSearchResponse.from(profileAndOptionSearchResponse);
+        OptionSearchResponse option = OptionSearchResponse.from(profileAndOptionSearchResponse);
+
+        return new InfoSearchResponse(profile, option, hobbies, styles);
+    }
 }
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
new file mode 100644
index 00000000..1cbf3b07
--- /dev/null
+++ b/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
@@ -0,0 +1,33 @@
+package com.atwoz.member.ui.info.dto;
+
+import com.atwoz.member.domain.info.option.Drink;
+import com.atwoz.member.domain.info.option.Graduate;
+import com.atwoz.member.domain.info.option.Mbti;
+import com.atwoz.member.domain.info.option.Religion;
+import com.atwoz.member.domain.info.option.Smoke;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.Job;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProfileAndOptionSearchResponse {
+
+    private int age;
+    private int height;
+    private Gender gender;
+    private Job job;
+    private String city;
+    private String sector;
+    private BigDecimal latitude;
+    private BigDecimal longitude;
+    private Drink drink;
+    private Graduate graduate;
+    private Mbti mbti;
+    private Religion religion;
+    private Smoke smoke;
+}
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
index d7bcaea8..7dd5c447 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
@@ -3,9 +3,9 @@
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
-import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
+import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
 
 public record OptionSearchResponse(
         String drink,
@@ -15,12 +15,12 @@ public record OptionSearchResponse(
         String mbti
 ) {
 
-    public static OptionSearchResponse from(final Option option) {
-        Drink drink = option.getDrink();
-        Graduate graduate = option.getGraduate();
-        Religion religion = option.getReligion();
-        Smoke smoke = option.getSmoke();
-        Mbti mbti = option.getMbti();
+    public static OptionSearchResponse from(final ProfileAndOptionSearchResponse response) {
+        Drink drink = response.getDrink();
+        Graduate graduate = response.getGraduate();
+        Religion religion = response.getReligion();
+        Smoke smoke = response.getSmoke();
+        Mbti mbti = response.getMbti();
 
         return new OptionSearchResponse(
                 drink.getName(),
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index bdf80fe3..74344874 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -1,10 +1,7 @@
 package com.atwoz.member.ui.info.dto.profile;
 
-import com.atwoz.member.domain.info.profile.Body;
-import com.atwoz.member.domain.info.profile.Job;
-import com.atwoz.member.domain.info.profile.Location;
-import com.atwoz.member.domain.info.profile.Position;
-import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
 
 public record ProfileSearchResponse(
         BodySearchResponse body,
@@ -12,18 +9,16 @@ public record ProfileSearchResponse(
         PositionSearchResponse position,
         String job
 ) {
+    public static ProfileSearchResponse from(final ProfileAndOptionSearchResponse response) {
+        int age = response.getAge();
+        int height = response.getHeight();
+        Gender gender = response.getGender();
+        BodySearchResponse body = new BodySearchResponse(age, height, gender.getName());
 
-    public static ProfileSearchResponse from(final Profile profile) {
-        Body body = profile.getBody();
-        Location location = profile.getLocation();
-        Position position = profile.getPosition();
-        Job job = profile.getJob();
+        LocationSearchResponse location = new LocationSearchResponse(response.getCity(), response.getSector());
+        PositionSearchResponse position = new PositionSearchResponse(response.getLatitude(), response.getLongitude());
+        String job = response.getJob().getCode();
 
-        return new ProfileSearchResponse(
-                BodySearchResponse.from(body),
-                LocationSearchResponse.from(location),
-                PositionSearchResponse.from(position),
-                job.getCode()
-        );
+        return new ProfileSearchResponse(body, location, position, job);
     }
 }

From dff9f00da40f63db0cf45354aac9d76ab14f11cc Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 17:38:20 +0900
Subject: [PATCH 206/225] =?UTF-8?q?refactor:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8?=
 =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이벤트 패키지 구조 수정 (도메인 중심으로 수정)
---
 .../member/application/auth/AuthService.java     |  2 +-
 .../member/application/info/InfoService.java     | 16 ++++++++--------
 .../info/hobby/HobbyEventHandler.java            |  4 ++--
 .../info/option/OptionEventHandler.java          |  4 ++--
 .../info/profile/ProfileEventHandler.java        |  4 ++--
 .../info/style/StyleEventHandler.java            |  4 ++--
 .../application/member/MemberEventHandler.java   |  2 +-
 .../auth}/event/ValidatedLoginEvent.java         |  2 +-
 .../info/hobby/event}/HobbyUpdatedEvent.java     |  2 +-
 .../info/hobby/event}/HobbyWroteEvent.java       |  2 +-
 .../info/option/event}/OptionUpdatedEvent.java   |  2 +-
 .../info/option/event}/OptionWroteEvent.java     |  2 +-
 .../info/profile/event}/ProfileUpdatedEvent.java |  2 +-
 .../info/profile/event}/ProfileWroteEvent.java   |  2 +-
 .../info/style/event}/StyleUpdatedEvent.java     |  2 +-
 .../info/style/event}/StyleWroteEvent.java       |  2 +-
 .../member/application/info/InfoServiceTest.java | 14 +++++++-------
 17 files changed, 34 insertions(+), 34 deletions(-)
 rename src/main/java/com/atwoz/member/{application => domain/auth}/event/ValidatedLoginEvent.java (85%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/hobby/event}/HobbyUpdatedEvent.java (84%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/hobby/event}/HobbyWroteEvent.java (84%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/option/event}/OptionUpdatedEvent.java (86%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/option/event}/OptionWroteEvent.java (86%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/profile/event}/ProfileUpdatedEvent.java (86%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/profile/event}/ProfileWroteEvent.java (86%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/style/event}/StyleUpdatedEvent.java (84%)
 rename src/main/java/com/atwoz/member/{application/event/info => domain/info/style/event}/StyleWroteEvent.java (84%)

diff --git a/src/main/java/com/atwoz/member/application/auth/AuthService.java b/src/main/java/com/atwoz/member/application/auth/AuthService.java
index dfdf46d9..048cf339 100644
--- a/src/main/java/com/atwoz/member/application/auth/AuthService.java
+++ b/src/main/java/com/atwoz/member/application/auth/AuthService.java
@@ -2,7 +2,7 @@
 
 import com.atwoz.global.event.Events;
 import com.atwoz.member.application.auth.dto.LoginRequest;
-import com.atwoz.member.application.event.ValidatedLoginEvent;
+import com.atwoz.member.domain.auth.event.ValidatedLoginEvent;
 import com.atwoz.member.domain.auth.TokenProvider;
 import com.atwoz.member.infrastructure.auth.dto.MemberInfoResponse;
 import com.atwoz.member.infrastructure.auth.dto.OAuthProviderRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index df1cf45a..1c44e275 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -1,14 +1,14 @@
 package com.atwoz.member.application.info;
 
 import com.atwoz.global.event.Events;
-import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
-import com.atwoz.member.application.event.info.HobbyWroteEvent;
-import com.atwoz.member.application.event.info.OptionUpdatedEvent;
-import com.atwoz.member.application.event.info.OptionWroteEvent;
-import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
-import com.atwoz.member.application.event.info.ProfileWroteEvent;
-import com.atwoz.member.application.event.info.StyleUpdatedEvent;
-import com.atwoz.member.application.event.info.StyleWroteEvent;
+import com.atwoz.member.domain.info.hobby.event.HobbyUpdatedEvent;
+import com.atwoz.member.domain.info.hobby.event.HobbyWroteEvent;
+import com.atwoz.member.domain.info.option.event.OptionUpdatedEvent;
+import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
+import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
+import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
+import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
+import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
 import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
index 7a7d6a3b..539cd1dc 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.hobby;
 
-import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
-import com.atwoz.member.application.event.info.HobbyWroteEvent;
+import com.atwoz.member.domain.info.hobby.event.HobbyUpdatedEvent;
+import com.atwoz.member.domain.info.hobby.event.HobbyWroteEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index a222ea6c..bdb9b9ca 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.application.event.info.OptionUpdatedEvent;
-import com.atwoz.member.application.event.info.OptionWroteEvent;
+import com.atwoz.member.domain.info.option.event.OptionUpdatedEvent;
+import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
index 969741fb..07d078a0 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
-import com.atwoz.member.application.event.info.ProfileWroteEvent;
+import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
+import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
index 5c8689c9..2dbc18a5 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.style;
 
-import com.atwoz.member.application.event.info.StyleUpdatedEvent;
-import com.atwoz.member.application.event.info.StyleWroteEvent;
+import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
+import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
index da7186f9..535859e3 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.application.member;
 
-import com.atwoz.member.application.event.ValidatedLoginEvent;
+import com.atwoz.member.domain.auth.event.ValidatedLoginEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/application/event/ValidatedLoginEvent.java b/src/main/java/com/atwoz/member/domain/auth/event/ValidatedLoginEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/application/event/ValidatedLoginEvent.java
rename to src/main/java/com/atwoz/member/domain/auth/event/ValidatedLoginEvent.java
index f7646176..8e29c99e 100644
--- a/src/main/java/com/atwoz/member/application/event/ValidatedLoginEvent.java
+++ b/src/main/java/com/atwoz/member/domain/auth/event/ValidatedLoginEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event;
+package com.atwoz.member.domain.auth.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java b/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyUpdatedEvent.java
similarity index 84%
rename from src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java
rename to src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyUpdatedEvent.java
index a7b5fdd4..444fbc74 100644
--- a/src/main/java/com/atwoz/member/application/event/info/HobbyUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.hobby.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/event/info/HobbyWroteEvent.java b/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyWroteEvent.java
similarity index 84%
rename from src/main/java/com/atwoz/member/application/event/info/HobbyWroteEvent.java
rename to src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyWroteEvent.java
index 8e7d2df6..5348fa4e 100644
--- a/src/main/java/com/atwoz/member/application/event/info/HobbyWroteEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.hobby.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java b/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
similarity index 86%
rename from src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java
rename to src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
index d8671d6e..28205142 100644
--- a/src/main/java/com/atwoz/member/application/event/info/OptionUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.option.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/application/event/info/OptionWroteEvent.java b/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
similarity index 86%
rename from src/main/java/com/atwoz/member/application/event/info/OptionWroteEvent.java
rename to src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
index 36f06ed2..c04c4d1a 100644
--- a/src/main/java/com/atwoz/member/application/event/info/OptionWroteEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.option.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
similarity index 86%
rename from src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java
rename to src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
index 6d288374..cdff9f11 100644
--- a/src/main/java/com/atwoz/member/application/event/info/ProfileUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.profile.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/application/event/info/ProfileWroteEvent.java b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
similarity index 86%
rename from src/main/java/com/atwoz/member/application/event/info/ProfileWroteEvent.java
rename to src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
index 44da64a4..23b70db0 100644
--- a/src/main/java/com/atwoz/member/application/event/info/ProfileWroteEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.profile.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java b/src/main/java/com/atwoz/member/domain/info/style/event/StyleUpdatedEvent.java
similarity index 84%
rename from src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java
rename to src/main/java/com/atwoz/member/domain/info/style/event/StyleUpdatedEvent.java
index 2e89733c..16210950 100644
--- a/src/main/java/com/atwoz/member/application/event/info/StyleUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/event/StyleUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.style.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/event/info/StyleWroteEvent.java b/src/main/java/com/atwoz/member/domain/info/style/event/StyleWroteEvent.java
similarity index 84%
rename from src/main/java/com/atwoz/member/application/event/info/StyleWroteEvent.java
rename to src/main/java/com/atwoz/member/domain/info/style/event/StyleWroteEvent.java
index 87530f3b..99d468fb 100644
--- a/src/main/java/com/atwoz/member/application/event/info/StyleWroteEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/style/event/StyleWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.event.info;
+package com.atwoz.member.domain.info.style.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index c4f85a52..28dc48c2 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -11,13 +11,13 @@
 import static org.mockito.Mockito.verify;
 
 import com.atwoz.global.event.Events;
-import com.atwoz.member.application.event.info.HobbyUpdatedEvent;
-import com.atwoz.member.application.event.info.HobbyWroteEvent;
-import com.atwoz.member.application.event.info.OptionWroteEvent;
-import com.atwoz.member.application.event.info.ProfileUpdatedEvent;
-import com.atwoz.member.application.event.info.ProfileWroteEvent;
-import com.atwoz.member.application.event.info.StyleUpdatedEvent;
-import com.atwoz.member.application.event.info.StyleWroteEvent;
+import com.atwoz.member.domain.info.hobby.event.HobbyUpdatedEvent;
+import com.atwoz.member.domain.info.hobby.event.HobbyWroteEvent;
+import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
+import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
+import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
+import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
+import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;

From b4777a8ee5bc354ec375c8bafab228c2b651e62c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 19:25:28 +0900
Subject: [PATCH 207/225] =?UTF-8?q?refactor:=20DTO=20=ED=8C=A8=ED=82=A4?=
 =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- DTO들이 각 도메인, 애플리케이션 하위 패키지로 들어가도록 수정
---
 .../member/application/info/InfoService.java     |  8 ++++----
 .../application/info/dto/InfoUpdateRequest.java  |  8 ++++----
 .../application/info/dto/InfoWriteRequest.java   |  8 ++++----
 .../hobby => hobby/dto}/HobbyUpdateRequest.java  |  2 +-
 .../hobby => hobby/dto}/HobbyWriteRequest.java   |  2 +-
 .../info/option/OptionEventHandler.java          |  4 ++--
 .../application/info/option/OptionService.java   |  8 ++++----
 .../dto}/OptionUpdateRequest.java                |  2 +-
 .../dto}/OptionWriteRequest.java                 |  2 +-
 .../info/profile/ProfileEventHandler.java        |  4 ++--
 .../application/info/profile/ProfileService.java |  8 ++++----
 .../body/dto}/BodyUpdateRequest.java             |  2 +-
 .../body/dto}/BodyWriteRequest.java              |  2 +-
 .../dto}/ProfileUpdateRequest.java               |  8 ++++----
 .../dto}/ProfileWriteRequest.java                |  8 ++++----
 .../location/dto}/LocationUpdateRequest.java     |  2 +-
 .../location/dto}/LocationWriteRequest.java      |  2 +-
 .../position/dto}/PositionUpdateRequest.java     |  2 +-
 .../position/dto}/PositionWriteRequest.java      |  2 +-
 .../style => style/dto}/StyleUpdateRequest.java  |  2 +-
 .../style => style/dto}/StyleWriteRequest.java   |  2 +-
 .../atwoz/member/domain/info/option/Option.java  |  4 ++--
 .../dto}/InnerOptionUpdateRequest.java           |  4 ++--
 .../dto}/InnerOptionWriteRequest.java            |  4 ++--
 .../info/option/event/OptionUpdatedEvent.java    |  2 +-
 .../info/option/event/OptionWroteEvent.java      |  2 +-
 .../member/domain/info/profile/Profile.java      |  7 +++++--
 .../domain/info/profile/{ => body}/Body.java     |  7 ++++---
 .../domain/info/profile/{ => body}/Gender.java   |  2 +-
 .../body/dto}/InnerBodyUpdateRequest.java        |  4 ++--
 .../body/dto}/InnerBodyWriteRequest.java         |  4 ++--
 .../dto}/InnerProfileUpdateRequest.java          | 10 +++++-----
 .../dto}/InnerProfileWriteRequest.java           | 10 +++++-----
 .../info/profile/event/ProfileUpdatedEvent.java  |  2 +-
 .../info/profile/event/ProfileWroteEvent.java    |  2 +-
 .../info/profile/{ => location}/Location.java    |  6 +++---
 .../dto}/InnerLocationUpdateRequest.java         |  4 ++--
 .../location/dto}/InnerLocationWriteRequest.java |  4 ++--
 .../info/profile/{ => position}/Position.java    |  6 +++---
 .../dto}/InnerPositionUpdateRequest.java         |  4 ++--
 .../position/dto}/InnerPositionWriteRequest.java |  4 ++--
 .../info/dto/ProfileAndOptionSearchResponse.java |  2 +-
 .../ui/info/dto/profile/BodySearchResponse.java  |  2 +-
 .../info/dto/profile/LocationSearchResponse.java |  2 +-
 .../info/dto/profile/PositionSearchResponse.java |  2 +-
 .../info/dto/profile/ProfileSearchResponse.java  |  2 +-
 .../application/info/OptionServiceTest.java      |  6 +++---
 .../application/info/ProfileServiceTest.java     |  4 ++--
 .../member/domain/info/option/OptionTest.java    |  2 +-
 .../member/domain/info/profile/BodyTest.java     |  2 ++
 .../member/domain/info/profile/GenderTest.java   |  1 +
 .../member/domain/info/profile/PositionTest.java |  1 +
 .../member/domain/info/profile/ProfileTest.java  |  3 +++
 .../atwoz/member/fixture/info/BodyFixture.java   |  4 ++--
 .../member/fixture/info/LocationFixture.java     |  2 +-
 .../member/fixture/info/PositionFixture.java     |  2 +-
 .../member/fixture/info/ProfileFixture.java      |  6 +++---
 .../info/dto/request/BodyRequestFixture.java     |  6 +++---
 .../info/dto/request/HobbiesRequestFixture.java  |  4 ++--
 .../info/dto/request/InfoRequestFixture.java     | 16 ++++++++--------
 .../info/dto/request/LocationRequestFixture.java |  4 ++--
 .../info/dto/request/OptionRequestFixture.java   |  6 +++---
 .../info/dto/request/PositionRequestFixture.java |  4 ++--
 .../info/dto/request/ProfileRequestFixture.java  | 16 ++++++++--------
 .../info/dto/request/StylesRequestFixture.java   |  4 ++--
 .../dto/response/BodySearchResponseFixture.java  |  2 +-
 .../info/ProfileJpaRepositoryTest.java           |  6 +++---
 67 files changed, 151 insertions(+), 140 deletions(-)
 rename src/main/java/com/atwoz/member/application/info/{dto/hobby => hobby/dto}/HobbyUpdateRequest.java (77%)
 rename src/main/java/com/atwoz/member/application/info/{dto/hobby => hobby/dto}/HobbyWriteRequest.java (77%)
 rename src/main/java/com/atwoz/member/application/info/{dto/option => option/dto}/OptionUpdateRequest.java (91%)
 rename src/main/java/com/atwoz/member/application/info/{dto/option => option/dto}/OptionWriteRequest.java (91%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile/body => profile/body/dto}/BodyUpdateRequest.java (87%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile/body => profile/body/dto}/BodyWriteRequest.java (87%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile => profile/dto}/ProfileUpdateRequest.java (73%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile => profile/dto}/ProfileWriteRequest.java (73%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile/location => profile/location/dto}/LocationUpdateRequest.java (81%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile/location => profile/location/dto}/LocationWriteRequest.java (81%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile/position => profile/position/dto}/PositionUpdateRequest.java (82%)
 rename src/main/java/com/atwoz/member/application/info/{dto/profile/position => profile/position/dto}/PositionWriteRequest.java (82%)
 rename src/main/java/com/atwoz/member/application/info/{dto/style => style/dto}/StyleUpdateRequest.java (77%)
 rename src/main/java/com/atwoz/member/application/info/{dto/style => style/dto}/StyleWriteRequest.java (77%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/option => option/dto}/InnerOptionUpdateRequest.java (80%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/option => option/dto}/InnerOptionWriteRequest.java (83%)
 rename src/main/java/com/atwoz/member/domain/info/profile/{ => body}/Body.java (90%)
 rename src/main/java/com/atwoz/member/domain/info/profile/{ => body}/Gender.java (91%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile/body => profile/body/dto}/InnerBodyUpdateRequest.java (78%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile/body => profile/body/dto}/InnerBodyWriteRequest.java (78%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile => profile/dto}/InnerProfileUpdateRequest.java (73%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile => profile/dto}/InnerProfileWriteRequest.java (73%)
 rename src/main/java/com/atwoz/member/domain/info/profile/{ => location}/Location.java (83%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile/location => profile/location/dto}/InnerLocationUpdateRequest.java (70%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile/location => profile/location/dto}/InnerLocationWriteRequest.java (69%)
 rename src/main/java/com/atwoz/member/domain/info/profile/{ => position}/Position.java (91%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile/position => profile/position/dto}/InnerPositionUpdateRequest.java (73%)
 rename src/main/java/com/atwoz/member/domain/info/{dto/profile/position => profile/position/dto}/InnerPositionWriteRequest.java (73%)

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 1c44e275..8a5d437f 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -9,12 +9,12 @@
 import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
 import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
 import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
-import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
+import com.atwoz.member.application.info.style.dto.StyleUpdateRequest;
+import com.atwoz.member.application.info.style.dto.StyleWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.exception.exceptions.info.InfoNotFoundException;
 import com.atwoz.member.ui.info.dto.InfoSearchResponse;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
index 8a600de6..445a18e8 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoUpdateRequest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.application.info.dto;
 
-import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.style.dto.StyleUpdateRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
index 256b97e2..1912a2a1 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/dto/InfoWriteRequest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.application.info.dto;
 
-import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
+import com.atwoz.member.application.info.style.dto.StyleWriteRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/hobby/dto/HobbyUpdateRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/hobby/dto/HobbyUpdateRequest.java
index 15242fdc..3160431d 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/dto/HobbyUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.hobby;
+package com.atwoz.member.application.info.hobby.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyWriteRequest.java b/src/main/java/com/atwoz/member/application/info/hobby/dto/HobbyWriteRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/hobby/dto/HobbyWriteRequest.java
index 36a21970..b7a05385 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/hobby/HobbyWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/dto/HobbyWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.hobby;
+package com.atwoz.member.application.info.hobby.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index bdb9b9ca..dbe57939 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -2,8 +2,8 @@
 
 import com.atwoz.member.domain.info.option.event.OptionUpdatedEvent;
 import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionService.java b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
index 1713d511..dac012d5 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionService.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionService.java
@@ -1,11 +1,11 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
-import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
-import com.atwoz.member.domain.info.dto.option.InnerOptionWriteRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/option/dto/OptionUpdateRequest.java
similarity index 91%
rename from src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/option/dto/OptionUpdateRequest.java
index d49d0db3..8ada9c0e 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/option/dto/OptionUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.option;
+package com.atwoz.member.application.info.option.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/option/dto/OptionWriteRequest.java
similarity index 91%
rename from src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/option/dto/OptionWriteRequest.java
index 056d909c..7e0efff1 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/option/OptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/option/dto/OptionWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.option;
+package com.atwoz.member.application.info.option.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
index 07d078a0..891c4a32 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
@@ -2,8 +2,8 @@
 
 import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
 import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 4edc44bf..317a5de8 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -1,12 +1,12 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.domain.info.dto.profile.InnerProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
 import com.atwoz.member.domain.info.profile.YearManager;
-import com.atwoz.member.domain.info.dto.profile.InnerProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/profile/body/dto/BodyUpdateRequest.java
similarity index 87%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/body/dto/BodyUpdateRequest.java
index 8adda7ea..f365ae58 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/body/dto/BodyUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.profile.body;
+package com.atwoz.member.application.info.profile.body.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java b/src/main/java/com/atwoz/member/application/info/profile/body/dto/BodyWriteRequest.java
similarity index 87%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/body/dto/BodyWriteRequest.java
index 39ec9726..62c7d8f3 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/body/BodyWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/body/dto/BodyWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.profile.body;
+package com.atwoz.member.application.info.profile.body.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/profile/dto/ProfileUpdateRequest.java
similarity index 73%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/dto/ProfileUpdateRequest.java
index d39ab1ae..04e7a0e4 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/dto/ProfileUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.atwoz.member.application.info.dto.profile;
+package com.atwoz.member.application.info.profile.dto;
 
-import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationUpdateRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/profile/dto/ProfileWriteRequest.java
similarity index 73%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/dto/ProfileWriteRequest.java
index 0cf8fab2..dd03b21d 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/ProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/dto/ProfileWriteRequest.java
@@ -1,8 +1,8 @@
-package com.atwoz.member.application.info.dto.profile;
+package com.atwoz.member.application.info.profile.dto;
 
-import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/profile/location/dto/LocationUpdateRequest.java
similarity index 81%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/location/dto/LocationUpdateRequest.java
index 37c8f3a2..47ec55f9 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/location/dto/LocationUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.profile.location;
+package com.atwoz.member.application.info.profile.location.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java b/src/main/java/com/atwoz/member/application/info/profile/location/dto/LocationWriteRequest.java
similarity index 81%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/location/dto/LocationWriteRequest.java
index d1639cd2..cae511bd 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/location/LocationWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/location/dto/LocationWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.profile.location;
+package com.atwoz.member.application.info.profile.location.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/profile/position/dto/PositionUpdateRequest.java
similarity index 82%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/position/dto/PositionUpdateRequest.java
index 3985ab04..442900ab 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/position/dto/PositionUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.profile.position;
+package com.atwoz.member.application.info.profile.position.dto;
 
 import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java b/src/main/java/com/atwoz/member/application/info/profile/position/dto/PositionWriteRequest.java
similarity index 82%
rename from src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/position/dto/PositionWriteRequest.java
index 51738c2b..0a6ae9ba 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/profile/position/PositionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/position/dto/PositionWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.profile.position;
+package com.atwoz.member.application.info.profile.position.dto;
 
 import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
diff --git a/src/main/java/com/atwoz/member/application/info/dto/style/StyleUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/style/dto/StyleUpdateRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/style/StyleUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/style/dto/StyleUpdateRequest.java
index baf28506..4e72fb63 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/style/StyleUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/style/dto/StyleUpdateRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.style;
+package com.atwoz.member.application.info.style.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/application/info/dto/style/StyleWriteRequest.java b/src/main/java/com/atwoz/member/application/info/style/dto/StyleWriteRequest.java
similarity index 77%
rename from src/main/java/com/atwoz/member/application/info/dto/style/StyleWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/style/dto/StyleWriteRequest.java
index b4f4d25e..4efce8a9 100644
--- a/src/main/java/com/atwoz/member/application/info/dto/style/StyleWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/style/dto/StyleWriteRequest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info.dto.style;
+package com.atwoz.member.application.info.style.dto;
 
 import jakarta.validation.constraints.NotBlank;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index af2fdd0d..4298c1e5 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.option;
 
-import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
-import com.atwoz.member.domain.info.dto.option.InnerOptionWriteRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
similarity index 80%
rename from src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
index 78943426..5e7ad281 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.option;
+package com.atwoz.member.domain.info.option.dto;
 
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
 
 public record InnerOptionUpdateRequest(
         String smokeName,
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
index 85ad7d19..8c28ac8a 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/option/InnerOptionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionWriteRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.option;
+package com.atwoz.member.domain.info.option.dto;
 
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 
 public record InnerOptionWriteRequest(
         Long memberId,
diff --git a/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java b/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
index 28205142..853caa87 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.option.event;
 
 import com.atwoz.global.event.Event;
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java b/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
index c04c4d1a..febf3902 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.option.event;
 
 import com.atwoz.global.event.Event;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index a60f75c4..75a2b608 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -1,7 +1,10 @@
 package com.atwoz.member.domain.info.profile;
 
-import com.atwoz.member.domain.info.dto.profile.InnerProfileUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.InnerProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.body.Body;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.location.Location;
+import com.atwoz.member.domain.info.profile.position.Position;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
similarity index 90%
rename from src/main/java/com/atwoz/member/domain/info/profile/Body.java
rename to src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
index 8d39cbd8..8923c101 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
@@ -1,7 +1,8 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.body;
 
-import com.atwoz.member.domain.info.dto.profile.body.InnerBodyUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.body.InnerBodyWriteRequest;
+import com.atwoz.member.domain.info.profile.body.dto.InnerBodyUpdateRequest;
+import com.atwoz.member.domain.info.profile.body.dto.InnerBodyWriteRequest;
+import com.atwoz.member.domain.info.profile.YearManager;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import jakarta.persistence.Column;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java b/src/main/java/com/atwoz/member/domain/info/profile/body/Gender.java
similarity index 91%
rename from src/main/java/com/atwoz/member/domain/info/profile/Gender.java
rename to src/main/java/com/atwoz/member/domain/info/profile/body/Gender.java
index 89dda389..84f112e7 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Gender.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/Gender.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.body;
 
 import com.atwoz.member.exception.exceptions.info.profile.body.InvalidGenderException;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java
similarity index 78%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java
index 6bcd0ba1..6f905e96 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.profile.body;
+package com.atwoz.member.domain.info.profile.body.dto;
 
-import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
 import com.atwoz.member.domain.info.profile.YearManager;
 
 public record InnerBodyUpdateRequest(
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java
similarity index 78%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java
index 9214cd17..ed6220b7 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/body/InnerBodyWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.profile.body;
+package com.atwoz.member.domain.info.profile.body.dto;
 
-import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
 import com.atwoz.member.domain.info.profile.YearManager;
 
 public record InnerBodyWriteRequest(
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
similarity index 73%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
index 664fc4d8..1c55ae13 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
@@ -1,9 +1,9 @@
-package com.atwoz.member.domain.info.dto.profile;
+package com.atwoz.member.domain.info.profile.dto;
 
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.body.InnerBodyUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.location.InnerLocationUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.position.InnerPositionUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.domain.info.profile.body.dto.InnerBodyUpdateRequest;
+import com.atwoz.member.domain.info.profile.location.dto.InnerLocationUpdateRequest;
+import com.atwoz.member.domain.info.profile.position.dto.InnerPositionUpdateRequest;
 import com.atwoz.member.domain.info.profile.YearManager;
 
 public record InnerProfileUpdateRequest(
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
similarity index 73%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
index 2cc05ac0..6c3bc136 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/InnerProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
@@ -1,9 +1,9 @@
-package com.atwoz.member.domain.info.dto.profile;
+package com.atwoz.member.domain.info.profile.dto;
 
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.domain.info.dto.profile.body.InnerBodyWriteRequest;
-import com.atwoz.member.domain.info.dto.profile.location.InnerLocationWriteRequest;
-import com.atwoz.member.domain.info.dto.profile.position.InnerPositionWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.body.dto.InnerBodyWriteRequest;
+import com.atwoz.member.domain.info.profile.location.dto.InnerLocationWriteRequest;
+import com.atwoz.member.domain.info.profile.position.dto.InnerPositionWriteRequest;
 import com.atwoz.member.domain.info.profile.YearManager;
 
 public record InnerProfileWriteRequest(
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
index cdff9f11..dc78d505 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.profile.event;
 
 import com.atwoz.global.event.Event;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
index 23b70db0..a1df70a7 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.profile.event;
 
 import com.atwoz.global.event.Event;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Location.java b/src/main/java/com/atwoz/member/domain/info/profile/location/Location.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/info/profile/Location.java
rename to src/main/java/com/atwoz/member/domain/info/profile/location/Location.java
index 35bfcfe4..e19e43ea 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Location.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/location/Location.java
@@ -1,7 +1,7 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.location;
 
-import com.atwoz.member.domain.info.dto.profile.location.InnerLocationUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.location.InnerLocationWriteRequest;
+import com.atwoz.member.domain.info.profile.location.dto.InnerLocationUpdateRequest;
+import com.atwoz.member.domain.info.profile.location.dto.InnerLocationWriteRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/location/dto/InnerLocationUpdateRequest.java
similarity index 70%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/location/dto/InnerLocationUpdateRequest.java
index fc0b526a..8a818858 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/location/dto/InnerLocationUpdateRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.profile.location;
+package com.atwoz.member.domain.info.profile.location.dto;
 
-import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationUpdateRequest;
 
 public record InnerLocationUpdateRequest(
         String city,
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/location/dto/InnerLocationWriteRequest.java
similarity index 69%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/location/dto/InnerLocationWriteRequest.java
index 391b07d9..b493ad5f 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/location/InnerLocationWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/location/dto/InnerLocationWriteRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.profile.location;
+package com.atwoz.member.domain.info.profile.location.dto;
 
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
 
 public record InnerLocationWriteRequest(
         String city,
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Position.java b/src/main/java/com/atwoz/member/domain/info/profile/position/Position.java
similarity index 91%
rename from src/main/java/com/atwoz/member/domain/info/profile/Position.java
rename to src/main/java/com/atwoz/member/domain/info/profile/position/Position.java
index b9185b25..52c698d4 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Position.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/position/Position.java
@@ -1,7 +1,7 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.position;
 
-import com.atwoz.member.domain.info.dto.profile.position.InnerPositionUpdateRequest;
-import com.atwoz.member.domain.info.dto.profile.position.InnerPositionWriteRequest;
+import com.atwoz.member.domain.info.profile.position.dto.InnerPositionUpdateRequest;
+import com.atwoz.member.domain.info.profile.position.dto.InnerPositionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import jakarta.persistence.Embeddable;
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/position/dto/InnerPositionUpdateRequest.java
similarity index 73%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/position/dto/InnerPositionUpdateRequest.java
index f692adb6..710d77ac 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/position/dto/InnerPositionUpdateRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.profile.position;
+package com.atwoz.member.domain.info.profile.position.dto;
 
-import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
 import java.math.BigDecimal;
 
 public record InnerPositionUpdateRequest(
diff --git a/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/position/dto/InnerPositionWriteRequest.java
similarity index 73%
rename from src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/position/dto/InnerPositionWriteRequest.java
index d8dd6a98..37b6c39d 100644
--- a/src/main/java/com/atwoz/member/domain/info/dto/profile/position/InnerPositionWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/position/dto/InnerPositionWriteRequest.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.domain.info.dto.profile.position;
+package com.atwoz.member.domain.info.profile.position.dto;
 
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
 import java.math.BigDecimal;
 
 public record InnerPositionWriteRequest(
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
index 1cbf3b07..be1b102f 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
@@ -5,7 +5,7 @@
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.domain.info.profile.Job;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
index 26e67351..bb1cd120 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.ui.info.dto.profile;
 
-import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.body.Body;
 
 public record BodySearchResponse(
         int age,
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
index 1d83d110..d7ad5dcf 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.ui.info.dto.profile;
 
-import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.location.Location;
 
 public record LocationSearchResponse(
         String city,
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
index 154ada8c..ae89ef33 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.ui.info.dto.profile;
 
-import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.position.Position;
 import java.math.BigDecimal;
 
 public record PositionSearchResponse(
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
index 74344874..ca65fecf 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.ui.info.dto.profile;
 
-import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
 
 public record ProfileSearchResponse(
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index c43a1b09..c533541d 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -8,12 +8,12 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 import com.atwoz.member.application.info.option.OptionService;
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
-import com.atwoz.member.domain.info.dto.option.InnerOptionWriteRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.infrastructure.info.OptionFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index e4251b64..8eed866f 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -8,8 +8,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import com.atwoz.member.application.info.profile.ProfileService;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
diff --git a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
index 75a143bf..d6dcc937 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
@@ -4,7 +4,7 @@
 import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청_내부;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
index aa095878..c8c514b7 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
@@ -3,6 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
+import com.atwoz.member.domain.info.profile.body.Body;
+import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import com.atwoz.member.infrastructure.info.FakeYearManager;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
index 98dd04ea..b016fbbc 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
+import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.exception.exceptions.info.profile.body.InvalidGenderException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
index 1f7ca98c..915b0454 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
+import com.atwoz.member.domain.info.profile.position.Position;
 import com.atwoz.member.exception.exceptions.info.profile.position.LatitudeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.position.LongitudeRangeException;
 import org.junit.jupiter.api.DisplayNameGeneration;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
index f8385132..72fe8680 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -7,6 +7,9 @@
 import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.domain.info.profile.body.Body;
+import com.atwoz.member.domain.info.profile.location.Location;
+import com.atwoz.member.domain.info.profile.position.Position;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
index 4860b34a..2ae818b8 100644
--- a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info;
 
-import com.atwoz.member.domain.info.profile.Body;
-import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.body.Body;
+import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.domain.info.profile.YearManager;
 import com.atwoz.member.infrastructure.info.FakeYearManager;
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
index 4a1fc9c8..d1149316 100644
--- a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info;
 
-import com.atwoz.member.domain.info.profile.Location;
+import com.atwoz.member.domain.info.profile.location.Location;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
index 084de147..ceb33202 100644
--- a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info;
 
-import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.position.Position;
 import java.math.BigDecimal;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java b/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
index 27e7a5e0..4a066fa6 100644
--- a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
@@ -9,10 +9,10 @@
 import static com.atwoz.member.fixture.info.PositionFixture.회원_수정_좌표_생성;
 import static com.atwoz.member.fixture.info.PositionFixture.회원_일반_좌표_생성;
 
-import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.body.Body;
 import com.atwoz.member.domain.info.profile.Job;
-import com.atwoz.member.domain.info.profile.Location;
-import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.location.Location;
+import com.atwoz.member.domain.info.profile.position.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
index be49a044..ee18cc65 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
-import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
+import com.atwoz.member.domain.info.profile.body.Gender;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class BodyRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
index 963bf6c1..05106638 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
@@ -5,8 +5,8 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 
-import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyWriteRequest;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
index e2d14cfc..d15ba8dd 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
@@ -9,16 +9,16 @@
 import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_수정_요청;
 
-import com.atwoz.member.application.info.dto.hobby.HobbyUpdateRequest;
-import com.atwoz.member.application.info.dto.hobby.HobbyWriteRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyUpdateRequest;
+import com.atwoz.member.application.info.hobby.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
+import com.atwoz.member.application.info.style.dto.StyleUpdateRequest;
+import com.atwoz.member.application.info.style.dto.StyleWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
index f3b270aa..d2b1981f 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationUpdateRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
index 810c81e4..e1ea7983 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
@@ -1,13 +1,13 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.option.OptionUpdateRequest;
-import com.atwoz.member.application.info.dto.option.OptionWriteRequest;
+import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
+import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import com.atwoz.member.domain.info.dto.option.InnerOptionUpdateRequest;
+import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
index 53130ef3..eade9a6c 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info.dto.request;
 
-import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
 import java.math.BigDecimal;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
index 69a7b6da..d7f60dcf 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
@@ -7,14 +7,14 @@
 import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_생성_요청;
 import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_수정_요청;
 
-import com.atwoz.member.application.info.dto.profile.ProfileUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.ProfileWriteRequest;
-import com.atwoz.member.application.info.dto.profile.body.BodyUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.body.BodyWriteRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.location.LocationWriteRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionUpdateRequest;
-import com.atwoz.member.application.info.dto.profile.position.PositionWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
+import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationUpdateRequest;
+import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
+import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
 import com.atwoz.member.domain.info.profile.Job;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
index 578e1ccc..459a9686 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
@@ -5,8 +5,8 @@
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.domain.info.style.Style.PURE;
 
-import com.atwoz.member.application.info.dto.style.StyleUpdateRequest;
-import com.atwoz.member.application.info.dto.style.StyleWriteRequest;
+import com.atwoz.member.application.info.style.dto.StyleUpdateRequest;
+import com.atwoz.member.application.info.style.dto.StyleWriteRequest;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
index a61492ab..2c7526ab 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.response;
 
-import com.atwoz.member.domain.info.profile.Gender;
+import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.ui.info.dto.profile.BodySearchResponse;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
index 9c9fbe4a..0a696cb5 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
@@ -3,10 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.domain.info.profile.Body;
+import com.atwoz.member.domain.info.profile.body.Body;
 import com.atwoz.member.domain.info.profile.Job;
-import com.atwoz.member.domain.info.profile.Location;
-import com.atwoz.member.domain.info.profile.Position;
+import com.atwoz.member.domain.info.profile.location.Location;
+import com.atwoz.member.domain.info.profile.position.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.fixture.info.BodyFixture;

From 9be88b77a0b31d8594f36d9412c045792823985a Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 23:01:25 +0900
Subject: [PATCH 208/225] =?UTF-8?q?refactor:=20=EC=9D=B4=EB=B2=A4=ED=8A=B8?=
 =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9C=84=EC=B9=98=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 각 서비스 단위로 이벤트가 관리되도록 패키지 위치 조정
---
 .../member/application/auth/AuthService.java     |  2 +-
 .../auth/event/ValidatedLoginEvent.java          |  2 +-
 .../member/application/info/InfoService.java     | 16 ++++++++--------
 .../info/hobby/HobbyEventHandler.java            |  4 ++--
 .../info/hobby/event/HobbyUpdatedEvent.java      |  2 +-
 .../info/hobby/event/HobbyWroteEvent.java        |  2 +-
 .../info/option/OptionEventHandler.java          |  4 ++--
 .../info/option/event/OptionUpdatedEvent.java    |  2 +-
 .../info/option/event/OptionWroteEvent.java      |  2 +-
 .../info/profile/ProfileEventHandler.java        |  4 ++--
 .../application/info/profile/ProfileService.java |  4 ++--
 .../profile/dto/InnerProfileUpdateRequest.java   |  3 +--
 .../profile/dto/InnerProfileWriteRequest.java    |  3 +--
 .../info/profile/event/ProfileUpdatedEvent.java  |  2 +-
 .../info/profile/event/ProfileWroteEvent.java    |  2 +-
 .../info/style/StyleEventHandler.java            |  4 ++--
 .../info/style/event/StyleUpdatedEvent.java      |  2 +-
 .../info/style/event/StyleWroteEvent.java        |  2 +-
 .../application/member/MemberEventHandler.java   |  2 +-
 .../member/domain/info/profile/Profile.java      |  4 ++--
 .../member/application/info/InfoServiceTest.java | 14 +++++++-------
 21 files changed, 40 insertions(+), 42 deletions(-)
 rename src/main/java/com/atwoz/member/{domain => application}/auth/event/ValidatedLoginEvent.java (83%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/hobby/event/HobbyUpdatedEvent.java (83%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/hobby/event/HobbyWroteEvent.java (83%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/option/event/OptionUpdatedEvent.java (85%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/option/event/OptionWroteEvent.java (85%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/profile/dto/InnerProfileUpdateRequest.java (89%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/profile/dto/InnerProfileWriteRequest.java (89%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/profile/event/ProfileUpdatedEvent.java (85%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/profile/event/ProfileWroteEvent.java (85%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/style/event/StyleUpdatedEvent.java (83%)
 rename src/main/java/com/atwoz/member/{domain => application}/info/style/event/StyleWroteEvent.java (83%)

diff --git a/src/main/java/com/atwoz/member/application/auth/AuthService.java b/src/main/java/com/atwoz/member/application/auth/AuthService.java
index 048cf339..2c61a67a 100644
--- a/src/main/java/com/atwoz/member/application/auth/AuthService.java
+++ b/src/main/java/com/atwoz/member/application/auth/AuthService.java
@@ -2,7 +2,7 @@
 
 import com.atwoz.global.event.Events;
 import com.atwoz.member.application.auth.dto.LoginRequest;
-import com.atwoz.member.domain.auth.event.ValidatedLoginEvent;
+import com.atwoz.member.application.auth.event.ValidatedLoginEvent;
 import com.atwoz.member.domain.auth.TokenProvider;
 import com.atwoz.member.infrastructure.auth.dto.MemberInfoResponse;
 import com.atwoz.member.infrastructure.auth.dto.OAuthProviderRequest;
diff --git a/src/main/java/com/atwoz/member/domain/auth/event/ValidatedLoginEvent.java b/src/main/java/com/atwoz/member/application/auth/event/ValidatedLoginEvent.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/auth/event/ValidatedLoginEvent.java
rename to src/main/java/com/atwoz/member/application/auth/event/ValidatedLoginEvent.java
index 8e29c99e..b3c8023a 100644
--- a/src/main/java/com/atwoz/member/domain/auth/event/ValidatedLoginEvent.java
+++ b/src/main/java/com/atwoz/member/application/auth/event/ValidatedLoginEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.auth.event;
+package com.atwoz.member.application.auth.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 8a5d437f..88d86aec 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -1,14 +1,14 @@
 package com.atwoz.member.application.info;
 
 import com.atwoz.global.event.Events;
-import com.atwoz.member.domain.info.hobby.event.HobbyUpdatedEvent;
-import com.atwoz.member.domain.info.hobby.event.HobbyWroteEvent;
-import com.atwoz.member.domain.info.option.event.OptionUpdatedEvent;
-import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
-import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
-import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
-import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
-import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
+import com.atwoz.member.application.info.hobby.event.HobbyUpdatedEvent;
+import com.atwoz.member.application.info.hobby.event.HobbyWroteEvent;
+import com.atwoz.member.application.info.option.event.OptionUpdatedEvent;
+import com.atwoz.member.application.info.option.event.OptionWroteEvent;
+import com.atwoz.member.application.info.profile.event.ProfileUpdatedEvent;
+import com.atwoz.member.application.info.profile.event.ProfileWroteEvent;
+import com.atwoz.member.application.info.style.event.StyleUpdatedEvent;
+import com.atwoz.member.application.info.style.event.StyleWroteEvent;
 import com.atwoz.member.application.info.hobby.dto.HobbyUpdateRequest;
 import com.atwoz.member.application.info.hobby.dto.HobbyWriteRequest;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
index 539cd1dc..66827c4d 100644
--- a/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/HobbyEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.hobby;
 
-import com.atwoz.member.domain.info.hobby.event.HobbyUpdatedEvent;
-import com.atwoz.member.domain.info.hobby.event.HobbyWroteEvent;
+import com.atwoz.member.application.info.hobby.event.HobbyUpdatedEvent;
+import com.atwoz.member.application.info.hobby.event.HobbyWroteEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyUpdatedEvent.java b/src/main/java/com/atwoz/member/application/info/hobby/event/HobbyUpdatedEvent.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyUpdatedEvent.java
rename to src/main/java/com/atwoz/member/application/info/hobby/event/HobbyUpdatedEvent.java
index 444fbc74..5d21f9a0 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/event/HobbyUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.hobby.event;
+package com.atwoz.member.application.info.hobby.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyWroteEvent.java b/src/main/java/com/atwoz/member/application/info/hobby/event/HobbyWroteEvent.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyWroteEvent.java
rename to src/main/java/com/atwoz/member/application/info/hobby/event/HobbyWroteEvent.java
index 5348fa4e..99c70fb5 100644
--- a/src/main/java/com/atwoz/member/domain/info/hobby/event/HobbyWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/hobby/event/HobbyWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.hobby.event;
+package com.atwoz.member.application.info.hobby.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
index dbe57939..6e2f7a64 100644
--- a/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/option/OptionEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.option;
 
-import com.atwoz.member.domain.info.option.event.OptionUpdatedEvent;
-import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
+import com.atwoz.member.application.info.option.event.OptionUpdatedEvent;
+import com.atwoz.member.application.info.option.event.OptionWroteEvent;
 import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
 import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java b/src/main/java/com/atwoz/member/application/info/option/event/OptionUpdatedEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
rename to src/main/java/com/atwoz/member/application/info/option/event/OptionUpdatedEvent.java
index 853caa87..b737c5e5 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/event/OptionUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/option/event/OptionUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.option.event;
+package com.atwoz.member.application.info.option.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java b/src/main/java/com/atwoz/member/application/info/option/event/OptionWroteEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
rename to src/main/java/com/atwoz/member/application/info/option/event/OptionWroteEvent.java
index febf3902..52a19435 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/event/OptionWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/option/event/OptionWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.option.event;
+package com.atwoz.member.application.info.option.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
index 891c4a32..7468e369 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.profile;
 
-import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
-import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
+import com.atwoz.member.application.info.profile.event.ProfileUpdatedEvent;
+import com.atwoz.member.application.info.profile.event.ProfileWroteEvent;
 import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index 317a5de8..ecd578f3 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -2,11 +2,11 @@
 
 import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
-import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
 import com.atwoz.member.domain.info.profile.YearManager;
-import com.atwoz.member.domain.info.profile.dto.InnerProfileWriteRequest;
+import com.atwoz.member.application.info.profile.dto.InnerProfileWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
similarity index 89%
rename from src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
index 1c55ae13..aa702001 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
@@ -1,6 +1,5 @@
-package com.atwoz.member.domain.info.profile.dto;
+package com.atwoz.member.application.info.profile.dto;
 
-import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyUpdateRequest;
 import com.atwoz.member.domain.info.profile.location.dto.InnerLocationUpdateRequest;
 import com.atwoz.member.domain.info.profile.position.dto.InnerPositionUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
similarity index 89%
rename from src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
rename to src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
index 6c3bc136..59184cdb 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
@@ -1,6 +1,5 @@
-package com.atwoz.member.domain.info.profile.dto;
+package com.atwoz.member.application.info.profile.dto;
 
-import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyWriteRequest;
 import com.atwoz.member.domain.info.profile.location.dto.InnerLocationWriteRequest;
 import com.atwoz.member.domain.info.profile.position.dto.InnerPositionWriteRequest;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java b/src/main/java/com/atwoz/member/application/info/profile/event/ProfileUpdatedEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
rename to src/main/java/com/atwoz/member/application/info/profile/event/ProfileUpdatedEvent.java
index dc78d505..da5a2325 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/event/ProfileUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile.event;
+package com.atwoz.member.application.info.profile.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java b/src/main/java/com/atwoz/member/application/info/profile/event/ProfileWroteEvent.java
similarity index 85%
rename from src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
rename to src/main/java/com/atwoz/member/application/info/profile/event/ProfileWroteEvent.java
index a1df70a7..6d83d96d 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/event/ProfileWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/event/ProfileWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile.event;
+package com.atwoz.member.application.info.profile.event;
 
 import com.atwoz.global.event.Event;
 import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
index 2dbc18a5..6af662df 100644
--- a/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/info/style/StyleEventHandler.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.application.info.style;
 
-import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
-import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
+import com.atwoz.member.application.info.style.event.StyleUpdatedEvent;
+import com.atwoz.member.application.info.style.event.StyleWroteEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/domain/info/style/event/StyleUpdatedEvent.java b/src/main/java/com/atwoz/member/application/info/style/event/StyleUpdatedEvent.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/info/style/event/StyleUpdatedEvent.java
rename to src/main/java/com/atwoz/member/application/info/style/event/StyleUpdatedEvent.java
index 16210950..51d2d30c 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/event/StyleUpdatedEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/style/event/StyleUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.style.event;
+package com.atwoz.member.application.info.style.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/domain/info/style/event/StyleWroteEvent.java b/src/main/java/com/atwoz/member/application/info/style/event/StyleWroteEvent.java
similarity index 83%
rename from src/main/java/com/atwoz/member/domain/info/style/event/StyleWroteEvent.java
rename to src/main/java/com/atwoz/member/application/info/style/event/StyleWroteEvent.java
index 99d468fb..82fcb9a9 100644
--- a/src/main/java/com/atwoz/member/domain/info/style/event/StyleWroteEvent.java
+++ b/src/main/java/com/atwoz/member/application/info/style/event/StyleWroteEvent.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.style.event;
+package com.atwoz.member.application.info.style.event;
 
 import com.atwoz.global.event.Event;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
index 535859e3..8aabd68e 100644
--- a/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
+++ b/src/main/java/com/atwoz/member/application/member/MemberEventHandler.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.application.member;
 
-import com.atwoz.member.domain.auth.event.ValidatedLoginEvent;
+import com.atwoz.member.application.auth.event.ValidatedLoginEvent;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 75a2b608..11a192ff 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.domain.info.profile;
 
 import com.atwoz.member.domain.info.profile.body.Body;
-import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
-import com.atwoz.member.domain.info.profile.dto.InnerProfileWriteRequest;
+import com.atwoz.member.application.info.profile.dto.InnerProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.InnerProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
 import jakarta.persistence.Column;
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 28dc48c2..f37e28a7 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -11,13 +11,13 @@
 import static org.mockito.Mockito.verify;
 
 import com.atwoz.global.event.Events;
-import com.atwoz.member.domain.info.hobby.event.HobbyUpdatedEvent;
-import com.atwoz.member.domain.info.hobby.event.HobbyWroteEvent;
-import com.atwoz.member.domain.info.option.event.OptionWroteEvent;
-import com.atwoz.member.domain.info.profile.event.ProfileUpdatedEvent;
-import com.atwoz.member.domain.info.profile.event.ProfileWroteEvent;
-import com.atwoz.member.domain.info.style.event.StyleUpdatedEvent;
-import com.atwoz.member.domain.info.style.event.StyleWroteEvent;
+import com.atwoz.member.application.info.hobby.event.HobbyUpdatedEvent;
+import com.atwoz.member.application.info.hobby.event.HobbyWroteEvent;
+import com.atwoz.member.application.info.option.event.OptionWroteEvent;
+import com.atwoz.member.application.info.profile.event.ProfileUpdatedEvent;
+import com.atwoz.member.application.info.profile.event.ProfileWroteEvent;
+import com.atwoz.member.application.info.style.event.StyleUpdatedEvent;
+import com.atwoz.member.application.info.style.event.StyleWroteEvent;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;

From a0a1effb6d94a1aaef460a4a0726f8f9190a873c Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Sun, 3 Mar 2024 23:38:11 +0900
Subject: [PATCH 209/225] =?UTF-8?q?refactor:=20=EC=9D=91=EB=8B=B5=20DTO=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 응답 DTO 위치를 인프라로 수정 (만드는 곳에서 관리되도록 수정)
---
 .../com/atwoz/member/application/info/InfoService.java |  2 +-
 .../com/atwoz/member/domain/info/InfoRepository.java   |  2 +-
 .../infrastructure/info/InfoQueryRepository.java       |  8 ++++----
 .../member/infrastructure/info/InfoRepositoryImpl.java |  2 +-
 .../info/dto/InfoSearchResponse.java                   |  8 +++++---
 .../info/dto/ProfileAndOptionSearchResponse.java       |  2 +-
 .../info/hobby}/dto/HobbySearchResponse.java           |  2 +-
 .../info/option/dto}/OptionSearchResponse.java         |  4 ++--
 .../info/profile/body/dto}/BodySearchResponse.java     |  2 +-
 .../info/profile/dto}/ProfileSearchResponse.java       |  7 +++++--
 .../profile/location/dto}/LocationSearchResponse.java  |  2 +-
 .../profile/position/dto}/PositionSearchResponse.java  |  2 +-
 .../info/style}/dto/StyleSearchResponse.java           |  2 +-
 .../java/com/atwoz/member/ui/info/InfoController.java  |  2 +-
 .../atwoz/member/application/info/InfoServiceTest.java |  2 +-
 .../info/dto/response/BodySearchResponseFixture.java   |  2 +-
 .../dto/response/HobbiesSearchResponseFixture.java     |  2 +-
 .../info/dto/response/InfoSearchResponseFixture.java   | 10 +++++-----
 .../dto/response/LocationSearchResponseFixture.java    |  2 +-
 .../info/dto/response/OptionSearchResponseFixture.java |  2 +-
 .../dto/response/PositionSearchResponseFixture.java    |  2 +-
 .../dto/response/ProfileSearchResponseFixture.java     |  8 ++++----
 .../info/dto/response/StylesSearchResponseFixture.java |  2 +-
 .../member/infrastructure/info/InfoFakeRepository.java |  2 +-
 .../ui/info/InfoControllerAcceptanceFixture.java       |  2 +-
 .../atwoz/member/ui/info/InfoControllerWebMvcTest.java |  2 +-
 26 files changed, 45 insertions(+), 40 deletions(-)
 rename src/main/java/com/atwoz/member/{ui => infrastructure}/info/dto/InfoSearchResponse.java (66%)
 rename src/main/java/com/atwoz/member/{ui => infrastructure}/info/dto/ProfileAndOptionSearchResponse.java (94%)
 rename src/main/java/com/atwoz/member/{ui/info => infrastructure/info/hobby}/dto/HobbySearchResponse.java (86%)
 rename src/main/java/com/atwoz/member/{ui/info/dto/option => infrastructure/info/option/dto}/OptionSearchResponse.java (87%)
 rename src/main/java/com/atwoz/member/{ui/info/dto/profile => infrastructure/info/profile/body/dto}/BodySearchResponse.java (83%)
 rename src/main/java/com/atwoz/member/{ui/info/dto/profile => infrastructure/info/profile/dto}/ProfileSearchResponse.java (69%)
 rename src/main/java/com/atwoz/member/{ui/info/dto/profile => infrastructure/info/profile/location/dto}/LocationSearchResponse.java (82%)
 rename src/main/java/com/atwoz/member/{ui/info/dto/profile => infrastructure/info/profile/position/dto}/PositionSearchResponse.java (84%)
 rename src/main/java/com/atwoz/member/{ui/info => infrastructure/info/style}/dto/StyleSearchResponse.java (86%)

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 88d86aec..2ea94fe8 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -17,7 +17,7 @@
 import com.atwoz.member.application.info.style.dto.StyleWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.exception.exceptions.info.InfoNotFoundException;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/atwoz/member/domain/info/InfoRepository.java b/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
index bf7e2975..66e6a47e 100644
--- a/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
+++ b/src/main/java/com/atwoz/member/domain/info/InfoRepository.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info;
 
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import java.util.Optional;
 
 public interface InfoRepository {
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
index e363b49d..e64985bc 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoQueryRepository.java
@@ -5,10 +5,10 @@
 import static com.atwoz.member.domain.info.profile.QProfile.profile;
 import static com.atwoz.member.domain.info.style.QMemberStyle.memberStyle;
 
-import com.atwoz.member.ui.info.dto.HobbySearchResponse;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
-import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
-import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import com.atwoz.member.infrastructure.info.hobby.dto.HobbySearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.ProfileAndOptionSearchResponse;
+import com.atwoz.member.infrastructure.info.style.dto.StyleSearchResponse;
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
index 18788ef0..bc87f97b 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/InfoRepositoryImpl.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.infrastructure.info;
 
 import com.atwoz.member.domain.info.InfoRepository;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import java.util.Optional;
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/dto/InfoSearchResponse.java
similarity index 66%
rename from src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/dto/InfoSearchResponse.java
index 14af6419..ecd6e98d 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/InfoSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/dto/InfoSearchResponse.java
@@ -1,7 +1,9 @@
-package com.atwoz.member.ui.info.dto;
+package com.atwoz.member.infrastructure.info.dto;
 
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import com.atwoz.member.infrastructure.info.hobby.dto.HobbySearchResponse;
+import com.atwoz.member.infrastructure.info.style.dto.StyleSearchResponse;
+import com.atwoz.member.infrastructure.info.option.dto.OptionSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.dto.ProfileSearchResponse;
 import java.util.List;
 
 public record InfoSearchResponse(
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java
similarity index 94%
rename from src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java
index be1b102f..be7635b3 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/ProfileAndOptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto;
+package com.atwoz.member.infrastructure.info.dto;
 
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/dto/HobbySearchResponse.java
similarity index 86%
rename from src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/hobby/dto/HobbySearchResponse.java
index 6a3c6b14..06b16bde 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/HobbySearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/dto/HobbySearchResponse.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto;
+package com.atwoz.member.infrastructure.info.hobby.dto;
 
 import com.atwoz.member.domain.info.hobby.Hobby;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/option/dto/OptionSearchResponse.java
similarity index 87%
rename from src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/option/dto/OptionSearchResponse.java
index 7dd5c447..264cd2ca 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/option/OptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/dto/OptionSearchResponse.java
@@ -1,11 +1,11 @@
-package com.atwoz.member.ui.info.dto.option;
+package com.atwoz.member.infrastructure.info.option.dto;
 
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.ProfileAndOptionSearchResponse;
 
 public record OptionSearchResponse(
         String drink,
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/body/dto/BodySearchResponse.java
similarity index 83%
rename from src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/profile/body/dto/BodySearchResponse.java
index bb1cd120..ce75d4cb 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/BodySearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/body/dto/BodySearchResponse.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto.profile;
+package com.atwoz.member.infrastructure.info.profile.body.dto;
 
 import com.atwoz.member.domain.info.profile.body.Body;
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/dto/ProfileSearchResponse.java
similarity index 69%
rename from src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/profile/dto/ProfileSearchResponse.java
index ca65fecf..96b7140c 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/ProfileSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/dto/ProfileSearchResponse.java
@@ -1,7 +1,10 @@
-package com.atwoz.member.ui.info.dto.profile;
+package com.atwoz.member.infrastructure.info.profile.dto;
 
 import com.atwoz.member.domain.info.profile.body.Gender;
-import com.atwoz.member.ui.info.dto.ProfileAndOptionSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.ProfileAndOptionSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.body.dto.BodySearchResponse;
+import com.atwoz.member.infrastructure.info.profile.location.dto.LocationSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.position.dto.PositionSearchResponse;
 
 public record ProfileSearchResponse(
         BodySearchResponse body,
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/location/dto/LocationSearchResponse.java
similarity index 82%
rename from src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/profile/location/dto/LocationSearchResponse.java
index d7ad5dcf..59030744 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/LocationSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/location/dto/LocationSearchResponse.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto.profile;
+package com.atwoz.member.infrastructure.info.profile.location.dto;
 
 import com.atwoz.member.domain.info.profile.location.Location;
 
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/position/dto/PositionSearchResponse.java
similarity index 84%
rename from src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/profile/position/dto/PositionSearchResponse.java
index ae89ef33..8bdc339c 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/profile/PositionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/position/dto/PositionSearchResponse.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto.profile;
+package com.atwoz.member.infrastructure.info.profile.position.dto;
 
 import com.atwoz.member.domain.info.profile.position.Position;
 import java.math.BigDecimal;
diff --git a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/style/dto/StyleSearchResponse.java
similarity index 86%
rename from src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
rename to src/main/java/com/atwoz/member/infrastructure/info/style/dto/StyleSearchResponse.java
index 6b08a76d..c8bdb28f 100644
--- a/src/main/java/com/atwoz/member/ui/info/dto/StyleSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/dto/StyleSearchResponse.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.ui.info.dto;
+package com.atwoz.member.infrastructure.info.style.dto;
 
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
diff --git a/src/main/java/com/atwoz/member/ui/info/InfoController.java b/src/main/java/com/atwoz/member/ui/info/InfoController.java
index 019d0247..8b46a0db 100644
--- a/src/main/java/com/atwoz/member/ui/info/InfoController.java
+++ b/src/main/java/com/atwoz/member/ui/info/InfoController.java
@@ -4,7 +4,7 @@
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.ui.auth.support.auth.AuthMember;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index f37e28a7..1b2b5d6f 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -22,7 +22,7 @@
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.infrastructure.info.InfoFakeRepository;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
index 2c7526ab..28202b46 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.fixture.info.dto.response;
 
 import com.atwoz.member.domain.info.profile.body.Gender;
-import com.atwoz.member.ui.info.dto.profile.BodySearchResponse;
+import com.atwoz.member.infrastructure.info.profile.body.dto.BodySearchResponse;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class BodySearchResponseFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
index e7da291d..a4af7a16 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
@@ -3,7 +3,7 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 
-import com.atwoz.member.ui.info.dto.HobbySearchResponse;
+import com.atwoz.member.infrastructure.info.hobby.dto.HobbySearchResponse;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
index 8abc6dbe..4a19931a 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
@@ -5,11 +5,11 @@
 import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
 import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
 
-import com.atwoz.member.ui.info.dto.HobbySearchResponse;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
-import com.atwoz.member.ui.info.dto.StyleSearchResponse;
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import com.atwoz.member.infrastructure.info.hobby.dto.HobbySearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.style.dto.StyleSearchResponse;
+import com.atwoz.member.infrastructure.info.option.dto.OptionSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.dto.ProfileSearchResponse;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
index 03a987e0..4aab139d 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.response;
 
-import com.atwoz.member.ui.info.dto.profile.LocationSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.location.dto.LocationSearchResponse;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class LocationSearchResponseFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
index 879cc0fc..c0e12f85 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
@@ -5,7 +5,7 @@
 import com.atwoz.member.domain.info.option.Mbti;
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
-import com.atwoz.member.ui.info.dto.option.OptionSearchResponse;
+import com.atwoz.member.infrastructure.info.option.dto.OptionSearchResponse;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class OptionSearchResponseFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
index ad523a13..b92526a6 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.fixture.info.dto.response;
 
-import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.position.dto.PositionSearchResponse;
 import java.math.BigDecimal;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
index 2035628f..9109b891 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
@@ -5,10 +5,10 @@
 import static com.atwoz.member.fixture.info.dto.response.PositionSearchResponseFixture.회원_좌표_조회_응답;
 
 import com.atwoz.member.domain.info.profile.Job;
-import com.atwoz.member.ui.info.dto.profile.BodySearchResponse;
-import com.atwoz.member.ui.info.dto.profile.LocationSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.PositionSearchResponse;
-import com.atwoz.member.ui.info.dto.profile.ProfileSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.body.dto.BodySearchResponse;
+import com.atwoz.member.infrastructure.info.profile.location.dto.LocationSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.position.dto.PositionSearchResponse;
+import com.atwoz.member.infrastructure.info.profile.dto.ProfileSearchResponse;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileSearchResponseFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
index d96a7d65..55022424 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
@@ -3,7 +3,7 @@
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 
-import com.atwoz.member.ui.info.dto.StyleSearchResponse;
+import com.atwoz.member.infrastructure.info.style.dto.StyleSearchResponse;
 import java.util.List;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
index efbdafe1..5ae42a44 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
@@ -6,7 +6,7 @@
 import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
 
 import com.atwoz.member.domain.info.InfoRepository;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import java.util.Optional;
 
 @SuppressWarnings("NonAsciiCharacters")
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
index 5133069c..004799c8 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
@@ -22,7 +22,7 @@
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.domain.member.MemberRepository;
 import com.atwoz.member.infrastructure.auth.JwtTokenProvider;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.ExtractableResponse;
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index 3577c869..c242c8a0 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -22,7 +22,7 @@
 import com.atwoz.helper.MockBeanInjection;
 import com.atwoz.member.application.info.dto.InfoUpdateRequest;
 import com.atwoz.member.application.info.dto.InfoWriteRequest;
-import com.atwoz.member.ui.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;

From 32a3fe776654fc4b00a4cfed87ad99b5d9a07e29 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 00:59:16 +0900
Subject: [PATCH 210/225] =?UTF-8?q?refactor:=20Fixture=20=EA=B5=AC?=
 =?UTF-8?q?=EC=A1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixture 내부에서도 계층을 나누도록 수정
- 프로덕션 구조와 테스트 구조가 동일하게 관리되도록 수정
---
 .../info/profile/ProfileService.java          |  2 +-
 .../dto/InnerProfileUpdateRequest.java        |  2 +-
 .../profile/dto/InnerProfileWriteRequest.java |  2 +-
 .../member/domain/info/profile/Profile.java   |  1 +
 .../member/domain/info/profile/body/Body.java |  1 -
 .../info/profile/{ => body}/YearManager.java  |  2 +-
 .../body/dto/InnerBodyUpdateRequest.java      |  2 +-
 .../body/dto/InnerBodyWriteRequest.java       |  2 +-
 .../domain/info/profile/{ => job}/Job.java    |  2 +-
 .../dto/ProfileAndOptionSearchResponse.java   |  2 +-
 .../{ => profile/body}/YearManagerImpl.java   |  4 ++--
 .../application/auth/AuthServiceTest.java     |  2 +-
 .../application/auth/OAuth2RequesterTest.java |  2 +-
 .../application/info/InfoServiceTest.java     |  6 +++---
 .../info/MemberHobbyServiceTest.java          |  6 +++---
 .../info/MemberStyleServiceTest.java          |  6 +++---
 .../application/info/OptionServiceTest.java   | 10 +++++-----
 .../application/info/ProfileServiceTest.java  | 14 ++++++-------
 .../member/domain/info/option/OptionTest.java |  4 ++--
 .../member/domain/info/profile/BodyTest.java  |  3 ++-
 .../member/domain/info/profile/JobTest.java   |  1 +
 .../domain/info/profile/ProfileTest.java      | 11 +++++-----
 .../member/domain/member/MemberTest.java      |  2 +-
 .../info}/InfoRequestFixture.java             | 20 +++++++++----------
 .../info/hobby}/HobbiesRequestFixture.java    |  2 +-
 .../info/option}/OptionRequestFixture.java    |  2 +-
 .../info/profile}/ProfileRequestFixture.java  | 16 +++++++--------
 .../profile/body}/BodyRequestFixture.java     |  2 +-
 .../location}/LocationRequestFixture.java     |  2 +-
 .../position}/PositionRequestFixture.java     |  2 +-
 .../info/style}/StylesRequestFixture.java     |  2 +-
 .../info/hobby}/MemberHobbiesFixture.java     |  2 +-
 .../info/option}/OptionFixture.java           |  2 +-
 .../info/profile}/ProfileFixture.java         | 20 +++++++++----------
 .../info/profile/body}/BodyFixture.java       |  6 +++---
 .../info/profile/job}/JobFixture.java         |  4 ++--
 .../profile/location}/LocationFixture.java    |  2 +-
 .../profile/position}/PositionFixture.java    |  2 +-
 .../info/style}/MemberStylesFixture.java      |  2 +-
 .../{ => domain}/member/MemberFixture.java    |  2 +-
 .../auth/OAuthProviderFixture.java            |  2 +-
 .../info}/InfoSearchResponseFixture.java      | 10 +++++-----
 .../hobby}/HobbiesSearchResponseFixture.java  |  2 +-
 .../option}/OptionSearchResponseFixture.java  |  2 +-
 .../ProfileSearchResponseFixture.java         | 10 +++++-----
 .../body}/BodySearchResponseFixture.java      |  2 +-
 .../LocationSearchResponseFixture.java        |  2 +-
 .../PositionSearchResponseFixture.java        |  2 +-
 .../style}/StylesSearchResponseFixture.java   |  2 +-
 .../info/InfoFakeRepository.java              |  8 ++++----
 .../MemberHobbyFakeRepository.java            |  2 +-
 .../MemberHobbyJpaRepositoryTest.java         |  4 ++--
 .../{ => option}/OptionFakeRepository.java    |  2 +-
 .../{ => option}/OptionJpaRepositoryTest.java |  4 ++--
 .../{ => profile}/ProfileFakeRepository.java  |  2 +-
 .../ProfileJpaRepositoryTest.java             | 15 +++++++-------
 .../{ => profile/body}/FakeYearManager.java   |  4 ++--
 .../MemberStyleFakeRepository.java            |  2 +-
 .../MemberStyleJpaRepositoryTest.java         |  4 ++--
 .../member/MemberJpaRepositoryTest.java       |  2 +-
 .../ui/auth/AuthControllerWebMvcTest.java     |  2 +-
 .../info/InfoControllerAcceptanceFixture.java | 18 ++++++++---------
 .../ui/info/InfoControllerAcceptanceTest.java |  4 ++--
 .../ui/info/InfoControllerWebMvcTest.java     |  6 +++---
 64 files changed, 147 insertions(+), 145 deletions(-)
 rename src/main/java/com/atwoz/member/domain/info/profile/{ => body}/YearManager.java (54%)
 rename src/main/java/com/atwoz/member/domain/info/profile/{ => job}/Job.java (96%)
 rename src/main/java/com/atwoz/member/infrastructure/info/{ => profile/body}/YearManagerImpl.java (70%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info}/InfoRequestFixture.java (67%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/hobby}/HobbiesRequestFixture.java (94%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/option}/OptionRequestFixture.java (97%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/profile}/ProfileRequestFixture.java (68%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/profile/body}/BodyRequestFixture.java (92%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/profile/location}/LocationRequestFixture.java (90%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/profile/position}/PositionRequestFixture.java (92%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/request => application/info/style}/StylesRequestFixture.java (94%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/hobby}/MemberHobbiesFixture.java (93%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/option}/OptionFixture.java (95%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/profile}/ProfileFixture.java (52%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/profile/body}/BodyFixture.java (79%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/profile/job}/JobFixture.java (69%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/profile/location}/LocationFixture.java (88%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/profile/position}/PositionFixture.java (90%)
 rename src/test/java/com/atwoz/member/fixture/{info => domain/info/style}/MemberStylesFixture.java (93%)
 rename src/test/java/com/atwoz/member/fixture/{ => domain}/member/MemberFixture.java (92%)
 rename src/test/java/com/atwoz/member/fixture/{ => infrastructure}/auth/OAuthProviderFixture.java (90%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info}/InfoSearchResponseFixture.java (64%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/hobby}/HobbiesSearchResponseFixture.java (90%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/option}/OptionSearchResponseFixture.java (93%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/profile}/ProfileSearchResponseFixture.java (66%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/profile/body}/BodySearchResponseFixture.java (87%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/profile/location}/LocationSearchResponseFixture.java (84%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/profile/position}/PositionSearchResponseFixture.java (86%)
 rename src/test/java/com/atwoz/member/fixture/{info/dto/response => infrastructure/info/style}/StylesSearchResponseFixture.java (90%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => hobby}/MemberHobbyFakeRepository.java (96%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => hobby}/MemberHobbyJpaRepositoryTest.java (96%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => option}/OptionFakeRepository.java (94%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => option}/OptionJpaRepositoryTest.java (96%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => profile}/ProfileFakeRepository.java (94%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => profile}/ProfileJpaRepositoryTest.java (86%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => profile/body}/FakeYearManager.java (59%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => style}/MemberStyleFakeRepository.java (96%)
 rename src/test/java/com/atwoz/member/infrastructure/info/{ => style}/MemberStyleJpaRepositoryTest.java (96%)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index ecd578f3..b05f60ea 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -5,7 +5,7 @@
 import com.atwoz.member.application.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 import com.atwoz.member.application.info.profile.dto.InnerProfileWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
index aa702001..ed81997b 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
@@ -3,7 +3,7 @@
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyUpdateRequest;
 import com.atwoz.member.domain.info.profile.location.dto.InnerLocationUpdateRequest;
 import com.atwoz.member.domain.info.profile.position.dto.InnerPositionUpdateRequest;
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 
 public record InnerProfileUpdateRequest(
         Long memberId,
diff --git a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
index 59184cdb..546d626e 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
@@ -3,7 +3,7 @@
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyWriteRequest;
 import com.atwoz.member.domain.info.profile.location.dto.InnerLocationWriteRequest;
 import com.atwoz.member.domain.info.profile.position.dto.InnerPositionWriteRequest;
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 
 public record InnerProfileWriteRequest(
         Long memberId,
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 11a192ff..6867685c 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -3,6 +3,7 @@
 import com.atwoz.member.domain.info.profile.body.Body;
 import com.atwoz.member.application.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.application.info.profile.dto.InnerProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
 import jakarta.persistence.Column;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
index 8923c101..ae6e2ef2 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
@@ -2,7 +2,6 @@
 
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyUpdateRequest;
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyWriteRequest;
-import com.atwoz.member.domain.info.profile.YearManager;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
 import jakarta.persistence.Column;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/YearManager.java b/src/main/java/com/atwoz/member/domain/info/profile/body/YearManager.java
similarity index 54%
rename from src/main/java/com/atwoz/member/domain/info/profile/YearManager.java
rename to src/main/java/com/atwoz/member/domain/info/profile/body/YearManager.java
index e9a2b302..7555a6c7 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/YearManager.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/YearManager.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.body;
 
 public interface YearManager {
 
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java
index 6f905e96..3a5d9354 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyUpdateRequest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.profile.body.dto;
 
 import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 
 public record InnerBodyUpdateRequest(
         YearManager yearManager,
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java
index ed6220b7..140e5d61 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/dto/InnerBodyWriteRequest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.profile.body.dto;
 
 import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 
 public record InnerBodyWriteRequest(
         YearManager yearManager,
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/job/Job.java
similarity index 96%
rename from src/main/java/com/atwoz/member/domain/info/profile/Job.java
rename to src/main/java/com/atwoz/member/domain/info/profile/job/Job.java
index ba07e2c2..4b652618 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/job/Job.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.job;
 
 import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
 import lombok.Getter;
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java b/src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java
index be7635b3..029d0c4c 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/dto/ProfileAndOptionSearchResponse.java
@@ -6,7 +6,7 @@
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
 import com.atwoz.member.domain.info.profile.body.Gender;
-import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.job.Job;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/YearManagerImpl.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/body/YearManagerImpl.java
similarity index 70%
rename from src/main/java/com/atwoz/member/infrastructure/info/YearManagerImpl.java
rename to src/main/java/com/atwoz/member/infrastructure/info/profile/body/YearManagerImpl.java
index cdfc5a5b..12afdeb5 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/YearManagerImpl.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/body/YearManagerImpl.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.profile.body;
 
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 
diff --git a/src/test/java/com/atwoz/member/application/auth/AuthServiceTest.java b/src/test/java/com/atwoz/member/application/auth/AuthServiceTest.java
index 13e2ff1b..69c8b378 100644
--- a/src/test/java/com/atwoz/member/application/auth/AuthServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/auth/AuthServiceTest.java
@@ -12,7 +12,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static com.atwoz.member.fixture.auth.OAuthProviderFixture.인증_기관_생성;
+import static com.atwoz.member.fixture.infrastructure.auth.OAuthProviderFixture.인증_기관_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.when;
diff --git a/src/test/java/com/atwoz/member/application/auth/OAuth2RequesterTest.java b/src/test/java/com/atwoz/member/application/auth/OAuth2RequesterTest.java
index 46b011b3..841a0b25 100644
--- a/src/test/java/com/atwoz/member/application/auth/OAuth2RequesterTest.java
+++ b/src/test/java/com/atwoz/member/application/auth/OAuth2RequesterTest.java
@@ -13,7 +13,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static com.atwoz.member.fixture.auth.OAuthProviderFixture.인증_기관_생성;
+import static com.atwoz.member.fixture.infrastructure.auth.OAuthProviderFixture.인증_기관_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.anyString;
diff --git a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
index 1b2b5d6f..06b146ad 100644
--- a/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/InfoServiceTest.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
+import static com.atwoz.member.fixture.application.info.InfoRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.application.info.InfoRequestFixture.회원_정보_수정_요청;
+import static com.atwoz.member.fixture.infrastructure.info.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
index e210658b..a585b66c 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
@@ -4,15 +4,15 @@
 import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
-import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_수정_취미_생성;
-import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_일반_취미_생성;
+import static com.atwoz.member.fixture.domain.info.hobby.MemberHobbiesFixture.회원_수정_취미_생성;
+import static com.atwoz.member.fixture.domain.info.hobby.MemberHobbiesFixture.회원_일반_취미_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.hobby.MemberHobbyService;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
-import com.atwoz.member.infrastructure.info.MemberHobbyFakeRepository;
+import com.atwoz.member.infrastructure.info.hobby.MemberHobbyFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
index ee1f573d..2aeac78b 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
@@ -4,15 +4,15 @@
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.domain.info.style.Style.PURE;
-import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_수정_스타일_생성;
-import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
+import static com.atwoz.member.fixture.domain.info.style.MemberStylesFixture.회원_수정_스타일_생성;
+import static com.atwoz.member.fixture.domain.info.style.MemberStylesFixture.회원_일반_스타일_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.application.info.style.MemberStyleService;
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.MemberStyleRepository;
-import com.atwoz.member.infrastructure.info.MemberStyleFakeRepository;
+import com.atwoz.member.infrastructure.info.style.MemberStyleFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
index c533541d..97db6816 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.OptionFixture.회원_수정_옵션_생성;
-import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
-import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_수정_옵션_생성;
+import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_일반_옵션_생성;
+import static com.atwoz.member.fixture.application.info.option.OptionRequestFixture.회원_옵션_생성_요청;
+import static com.atwoz.member.fixture.application.info.option.OptionRequestFixture.회원_옵션_수정_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -15,7 +15,7 @@
 import com.atwoz.member.domain.info.option.OptionRepository;
 import com.atwoz.member.domain.info.option.dto.InnerOptionWriteRequest;
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
-import com.atwoz.member.infrastructure.info.OptionFakeRepository;
+import com.atwoz.member.infrastructure.info.option.OptionFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
index 8eed866f..1d7e45f2 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.application.info;
 
-import static com.atwoz.member.fixture.info.ProfileFixture.회원_수정_프로필_생성;
-import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
-import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_수정_프로필_생성;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
+import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_생성_요청;
+import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_수정_요청;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -13,10 +13,10 @@
 import com.atwoz.member.application.info.profile.ProfileService;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
-import com.atwoz.member.infrastructure.info.FakeYearManager;
-import com.atwoz.member.infrastructure.info.ProfileFakeRepository;
+import com.atwoz.member.infrastructure.info.profile.body.FakeYearManager;
+import com.atwoz.member.infrastructure.info.profile.ProfileFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
index d6dcc937..70fa7c08 100644
--- a/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/option/OptionTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.domain.info.option;
 
-import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
-import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청_내부;
+import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_일반_옵션_생성;
+import static com.atwoz.member.fixture.application.info.option.OptionRequestFixture.회원_옵션_수정_요청_내부;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.domain.info.option.dto.InnerOptionUpdateRequest;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
index c8c514b7..a6d35bb0 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
@@ -5,9 +5,10 @@
 
 import com.atwoz.member.domain.info.profile.body.Body;
 import com.atwoz.member.domain.info.profile.body.Gender;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.HeightRangeException;
-import com.atwoz.member.infrastructure.info.FakeYearManager;
+import com.atwoz.member.infrastructure.info.profile.body.FakeYearManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
index 0939744f..2e487c79 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
+import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
index 72fe8680..e082bcd5 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -1,13 +1,14 @@
 package com.atwoz.member.domain.info.profile;
 
-import static com.atwoz.member.fixture.info.BodyFixture.회원_수정_body_생성;
-import static com.atwoz.member.fixture.info.JobFixture.회원_수정_직업_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.회원_수정_위치_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.회원_수정_좌표_생성;
-import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
+import static com.atwoz.member.fixture.domain.info.profile.body.BodyFixture.회원_수정_body_생성;
+import static com.atwoz.member.fixture.domain.info.profile.job.JobFixture.회원_수정_직업_생성;
+import static com.atwoz.member.fixture.domain.info.profile.location.LocationFixture.회원_수정_위치_생성;
+import static com.atwoz.member.fixture.domain.info.profile.position.PositionFixture.회원_수정_좌표_생성;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.domain.info.profile.body.Body;
+import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
 import org.junit.jupiter.api.DisplayNameGeneration;
diff --git a/src/test/java/com/atwoz/member/domain/member/MemberTest.java b/src/test/java/com/atwoz/member/domain/member/MemberTest.java
index 924f4780..d15f144f 100644
--- a/src/test/java/com/atwoz/member/domain/member/MemberTest.java
+++ b/src/test/java/com/atwoz/member/domain/member/MemberTest.java
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 
-import static com.atwoz.member.fixture.member.MemberFixture.어드민_유저_생성;
+import static com.atwoz.member.fixture.domain.member.MemberFixture.어드민_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/InfoRequestFixture.java
similarity index 67%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/InfoRequestFixture.java
index d15ba8dd..0a4fd333 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/InfoRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/InfoRequestFixture.java
@@ -1,13 +1,13 @@
-package com.atwoz.member.fixture.info.dto.request;
-
-import static com.atwoz.member.fixture.info.dto.request.HobbiesRequestFixture.회원_취미_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.HobbiesRequestFixture.회원_취미_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.OptionRequestFixture.회원_옵션_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.ProfileRequestFixture.회원_프로필_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.StylesRequestFixture.회원_스타일_수정_요청;
+package com.atwoz.member.fixture.application.info;
+
+import static com.atwoz.member.fixture.application.info.hobby.HobbiesRequestFixture.회원_취미_생성_요청;
+import static com.atwoz.member.fixture.application.info.hobby.HobbiesRequestFixture.회원_취미_수정_요청;
+import static com.atwoz.member.fixture.application.info.option.OptionRequestFixture.회원_옵션_수정_요청;
+import static com.atwoz.member.fixture.application.info.option.OptionRequestFixture.회원_옵션_생성_요청;
+import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_생성_요청;
+import static com.atwoz.member.fixture.application.info.style.StylesRequestFixture.회원_스타일_생성_요청;
+import static com.atwoz.member.fixture.application.info.style.StylesRequestFixture.회원_스타일_수정_요청;
 
 import com.atwoz.member.application.info.hobby.dto.HobbyUpdateRequest;
 import com.atwoz.member.application.info.hobby.dto.HobbyWriteRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/hobby/HobbiesRequestFixture.java
similarity index 94%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/hobby/HobbiesRequestFixture.java
index 05106638..c0c61a30 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/HobbiesRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/hobby/HobbiesRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.hobby;
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
 import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/option/OptionRequestFixture.java
similarity index 97%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/option/OptionRequestFixture.java
index e1ea7983..b492b613 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/OptionRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/option/OptionRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.option;
 
 import com.atwoz.member.application.info.option.dto.OptionUpdateRequest;
 import com.atwoz.member.application.info.option.dto.OptionWriteRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java
similarity index 68%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java
index d7f60dcf..828e6624 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/ProfileRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java
@@ -1,11 +1,11 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.profile;
 
-import static com.atwoz.member.fixture.info.dto.request.BodyRequestFixture.회원_신체_정보_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.BodyRequestFixture.회원_신체_정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.LocationRequestFixture.회원_위치_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.LocationRequestFixture.회원_위치_수정_요청;
-import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.PositionRequestFixture.회원_좌표_수정_요청;
+import static com.atwoz.member.fixture.application.info.profile.body.BodyRequestFixture.회원_신체_정보_생성_요청;
+import static com.atwoz.member.fixture.application.info.profile.body.BodyRequestFixture.회원_신체_정보_수정_요청;
+import static com.atwoz.member.fixture.application.info.profile.location.LocationRequestFixture.회원_위치_생성_요청;
+import static com.atwoz.member.fixture.application.info.profile.location.LocationRequestFixture.회원_위치_수정_요청;
+import static com.atwoz.member.fixture.application.info.profile.position.PositionRequestFixture.회원_좌표_생성_요청;
+import static com.atwoz.member.fixture.application.info.profile.position.PositionRequestFixture.회원_좌표_수정_요청;
 
 import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
@@ -15,7 +15,7 @@
 import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
 import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
 import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
-import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.job.Job;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileRequestFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/profile/body/BodyRequestFixture.java
similarity index 92%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/profile/body/BodyRequestFixture.java
index ee18cc65..c2815199 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/BodyRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/profile/body/BodyRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.profile.body;
 
 import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
 import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/profile/location/LocationRequestFixture.java
similarity index 90%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/profile/location/LocationRequestFixture.java
index d2b1981f..a4148fa5 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/LocationRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/profile/location/LocationRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.profile.location;
 
 import com.atwoz.member.application.info.profile.location.dto.LocationUpdateRequest;
 import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/profile/position/PositionRequestFixture.java
similarity index 92%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/profile/position/PositionRequestFixture.java
index eade9a6c..250ee591 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/PositionRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/profile/position/PositionRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.profile.position;
 
 import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
 import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/style/StylesRequestFixture.java
similarity index 94%
rename from src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
rename to src/test/java/com/atwoz/member/fixture/application/info/style/StylesRequestFixture.java
index 459a9686..6537f578 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/request/StylesRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/style/StylesRequestFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.request;
+package com.atwoz.member.fixture.application.info.style;
 
 import static com.atwoz.member.domain.info.style.Style.FASHION;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
diff --git a/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/hobby/MemberHobbiesFixture.java
similarity index 93%
rename from src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/hobby/MemberHobbiesFixture.java
index c061028e..48356987 100644
--- a/src/test/java/com/atwoz/member/fixture/info/MemberHobbiesFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/hobby/MemberHobbiesFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.hobby;
 
 import com.atwoz.member.domain.info.hobby.Hobby;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
diff --git a/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/option/OptionFixture.java
similarity index 95%
rename from src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/option/OptionFixture.java
index f0bcb8c3..a1ad4bcd 100644
--- a/src/test/java/com/atwoz/member/fixture/info/OptionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/option/OptionFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.option;
 
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
diff --git a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/profile/ProfileFixture.java
similarity index 52%
rename from src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/profile/ProfileFixture.java
index 4a066fa6..9415a961 100644
--- a/src/test/java/com/atwoz/member/fixture/info/ProfileFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/profile/ProfileFixture.java
@@ -1,16 +1,16 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.profile;
 
-import static com.atwoz.member.fixture.info.BodyFixture.회원_수정_body_생성;
-import static com.atwoz.member.fixture.info.BodyFixture.회원_일반_body_생성;
-import static com.atwoz.member.fixture.info.JobFixture.회원_수정_직업_생성;
-import static com.atwoz.member.fixture.info.JobFixture.회원_일반_직업_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.회원_수정_위치_생성;
-import static com.atwoz.member.fixture.info.LocationFixture.회원_일반_위치_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.회원_수정_좌표_생성;
-import static com.atwoz.member.fixture.info.PositionFixture.회원_일반_좌표_생성;
+import static com.atwoz.member.fixture.domain.info.profile.body.BodyFixture.회원_수정_body_생성;
+import static com.atwoz.member.fixture.domain.info.profile.body.BodyFixture.회원_일반_body_생성;
+import static com.atwoz.member.fixture.domain.info.profile.job.JobFixture.회원_수정_직업_생성;
+import static com.atwoz.member.fixture.domain.info.profile.job.JobFixture.회원_일반_직업_생성;
+import static com.atwoz.member.fixture.domain.info.profile.location.LocationFixture.회원_수정_위치_생성;
+import static com.atwoz.member.fixture.domain.info.profile.location.LocationFixture.회원_일반_위치_생성;
+import static com.atwoz.member.fixture.domain.info.profile.position.PositionFixture.회원_수정_좌표_생성;
+import static com.atwoz.member.fixture.domain.info.profile.position.PositionFixture.회원_일반_좌표_생성;
 
 import com.atwoz.member.domain.info.profile.body.Body;
-import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
 import com.atwoz.member.domain.info.profile.Profile;
diff --git a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/profile/body/BodyFixture.java
similarity index 79%
rename from src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/profile/body/BodyFixture.java
index 2ae818b8..35f44d12 100644
--- a/src/test/java/com/atwoz/member/fixture/info/BodyFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/profile/body/BodyFixture.java
@@ -1,9 +1,9 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.profile.body;
 
 import com.atwoz.member.domain.info.profile.body.Body;
 import com.atwoz.member.domain.info.profile.body.Gender;
-import com.atwoz.member.domain.info.profile.YearManager;
-import com.atwoz.member.infrastructure.info.FakeYearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
+import com.atwoz.member.infrastructure.info.profile.body.FakeYearManager;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class BodyFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/profile/job/JobFixture.java
similarity index 69%
rename from src/test/java/com/atwoz/member/fixture/info/JobFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/profile/job/JobFixture.java
index f16ee8b7..1031cc8b 100644
--- a/src/test/java/com/atwoz/member/fixture/info/JobFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/profile/job/JobFixture.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.profile.job;
 
-import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.job.Job;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class JobFixture {
diff --git a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/profile/location/LocationFixture.java
similarity index 88%
rename from src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/profile/location/LocationFixture.java
index d1149316..5eb65b4e 100644
--- a/src/test/java/com/atwoz/member/fixture/info/LocationFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/profile/location/LocationFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.profile.location;
 
 import com.atwoz.member.domain.info.profile.location.Location;
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/profile/position/PositionFixture.java
similarity index 90%
rename from src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/profile/position/PositionFixture.java
index ceb33202..723b9697 100644
--- a/src/test/java/com/atwoz/member/fixture/info/PositionFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/profile/position/PositionFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.profile.position;
 
 import com.atwoz.member.domain.info.profile.position.Position;
 import java.math.BigDecimal;
diff --git a/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java b/src/test/java/com/atwoz/member/fixture/domain/info/style/MemberStylesFixture.java
similarity index 93%
rename from src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/info/style/MemberStylesFixture.java
index fae79af3..035c7f91 100644
--- a/src/test/java/com/atwoz/member/fixture/info/MemberStylesFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/info/style/MemberStylesFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info;
+package com.atwoz.member.fixture.domain.info.style;
 
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
diff --git a/src/test/java/com/atwoz/member/fixture/member/MemberFixture.java b/src/test/java/com/atwoz/member/fixture/domain/member/MemberFixture.java
similarity index 92%
rename from src/test/java/com/atwoz/member/fixture/member/MemberFixture.java
rename to src/test/java/com/atwoz/member/fixture/domain/member/MemberFixture.java
index 468c35ed..eb0a1fd7 100644
--- a/src/test/java/com/atwoz/member/fixture/member/MemberFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/domain/member/MemberFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.member;
+package com.atwoz.member.fixture.domain.member;
 
 import com.atwoz.member.domain.member.Member;
 import com.atwoz.member.domain.member.MemberRole;
diff --git a/src/test/java/com/atwoz/member/fixture/auth/OAuthProviderFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/auth/OAuthProviderFixture.java
similarity index 90%
rename from src/test/java/com/atwoz/member/fixture/auth/OAuthProviderFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/auth/OAuthProviderFixture.java
index e0303ced..dd76fc1e 100644
--- a/src/test/java/com/atwoz/member/fixture/auth/OAuthProviderFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/auth/OAuthProviderFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.auth;
+package com.atwoz.member.fixture.infrastructure.auth;
 
 import com.atwoz.member.infrastructure.auth.dto.MemberInfoKeyWordRequest;
 import com.atwoz.member.infrastructure.auth.dto.OAuthProviderRequest;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/InfoSearchResponseFixture.java
similarity index 64%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/InfoSearchResponseFixture.java
index 4a19931a..1b3c64e1 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/InfoSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/InfoSearchResponseFixture.java
@@ -1,9 +1,9 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info;
 
-import static com.atwoz.member.fixture.info.dto.response.HobbiesSearchResponseFixture.회원_취미_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.hobby.HobbiesSearchResponseFixture.회원_취미_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.option.OptionSearchResponseFixture.회원_옵션_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.profile.ProfileSearchResponseFixture.회원_프로필_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.style.StylesSearchResponseFixture.회원_스타일_조회_응답;
 
 import com.atwoz.member.infrastructure.info.hobby.dto.HobbySearchResponse;
 import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/hobby/HobbiesSearchResponseFixture.java
similarity index 90%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/hobby/HobbiesSearchResponseFixture.java
index a4af7a16..525a07ba 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/HobbiesSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/hobby/HobbiesSearchResponseFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.hobby;
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/option/OptionSearchResponseFixture.java
similarity index 93%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/option/OptionSearchResponseFixture.java
index c0e12f85..bef3f428 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/OptionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/option/OptionSearchResponseFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.option;
 
 import com.atwoz.member.domain.info.option.Drink;
 import com.atwoz.member.domain.info.option.Graduate;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/ProfileSearchResponseFixture.java
similarity index 66%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/ProfileSearchResponseFixture.java
index 9109b891..1a6557a4 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/ProfileSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/ProfileSearchResponseFixture.java
@@ -1,10 +1,10 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.profile;
 
-import static com.atwoz.member.fixture.info.dto.response.BodySearchResponseFixture.회원_신체_정보_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.LocationSearchResponseFixture.회원_위치_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.PositionSearchResponseFixture.회원_좌표_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.profile.body.BodySearchResponseFixture.회원_신체_정보_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.profile.location.LocationSearchResponseFixture.회원_위치_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.profile.position.PositionSearchResponseFixture.회원_좌표_조회_응답;
 
-import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.infrastructure.info.profile.body.dto.BodySearchResponse;
 import com.atwoz.member.infrastructure.info.profile.location.dto.LocationSearchResponse;
 import com.atwoz.member.infrastructure.info.profile.position.dto.PositionSearchResponse;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/body/BodySearchResponseFixture.java
similarity index 87%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/body/BodySearchResponseFixture.java
index 28202b46..d23dec4c 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/BodySearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/body/BodySearchResponseFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.profile.body;
 
 import com.atwoz.member.domain.info.profile.body.Gender;
 import com.atwoz.member.infrastructure.info.profile.body.dto.BodySearchResponse;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/location/LocationSearchResponseFixture.java
similarity index 84%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/location/LocationSearchResponseFixture.java
index 4aab139d..c30b6a6d 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/LocationSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/location/LocationSearchResponseFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.profile.location;
 
 import com.atwoz.member.infrastructure.info.profile.location.dto.LocationSearchResponse;
 
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/position/PositionSearchResponseFixture.java
similarity index 86%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/position/PositionSearchResponseFixture.java
index b92526a6..f85ee50c 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/PositionSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/profile/position/PositionSearchResponseFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.profile.position;
 
 import com.atwoz.member.infrastructure.info.profile.position.dto.PositionSearchResponse;
 import java.math.BigDecimal;
diff --git a/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java b/src/test/java/com/atwoz/member/fixture/infrastructure/info/style/StylesSearchResponseFixture.java
similarity index 90%
rename from src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
rename to src/test/java/com/atwoz/member/fixture/infrastructure/info/style/StylesSearchResponseFixture.java
index 55022424..10a886ae 100644
--- a/src/test/java/com/atwoz/member/fixture/info/dto/response/StylesSearchResponseFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/infrastructure/info/style/StylesSearchResponseFixture.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.fixture.info.dto.response;
+package com.atwoz.member.fixture.infrastructure.info.style;
 
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
index 5ae42a44..16320e08 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/InfoFakeRepository.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.infrastructure.info;
 
-import static com.atwoz.member.fixture.info.dto.response.HobbiesSearchResponseFixture.회원_취미_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.hobby.HobbiesSearchResponseFixture.회원_취미_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.option.OptionSearchResponseFixture.회원_옵션_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.profile.ProfileSearchResponseFixture.회원_프로필_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.style.StylesSearchResponseFixture.회원_스타일_조회_응답;
 
 import com.atwoz.member.domain.info.InfoRepository;
 import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyFakeRepository.java
similarity index 96%
rename from src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
rename to src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyFakeRepository.java
index 70143655..5b6b8564 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyFakeRepository.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.hobby;
 
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java
similarity index 96%
rename from src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java
index 79d84189..832a9574 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberHobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.hobby;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -6,7 +6,7 @@
 import com.atwoz.member.domain.info.hobby.Hobby;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.fixture.domain.member.MemberFixture;
 import com.atwoz.member.infrastructure.info.hobby.MemberHobbyJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/option/OptionFakeRepository.java
similarity index 94%
rename from src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java
rename to src/test/java/com/atwoz/member/infrastructure/info/option/OptionFakeRepository.java
index b943c764..ddbfa9e1 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/OptionFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/option/OptionFakeRepository.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.option;
 
 import com.atwoz.member.domain.info.option.Option;
 import com.atwoz.member.domain.info.option.OptionRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java
similarity index 96%
rename from src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java
index ae1a3a56..60f07b3c 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/OptionJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.option;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -10,7 +10,7 @@
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.fixture.domain.member.MemberFixture;
 import com.atwoz.member.infrastructure.info.option.OptionJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileFakeRepository.java
similarity index 94%
rename from src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java
rename to src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileFakeRepository.java
index 87fecae8..f399dd77 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/ProfileFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileFakeRepository.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.profile;
 
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java
similarity index 86%
rename from src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java
index 0a696cb5..197d84f2 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/ProfileJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java
@@ -1,20 +1,19 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.profile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.domain.info.profile.body.Body;
-import com.atwoz.member.domain.info.profile.Job;
+import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.info.BodyFixture;
-import com.atwoz.member.fixture.info.JobFixture;
-import com.atwoz.member.fixture.info.LocationFixture;
-import com.atwoz.member.fixture.info.PositionFixture;
-import com.atwoz.member.fixture.member.MemberFixture;
-import com.atwoz.member.infrastructure.info.profile.ProfileJpaRepository;
+import com.atwoz.member.fixture.domain.info.profile.body.BodyFixture;
+import com.atwoz.member.fixture.domain.info.profile.job.JobFixture;
+import com.atwoz.member.fixture.domain.info.profile.location.LocationFixture;
+import com.atwoz.member.fixture.domain.info.profile.position.PositionFixture;
+import com.atwoz.member.fixture.domain.member.MemberFixture;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/FakeYearManager.java b/src/test/java/com/atwoz/member/infrastructure/info/profile/body/FakeYearManager.java
similarity index 59%
rename from src/test/java/com/atwoz/member/infrastructure/info/FakeYearManager.java
rename to src/test/java/com/atwoz/member/infrastructure/info/profile/body/FakeYearManager.java
index 1eb26538..948342b4 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/FakeYearManager.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/profile/body/FakeYearManager.java
@@ -1,6 +1,6 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.profile.body;
 
-import com.atwoz.member.domain.info.profile.YearManager;
+import com.atwoz.member.domain.info.profile.body.YearManager;
 
 public class FakeYearManager implements YearManager {
 
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java b/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleFakeRepository.java
similarity index 96%
rename from src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
rename to src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleFakeRepository.java
index ca5f85f8..1e725b03 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleFakeRepository.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleFakeRepository.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.style;
 
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.MemberStyleRepository;
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java
similarity index 96%
rename from src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
rename to src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java
index 2a424143..abda9e76 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/MemberStyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.infrastructure.info;
+package com.atwoz.member.infrastructure.info.style;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
@@ -6,7 +6,7 @@
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.member.MemberFixture;
+import com.atwoz.member.fixture.domain.member.MemberFixture;
 import com.atwoz.member.infrastructure.info.style.MemberStyleJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/atwoz/member/infrastructure/member/MemberJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/member/MemberJpaRepositoryTest.java
index 21f64693..00641b54 100644
--- a/src/test/java/com/atwoz/member/infrastructure/member/MemberJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/member/MemberJpaRepositoryTest.java
@@ -12,7 +12,7 @@
 
 import java.util.Optional;
 
-import static com.atwoz.member.fixture.member.MemberFixture.일반_유저_생성;
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
diff --git a/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
index 8e725850..99f16507 100644
--- a/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/auth/AuthControllerWebMvcTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.ui.auth;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.fixture.auth.OAuthProviderFixture.인증_기관_생성;
+import static com.atwoz.member.fixture.infrastructure.auth.OAuthProviderFixture.인증_기관_생성;
 import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
index 004799c8..6660cd1c 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceFixture.java
@@ -1,14 +1,14 @@
 package com.atwoz.member.ui.info;
 
-import static com.atwoz.member.fixture.info.MemberHobbiesFixture.회원_일반_취미_생성;
-import static com.atwoz.member.fixture.info.MemberStylesFixture.회원_일반_스타일_생성;
-import static com.atwoz.member.fixture.info.OptionFixture.회원_일반_옵션_생성;
-import static com.atwoz.member.fixture.info.ProfileFixture.회원_일반_프로필_생성;
-import static com.atwoz.member.fixture.info.dto.response.HobbiesSearchResponseFixture.회원_취미_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.OptionSearchResponseFixture.회원_옵션_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.ProfileSearchResponseFixture.회원_프로필_조회_응답;
-import static com.atwoz.member.fixture.info.dto.response.StylesSearchResponseFixture.회원_스타일_조회_응답;
-import static com.atwoz.member.fixture.member.MemberFixture.일반_유저_생성;
+import static com.atwoz.member.fixture.domain.info.hobby.MemberHobbiesFixture.회원_일반_취미_생성;
+import static com.atwoz.member.fixture.domain.info.style.MemberStylesFixture.회원_일반_스타일_생성;
+import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_일반_옵션_생성;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
+import static com.atwoz.member.fixture.infrastructure.info.hobby.HobbiesSearchResponseFixture.회원_취미_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.option.OptionSearchResponseFixture.회원_옵션_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.profile.ProfileSearchResponseFixture.회원_프로필_조회_응답;
+import static com.atwoz.member.fixture.infrastructure.info.style.StylesSearchResponseFixture.회원_스타일_조회_응답;
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
index 110951d7..da2954f2 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerAcceptanceTest.java
@@ -1,7 +1,7 @@
 package com.atwoz.member.ui.info;
 
-import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_수정_요청;
+import static com.atwoz.member.fixture.application.info.InfoRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.application.info.InfoRequestFixture.회원_정보_수정_요청;
 
 import com.atwoz.member.domain.member.Member;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
index c242c8a0..0d437c39 100644
--- a/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
+++ b/src/test/java/com/atwoz/member/ui/info/InfoControllerWebMvcTest.java
@@ -1,9 +1,9 @@
 package com.atwoz.member.ui.info;
 
 import static com.atwoz.helper.RestDocsHelper.customDocument;
-import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_생성_요청;
-import static com.atwoz.member.fixture.info.dto.request.InfoRequestFixture.회원_정보_수정_요청;
-import static com.atwoz.member.fixture.info.dto.response.InfoSearchResponseFixture.회원_정보_조회_응답;
+import static com.atwoz.member.fixture.application.info.InfoRequestFixture.회원_정보_생성_요청;
+import static com.atwoz.member.fixture.application.info.InfoRequestFixture.회원_정보_수정_요청;
+import static com.atwoz.member.fixture.infrastructure.info.InfoSearchResponseFixture.회원_정보_조회_응답;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;

From 0c8d4cfe86c495be628b407fb2b907123d4e4238 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 01:03:16 +0900
Subject: [PATCH 211/225] =?UTF-8?q?refactor:=20InnerProfile=20DTO=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InnerProfile DTO를 도메인 단에 두도록 수정
---
 .../atwoz/member/application/info/profile/ProfileService.java | 4 ++--
 .../java/com/atwoz/member/domain/info/profile/Profile.java    | 4 ++--
 .../info/profile/dto/InnerProfileUpdateRequest.java           | 3 ++-
 .../info/profile/dto/InnerProfileWriteRequest.java            | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename src/main/java/com/atwoz/member/{application => domain}/info/profile/dto/InnerProfileUpdateRequest.java (89%)
 rename src/main/java/com/atwoz/member/{application => domain}/info/profile/dto/InnerProfileWriteRequest.java (89%)

diff --git a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
index b05f60ea..23b67915 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
+++ b/src/main/java/com/atwoz/member/application/info/profile/ProfileService.java
@@ -2,11 +2,11 @@
 
 import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
-import com.atwoz.member.application.info.profile.dto.InnerProfileUpdateRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.ProfileRepository;
 import com.atwoz.member.domain.info.profile.body.YearManager;
-import com.atwoz.member.application.info.profile.dto.InnerProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileWriteRequest;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 6867685c..4370e933 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -1,8 +1,8 @@
 package com.atwoz.member.domain.info.profile;
 
 import com.atwoz.member.domain.info.profile.body.Body;
-import com.atwoz.member.application.info.profile.dto.InnerProfileUpdateRequest;
-import com.atwoz.member.application.info.profile.dto.InnerProfileWriteRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
similarity index 89%
rename from src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
index ed81997b..e5534a02 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileUpdateRequest.java
@@ -1,5 +1,6 @@
-package com.atwoz.member.application.info.profile.dto;
+package com.atwoz.member.domain.info.profile.dto;
 
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyUpdateRequest;
 import com.atwoz.member.domain.info.profile.location.dto.InnerLocationUpdateRequest;
 import com.atwoz.member.domain.info.profile.position.dto.InnerPositionUpdateRequest;
diff --git a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
similarity index 89%
rename from src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
rename to src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
index 546d626e..79318ff6 100644
--- a/src/main/java/com/atwoz/member/application/info/profile/dto/InnerProfileWriteRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/dto/InnerProfileWriteRequest.java
@@ -1,5 +1,6 @@
-package com.atwoz.member.application.info.profile.dto;
+package com.atwoz.member.domain.info.profile.dto;
 
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import com.atwoz.member.domain.info.profile.body.dto.InnerBodyWriteRequest;
 import com.atwoz.member.domain.info.profile.location.dto.InnerLocationWriteRequest;
 import com.atwoz.member.domain.info.profile.position.dto.InnerPositionWriteRequest;

From 1308dc466786552668ef51ffb02be9407e3f15e3 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 01:16:37 +0900
Subject: [PATCH 212/225] =?UTF-8?q?refactor:=20=EC=84=9C=EB=B9=84=EC=8A=A4?=
 =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 서비스 테스트 패키지 구조 수정
---
 .../application/info/{ => hobby}/MemberHobbyServiceTest.java    | 2 +-
 .../member/application/info/{ => option}/OptionServiceTest.java | 2 +-
 .../application/info/{ => profile}/ProfileServiceTest.java      | 2 +-
 .../application/info/{ => style}/MemberStyleServiceTest.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/test/java/com/atwoz/member/application/info/{ => hobby}/MemberHobbyServiceTest.java (98%)
 rename src/test/java/com/atwoz/member/application/info/{ => option}/OptionServiceTest.java (98%)
 rename src/test/java/com/atwoz/member/application/info/{ => profile}/ProfileServiceTest.java (98%)
 rename src/test/java/com/atwoz/member/application/info/{ => style}/MemberStyleServiceTest.java (98%)

diff --git a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java
index a585b66c..2ace6283 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info;
+package com.atwoz.member.application.info.hobby;
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
 import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
diff --git a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java b/src/test/java/com/atwoz/member/application/info/option/OptionServiceTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/option/OptionServiceTest.java
index 97db6816..abd34ad8 100644
--- a/src/test/java/com/atwoz/member/application/info/OptionServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/option/OptionServiceTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info;
+package com.atwoz.member.application.info.option;
 
 import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_수정_옵션_생성;
 import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_일반_옵션_생성;
diff --git a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java b/src/test/java/com/atwoz/member/application/info/profile/ProfileServiceTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/profile/ProfileServiceTest.java
index 1d7e45f2..b52961ef 100644
--- a/src/test/java/com/atwoz/member/application/info/ProfileServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/profile/ProfileServiceTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info;
+package com.atwoz.member.application.info.profile;
 
 import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_수정_프로필_생성;
 import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
diff --git a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java
similarity index 98%
rename from src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
rename to src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java
index 2aeac78b..afccc712 100644
--- a/src/test/java/com/atwoz/member/application/info/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.application.info;
+package com.atwoz.member.application.info.style;
 
 import static com.atwoz.member.domain.info.style.Style.FASHION;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;

From 10e2808e56767a7e61cc6887f9c3dbb3983a8cf6 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 01:39:21 +0900
Subject: [PATCH 213/225] =?UTF-8?q?test:=20=EC=B7=A8=EB=AF=B8=20=EC=84=9C?=
 =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EB=8B=A8=EA=B3=84=EC=9D=98=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=20=EA=B2=80=EC=A6=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberHobbyService 예외 검증 추가
---
 .../info/hobby/MemberHobbyServiceTest.java    | 111 +++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java b/src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java
index 2ace6283..e5903763 100644
--- a/src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/hobby/MemberHobbyServiceTest.java
@@ -1,21 +1,26 @@
 package com.atwoz.member.application.info.hobby;
 
 import static com.atwoz.member.domain.info.hobby.Hobby.COOK;
+import static com.atwoz.member.domain.info.hobby.Hobby.DANCE;
 import static com.atwoz.member.domain.info.hobby.Hobby.DRAMA;
 import static com.atwoz.member.domain.info.hobby.Hobby.WINE;
 import static com.atwoz.member.domain.info.hobby.Hobby.WRITE;
 import static com.atwoz.member.fixture.domain.info.hobby.MemberHobbiesFixture.회원_수정_취미_생성;
 import static com.atwoz.member.fixture.domain.info.hobby.MemberHobbiesFixture.회원_일반_취미_생성;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.hobby.MemberHobbyService;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.info.hobby.MemberHobbyRepository;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbyDuplicateException;
+import com.atwoz.member.exception.exceptions.info.hobby.HobbySizeException;
+import com.atwoz.member.exception.exceptions.info.hobby.InvalidHobbyException;
 import com.atwoz.member.infrastructure.info.hobby.MemberHobbyFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import java.util.List;
 
@@ -67,4 +72,108 @@ void init() {
             softly.assertThat(saveMemberHobbies).containsAll(updateMemberHobbies);
         });
     }
+
+    @Nested
+    class 취미_서비스_예외 {
+
+        @Test
+        void 제한을_벗어난_취미를_저장하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> hobbyCodes = List.of(WINE.getCode(), DRAMA.getCode(), DANCE.getCode(), WRITE.getCode());
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.saveMemberHobbies(memberId, hobbyCodes))
+                    .isInstanceOf(HobbySizeException.class);
+        }
+
+        @Test
+        void 취미를_아예_저장하지_않으면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> hobbyCodes = List.of();
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.saveMemberHobbies(memberId, hobbyCodes))
+                    .isInstanceOf(HobbySizeException.class);
+        }
+
+        @Test
+        void 취미를_중복_저장하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> hobbyCodes = List.of(WINE.getCode(), WINE.getCode());
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.saveMemberHobbies(memberId, hobbyCodes))
+                    .isInstanceOf(HobbyDuplicateException.class);
+        }
+
+        @Test
+        void 없는_취미를_저장하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> hobbyCodes = List.of("hello");
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.saveMemberHobbies(memberId, hobbyCodes))
+                    .isInstanceOf(InvalidHobbyException.class);
+        }
+
+        @Test
+        void 제한을_벗어난_취미를_수정하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
+            List<String> updateHobbyCodes = List.of(WINE.getCode(), DRAMA.getCode(), DANCE.getCode(), WRITE.getCode());
+
+            memberHobbyRepository.saveAll(originMemberHobbies);
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes))
+                    .isInstanceOf(HobbySizeException.class);
+        }
+
+        @Test
+        void 수정할_취미를_아예_선택하지_않으면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
+            List<String> updateHobbyCodes = List.of();
+
+            memberHobbyRepository.saveAll(originMemberHobbies);
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes))
+                    .isInstanceOf(HobbySizeException.class);
+        }
+
+        @Test
+        void 취미를_중복_수정하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
+            List<String> updateHobbyCodes = List.of(WINE.getCode(), WINE.getCode());
+
+            memberHobbyRepository.saveAll(originMemberHobbies);
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes))
+                    .isInstanceOf(HobbyDuplicateException.class);
+        }
+
+        @Test
+        void 없는_취미로_수정하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberHobby> originMemberHobbies = 회원_일반_취미_생성();
+            List<String> updateHobbyCodes = List.of("hello");
+
+            memberHobbyRepository.saveAll(originMemberHobbies);
+
+            // when & then
+            assertThatThrownBy(() -> memberHobbyService.updateMemberHobbies(memberId, updateHobbyCodes))
+                    .isInstanceOf(InvalidHobbyException.class);
+        }
+    }
 }

From 40e879669a52aa4495d3e20975175bc5a86a900d Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 01:39:40 +0900
Subject: [PATCH 214/225] =?UTF-8?q?test:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?=
 =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=8B=A8=EA=B3=84=EC=9D=98=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EA=B2=80=EC=A6=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MemberStyleService 예외 검증 추가
---
 .../info/style/MemberStyleServiceTest.java    | 111 +++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java b/src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java
index afccc712..c497e8d1 100644
--- a/src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java
+++ b/src/test/java/com/atwoz/member/application/info/style/MemberStyleServiceTest.java
@@ -1,21 +1,26 @@
 package com.atwoz.member.application.info.style;
 
 import static com.atwoz.member.domain.info.style.Style.FASHION;
+import static com.atwoz.member.domain.info.style.Style.FUNNY;
 import static com.atwoz.member.domain.info.style.Style.GENTLE;
 import static com.atwoz.member.domain.info.style.Style.POSITIVE;
 import static com.atwoz.member.domain.info.style.Style.PURE;
 import static com.atwoz.member.fixture.domain.info.style.MemberStylesFixture.회원_수정_스타일_생성;
 import static com.atwoz.member.fixture.domain.info.style.MemberStylesFixture.회원_일반_스타일_생성;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.style.MemberStyleService;
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.MemberStyleRepository;
+import com.atwoz.member.exception.exceptions.info.style.InvalidStyleException;
+import com.atwoz.member.exception.exceptions.info.style.StyleDuplicateException;
+import com.atwoz.member.exception.exceptions.info.style.StyleSizeException;
 import com.atwoz.member.infrastructure.info.style.MemberStyleFakeRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import java.util.List;
 
@@ -67,4 +72,108 @@ void init() {
             softly.assertThat(saveMemberStyles).containsAll(updateMemberStyles);
         });
     }
+
+    @Nested
+    class 스타일_서비스_예외 {
+
+        @Test
+        void 제한을_벗어난_스타일을_저장하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> styleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode(), FASHION.getCode(), FUNNY.getCode());
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.saveMemberStyles(memberId, styleCodes))
+                    .isInstanceOf(StyleSizeException.class);
+        }
+
+        @Test
+        void 스타일을_아예_저장하지_않으면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> styleCodes = List.of();
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.saveMemberStyles(memberId, styleCodes))
+                    .isInstanceOf(StyleSizeException.class);
+        }
+
+        @Test
+        void 스타일을_중복_저장하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> styleCodes = List.of(POSITIVE.getCode(), POSITIVE.getCode());
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.saveMemberStyles(memberId, styleCodes))
+                    .isInstanceOf(StyleDuplicateException.class);
+        }
+
+        @Test
+        void 없는_스타일을_저장하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<String> styleCodes = List.of("hello");
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.saveMemberStyles(memberId, styleCodes))
+                    .isInstanceOf(InvalidStyleException.class);
+        }
+
+        @Test
+        void 제한을_벗어난_스타일을_수정하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
+            List<String> updateStyleCodes = List.of(POSITIVE.getCode(), GENTLE.getCode(), FASHION.getCode(), FUNNY.getCode());
+
+            memberStyleRepository.saveAll(originMemberStyles);
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.updateMemberStyles(memberId, updateStyleCodes))
+                    .isInstanceOf(StyleSizeException.class);
+        }
+
+        @Test
+        void 수정할_스타일을_아예_선택하지_않으면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
+            List<String> updateStyleCodes = List.of();
+
+            memberStyleRepository.saveAll(originMemberStyles);
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.updateMemberStyles(memberId, updateStyleCodes))
+                    .isInstanceOf(StyleSizeException.class);
+        }
+
+        @Test
+        void 스타일을_중복_수정하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
+            List<String> updateStyleCodes = List.of(POSITIVE.getCode(), POSITIVE.getCode());
+
+            memberStyleRepository.saveAll(originMemberStyles);
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.updateMemberStyles(memberId, updateStyleCodes))
+                    .isInstanceOf(StyleDuplicateException.class);
+        }
+
+        @Test
+        void 없는_스타일로_수정하면_예외가_발생한다() {
+            // given
+            Long memberId = 1L;
+            List<MemberStyle> originMemberStyles = 회원_일반_스타일_생성();
+            List<String> updateStyleCodes = List.of("hello");
+
+            memberStyleRepository.saveAll(originMemberStyles);
+
+            // when & then
+            assertThatThrownBy(() -> memberStyleService.updateMemberStyles(memberId, updateStyleCodes))
+                    .isInstanceOf(InvalidStyleException.class);
+        }
+    }
 }

From d64c1c293bd73d737439983a5b47295e7ec4eb6e Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 02:02:17 +0900
Subject: [PATCH 215/225] =?UTF-8?q?refactor:=20=EB=8F=84=EB=A9=94=EC=9D=B8?=
 =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 도메인 패키지 구조 수정
---
 .../atwoz/member/domain/info/profile/{ => body}/BodyTest.java   | 2 +-
 .../atwoz/member/domain/info/profile/{ => body}/GenderTest.java | 2 +-
 .../com/atwoz/member/domain/info/profile/{ => job}/JobTest.java | 2 +-
 .../member/domain/info/profile/{ => position}/PositionTest.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/test/java/com/atwoz/member/domain/info/profile/{ => body}/BodyTest.java (97%)
 rename src/test/java/com/atwoz/member/domain/info/profile/{ => body}/GenderTest.java (95%)
 rename src/test/java/com/atwoz/member/domain/info/profile/{ => job}/JobTest.java (95%)
 rename src/test/java/com/atwoz/member/domain/info/profile/{ => position}/PositionTest.java (97%)

diff --git a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java b/src/test/java/com/atwoz/member/domain/info/profile/body/BodyTest.java
similarity index 97%
rename from src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
rename to src/test/java/com/atwoz/member/domain/info/profile/body/BodyTest.java
index a6d35bb0..f6e7ea46 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/BodyTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/body/BodyTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.body;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java b/src/test/java/com/atwoz/member/domain/info/profile/body/GenderTest.java
similarity index 95%
rename from src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
rename to src/test/java/com/atwoz/member/domain/info/profile/body/GenderTest.java
index b016fbbc..025e4a2a 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/GenderTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/body/GenderTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.body;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java b/src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java
similarity index 95%
rename from src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
rename to src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java
index 2e487c79..a96f7068 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/JobTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.job;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java b/src/test/java/com/atwoz/member/domain/info/profile/position/PositionTest.java
similarity index 97%
rename from src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
rename to src/test/java/com/atwoz/member/domain/info/profile/position/PositionTest.java
index 915b0454..132b5c43 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/PositionTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/position/PositionTest.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.domain.info.profile;
+package com.atwoz.member.domain.info.profile.position;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

From 7fad512f21e9b9bac50ab018ee153a18057a5eee Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 02:08:26 +0900
Subject: [PATCH 216/225] =?UTF-8?q?refactor:=20JPA=20=EB=A6=AC=ED=8F=AC?=
 =?UTF-8?q?=EC=A7=80=ED=84=B0=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C?=
 =?UTF-8?q?=EB=93=A4=EC=9D=B4=20=EB=AA=85=EC=8B=9C=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- JPA 리포지터리 메서드들이 명시되도록 수정
---
 .../infrastructure/info/hobby/MemberHobbyJpaRepository.java   | 4 ++++
 .../infrastructure/info/option/OptionJpaRepository.java       | 2 ++
 .../infrastructure/info/profile/ProfileJpaRepository.java     | 2 ++
 .../infrastructure/info/style/MemberStyleJpaRepository.java   | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
index 75e9ba15..2f1be9d8 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
@@ -8,6 +8,10 @@
 
 public interface MemberHobbyJpaRepository extends JpaRepository<MemberHobby, Long> {
 
+    MemberHobby save(final MemberHobby memberHobby);
+
+    void saveAll(final List<MemberHobby> memberHobbies);
+
     @Modifying
     @Query("delete from MemberHobby mh where mh.memberId = :memberId")
     void deleteByMemberId(final Long memberId);
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
index 4d62ee67..6a055ccf 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepository.java
@@ -6,6 +6,8 @@
 
 public interface OptionJpaRepository extends JpaRepository<Option, Long> {
 
+    Option save(final Option option);
+
     Optional<Option> findByMemberId(final Long memberId);
 
     boolean existsByMemberId(final Long memberId);
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
index f081e4fa..117856ec 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepository.java
@@ -6,6 +6,8 @@
 
 public interface ProfileJpaRepository extends JpaRepository<Profile, Long> {
 
+    Profile save(final Profile profile);
+
     Optional<Profile> findByMemberId(final Long memberId);
     
     boolean existsByMemberId(final Long memberId);
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
index 1307ac77..b193c2e4 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
@@ -8,6 +8,10 @@
 
 public interface MemberStyleJpaRepository extends JpaRepository<MemberStyle, Long> {
 
+    MemberStyle save(final MemberStyle memberStyle);
+
+    void saveAll(final List<MemberStyle> memberStyles);
+
     @Modifying
     @Query("delete from MemberStyle ms where ms.memberId = :memberId")
     void deleteByMemberId(final Long memberId);

From 0217c19716ca594995b0a64a7f540166427e37cd Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 02:40:17 +0900
Subject: [PATCH 217/225] =?UTF-8?q?fix:=20findAll=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=9E=AC=EC=A0=95=EC=9D=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- findAll 메서드는 기존 부모 메서드를 사용하도록 복구
---
 .../infrastructure/info/hobby/MemberHobbyJpaRepository.java     | 2 --
 .../infrastructure/info/style/MemberStyleJpaRepository.java     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
index 2f1be9d8..49986b81 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepository.java
@@ -10,8 +10,6 @@ public interface MemberHobbyJpaRepository extends JpaRepository<MemberHobby, Lon
 
     MemberHobby save(final MemberHobby memberHobby);
 
-    void saveAll(final List<MemberHobby> memberHobbies);
-
     @Modifying
     @Query("delete from MemberHobby mh where mh.memberId = :memberId")
     void deleteByMemberId(final Long memberId);
diff --git a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
index b193c2e4..3522fbc2 100644
--- a/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
+++ b/src/main/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepository.java
@@ -10,8 +10,6 @@ public interface MemberStyleJpaRepository extends JpaRepository<MemberStyle, Lon
 
     MemberStyle save(final MemberStyle memberStyle);
 
-    void saveAll(final List<MemberStyle> memberStyles);
-
     @Modifying
     @Query("delete from MemberStyle ms where ms.memberId = :memberId")
     void deleteByMemberId(final Long memberId);

From b5cb7450925797c2bad8d701b65826e0646e2965 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 02:57:37 +0900
Subject: [PATCH 218/225] =?UTF-8?q?refactor:=20Fixture=20static=20import?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixture 사용 시 이름이 충돌되지 않을 경우 static import 되도록 수정
---
 .../hobby/MemberHobbyJpaRepositoryTest.java   |  5 ++--
 .../info/option/OptionJpaRepositoryTest.java  |  5 ++--
 .../profile/ProfileJpaRepositoryTest.java     | 30 +++++++++----------
 .../style/MemberStyleJpaRepositoryTest.java   |  5 ++--
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java
index 832a9574..39795529 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/hobby/MemberHobbyJpaRepositoryTest.java
@@ -1,13 +1,12 @@
 package com.atwoz.member.infrastructure.info.hobby;
 
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.domain.info.hobby.Hobby;
 import com.atwoz.member.domain.info.hobby.MemberHobby;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.domain.member.MemberFixture;
-import com.atwoz.member.infrastructure.info.hobby.MemberHobbyJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -33,7 +32,7 @@ class MemberHobbyJpaRepositoryTest {
 
     @BeforeEach
     void init() {
-        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+        member = memberJpaRepository.save(일반_유저_생성());
     }
 
     @Test
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java
index 60f07b3c..99c7c03f 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/option/OptionJpaRepositoryTest.java
@@ -1,5 +1,6 @@
 package com.atwoz.member.infrastructure.info.option;
 
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
@@ -10,8 +11,6 @@
 import com.atwoz.member.domain.info.option.Religion;
 import com.atwoz.member.domain.info.option.Smoke;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.domain.member.MemberFixture;
-import com.atwoz.member.infrastructure.info.option.OptionJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -36,7 +35,7 @@ class OptionJpaRepositoryTest {
 
     @BeforeEach
     void init() {
-        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+        member = memberJpaRepository.save(일반_유저_생성());
     }
 
     @Test
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java
index 197d84f2..b53eeb3d 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/profile/ProfileJpaRepositoryTest.java
@@ -1,19 +1,19 @@
 package com.atwoz.member.infrastructure.info.profile;
 
+import static com.atwoz.member.fixture.domain.info.profile.body.BodyFixture.회원_일반_body_생성;
+import static com.atwoz.member.fixture.domain.info.profile.job.JobFixture.회원_일반_직업_생성;
+import static com.atwoz.member.fixture.domain.info.profile.location.LocationFixture.회원_일반_위치_생성;
+import static com.atwoz.member.fixture.domain.info.profile.position.PositionFixture.회원_일반_좌표_생성;
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.info.profile.body.Body;
 import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
-import com.atwoz.member.domain.info.profile.Profile;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.domain.info.profile.body.BodyFixture;
-import com.atwoz.member.fixture.domain.info.profile.job.JobFixture;
-import com.atwoz.member.fixture.domain.info.profile.location.LocationFixture;
-import com.atwoz.member.fixture.domain.info.profile.position.PositionFixture;
-import com.atwoz.member.fixture.domain.member.MemberFixture;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -38,17 +38,17 @@ class ProfileJpaRepositoryTest {
 
     @BeforeEach
     void init() {
-        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+        member = memberJpaRepository.save(일반_유저_생성());
     }
 
     @Test
     void profile을_저장한다() {
         // given
         Long memberId = member.getId();
-        Body body = BodyFixture.회원_일반_body_생성();
-        Location location = LocationFixture.회원_일반_위치_생성();
-        Position position = PositionFixture.회원_일반_좌표_생성();
-        Job job = JobFixture.회원_일반_직업_생성();
+        Body body = 회원_일반_body_생성();
+        Location location = 회원_일반_위치_생성();
+        Position position = 회원_일반_좌표_생성();
+        Job job = 회원_일반_직업_생성();
 
         Profile newProfile = new Profile(memberId, body, location, position, job);
 
@@ -66,10 +66,10 @@ void init() {
     void profile을_조회한다() {
         // given
         Long memberId = member.getId();
-        Body body = BodyFixture.회원_일반_body_생성();
-        Location location = LocationFixture.회원_일반_위치_생성();
-        Position position = PositionFixture.회원_일반_좌표_생성();
-        Job job = JobFixture.회원_일반_직업_생성();
+        Body body = 회원_일반_body_생성();
+        Location location = 회원_일반_위치_생성();
+        Position position = 회원_일반_좌표_생성();
+        Job job = 회원_일반_직업_생성();
 
         Profile newProfile = new Profile(memberId, body, location, position, job);
         Profile saveProfile = profileJpaRepository.save(newProfile);
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java
index abda9e76..5acf2de5 100644
--- a/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java
+++ b/src/test/java/com/atwoz/member/infrastructure/info/style/MemberStyleJpaRepositoryTest.java
@@ -1,13 +1,12 @@
 package com.atwoz.member.infrastructure.info.style;
 
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import com.atwoz.member.domain.info.style.MemberStyle;
 import com.atwoz.member.domain.info.style.Style;
 import com.atwoz.member.domain.member.Member;
-import com.atwoz.member.fixture.domain.member.MemberFixture;
-import com.atwoz.member.infrastructure.info.style.MemberStyleJpaRepository;
 import com.atwoz.member.infrastructure.member.MemberJpaRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -33,7 +32,7 @@ class MemberStyleJpaRepositoryTest {
 
     @BeforeEach
     void init() {
-        member = memberJpaRepository.save(MemberFixture.일반_유저_생성());
+        member = memberJpaRepository.save(일반_유저_생성());
     }
 
     @Test

From a5cde12ef8a13b8b91c448628c4750895d3aff09 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 02:58:39 +0900
Subject: [PATCH 219/225] =?UTF-8?q?test:=20InfoQueryRepository=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoQueryRepository 테스트 추가
- 예외를 방지하기 위해 JPAQueryFactory 수동 빈 등록 환경 추가
---
 .../java/com/atwoz/config/TestConfig.java     | 19 +++++
 .../info/InfoQueryRepositoryTest.java         | 82 +++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 src/test/java/com/atwoz/config/TestConfig.java
 create mode 100644 src/test/java/com/atwoz/member/infrastructure/info/InfoQueryRepositoryTest.java

diff --git a/src/test/java/com/atwoz/config/TestConfig.java b/src/test/java/com/atwoz/config/TestConfig.java
new file mode 100644
index 00000000..9953f133
--- /dev/null
+++ b/src/test/java/com/atwoz/config/TestConfig.java
@@ -0,0 +1,19 @@
+package com.atwoz.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+public class TestConfig {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}
diff --git a/src/test/java/com/atwoz/member/infrastructure/info/InfoQueryRepositoryTest.java b/src/test/java/com/atwoz/member/infrastructure/info/InfoQueryRepositoryTest.java
new file mode 100644
index 00000000..48b7df2e
--- /dev/null
+++ b/src/test/java/com/atwoz/member/infrastructure/info/InfoQueryRepositoryTest.java
@@ -0,0 +1,82 @@
+package com.atwoz.member.infrastructure.info;
+
+import static com.atwoz.member.fixture.domain.info.hobby.MemberHobbiesFixture.회원_일반_취미_생성;
+import static com.atwoz.member.fixture.domain.info.option.OptionFixture.회원_일반_옵션_생성;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
+import static com.atwoz.member.fixture.domain.info.style.MemberStylesFixture.회원_일반_스타일_생성;
+import static com.atwoz.member.fixture.domain.member.MemberFixture.일반_유저_생성;
+import static com.atwoz.member.fixture.infrastructure.info.InfoSearchResponseFixture.회원_정보_조회_응답;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
+
+import com.atwoz.config.TestConfig;
+import com.atwoz.member.domain.member.Member;
+import com.atwoz.member.infrastructure.info.dto.InfoSearchResponse;
+import com.atwoz.member.infrastructure.info.hobby.MemberHobbyJpaRepository;
+import com.atwoz.member.infrastructure.info.option.OptionJpaRepository;
+import com.atwoz.member.infrastructure.info.profile.ProfileJpaRepository;
+import com.atwoz.member.infrastructure.info.style.MemberStyleJpaRepository;
+import com.atwoz.member.infrastructure.member.MemberJpaRepository;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
+import java.util.Optional;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+@Import(TestConfig.class)
+@DataJpaTest
+public class InfoQueryRepositoryTest {
+
+    @Autowired
+    private MemberJpaRepository memberJpaRepository;
+
+    @Autowired
+    private ProfileJpaRepository profileJpaRepository;
+
+    @Autowired
+    private OptionJpaRepository optionJpaRepository;
+
+    @Autowired
+    private MemberHobbyJpaRepository memberHobbyJpaRepository;
+
+    @Autowired
+    private MemberStyleJpaRepository memberStyleJpaRepository;
+
+    @Autowired
+    private JPAQueryFactory jpaQueryFactory;
+
+    private InfoQueryRepository infoQueryRepository;
+
+    private Member member;
+
+    @BeforeEach
+    void init() {
+        member = memberJpaRepository.save(일반_유저_생성());
+        profileJpaRepository.save(회원_일반_프로필_생성());
+        optionJpaRepository.save(회원_일반_옵션_생성());
+        memberHobbyJpaRepository.saveAll(회원_일반_취미_생성());
+        memberStyleJpaRepository.saveAll(회원_일반_스타일_생성());
+        infoQueryRepository = new InfoQueryRepository(jpaQueryFactory);
+    }
+
+    @Test
+    void 회원_정보를_조회한다() {
+        // given
+        InfoSearchResponse expectedResponse = 회원_정보_조회_응답();
+
+        // when
+        Optional<InfoSearchResponse> response = infoQueryRepository.findByMemberId(member.getId());
+
+        // then
+        assertSoftly(softly -> {
+            softly.assertThat(response).isPresent();
+            softly.assertThat(response.get()).usingRecursiveComparison()
+                    .isEqualTo(expectedResponse);
+        });
+    }
+}

From 1b233286d6407f1db781d643a675835ccb69b686 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 10:37:48 +0900
Subject: [PATCH 220/225] =?UTF-8?q?refactor:=20Job=20=EC=98=88=EC=99=B8=20?=
 =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Job 예외 패키지 구조 수정 (job 패키지 안에 들어가도록 수정)
---
 .../java/com/atwoz/member/domain/info/profile/job/Job.java     | 2 +-
 .../com/atwoz/member/exception/MemberExceptionHandler.java     | 2 +-
 .../exceptions/info/profile/{ => job}/InvalidJobException.java | 2 +-
 .../java/com/atwoz/member/domain/info/profile/job/JobTest.java | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename src/main/java/com/atwoz/member/exception/exceptions/info/profile/{ => job}/InvalidJobException.java (71%)

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/job/Job.java b/src/main/java/com/atwoz/member/domain/info/profile/job/Job.java
index 4b652618..eb40b081 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/job/Job.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/job/Job.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.profile.job;
 
-import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
+import com.atwoz.member.exception.exceptions.info.profile.job.InvalidJobException;
 import lombok.Getter;
 import java.util.Arrays;
 
diff --git a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
index 568dd5e5..a40c9a3d 100644
--- a/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
+++ b/src/main/java/com/atwoz/member/exception/MemberExceptionHandler.java
@@ -18,7 +18,7 @@
 import com.atwoz.member.exception.exceptions.info.option.OptionNotFoundException;
 import com.atwoz.member.exception.exceptions.info.option.InvalidReligionException;
 import com.atwoz.member.exception.exceptions.info.option.InvalidSmokeException;
-import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
+import com.atwoz.member.exception.exceptions.info.profile.job.InvalidJobException;
 import com.atwoz.member.exception.exceptions.info.profile.ProfileNotFoundException;
 import com.atwoz.member.exception.exceptions.info.profile.body.AgeRangeException;
 import com.atwoz.member.exception.exceptions.info.profile.body.InvalidGenderException;
diff --git a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/InvalidJobException.java b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/job/InvalidJobException.java
similarity index 71%
rename from src/main/java/com/atwoz/member/exception/exceptions/info/profile/InvalidJobException.java
rename to src/main/java/com/atwoz/member/exception/exceptions/info/profile/job/InvalidJobException.java
index 324821bc..96cb85b3 100644
--- a/src/main/java/com/atwoz/member/exception/exceptions/info/profile/InvalidJobException.java
+++ b/src/main/java/com/atwoz/member/exception/exceptions/info/profile/job/InvalidJobException.java
@@ -1,4 +1,4 @@
-package com.atwoz.member.exception.exceptions.info.profile;
+package com.atwoz.member.exception.exceptions.info.profile.job;
 
 public class InvalidJobException extends RuntimeException {
 
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java b/src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java
index a96f7068..315eeeac 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/job/JobTest.java
@@ -3,8 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import com.atwoz.member.domain.info.profile.job.Job;
-import com.atwoz.member.exception.exceptions.info.profile.InvalidJobException;
+import com.atwoz.member.exception.exceptions.info.profile.job.InvalidJobException;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;

From ded8bd82965bbdef6c94a07d5329f926f7116436 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 13:26:20 +0900
Subject: [PATCH 221/225] =?UTF-8?q?refactor:=20Option,=20Body=20=EC=A0=95?=
 =?UTF-8?q?=EC=A0=81=20=ED=8C=A9=ED=84=B0=EB=A6=AC=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 정적 팩터리 메서드 사용 시 변수를 밖으로 이끌어내지 않도록 수정
---
 .../atwoz/member/domain/info/option/Option.java  | 15 ++++++++-------
 .../member/domain/info/profile/body/Body.java    | 16 ++++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/option/Option.java b/src/main/java/com/atwoz/member/domain/info/option/Option.java
index 4298c1e5..7e6f0e78 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/Option.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/Option.java
@@ -64,13 +64,14 @@ public Option(final Long memberId,
     }
 
     public static Option createFrom(final InnerOptionWriteRequest request) {
-        Smoke smoke = Smoke.findByName(request.smokeName());
-        Religion religion = Religion.findByName(request.religionName());
-        Drink drink = Drink.findByName(request.drinkName());
-        Mbti mbti = Mbti.findByName(request.mbtiName());
-        Graduate graduate = Graduate.findByName(request.graduateName());
-
-        return new Option(request.memberId(), smoke, religion, drink, mbti, graduate);
+        return new Option(
+                request.memberId(),
+                Smoke.findByName(request.smokeName()),
+                Religion.findByName(request.religionName()),
+                Drink.findByName(request.drinkName()),
+                Mbti.findByName(request.mbtiName()),
+                Graduate.findByName(request.graduateName())
+        );
     }
 
     public void updateContentsFrom(final InnerOptionUpdateRequest request) {
diff --git a/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java b/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
index ae6e2ef2..7bd85e91 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/body/Body.java
@@ -58,12 +58,20 @@ private int calculateAgeFromYear(final YearManager yearManager, final int birthY
     }
 
     public static Body createFrom(final InnerBodyWriteRequest request) {
-        Gender gender = Gender.findByName(request.gender());
-        return new Body(request.yearManager(), request.birthYear(), request.height(), gender);
+        return new Body(
+                request.yearManager(),
+                request.birthYear(),
+                request.height(),
+                Gender.findByName(request.gender())
+        );
     }
 
     public static Body updateContentsFrom(final InnerBodyUpdateRequest request) {
-        Gender gender = Gender.findByName(request.gender());
-        return new Body(request.yearManager(), request.birthYear(), request.height(), gender);
+        return new Body(
+                request.yearManager(),
+                request.birthYear(),
+                request.height(),
+                Gender.findByName(request.gender())
+        );
     }
 }

From b0433e030e91f1189fa93df336c6edf7948b9f1b Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 13:26:45 +0900
Subject: [PATCH 222/225] =?UTF-8?q?refactor:=20InnerOptionUpdateRequest=20?=
 =?UTF-8?q?=EA=B3=B5=EB=B0=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InnerOptionUpdateRequest 정적 팩터리 메서드 공백 추가
---
 .../info/option/dto/InnerOptionUpdateRequest.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
index 5e7ad281..c6783b0b 100644
--- a/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
+++ b/src/main/java/com/atwoz/member/domain/info/option/dto/InnerOptionUpdateRequest.java
@@ -12,11 +12,11 @@ public record InnerOptionUpdateRequest(
 
     public static InnerOptionUpdateRequest from(final OptionUpdateRequest request) {
         return new InnerOptionUpdateRequest(
-          request.smoke(),
-          request.religion(),
-          request.drink(),
-          request.mbti(),
-          request.graduate()
+                request.smoke(),
+                request.religion(),
+                request.drink(),
+                request.mbti(),
+                request.graduate()
         );
     }
 }

From 26513b34474eb0d6603f51b3947e22a14611cdd9 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 13:37:41 +0900
Subject: [PATCH 223/225] =?UTF-8?q?refactor:=20Profile=20updateContents=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- updateContents를 다른 곳에서 사용하지 않으므로 삭제
- 관련 테스트 수정
---
 .../member/domain/info/profile/Profile.java   | 18 ++++++--------
 .../domain/info/profile/ProfileTest.java      | 24 +++++++++++++++++--
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
index 4370e933..aa857741 100644
--- a/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
+++ b/src/main/java/com/atwoz/member/domain/info/profile/Profile.java
@@ -55,16 +55,19 @@ public Profile(final Long memberId,
                    final Position position,
                    final Job job) {
         this.memberId = memberId;
-        updateContents(body, location, position, job);
-    }
-
-    public void updateContents(final Body body, final Location location, final Position position, final Job job) {
         this.body = body;
         this.location = location;
         this.position = position;
         this.job = job;
     }
 
+    public void updateContentsFrom(final InnerProfileUpdateRequest request) {
+        this.body = Body.updateContentsFrom(request.body());
+        this.location = Location.updateContentsFrom(request.location());
+        this.position = Position.updateContentsFrom(request.position());
+        this.job = Job.findByCode(request.jobCode());
+    }
+
     public static Profile createFrom(final InnerProfileWriteRequest request) {
         Body body = Body.createFrom(request.body());
         Location location = Location.createFrom(request.location());
@@ -73,11 +76,4 @@ public static Profile createFrom(final InnerProfileWriteRequest request) {
 
         return new Profile(request.memberId(), body, location, position, job);
     }
-
-    public void updateContentsFrom(final InnerProfileUpdateRequest request) {
-        this.body = Body.updateContentsFrom(request.body());
-        this.location = Location.updateContentsFrom(request.location());
-        this.position = Position.updateContentsFrom(request.position());
-        this.job = Job.findByCode(request.jobCode());
-    }
 }
diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
index e082bcd5..eee7fdf8 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -1,16 +1,22 @@
 package com.atwoz.member.domain.info.profile;
 
+import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
 import static com.atwoz.member.fixture.domain.info.profile.body.BodyFixture.회원_수정_body_생성;
 import static com.atwoz.member.fixture.domain.info.profile.job.JobFixture.회원_수정_직업_생성;
 import static com.atwoz.member.fixture.domain.info.profile.location.LocationFixture.회원_수정_위치_생성;
 import static com.atwoz.member.fixture.domain.info.profile.position.PositionFixture.회원_수정_좌표_생성;
-import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.body.Body;
+import com.atwoz.member.domain.info.profile.body.YearManager;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
+import com.atwoz.member.infrastructure.info.profile.body.FakeYearManager;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -19,6 +25,13 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileTest {
 
+    private YearManager yearManager;
+
+    @BeforeEach
+    void init() {
+        yearManager = new FakeYearManager();
+    }
+
     @Test
     void 내용_수정_검증() {
         // given
@@ -29,8 +42,15 @@ public class ProfileTest {
         Location updateLocation = 회원_수정_위치_생성();
         Position updatePosition = 회원_수정_좌표_생성();
 
+        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
+        InnerProfileUpdateRequest request = InnerProfileUpdateRequest.of(
+                profile.getMemberId(),
+                yearManager,
+                profileUpdateRequest
+        );
+
         // when
-        profile.updateContents(updateBody, updateLocation, updatePosition, updateJob);
+        profile.updateContentsFrom(request);
 
         // then
         assertSoftly(softly -> {

From 972ede00a471ed2c52865d07ff788ae3d60ab802 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Mon, 4 Mar 2024 13:41:58 +0900
Subject: [PATCH 224/225] =?UTF-8?q?refactor:=20InnerProfileUpdateRequest?=
 =?UTF-8?q?=20Fixture=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InnerProfileUpdateRequest Fixture 등록
---
 .../domain/info/profile/ProfileTest.java      | 20 ++----------------
 .../info/profile/ProfileRequestFixture.java   | 21 +++++++++++++++++--
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
index eee7fdf8..1fb67206 100644
--- a/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
+++ b/src/test/java/com/atwoz/member/domain/info/profile/ProfileTest.java
@@ -1,6 +1,6 @@
 package com.atwoz.member.domain.info.profile;
 
-import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_수정_요청;
+import static com.atwoz.member.fixture.application.info.profile.ProfileRequestFixture.회원_프로필_수정_요청_내부;
 import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
 import static com.atwoz.member.fixture.domain.info.profile.body.BodyFixture.회원_수정_body_생성;
 import static com.atwoz.member.fixture.domain.info.profile.job.JobFixture.회원_수정_직업_생성;
@@ -8,15 +8,11 @@
 import static com.atwoz.member.fixture.domain.info.profile.position.PositionFixture.회원_수정_좌표_생성;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.body.Body;
-import com.atwoz.member.domain.info.profile.body.YearManager;
 import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.job.Job;
 import com.atwoz.member.domain.info.profile.location.Location;
 import com.atwoz.member.domain.info.profile.position.Position;
-import com.atwoz.member.infrastructure.info.profile.body.FakeYearManager;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -25,13 +21,6 @@
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileTest {
 
-    private YearManager yearManager;
-
-    @BeforeEach
-    void init() {
-        yearManager = new FakeYearManager();
-    }
-
     @Test
     void 내용_수정_검증() {
         // given
@@ -42,12 +31,7 @@ void init() {
         Location updateLocation = 회원_수정_위치_생성();
         Position updatePosition = 회원_수정_좌표_생성();
 
-        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
-        InnerProfileUpdateRequest request = InnerProfileUpdateRequest.of(
-                profile.getMemberId(),
-                yearManager,
-                profileUpdateRequest
-        );
+        InnerProfileUpdateRequest request = 회원_프로필_수정_요청_내부();
 
         // when
         profile.updateContentsFrom(request);
diff --git a/src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java b/src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java
index 828e6624..d20f1037 100644
--- a/src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java
+++ b/src/test/java/com/atwoz/member/fixture/application/info/profile/ProfileRequestFixture.java
@@ -6,16 +6,21 @@
 import static com.atwoz.member.fixture.application.info.profile.location.LocationRequestFixture.회원_위치_수정_요청;
 import static com.atwoz.member.fixture.application.info.profile.position.PositionRequestFixture.회원_좌표_생성_요청;
 import static com.atwoz.member.fixture.application.info.profile.position.PositionRequestFixture.회원_좌표_수정_요청;
+import static com.atwoz.member.fixture.domain.info.profile.ProfileFixture.회원_일반_프로필_생성;
 
-import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
-import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import com.atwoz.member.application.info.profile.body.dto.BodyUpdateRequest;
 import com.atwoz.member.application.info.profile.body.dto.BodyWriteRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileUpdateRequest;
+import com.atwoz.member.application.info.profile.dto.ProfileWriteRequest;
 import com.atwoz.member.application.info.profile.location.dto.LocationUpdateRequest;
 import com.atwoz.member.application.info.profile.location.dto.LocationWriteRequest;
 import com.atwoz.member.application.info.profile.position.dto.PositionUpdateRequest;
 import com.atwoz.member.application.info.profile.position.dto.PositionWriteRequest;
+import com.atwoz.member.domain.info.profile.Profile;
+import com.atwoz.member.domain.info.profile.body.YearManager;
+import com.atwoz.member.domain.info.profile.dto.InnerProfileUpdateRequest;
 import com.atwoz.member.domain.info.profile.job.Job;
+import com.atwoz.member.infrastructure.info.profile.body.FakeYearManager;
 
 @SuppressWarnings("NonAsciiCharacters")
 public class ProfileRequestFixture {
@@ -47,4 +52,16 @@ public class ProfileRequestFixture {
                 job
         );
     }
+
+    public static InnerProfileUpdateRequest 회원_프로필_수정_요청_내부() {
+        Profile profile = 회원_일반_프로필_생성();
+        YearManager yearManager = new FakeYearManager();
+        ProfileUpdateRequest profileUpdateRequest = 회원_프로필_수정_요청();
+
+        return InnerProfileUpdateRequest.of(
+                profile.getMemberId(),
+                yearManager,
+                profileUpdateRequest
+        );
+    }
 }

From 7201923f1fb056f0ec8a8904670d3f3a1d3d6a64 Mon Sep 17 00:00:00 2001
From: devholic22 <hyunjoon.tech@gmail.com>
Date: Tue, 5 Mar 2024 12:44:58 +0900
Subject: [PATCH 225/225] =?UTF-8?q?refactor:=20InfoService=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EC=B2=B4=EC=9D=B4=EB=8B=9D=20=EC=B5=9C?=
 =?UTF-8?q?=EC=86=8C=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InfoService 메서드 체이닝이 최소화되도록 수정
---
 .../member/application/info/InfoService.java  | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/atwoz/member/application/info/InfoService.java b/src/main/java/com/atwoz/member/application/info/InfoService.java
index 2ea94fe8..917d4159 100644
--- a/src/main/java/com/atwoz/member/application/info/InfoService.java
+++ b/src/main/java/com/atwoz/member/application/info/InfoService.java
@@ -32,8 +32,8 @@ public class InfoService {
 
     @Transactional
     public void writeInfo(final Long memberId, final InfoWriteRequest request) {
-        List<String> hobbyCodes = extractHobbyNamesFromInfoWriteRequest(request);
-        List<String> styleCodes = extractStyleNamesFromInfoWriteRequest(request);
+        List<String> hobbyCodes = extractHobbyNamesFromInfoWriteRequest(request.hobbies());
+        List<String> styleCodes = extractStyleNamesFromInfoWriteRequest(request.styles());
 
         Events.raise(new ProfileWroteEvent(memberId, request.profile()));
         Events.raise(new OptionWroteEvent(memberId, request.option()));
@@ -42,24 +42,22 @@ public void writeInfo(final Long memberId, final InfoWriteRequest request) {
         Events.raise(new StyleWroteEvent(memberId, styleCodes));
     }
 
-    private List<String> extractHobbyNamesFromInfoWriteRequest(final InfoWriteRequest request) {
-        return request.hobbies()
-                .stream()
+    private List<String> extractHobbyNamesFromInfoWriteRequest(final List<HobbyWriteRequest> hobbies) {
+        return hobbies.stream()
                 .map(HobbyWriteRequest::hobby)
                 .toList();
     }
 
-    private List<String> extractStyleNamesFromInfoWriteRequest(final InfoWriteRequest request) {
-        return request.styles()
-                .stream()
+    private List<String> extractStyleNamesFromInfoWriteRequest(final List<StyleWriteRequest> styles) {
+        return styles.stream()
                 .map(StyleWriteRequest::style)
                 .toList();
     }
 
     @Transactional
     public void updateInfo(final Long memberId, final InfoUpdateRequest request) {
-        List<String> hobbyCodes = extractHobbyNamesFromInfoUpdateRequest(request);
-        List<String> styleCodes = extractStyleNamesFromInfoUpdateRequest(request);
+        List<String> hobbyCodes = extractHobbyNamesFromInfoUpdateRequest(request.hobbies());
+        List<String> styleCodes = extractStyleNamesFromInfoUpdateRequest(request.styles());
 
         Events.raise(new ProfileUpdatedEvent(memberId, request.profile()));
         Events.raise(new OptionUpdatedEvent(memberId, request.option()));
@@ -68,16 +66,14 @@ public void updateInfo(final Long memberId, final InfoUpdateRequest request) {
         Events.raise(new StyleUpdatedEvent(memberId, styleCodes));
     }
 
-    private List<String> extractHobbyNamesFromInfoUpdateRequest(final InfoUpdateRequest request) {
-        return request.hobbies()
-                .stream()
+    private List<String> extractHobbyNamesFromInfoUpdateRequest(final List<HobbyUpdateRequest> hobbies) {
+        return hobbies.stream()
                 .map(HobbyUpdateRequest::hobby)
                 .toList();
     }
 
-    private List<String> extractStyleNamesFromInfoUpdateRequest(final InfoUpdateRequest request) {
-        return request.styles()
-                .stream()
+    private List<String> extractStyleNamesFromInfoUpdateRequest(final List<StyleUpdateRequest> styles) {
+        return styles.stream()
                 .map(StyleUpdateRequest::style)
                 .toList();
     }