question table에서 recruitment column, index 제거 #122

Merge pull request #124 from team-crews/refactor/#122-remove-index-in-question-table
team-crews · Nov 16, 2024 · 3aac619 · 3aac619
2 parents b4b3b31 + d0304cc
commit 3aac619
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 34 deletions.
diff --git a/src/main/java/com/server/crews/recruitment/domain/NarrativeQuestion.java b/src/main/java/com/server/crews/recruitment/domain/NarrativeQuestion.java
@@ -25,9 +25,7 @@
 @AllArgsConstructor
 @Table(name = "narrative_question",
         indexes = {
-                @Index(columnList = "section_id", name = "idx_section_id"),
-                @Index(columnList = "recruitment_id", name = "idx_recruitment_id")
-
+                @Index(columnList = "section_id", name = "idx_section_id")
         }
 )
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -36,10 +34,6 @@ public class NarrativeQuestion implements Question {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "recruitment_id", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
-    private Recruitment recruitment;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "section_id", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private Section section;
@@ -60,7 +54,7 @@ public class NarrativeQuestion implements Question {
     private Integer wordLimit;
 
     public NarrativeQuestion(Long id) {
-        this(id, null, null, null, null, null, null);
+        this(id, null, null, null, null);
     }
 
     public NarrativeQuestion(Long id, String content, Boolean necessity, Integer order, Integer wordLimit) {
@@ -79,10 +73,6 @@ public void updateSection(Section section) {
         this.section = section;
     }
 
-    public void updateRecruitment(Recruitment recruitment) {
-        this.recruitment = recruitment;
-    }
-
     public Long getSectionId() {
         return this.section.getId();
     }

diff --git a/src/main/java/com/server/crews/recruitment/domain/Recruitment.java b/src/main/java/com/server/crews/recruitment/domain/Recruitment.java
@@ -92,14 +92,6 @@ public Recruitment(Long id, String code, String title, String description, Local
 
     private void addSections(List<Section> sections) {
         sections.forEach(section -> section.updateRecruitment(this));
-        sections.stream()
-                .map(section -> section.getSelectiveQuestions())
-                .flatMap(Collection::stream)
-                .forEach(selectiveQuestion -> selectiveQuestion.updateRecruitment(this));
-        sections.stream()
-                .map(section -> section.getNarrativeQuestions())
-                .flatMap(Collection::stream)
-                .forEach(narrativeQuestion -> narrativeQuestion.updateRecruitment(this));
         this.sections.addAll(sections);
     }
 

diff --git a/src/main/java/com/server/crews/recruitment/domain/SelectiveQuestion.java b/src/main/java/com/server/crews/recruitment/domain/SelectiveQuestion.java
@@ -31,8 +31,7 @@
 @Entity
 @Table(name = "selective_question",
         indexes = {
-                @Index(columnList = "section_id", name = "idx_section_id"),
-                @Index(columnList = "recruitment_id", name = "idx_recruitment_id")
+                @Index(columnList = "section_id", name = "idx_section_id")
         }
 )
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -41,10 +40,6 @@ public class SelectiveQuestion implements Question {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "recruitment_id", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
-    private Recruitment recruitment;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "section_id", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private Section section;
@@ -108,10 +103,6 @@ public void updateSection(Section section) {
         this.section = section;
     }
 
-    public void updateRecruitment(Recruitment recruitment) {
-        this.recruitment = recruitment;
-    }
-
     public List<Choice> getOrderedChoices() {
         Collections.sort(choices);
         return choices;

diff --git a/src/test/java/com/server/crews/environ/repository/RepositoryTest.java b/src/test/java/com/server/crews/environ/repository/RepositoryTest.java
@@ -73,14 +73,12 @@ protected Recruitment createDefaultRecruitment(Administrator publisher) {
     private NarrativeQuestion createNarrativeQuestion(Section section) {
         NarrativeQuestion narrativeQuestion = NARRATIVE_QUESTION();
         narrativeQuestion.updateSection(section);
-        narrativeQuestion.updateRecruitment(section.getRecruitment());
         return narrativeQuestion;
     }
 
     private SelectiveQuestion createSelectiveQuestion(Section section) {
         SelectiveQuestion selectiveQuestion = SELECTIVE_QUESTION();
         selectiveQuestion.updateSection(section);
-        selectiveQuestion.updateRecruitment(section.getRecruitment());
         return selectiveQuestion;
     }
 

diff --git a/src/test/java/com/server/crews/environ/service/TestRecruitment.java b/src/test/java/com/server/crews/environ/service/TestRecruitment.java
@@ -30,8 +30,6 @@ public TestRecruitment create(String code, String clubName, LocalDateTime deadli
 
     public TestRecruitment addSection(String name, List<NarrativeQuestion> narrativeQuestions,
                                       List<SelectiveQuestion> selectiveQuestions) {
-        narrativeQuestions.forEach(narrativeQuestion -> narrativeQuestion.updateRecruitment(this.recruitment));
-        selectiveQuestions.forEach(selectiveQuestion -> selectiveQuestion.updateRecruitment(this.recruitment));
         Section section = new Section(null, name, DEFAULT_DESCRIPTION, narrativeQuestions, selectiveQuestions);
         section.updateRecruitment(this.recruitment);
         Section savedSection = environ.sectionRepository().save(section);