[Step2] 연관 관계 매핑

src/main/java/qna/domain/Answer.java

@@ -2,26 +2,45 @@
 
 import java.util.Objects;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.ForeignKey;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+
+import org.springframework.lang.NonNull;
 
 import qna.NotFoundException;
 import qna.UnAuthorizedException;
 
 @Entity
 public class Answer extends BaseEntity {
 
+    public static final Answer NONE = new Answer();
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private Long writerId;
-    private Long questionId;
+
+    @JoinColumn(name = "writer_id",
+        referencedColumnName = "ID",
+        foreignKey = @ForeignKey(name = "fk_answer_writer"))
+    @ManyToOne
+    private User writer;
+
+    @JoinColumn(name = "question_id",
+        referencedColumnName = "ID",
+        foreignKey = @ForeignKey(name = "fk_answer_to_question"))
+    @ManyToOne
+    private Question question;
     @Lob
     private String contents;
 
+    @NonNull
+    @Column(nullable = false)
     private boolean deleted = false;
 
     public Answer(User writer, Question question, String contents) {
@@ -39,19 +58,19 @@ public Answer(Long id, User writer, Question question, String contents) {
             throw new NotFoundException();
         }
 
-        this.writerId = writer.getId();
-        this.questionId = question.getId();
+        this.writer = writer;
+        this.question = question;
         this.contents = contents;
     }
     // for jpa
     protected Answer() {}
 
     public boolean isOwner(User writer) {
-        return this.writerId.equals(writer.getId());
+        return this.writer.equals(writer);
     }
 
     public void toQuestion(Question question) {
-        this.questionId = question.getId();
+        this.question = question;
     }
 
     public Long getId() {
@@ -62,20 +81,20 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getWriterId() {
-        return writerId;
+    public User getWriter() {
+        return writer;
     }
 
-    public void setWriterId(Long writerId) {
-        this.writerId = writerId;
+    public void setWriter(User writerId) {
+        this.writer = writerId;
     }
 
-    public Long getQuestionId() {
-        return questionId;
+    public Question getQuestion() {
+        return question;
     }
 
-    public void setQuestionId(Long questionId) {
-        this.questionId = questionId;
+    public void setQuestion(Question question) {
+        this.question = question;
     }
 
     public String getContents() {
@@ -98,8 +117,8 @@ public void setDeleted(boolean deleted) {
     public String toString() {
         return "Answer{" +
                 "id=" + id +
-                ", writerId=" + writerId +
-                ", questionId=" + questionId +
+                ", writerId=" + writer +
+                ", questionId=" + question +
                 ", contents='" + contents + '\'' +
                 ", deleted=" + deleted +
                 '}';

src/main/java/qna/domain/BaseEntity.java

@@ -17,6 +17,7 @@ public class BaseEntity {
 	@Column(nullable = false)
 	@CreatedDate
 	private LocalDateTime createAt;
+
 	@LastModifiedDate
 	private LocalDateTime updateAt;
 

src/main/java/qna/domain/DeleteHistory.java

@@ -3,30 +3,40 @@
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.ForeignKey;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 
 @Entity
 public class DeleteHistory {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Enumerated(value = EnumType.STRING)
     private ContentType contentType;
+
     private Long contentId;
-    private Long deletedById;
+
+    @JoinColumn(name = "deleted_by_id",
+        referencedColumnName = "ID",
+        foreignKey = @ForeignKey(name = "fk_delete_history_to_user"))
+    @ManyToOne
+    private User deletedBy;
+
     private LocalDateTime createDate = LocalDateTime.now();
 
-    public DeleteHistory(ContentType contentType, Long contentId, Long deletedById, LocalDateTime createDate) {
+    public DeleteHistory(ContentType contentType, Long contentId, User deletedBy, LocalDateTime createDate) {
         this.contentType = contentType;
         this.contentId = contentId;
-        this.deletedById = deletedById;
+        this.deletedBy = deletedBy;
         this.createDate = createDate;
     }
     // for jpa
@@ -40,12 +50,12 @@ public boolean equals(Object o) {
         return Objects.equals(id, that.id) &&
                 contentType == that.contentType &&
                 Objects.equals(contentId, that.contentId) &&
-                Objects.equals(deletedById, that.deletedById);
+                Objects.equals(deletedBy, that.deletedBy);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, contentType, contentId, deletedById);
+        return Objects.hash(id, contentType, contentId, deletedBy);
     }
 
     @Override
@@ -54,7 +64,7 @@ public String toString() {
                 "id=" + id +
                 ", contentType=" + contentType +
                 ", contentId=" + contentId +
-                ", deletedById=" + deletedById +
+                ", deletedById=" + deletedBy +
                 ", createDate=" + createDate +
                 '}';
     }

src/main/java/qna/domain/Question.java

@@ -2,21 +2,39 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.ForeignKey;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+
+import org.springframework.lang.NonNull;
 
 @Entity
 public class Question extends BaseEntity {
+
+    public static final Question NONE = new Question();
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Column(length = 100, nullable = false)
     private String title;
+
     @Lob
     private String contents;
-    private Long writerId;
+
+    @ManyToOne
+    @JoinColumn(name = "writer_id",
+        referencedColumnName = "ID",
+        foreignKey = @ForeignKey(name = "fk_question_writer")
+    )
+    private User writer;
+
+    @NonNull
+    @Column(nullable = false)
     private boolean deleted = false;
 
     public Question(String title, String contents) {
@@ -32,12 +50,12 @@ public Question(Long id, String title, String contents) {
     protected Question() { }
 
     public Question writeBy(User writer) {
-        this.writerId = writer.getId();
+        this.writer = writer;
         return this;
     }
 
     public boolean isOwner(User writer) {
-        return this.writerId.equals(writer.getId());
+        return this.writer.equals(writer);
     }
 
     public void addAnswer(Answer answer) {
@@ -68,12 +86,12 @@ public void setContents(String contents) {
         this.contents = contents;
     }
 
-    public Long getWriterId() {
-        return writerId;
+    public User getWriter() {
+        return writer;
     }
 
-    public void setWriterId(Long writerId) {
-        this.writerId = writerId;
+    public void setWriter(User writer) {
+        this.writer = writer;
     }
 
     public boolean isDeleted() {
@@ -87,11 +105,11 @@ public void setDeleted(boolean deleted) {
     @Override
     public String toString() {
         return "Question{" +
-                "id=" + id +
-                ", title='" + title + '\'' +
-                ", contents='" + contents + '\'' +
-                ", writerId=" + writerId +
-                ", deleted=" + deleted +
-                '}';
+            "id=" + id +
+            ", title='" + title + '\'' +
+            ", contents='" + contents + '\'' +
+            ", writerId=" + writer +
+            ", deleted=" + deleted +
+            '}';
     }
 }

src/main/java/qna/domain/User.java

@@ -1,7 +1,5 @@
 package qna.domain;
 
-import qna.UnAuthorizedException;
-
 import java.util.Objects;
 
 import javax.persistence.Column;
@@ -12,21 +10,29 @@
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
+import qna.UnAuthorizedException;
+
 @Entity
 @Table(uniqueConstraints = {
     @UniqueConstraint(name = "UK_a3imlf41l37utmxiquukk8ajc", columnNames = {"userId"})
 })
-public class User extends BaseEntity{
+public class User extends BaseEntity {
+
     public static final GuestUser GUEST_USER = new GuestUser();
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    @Column(length = 20)
+
+    @Column(length = 20, nullable = false, unique = true)
     private String userId;
-    @Column(length = 20)
+
+    @Column(length = 20, nullable = false)
     private String password;
-    @Column(length = 20)
+
+    @Column(length = 20, nullable = false)
     private String name;
+
     @Column(length = 40)
     private String email;
 

src/main/java/qna/service/QnaService.java

@@ -48,10 +48,10 @@ public void deleteQuestion(User loginUser, Long questionId) throws CannotDeleteE
 
         List<DeleteHistory> deleteHistories = new ArrayList<>();
         question.setDeleted(true);
-        deleteHistories.add(new DeleteHistory(ContentType.QUESTION, questionId, question.getWriterId(), LocalDateTime.now()));
+        deleteHistories.add(new DeleteHistory(ContentType.QUESTION, questionId, question.getWriter(), LocalDateTime.now()));
         for (Answer answer : answers) {
             answer.setDeleted(true);
-            deleteHistories.add(new DeleteHistory(ContentType.ANSWER, answer.getId(), answer.getWriterId(), LocalDateTime.now()));
+            deleteHistories.add(new DeleteHistory(ContentType.ANSWER, answer.getId(), answer.getWriter(), LocalDateTime.now()));
         }
         deleteHistoryService.saveAll(deleteHistories);
     }

src/main/resources/application.properties

@@ -1,6 +1,9 @@
-spring.datasource.url=jdbc:h2:~/test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:~/test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=MySQL
 spring.datasource.username=sa
 spring.h2.console.enabled=true
 
+logging.level.org.hibernate.type.descriptor.sql = trace
 spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.show-sql=true
+spring.jpa.show-sql=true
+
+spring.jpa.hibernate.ddl-auto=create-drop