merge(relation): 연관관계 설정

[feat] 연관관계 설정
Noostak · Feb 13, 2025 · a499918 · a499918
2 parents 6091f88 + c800858
commit a499918
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 34 deletions.
diff --git a/src/main/java/org/noostak/appointment/domain/Appointment.java b/src/main/java/org/noostak/appointment/domain/Appointment.java
@@ -9,6 +9,7 @@
 import org.noostak.appointment.domain.vo.AppointmentMemberCount;
 import org.noostak.appointment.domain.vo.AppointmentStatus;
 import org.noostak.global.entity.BaseTimeEntity;
+import org.noostak.group.domain.Groups;
 
 @Entity
 @Getter
@@ -19,8 +20,9 @@ public class Appointment extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    private Group group;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "groups_id")
+    private Groups groups;
 
     private Long appointmentHostId;
 

diff --git a/src/main/java/org/noostak/appointment/domain/AppointmentHostSelectionTimes.java b/src/main/java/org/noostak/appointment/domain/AppointmentHostSelectionTimes.java
@@ -3,13 +3,14 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.noostak.global.entity.BaseTimeEntity;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class AppointmentHostSelectionTimes {
+public class AppointmentHostSelectionTimes extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -24,8 +25,7 @@ public class AppointmentHostSelectionTimes {
     @Column
     private LocalDateTime appointmentHostSelectionEndTime;
 
-// TODO:
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "appointment_id")
-//    private Appointment appointment;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "appointment_id")
+    private Appointment appointment;
 }
diff --git a/src/main/java/org/noostak/appointmentmember/domain/AppointmentMember.java b/src/main/java/org/noostak/appointmentmember/domain/AppointmentMember.java
@@ -3,13 +3,15 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.noostak.appointment.domain.Appointment;
 import org.noostak.appointmentmember.domain.vo.AppointmentAvailability;
+import org.noostak.global.entity.BaseTimeEntity;
 import org.noostak.member.domain.Member;
 
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class AppointmentMember {
+public class AppointmentMember extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -19,10 +21,9 @@ public class AppointmentMember {
     @Column(name = "availability_availability")
     private AppointmentAvailability appointmentAvailability;
 
-// TODO:
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "appointment_id")
-//    private Appointment appointment;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "appointment_id")
+    private Appointment appointment;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id")

diff --git a/src/main/java/org/noostak/appointmentmember/domain/AppointmentMemberAvailableTimes.java b/src/main/java/org/noostak/appointmentmember/domain/AppointmentMemberAvailableTimes.java
@@ -3,14 +3,15 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.noostak.global.entity.BaseTimeEntity;
 import org.noostak.member.domain.Member;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class AppointmentMemberAvailableTimes {
+public class AppointmentMemberAvailableTimes extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/org/noostak/appointmentmember/domain/temp b/src/main/java/org/noostak/appointmentmember/domain/temp
diff --git a/src/main/java/org/noostak/appointmentoption/domain/AppointmentOption.java b/src/main/java/org/noostak/appointmentoption/domain/AppointmentOption.java
@@ -3,14 +3,16 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.noostak.appointment.domain.Appointment;
 import org.noostak.appointmentoption.domain.vo.AppointmentOptionStatus;
+import org.noostak.global.entity.BaseTimeEntity;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class AppointmentOption {
+public class AppointmentOption extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -29,8 +31,7 @@ public class AppointmentOption {
     @Column
     private LocalDateTime appointmentOptionEndTime;
 
-// TODO:
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "appointment_id")
-//    private Appointment appointment;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "appointment_id")
+    private Appointment appointment;
 }
diff --git a/.../java/org/noostak/group/domain/Group.java → ...java/org/noostak/group/domain/Groups.java b/.../java/org/noostak/group/domain/Group.java → ...java/org/noostak/group/domain/Groups.java
@@ -12,7 +12,7 @@
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class Group extends BaseTimeEntity {
+public class Groups extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -36,15 +36,15 @@ public class Group extends BaseTimeEntity {
 
     private Long groupHostId;
 
-    private Group(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
+    private Groups(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
         this.groupHostId = groupHostId;
         this.name = name;
         this.key = key;
         this.memberCount = GroupMemberCount.from(1L);
         this.code = GroupInvitationCode.from(code);
     }
 
-    public static Group of(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
-        return new Group(groupHostId, name, key, code);
+    public static Groups of(final Long groupHostId, final GroupName name, final GroupProfileImageKey key, final String code) {
+        return new Groups(groupHostId, name, key, code);
     }
 }
diff --git a/src/main/java/org/noostak/likes/domain/Likes.java b/src/main/java/org/noostak/likes/domain/Likes.java
@@ -3,12 +3,15 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.noostak.appointmentmember.domain.AppointmentMember;
+import org.noostak.appointmentoption.domain.AppointmentOption;
+import org.noostak.global.entity.BaseTimeEntity;
 import org.noostak.likes.domain.vo.LikesCount;
 
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class Likes {
+public class Likes extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -18,11 +21,11 @@ public class Likes {
     @AttributeOverride(name = "count", column = @Column(name = "likes_count"))
     private LikesCount likesCount;
 
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "appointment_member_id")
-//    private AppointmentMember appointmentMember;
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "appointment_option_id")
-//    private AppointmentOption appointmentOption;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "appointment_member_id")
+    private AppointmentMember appointmentMember;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "appointment_option_id")
+    private AppointmentOption appointmentOption;
 }
diff --git a/src/main/java/org/noostak/member/domain/Member.java b/src/main/java/org/noostak/member/domain/Member.java
@@ -3,12 +3,13 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.noostak.global.entity.BaseTimeEntity;
 import org.noostak.member.domain.vo.*;
 
 @Entity
 @Getter
 @RequiredArgsConstructor
-public class Member {
+public class Member extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/...up/domain/vo/GroupInvitationCodeTest.java → ...p/domain/vo/GroupsInvitationCodeTest.java b/...up/domain/vo/GroupInvitationCodeTest.java → ...p/domain/vo/GroupsInvitationCodeTest.java
@@ -11,7 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-class GroupInvitationCodeTest {
+class GroupsInvitationCodeTest {
 
     @Nested
     @DisplayName("성공 케이스")

diff --git a/...group/domain/vo/GroupMemberCountTest.java → ...roup/domain/vo/GroupsMemberCountTest.java b/...group/domain/vo/GroupMemberCountTest.java → ...roup/domain/vo/GroupsMemberCountTest.java
@@ -9,7 +9,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-class GroupMemberCountTest {
+class GroupsMemberCountTest {
 
     @Nested
     @DisplayName("성공 케이스")

diff --git a/...oostak/group/domain/vo/GroupNameTest.java → ...ostak/group/domain/vo/GroupsNameTest.java b/...oostak/group/domain/vo/GroupNameTest.java → ...ostak/group/domain/vo/GroupsNameTest.java
@@ -11,7 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-class GroupNameTest {
+class GroupsNameTest {
 
     @Nested
     @DisplayName("성공 케이스")