From 9ee74a01d792a55300fdf2c35bb13b4ffd671352 Mon Sep 17 00:00:00 2001
From: yujamint <woawoa0513@gmail.com>
Date: Thu, 25 Jul 2024 23:04:20 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=BA=90=EC=8B=9C=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/CategorizedProblemService.java            | 11 +++--------
 .../service/CategorizedSummaryService.java            |  8 +++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/app/domain/categorizedproblem/service/CategorizedProblemService.java b/src/main/java/com/app/domain/categorizedproblem/service/CategorizedProblemService.java
index aff47ab..9308e16 100644
--- a/src/main/java/com/app/domain/categorizedproblem/service/CategorizedProblemService.java
+++ b/src/main/java/com/app/domain/categorizedproblem/service/CategorizedProblemService.java
@@ -247,15 +247,9 @@ public Page<CategorizedProblem> findCategorizedProblemsByCategoryId(Long categor
         return categorizedProblemRepository.findByCategoryCategoryId(categoryId, pageRequest);
     }
 
-
-    public void deleteCategorizedProblem(Long categorizedProblemID){
+    @CacheEvict(value = "categorizedProblem", key = "#result")
+    public Long deleteCategorizedProblem(Long categorizedProblemID) {
         CategorizedProblem categorizedProblem = findVerifiedCategorizedProblemByCategorizedProblemId(categorizedProblemID);
-        Long categoryId = categorizedProblem.getCategory().getCategoryId();
-        deleteAndEvictCache(categorizedProblem, categoryId);
-    }
-
-    @CacheEvict(value = "categorizedProblem", key = "#categoryId")
-    public void deleteAndEvictCache(CategorizedProblem categorizedProblem, Long categoryId) {
         categorizedProblemRepository.deleteById(categorizedProblem.getCategorizedProblemId());
 
         Problem problem = categorizedProblem.getProblem();
@@ -263,6 +257,7 @@ public void deleteAndEvictCache(CategorizedProblem categorizedProblem, Long cate
         if (problem.isMemberSavedProblem() && !isProblemUsedInOtherCategorizedProblems(problemId)) {
             problemService.deleteProblem(problemId);
         }
+        return categorizedProblem.getCategory().getCategoryId();
     }
 
     private boolean isProblemUsedInOtherCategorizedProblems(Long problemId) {
diff --git a/src/main/java/com/app/domain/categorizedsummary/service/CategorizedSummaryService.java b/src/main/java/com/app/domain/categorizedsummary/service/CategorizedSummaryService.java
index 54e068c..c3678bc 100644
--- a/src/main/java/com/app/domain/categorizedsummary/service/CategorizedSummaryService.java
+++ b/src/main/java/com/app/domain/categorizedsummary/service/CategorizedSummaryService.java
@@ -76,7 +76,7 @@ public SummaryDto.pdfResponse createSummaryPdf(Long categorizedSummaryId) throws
         return summaryService.createSummaryPdf(summaryId);
     }
 
-    @CacheEvict(value = "categorizedSummary", key = "#categoryId")
+    @CacheEvict(value = "categorizedSummary", key = "#result.getCategory().getCategoryId()")
     public CategorizedSummary updateCategorizedSummary(Long categorizedSummaryId, SummaryDto.Patch summaryPatchDto) {
         CategorizedSummary categorizedSummary = findVerifiedCategorizedSummaryByCategorizedSummaryId(categorizedSummaryId);
         summaryService.updateSummary(
@@ -87,8 +87,8 @@ public CategorizedSummary updateCategorizedSummary(Long categorizedSummaryId, Su
         return categorizedSummaryRepository.save(categorizedSummary);
     }
 
-    @CacheEvict(value = "categorizedSummary", key = "#categoryId")
-    public void deleteCategorizedSummary(Long categorizedSummaryId) {
+    @CacheEvict(value = "categorizedSummary", key = "#result")
+    public Long deleteCategorizedSummary(Long categorizedSummaryId) {
         CategorizedSummary categorizedSummary = findVerifiedCategorizedSummaryByCategorizedSummaryId(categorizedSummaryId);
 
         categorizedSummaryRepository.deleteById(categorizedSummaryId);
@@ -98,6 +98,8 @@ public void deleteCategorizedSummary(Long categorizedSummaryId) {
         if (summary.isMemberSavedSummary() && !isSummaryUsedInOtherCategorizedSummarys(summaryId)) {
             summaryRepository.deleteById(summaryId);
         }
+        Long categoryId = categorizedSummary.getCategory().getCategoryId();
+        return categoryId;
     }
 
     private boolean isSummaryUsedInOtherCategorizedSummarys(Long summaryId){