From b795342c09c3ac24c24f086df2162dec954b9c10 Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Thu, 18 Jul 2024 15:48:45 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Chore:=20package=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/cmc/suppin/answer/controller/.gitkeep | 0 src/main/java/com/cmc/suppin/answer/converter/.gitkeep | 0 src/main/java/com/cmc/suppin/answer/exception/.gitkeep | 0 src/main/java/com/cmc/suppin/answer/service/.gitkeep | 0 src/main/java/com/cmc/suppin/comment/controller/.gitkeep | 0 src/main/java/com/cmc/suppin/comment/converter/.gitkeep | 0 src/main/java/com/cmc/suppin/comment/exception/.gitkeep | 0 src/main/java/com/cmc/suppin/comment/service/.gitkeep | 0 src/main/java/com/cmc/suppin/event/controller/.gitkeep | 0 src/main/java/com/cmc/suppin/event/converter/.gitkeep | 0 src/main/java/com/cmc/suppin/event/exception/.gitkeep | 0 src/main/java/com/cmc/suppin/event/service/.gitkeep | 0 src/main/java/com/cmc/suppin/member/controller/.gitkeep | 0 src/main/java/com/cmc/suppin/member/converter/.gitkeep | 0 src/main/java/com/cmc/suppin/member/exception/.gitkeep | 0 src/main/java/com/cmc/suppin/member/service/.gitkeep | 0 src/main/java/com/cmc/suppin/survey/controller/.gitkeep | 0 src/main/java/com/cmc/suppin/survey/converter/.gitkeep | 0 src/main/java/com/cmc/suppin/survey/exception/.gitkeep | 0 src/main/java/com/cmc/suppin/survey/service/.gitkeep | 0 20 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/com/cmc/suppin/answer/controller/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/answer/converter/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/answer/exception/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/answer/service/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/comment/controller/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/comment/converter/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/comment/exception/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/comment/service/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/event/controller/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/event/converter/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/event/exception/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/event/service/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/member/controller/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/member/converter/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/member/exception/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/member/service/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/survey/controller/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/survey/converter/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/survey/exception/.gitkeep create mode 100644 src/main/java/com/cmc/suppin/survey/service/.gitkeep diff --git a/src/main/java/com/cmc/suppin/answer/controller/.gitkeep b/src/main/java/com/cmc/suppin/answer/controller/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/answer/converter/.gitkeep b/src/main/java/com/cmc/suppin/answer/converter/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/answer/exception/.gitkeep b/src/main/java/com/cmc/suppin/answer/exception/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/answer/service/.gitkeep b/src/main/java/com/cmc/suppin/answer/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/comment/controller/.gitkeep b/src/main/java/com/cmc/suppin/comment/controller/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/comment/converter/.gitkeep b/src/main/java/com/cmc/suppin/comment/converter/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/comment/exception/.gitkeep b/src/main/java/com/cmc/suppin/comment/exception/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/comment/service/.gitkeep b/src/main/java/com/cmc/suppin/comment/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/event/controller/.gitkeep b/src/main/java/com/cmc/suppin/event/controller/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/event/converter/.gitkeep b/src/main/java/com/cmc/suppin/event/converter/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/event/exception/.gitkeep b/src/main/java/com/cmc/suppin/event/exception/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/event/service/.gitkeep b/src/main/java/com/cmc/suppin/event/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/member/controller/.gitkeep b/src/main/java/com/cmc/suppin/member/controller/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/member/converter/.gitkeep b/src/main/java/com/cmc/suppin/member/converter/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/member/exception/.gitkeep b/src/main/java/com/cmc/suppin/member/exception/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/member/service/.gitkeep b/src/main/java/com/cmc/suppin/member/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/survey/controller/.gitkeep b/src/main/java/com/cmc/suppin/survey/controller/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/survey/converter/.gitkeep b/src/main/java/com/cmc/suppin/survey/converter/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/survey/exception/.gitkeep b/src/main/java/com/cmc/suppin/survey/exception/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/cmc/suppin/survey/service/.gitkeep b/src/main/java/com/cmc/suppin/survey/service/.gitkeep new file mode 100644 index 0000000..e69de29 From 577c83083479c8a391f148a567ef871e2a93497c Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Thu, 18 Jul 2024 15:49:19 +0900 Subject: [PATCH 2/6] =?UTF-8?q?Feat:=20BaseDateTime(createdAt,=20updatedAt?= =?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 --- .../global/domain/BaseDateTimeEntity.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/main/java/com/cmc/suppin/global/domain/BaseDateTimeEntity.java diff --git a/src/main/java/com/cmc/suppin/global/domain/BaseDateTimeEntity.java b/src/main/java/com/cmc/suppin/global/domain/BaseDateTimeEntity.java new file mode 100644 index 0000000..196f352 --- /dev/null +++ b/src/main/java/com/cmc/suppin/global/domain/BaseDateTimeEntity.java @@ -0,0 +1,24 @@ +package com.cmc.suppin.global.domain; + +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.Column; +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; +import java.time.LocalDateTime; + +@EntityListeners(AuditingEntityListener.class) +@MappedSuperclass +@Getter +public abstract class BaseDateTimeEntity { + + @Column(updatable = false) + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} From dbeb7ccfdc2502ea0eac44921bdc5922c7d11d2a Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Thu, 18 Jul 2024 15:49:47 +0900 Subject: [PATCH 3/6] Feat: Entity settings --- .../answer/domain/AnonymousParticipant.java | 26 ++++++++++ .../com/cmc/suppin/answer/domain/Answer.java | 32 ++++++++++++ .../suppin/answer/domain/AnswerOption.java | 22 ++++++++ .../cmc/suppin/comment/domain/Comment.java | 27 ++++++++++ .../com/cmc/suppin/event/domain/Event.java | 50 +++++++++++++++++++ .../cmc/suppin/global/enums/EventType.java | 5 ++ .../cmc/suppin/global/enums/QuestionType.java | 17 +++++++ .../com/cmc/suppin/member/domain/Member.java | 35 +++++++++++++ .../cmc/suppin/survey/domain/Question.java | 33 ++++++++++++ .../suppin/survey/domain/QuestionOption.java | 27 ++++++++++ .../com/cmc/suppin/survey/domain/Survey.java | 28 +++++++++++ 11 files changed, 302 insertions(+) create mode 100644 src/main/java/com/cmc/suppin/answer/domain/AnonymousParticipant.java create mode 100644 src/main/java/com/cmc/suppin/answer/domain/Answer.java create mode 100644 src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java create mode 100644 src/main/java/com/cmc/suppin/comment/domain/Comment.java create mode 100644 src/main/java/com/cmc/suppin/event/domain/Event.java create mode 100644 src/main/java/com/cmc/suppin/global/enums/EventType.java create mode 100644 src/main/java/com/cmc/suppin/global/enums/QuestionType.java create mode 100644 src/main/java/com/cmc/suppin/member/domain/Member.java create mode 100644 src/main/java/com/cmc/suppin/survey/domain/Question.java create mode 100644 src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java create mode 100644 src/main/java/com/cmc/suppin/survey/domain/Survey.java diff --git a/src/main/java/com/cmc/suppin/answer/domain/AnonymousParticipant.java b/src/main/java/com/cmc/suppin/answer/domain/AnonymousParticipant.java new file mode 100644 index 0000000..589b8ac --- /dev/null +++ b/src/main/java/com/cmc/suppin/answer/domain/AnonymousParticipant.java @@ -0,0 +1,26 @@ +package com.cmc.suppin.answer.domain; + +import com.cmc.suppin.global.domain.BaseDateTimeEntity; +import com.cmc.suppin.survey.domain.Survey; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class AnonymousParticipant extends BaseDateTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "anonymous_participant_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "survey_id") + private Survey survey; + + @Column(columnDefinition = "VARCHAR(255)", nullable = false) + private String sessionId; + + @OneToMany(mappedBy = "anonymousParticipant") + private List answerList = new ArrayList<>(); +} diff --git a/src/main/java/com/cmc/suppin/answer/domain/Answer.java b/src/main/java/com/cmc/suppin/answer/domain/Answer.java new file mode 100644 index 0000000..1ef1aca --- /dev/null +++ b/src/main/java/com/cmc/suppin/answer/domain/Answer.java @@ -0,0 +1,32 @@ +package com.cmc.suppin.answer.domain; + +import com.cmc.suppin.survey.domain.Question; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Answer { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "answer_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "question_id") + private Question question; + + @ManyToOne + @JoinColumn(name = "anonymous_participant_id") + private AnonymousParticipant anonymousParticipant; + + @OneToMany(mappedBy = "answer") + private List answerOptionList = new ArrayList<>(); + + @Column(columnDefinition = "TEXT", nullable = false) + private String answerText; + +} + diff --git a/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java b/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java new file mode 100644 index 0000000..048e649 --- /dev/null +++ b/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java @@ -0,0 +1,22 @@ +package com.cmc.suppin.answer.domain; + +import com.cmc.suppin.survey.domain.QuestionOption; + +import javax.persistence.*; + +@Entity +public class AnswerOption { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "answer_option_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "answer_id") + private Answer answer; + + @ManyToOne + @JoinColumn(name = "option_id") + private QuestionOption questionOption; +} + diff --git a/src/main/java/com/cmc/suppin/comment/domain/Comment.java b/src/main/java/com/cmc/suppin/comment/domain/Comment.java new file mode 100644 index 0000000..f6f2734 --- /dev/null +++ b/src/main/java/com/cmc/suppin/comment/domain/Comment.java @@ -0,0 +1,27 @@ +package com.cmc.suppin.comment.domain; + +import com.cmc.suppin.event.domain.Event; +import com.cmc.suppin.global.domain.BaseDateTimeEntity; + +import javax.persistence.*; + +@Entity +public class Comment extends BaseDateTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "comment_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "event_id") + private Event event; + + @Column(columnDefinition = "TEXT", nullable = false) + private String url; + @Column(columnDefinition = "VARCHAR(30)", nullable = false) + private String nickname; + @Column(columnDefinition = "TEXT", nullable = false) + private String commentText; + +} diff --git a/src/main/java/com/cmc/suppin/event/domain/Event.java b/src/main/java/com/cmc/suppin/event/domain/Event.java new file mode 100644 index 0000000..8e150f8 --- /dev/null +++ b/src/main/java/com/cmc/suppin/event/domain/Event.java @@ -0,0 +1,50 @@ +package com.cmc.suppin.event.domain; + +import com.cmc.suppin.comment.domain.Comment; +import com.cmc.suppin.global.domain.BaseDateTimeEntity; +import com.cmc.suppin.global.enums.EventType; +import com.cmc.suppin.member.domain.Member; +import com.cmc.suppin.survey.domain.Survey; + +import javax.persistence.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Event extends BaseDateTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "event_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "member_id") + private Member member; + + @OneToMany(mappedBy = "event") + private List surveyList = new ArrayList<>(); + + @OneToMany(mappedBy = "event") + private List commentList = new ArrayList<>(); + + @Column(columnDefinition = "VARCHAR(100)", nullable = false) + private String title; + + @Column(columnDefinition = "TEXT", nullable = false) + private String description; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private EventType type; + + @Column + private LocalDateTime startDate; + @Column + private LocalDateTime endDate; + @Column + private LocalDateTime announcementDate; + + // Getters and Setters + +} diff --git a/src/main/java/com/cmc/suppin/global/enums/EventType.java b/src/main/java/com/cmc/suppin/global/enums/EventType.java new file mode 100644 index 0000000..fea0236 --- /dev/null +++ b/src/main/java/com/cmc/suppin/global/enums/EventType.java @@ -0,0 +1,5 @@ +package com.cmc.suppin.global.enums; + +public enum EventType { + COMMENT, SURVEY +} diff --git a/src/main/java/com/cmc/suppin/global/enums/QuestionType.java b/src/main/java/com/cmc/suppin/global/enums/QuestionType.java new file mode 100644 index 0000000..e22b96d --- /dev/null +++ b/src/main/java/com/cmc/suppin/global/enums/QuestionType.java @@ -0,0 +1,17 @@ +package com.cmc.suppin.global.enums; + +public enum QuestionType { + SHORT_ANSWER("주관식"), + SINGLE_CHOICE("객관식(단일 선택)"), + MULTIPLE_CHOICE("객관식(복수 선택)"); + + private String description; + + QuestionType(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } +} diff --git a/src/main/java/com/cmc/suppin/member/domain/Member.java b/src/main/java/com/cmc/suppin/member/domain/Member.java new file mode 100644 index 0000000..a589eea --- /dev/null +++ b/src/main/java/com/cmc/suppin/member/domain/Member.java @@ -0,0 +1,35 @@ +package com.cmc.suppin.member.domain; + +import com.cmc.suppin.event.domain.Event; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "member_id") + private Long id; + + @OneToMany(mappedBy = "member") + private List eventList = new ArrayList<>(); + + @Column(columnDefinition = "VARCHAR(20)", nullable = false) + private String name; + + @Column(columnDefinition = "VARCHAR(30)", nullable = false) + private String nickname; + + @Column(columnDefinition = "VARCHAR(30)", nullable = false) + private String email; + + @Column(columnDefinition = "VARCHAR(20)", nullable = false) + private String password; + + @Column(columnDefinition = "VARCHAR(13)", nullable = false) + private String phoneNumber; + +} + diff --git a/src/main/java/com/cmc/suppin/survey/domain/Question.java b/src/main/java/com/cmc/suppin/survey/domain/Question.java new file mode 100644 index 0000000..173e01d --- /dev/null +++ b/src/main/java/com/cmc/suppin/survey/domain/Question.java @@ -0,0 +1,33 @@ +package com.cmc.suppin.survey.domain; + +import com.cmc.suppin.answer.domain.Answer; +import com.cmc.suppin.global.enums.QuestionType; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Question { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long questionId; + + @ManyToOne + @JoinColumn(name = "survey_id") + private Survey survey; + + @OneToMany(mappedBy = "question") + private List questionOptionList = new ArrayList<>(); + + @OneToMany(mappedBy = "question") + private List answerList = new ArrayList<>(); + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private QuestionType questionType; + + @Column(columnDefinition = "VARCHAR(100)", nullable = false) + private String questionText; + +} diff --git a/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java b/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java new file mode 100644 index 0000000..0e07ba3 --- /dev/null +++ b/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java @@ -0,0 +1,27 @@ +package com.cmc.suppin.survey.domain; + +import com.cmc.suppin.answer.domain.AnswerOption; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class QuestionOption { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "question_option_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "question_id") + private Question question; + + @Column(columnDefinition = "VARCHAR(50)", nullable = false) + private String optionText; + + @OneToMany(mappedBy = "option") + private List answerOptionList = new ArrayList<>(); + +} + diff --git a/src/main/java/com/cmc/suppin/survey/domain/Survey.java b/src/main/java/com/cmc/suppin/survey/domain/Survey.java new file mode 100644 index 0000000..f100341 --- /dev/null +++ b/src/main/java/com/cmc/suppin/survey/domain/Survey.java @@ -0,0 +1,28 @@ +package com.cmc.suppin.survey.domain; + +import com.cmc.suppin.answer.domain.AnonymousParticipant; +import com.cmc.suppin.event.domain.Event; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +public class Survey { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "survey_id") + private Long id; + + @ManyToOne + @JoinColumn(name = "event_id") + private Event event; + + @OneToMany(mappedBy = "survey") + private List questionList = new ArrayList<>(); + + @OneToMany(mappedBy = "survey") + private List anonymousParticipantList = new ArrayList<>(); + +} + From aae6fbb1f385df600d4c9990e91d3c6c11c48f4a Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Thu, 18 Jul 2024 15:50:03 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Chore:=20yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7b1d301..82665d1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver jpa: hibernate: - ddl-auto: none + ddl-auto: update properties: hibernate: dialect: org.hibernate.dialect.MySQL8Dialect From 57c04e994b4089dc561ca88062a6dc7bbdcebb36 Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Thu, 18 Jul 2024 15:55:30 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Feat:=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EB=B3=84=20BaseTimeEntity=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 --- src/main/java/com/cmc/suppin/answer/domain/Answer.java | 5 +++-- src/main/java/com/cmc/suppin/member/domain/Member.java | 3 ++- src/main/java/com/cmc/suppin/survey/domain/Survey.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cmc/suppin/answer/domain/Answer.java b/src/main/java/com/cmc/suppin/answer/domain/Answer.java index 1ef1aca..3fcdffa 100644 --- a/src/main/java/com/cmc/suppin/answer/domain/Answer.java +++ b/src/main/java/com/cmc/suppin/answer/domain/Answer.java @@ -1,5 +1,6 @@ package com.cmc.suppin.answer.domain; +import com.cmc.suppin.global.domain.BaseDateTimeEntity; import com.cmc.suppin.survey.domain.Question; import javax.persistence.*; @@ -7,8 +8,8 @@ import java.util.List; @Entity -public class Answer { - +public class Answer extends BaseDateTimeEntity { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "answer_id") diff --git a/src/main/java/com/cmc/suppin/member/domain/Member.java b/src/main/java/com/cmc/suppin/member/domain/Member.java index a589eea..fff34e7 100644 --- a/src/main/java/com/cmc/suppin/member/domain/Member.java +++ b/src/main/java/com/cmc/suppin/member/domain/Member.java @@ -1,13 +1,14 @@ package com.cmc.suppin.member.domain; import com.cmc.suppin.event.domain.Event; +import com.cmc.suppin.global.domain.BaseDateTimeEntity; import javax.persistence.*; import java.util.ArrayList; import java.util.List; @Entity -public class Member { +public class Member extends BaseDateTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "member_id") diff --git a/src/main/java/com/cmc/suppin/survey/domain/Survey.java b/src/main/java/com/cmc/suppin/survey/domain/Survey.java index f100341..b5948ea 100644 --- a/src/main/java/com/cmc/suppin/survey/domain/Survey.java +++ b/src/main/java/com/cmc/suppin/survey/domain/Survey.java @@ -2,13 +2,14 @@ import com.cmc.suppin.answer.domain.AnonymousParticipant; import com.cmc.suppin.event.domain.Event; +import com.cmc.suppin.global.domain.BaseDateTimeEntity; import javax.persistence.*; import java.util.ArrayList; import java.util.List; @Entity -public class Survey { +public class Survey extends BaseDateTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "survey_id") From cb01761d82f4257505a9c9dd5496972fabf57305 Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Thu, 18 Jul 2024 16:06:51 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Fix:=20mappedBy=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=ED=95=84=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/main/java/com/cmc/suppin/answer/domain/AnswerOption.java | 4 ++-- .../java/com/cmc/suppin/survey/domain/QuestionOption.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java b/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java index 048e649..2f06669 100644 --- a/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java +++ b/src/main/java/com/cmc/suppin/answer/domain/AnswerOption.java @@ -12,11 +12,11 @@ public class AnswerOption { private Long id; @ManyToOne - @JoinColumn(name = "answer_id") + @JoinColumn(name = "answer_id", nullable = false) private Answer answer; @ManyToOne - @JoinColumn(name = "option_id") + @JoinColumn(name = "question_option_id", nullable = false) private QuestionOption questionOption; } diff --git a/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java b/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java index 0e07ba3..1fc91e6 100644 --- a/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java +++ b/src/main/java/com/cmc/suppin/survey/domain/QuestionOption.java @@ -20,7 +20,7 @@ public class QuestionOption { @Column(columnDefinition = "VARCHAR(50)", nullable = false) private String optionText; - @OneToMany(mappedBy = "option") + @OneToMany(mappedBy = "questionOption") private List answerOptionList = new ArrayList<>(); }