Merge branch 'develop'

The-Monitor-Dev · Nov 28, 2024 · 9295f73 · 9295f73
2 parents 9d09187 + bbebde7
commit 9295f73
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/main/java/the_monitor/application/serviceImpl/ReportServiceImpl.java b/src/main/java/the_monitor/application/serviceImpl/ReportServiceImpl.java
@@ -602,11 +602,17 @@ private ReportCategory setDefaultCategory(Report report, String categoryType) {
 
     private void setReportArticleDefaultCategory(Report report, ReportArticle reportArticle, CategoryType categoryType) {
 
-        ReportCategory defaultCategory = reportCategoryRepository.findByReportAndCategoryTypeAndIsDefault(report, categoryType, true);
+        ReportCategory defaultCategory = findReportCategoryDefault(report, categoryType);
+
+//        // 기본 ReportCategory 설정
+//        reportArticle.setReportCategory(defaultCategory);
+//        reportArticleRepository.save(reportArticle);
+
+        defaultCategory.addReportArticle(reportArticle);
+
+        report.addReportCategory(defaultCategory);
+        reportRepository.save(report);
 
-        // 기본 ReportCategory 설정
-        reportArticle.setReportCategory(defaultCategory);
-        reportArticleRepository.save(reportArticle);
 
     }
 
@@ -642,4 +648,9 @@ private List<Long> getArticleIdsByReportCreateRequest(ReportCreateRequest reques
 
     }
 
+    private ReportCategory findReportCategoryDefault(Report report, CategoryType categoryType) {
+        return reportCategoryRepository.findByReportAndCategoryTypeAndName(report, categoryType, "default")
+                .orElseThrow(() -> new ApiException(ErrorStatus._REPORT_CATEGORY_NOT_FOUND));
+    }
+
 }
diff --git a/src/main/java/the_monitor/domain/model/ReportCategory.java b/src/main/java/the_monitor/domain/model/ReportCategory.java
@@ -63,6 +63,11 @@ public void addReportArticles(List<ReportArticle> reportArticles) {
         reportArticles.forEach(reportArticle -> reportArticle.setReportCategory(this)); // 양방향 연관 관계 설정
     }
 
+    public void addReportArticle(ReportArticle reportArticle) {
+        this.reportArticles.add(reportArticle); // 리스트에 개별 ReportArticle 추가
+        reportArticle.setReportCategory(this); // 양방향 연관 관계 설정
+    }
+
     public void setCategoryType(CategoryType categoryType) {
         this.categoryType = categoryType;
     }

diff --git a/src/main/java/the_monitor/domain/repository/ReportCategoryRepository.java b/src/main/java/the_monitor/domain/repository/ReportCategoryRepository.java
@@ -8,6 +8,7 @@
 import the_monitor.domain.model.ReportCategory;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface ReportCategoryRepository extends JpaRepository<ReportCategory, Long> {
@@ -18,4 +19,6 @@ public interface ReportCategoryRepository extends JpaRepository<ReportCategory,
 
     ReportCategory findByReportAndCategoryTypeAndIsDefault(Report report, CategoryType categoryType, boolean isDefault);
 
+    Optional<ReportCategory> findByReportAndCategoryTypeAndName(Report report, CategoryType categoryType, String reportCategoryName);
+
 }