fix: 캐시 초기화 문제 수정

capstone-five-ai · Jul 25, 2024 · 9ee74a0 · 9ee74a0
1 parent 3118ff7
commit 9ee74a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -247,22 +247,17 @@ 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();
         Long problemId = problem.getProblemId();
         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
@@ -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){