Merge pull request #18 from ICCAS2024-TightPattern/develop

[FIX] Fix JPA Relationship

Author: rhkr8521

src/main/java/com/rhkr8521/iccas_question/api/answer/domain/Answer.java

@@ -1,5 +1,6 @@
 package com.rhkr8521.iccas_question.api.answer.domain;
 
+import com.rhkr8521.iccas_question.api.member.domain.Member;
 import com.rhkr8521.iccas_question.api.question.domain.Question;
 import com.rhkr8521.iccas_question.common.entity.BaseTimeEntity;
 import jakarta.persistence.*;
@@ -20,7 +21,9 @@ public class Answer extends BaseTimeEntity {
     @JoinColumn(name = "questionId")
     private Question question;
 
-    private String userId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId")
+    private Member userId;
 
     @Enumerated(EnumType.STRING)
     private Result result;

src/main/java/com/rhkr8521/iccas_question/api/member/domain/Member.java

@@ -1,9 +1,13 @@
 package com.rhkr8521.iccas_question.api.member.domain;
 
+import com.rhkr8521.iccas_question.api.answer.domain.Answer;
+import com.rhkr8521.iccas_question.api.result.domain.GameSet;
 import com.rhkr8521.iccas_question.common.entity.BaseTimeEntity;
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.util.List;
+
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Getter
@@ -16,4 +20,10 @@ public class Member extends BaseTimeEntity {
     private Long id;
 
     private String userId;
+
+    @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<GameSet> gameSets;
+
+    @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Answer> answers;
 }

src/main/java/com/rhkr8521/iccas_question/api/result/domain/GameSet.java

@@ -1,5 +1,6 @@
 package com.rhkr8521.iccas_question.api.result.domain;
 
+import com.rhkr8521.iccas_question.api.member.domain.Member;
 import com.rhkr8521.iccas_question.common.entity.BaseTimeEntity;
 import jakarta.persistence.*;
 import lombok.*;
@@ -15,7 +16,10 @@ public class GameSet extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private String userId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId")
+    private Member userId;
+
     private String theme;
     private int firstStageRecord;
     private int firstStageTotalCount;

src/main/java/com/rhkr8521/iccas_question/api/result/domain/Result.java

@@ -1,5 +1,6 @@
 package com.rhkr8521.iccas_question.api.result.domain;
 
+import com.rhkr8521.iccas_question.api.member.domain.Member;
 import com.rhkr8521.iccas_question.common.entity.BaseTimeEntity;
 import jakarta.persistence.*;
 import lombok.*;
@@ -15,7 +16,10 @@ public class Result extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private String userId;
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId")
+    private Member userId;
+
     private String theme;
     private Long stage;
     private int correctAnswers;