fix: 코드 충돌 해결

woowacourse-teams · Jul 25, 2024 · f44b0f4 · f44b0f4
1 parent 6086eda
commit f44b0f4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java
@@ -4,6 +4,7 @@
 import com.bang_ggood.checklist.domain.Grade;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 
 public enum Category {
@@ -43,10 +44,14 @@ public String getDescription() {
 
     public Badge getBadge() { return badge; }
 
+    public Set<Integer> getQuestionIds() {
+        return questionIds;
+    }
+
     public static List<Badge> getBadges(List<ChecklistQuestion> questions) {
         return Arrays.stream(values())
                 .filter(category -> {
-                    List<Integer> questionIds = category.questionIds;
+                    Set<Integer> questionIds = category.questionIds;
                     List<ChecklistQuestion> categoryQuestions = questions.stream()
                             .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId()))
                             .toList();
@@ -62,8 +67,5 @@ public static List<Badge> getBadges(List<ChecklistQuestion> questions) {
                 })
                 .map(Category::getBadge)
                 .toList();
-
-    public Set<Integer> getQuestionIds() {
-        return questionIds;
     }
 }
diff --git a/...end/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/...end/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java
@@ -30,6 +30,7 @@ public ResponseEntity<Void> createChecklist(@Valid @RequestBody ChecklistCreateR
     @GetMapping("/checklists")
     public ResponseEntity<UserChecklistsPreviewResponse> readUserChecklistsPreview() {
         return ResponseEntity.ok(checklistService.readUserChecklistsPreview());
+    }
 
     @GetMapping("/checklists/questions")
     public ResponseEntity<ChecklistQuestionsResponse> readChecklistQuestions() {

diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java
@@ -36,7 +36,7 @@ public class Checklist extends BaseEntity {
 
     private String realEstate;
 
-    @OneToMany(mappedBy = "checklist_question")
+    @OneToMany(mappedBy = "checklist")
     private List<ChecklistQuestion> questions;
 
     public Checklist(User user, Room room, Integer deposit, Integer rent, Integer contractTerm, String realEstate) {

diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java
@@ -12,9 +12,9 @@
 import com.bang_ggood.checklist.dto.ChecklistInfo;
 import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse;
 import com.bang_ggood.checklist.dto.QuestionCreateRequest;
+import com.bang_ggood.checklist.dto.QuestionResponse;
 import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse;
 import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse;
-import com.bang_ggood.checklist.dto.QuestionResponse;
 import com.bang_ggood.checklist.repository.ChecklistOptionRepository;
 import com.bang_ggood.checklist.repository.ChecklistQuestionRepository;
 import com.bang_ggood.checklist.repository.ChecklistRepository;
@@ -145,12 +145,14 @@ private List<BadgeResponse> createBadges(List<ChecklistQuestion> questions) {
         return Category.getBadges(questions).stream()
                 .map(BadgeResponse::from)
                 .toList();
-
-    public ChecklistQuestionsResponse readChecklistQuestions() {
+    }
+
+    public ChecklistQuestionsResponse readChecklistQuestions () {
         List<CategoryQuestionsResponse> categoryQuestionsResponses = new ArrayList<>();
         for (Category category : Category.values()) {
             CategoryQuestionsResponse categoryQuestionsResponse =
-                    new CategoryQuestionsResponse(category.getId(), category.getDescription(),  readChecklistQuestion(category));
+                    new CategoryQuestionsResponse(category.getId(), category.getDescription(),
+                            readChecklistQuestion(category));
             categoryQuestionsResponses.add(categoryQuestionsResponse);
         }
         return new ChecklistQuestionsResponse(categoryQuestionsResponses);