[#6] refactor: 엔티티 연관관계 및 포맷팅 수정

Network-office · Sep 24, 2024 · 9c2ab82 · 9c2ab82
1 parent 265fe60
commit 9c2ab82
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/Applicants.java b/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/Applicants.java
@@ -1,10 +1,13 @@
 package dev.office.networkoffice.gathering.entity;
 
 import dev.office.networkoffice.user.entity.User;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
@@ -23,14 +26,18 @@
 @Table(name = "applicants")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Applicants {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "applicant_id")
 	private Long id;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "gathering_id")
 	private Gathering gathering;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
 	private User user;
 
 	@Builder

diff --git a/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/DeletedGathering.java b/Network-Office/src/main/java/dev/office/networkoffice/gathering/entity/DeletedGathering.java
@@ -1,6 +1,7 @@
 package dev.office.networkoffice.gathering.entity;
 
 import dev.office.networkoffice.gathering.domain.DeletedType;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -22,10 +23,14 @@
 @Table(name = "deleted_gatherings")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class DeletedGathering {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "deleted_gathering_id")
 	private Long id;
+
 	private String reason;
+
 	private DeletedType deletedType;
 
 	@Builder

diff --git a/...fice/src/main/java/dev/office/networkoffice/gathering/entity/DeletedGatheringManager.java b/...fice/src/main/java/dev/office/networkoffice/gathering/entity/DeletedGatheringManager.java
@@ -3,9 +3,11 @@
 import dev.office.networkoffice.user.entity.User;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
@@ -21,13 +23,15 @@ public class DeletedGatheringManager {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "gathering_id")
+	@Column(name = "deleted_gathering_manager_id")
 	private Long id;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "deleted_gathering_id")
 	private DeletedGathering deletedGathering;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
 	private User user;
 
 	private Long originGatheringId;

diff --git a/.../src/main/java/dev/office/networkoffice/gathering/entity/GatheringUserConfirmManager.java b/.../src/main/java/dev/office/networkoffice/gathering/entity/GatheringUserConfirmManager.java
@@ -4,9 +4,11 @@
 import dev.office.networkoffice.user.entity.User;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
@@ -25,16 +27,19 @@ public class GatheringUserConfirmManager {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "gathering_id")
+	@Column(name = "gathering_manager_id")
 	private Long id;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "gathering_id")
 	private Gathering gathering;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
 	private User user;
 
 	private GatheringAuthority gatheringAuthority;
+
 	@Builder
 	private GatheringUserConfirmManager(Gathering gathering, User user, GatheringAuthority gatheringAuthority) {
 		this.gathering = gathering;