Merge pull request #135 from team-ppointer/develop

sejoon00 · web-flow · commit 4185fd877124 · 2025-04-20T19:52:59.000+09:00
문항 바로 풀러가기 안됨 오류 해결
diff --git a/src/main/java/com/moplus/moplus_server/domain/concept/repository/ConceptTagRepository.java b/src/main/java/com/moplus/moplus_server/domain/concept/repository/ConceptTagRepository.java
@@ -23,9 +23,13 @@ default void existsByIdElseThrow(Set<Long> ids) {
 
     default List<ConceptTag> findAllByIdsElseThrow(Set<Long> ids) {
         List<ConceptTag> conceptTags = findAllById(ids);
+        List<Long> foundIds = conceptTags.stream()
+                .map(ConceptTag::getId)
+                .toList();
+
         if (conceptTags.size() != ids.size()) {
             throw new NotFoundException(ErrorCode.CONCEPT_TAG_NOT_FOUND_IN_LIST,
-                    "targetIds: " + ids + " / foundIds: " + conceptTags);
+                    "targetIds: " + ids + " / foundIds: " + foundIds);
         }
         return conceptTags;
     }
diff --git a/src/main/java/com/moplus/moplus_server/statistic/Problem/repository/ChildProblemStatisticRepository.java b/src/main/java/com/moplus/moplus_server/statistic/Problem/repository/ChildProblemStatisticRepository.java
@@ -3,11 +3,15 @@
 import com.moplus.moplus_server.global.error.exception.ErrorCode;
 import com.moplus.moplus_server.global.error.exception.NotFoundException;
 import com.moplus.moplus_server.statistic.Problem.domain.ChildProblemStatistic;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ChildProblemStatisticRepository extends JpaRepository<ChildProblemStatistic, Long> {
-    default ChildProblemStatistic findByIdElseThrow(Long id) {
-        return findById(id)
-            .orElseThrow(() -> new NotFoundException(ErrorCode.CHILD_PROBLEM_STATISTIC_NOT_FOUND));
+
+    Optional<ChildProblemStatistic> findByChildProblemId(Long childProblemId);
+
+    default ChildProblemStatistic findByChildProblemIdOrElse(Long childProblemId) {
+        return findByChildProblemId(childProblemId)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.CHILD_PROBLEM_STATISTIC_NOT_FOUND));
     }
 } 
diff --git a/src/main/java/com/moplus/moplus_server/statistic/Problem/repository/ProblemSetStatisticRepository.java b/src/main/java/com/moplus/moplus_server/statistic/Problem/repository/ProblemSetStatisticRepository.java
@@ -14,9 +14,4 @@ default ProblemSetStatistic findByProblemSetIdElseThrow(Long id) {
         return findByProblemSetId(id)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.PROBLEM_SET_STATISTIC_NOT_FOUND));
     }
-
-    default ProblemSetStatistic findByIdElseThrow(Long id) {
-        return findById(id)
-                .orElseThrow(() -> new NotFoundException(ErrorCode.PROBLEM_SET_STATISTIC_NOT_FOUND));
-    }
 } 
diff --git a/src/main/java/com/moplus/moplus_server/statistic/Problem/repository/ProblemStatisticRepository.java b/src/main/java/com/moplus/moplus_server/statistic/Problem/repository/ProblemStatisticRepository.java
@@ -3,11 +3,16 @@
 import com.moplus.moplus_server.global.error.exception.ErrorCode;
 import com.moplus.moplus_server.global.error.exception.NotFoundException;
 import com.moplus.moplus_server.statistic.Problem.domain.ProblemStatistic;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+
 public interface ProblemStatisticRepository extends JpaRepository<ProblemStatistic, Long> {
-    default ProblemStatistic findByIdElseThrow(Long id) {
-        return findById(id)
-            .orElseThrow(() -> new NotFoundException(ErrorCode.PROBLEM_STATISTIC_NOT_FOUND));
+
+    Optional<ProblemStatistic> findByProblemId(Long problemId);
+
+    default ProblemStatistic findByProblemIdElseThrow(Long problemId) {
+        return findByProblemId(problemId)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.PROBLEM_STATISTIC_NOT_FOUND));
     }
 } 
diff --git a/src/main/java/com/moplus/moplus_server/statistic/Problem/service/CountStatisticsUpdateService.java b/src/main/java/com/moplus/moplus_server/statistic/Problem/service/CountStatisticsUpdateService.java
@@ -10,9 +10,11 @@
 import com.moplus.moplus_server.statistic.Problem.repository.ProblemSetStatisticRepository;
 import com.moplus.moplus_server.statistic.Problem.repository.ProblemStatisticRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class CountStatisticsUpdateService {
@@ -21,8 +23,8 @@ public class CountStatisticsUpdateService {
     private final ChildProblemStatisticRepository childProblemStatisticRepository;
 
     @Transactional
-    public void updateStatistics(Long statisticId, StatisticFieldType type, StatisticEntityTarget target) {
-        StatisticCounter statistic = findStatistic(statisticId, target);
+    public void updateStatistics(Long statisticEntityTargetId, StatisticFieldType type, StatisticEntityTarget target) {
+        StatisticCounter statistic = findStatistic(statisticEntityTargetId, target);
         statistic.updateCount(type);
     }
 
@@ -35,11 +37,19 @@ public void createStatistics(Long statisticId, StatisticEntityTarget target) {
         }
     }
 
-    private StatisticCounter findStatistic(Long statisticId, StatisticEntityTarget target) {
-        return switch (target) {
-            case PROBLEM -> problemStatisticRepository.findByIdElseThrow(statisticId);
-            case PROBLEM_SET -> problemSetStatisticRepository.findByIdElseThrow(statisticId);
-            case CHILD_PROBLEM -> childProblemStatisticRepository.findByIdElseThrow(statisticId);
-        };
+    private StatisticCounter findStatistic(Long statisticEntityTargetId, StatisticEntityTarget target) {
+        try {
+            return switch (target) {
+                case PROBLEM -> problemStatisticRepository.findByProblemIdElseThrow(statisticEntityTargetId);
+                case PROBLEM_SET -> problemSetStatisticRepository.findByProblemSetIdElseThrow(statisticEntityTargetId);
+                case CHILD_PROBLEM ->
+                        childProblemStatisticRepository.findByChildProblemIdOrElse(statisticEntityTargetId);
+            };
+        } catch (Exception e) {
+            String message = String.format("📌 [통계 조회 실패] targetType=%s, id=%d, error=%s", target,
+                    statisticEntityTargetId, e.getMessage());
+            log.warn(message, e);
+            throw e;
+        }
     }
 }
diff --git a/src/test/java/com/moplus/moplus_server/statistic/Problem/service/CountStatisticsUpdateServiceTest.java b/src/test/java/com/moplus/moplus_server/statistic/Problem/service/CountStatisticsUpdateServiceTest.java
@@ -36,15 +36,15 @@ class CountStatisticsUpdateServiceTest {
         // given
         Long problemId = 1L;
         ProblemStatistic problemStatistic = new ProblemStatistic(problemId);
-        given(problemStatisticRepository.findByIdElseThrow(problemId))
+        given(problemStatisticRepository.findByProblemIdElseThrow(problemId))
                 .willReturn(problemStatistic);
 
         // when
         countStatisticsUpdateService.updateStatistics(problemId, StatisticFieldType.VIEW,
                 StatisticEntityTarget.PROBLEM);
 
         // then
-        verify(problemStatisticRepository).findByIdElseThrow(problemId);
+        verify(problemStatisticRepository).findByProblemIdElseThrow(problemId);
         assertThat(problemStatistic.getViewCount()).isEqualTo(1L);
         assertThat(problemStatistic.getSubmitCount()).isEqualTo(0L);
     }
@@ -54,15 +54,15 @@ class CountStatisticsUpdateServiceTest {
         // given
         Long problemSetId = 1L;
         ProblemSetStatistic problemSetStatistic = new ProblemSetStatistic(problemSetId);
-        given(problemSetStatisticRepository.findByIdElseThrow(problemSetId))
+        given(problemSetStatisticRepository.findByProblemSetIdElseThrow(problemSetId))
                 .willReturn(problemSetStatistic);
 
         // when
         countStatisticsUpdateService.updateStatistics(problemSetId, StatisticFieldType.SUBMIT,
                 StatisticEntityTarget.PROBLEM_SET);
 
         // then
-        verify(problemSetStatisticRepository).findByIdElseThrow(problemSetId);
+        verify(problemSetStatisticRepository).findByProblemSetIdElseThrow(problemSetId);
         assertThat(problemSetStatistic.getSubmitCount()).isEqualTo(1L);
         assertThat(problemSetStatistic.getViewCount()).isEqualTo(0L);
     }
@@ -72,15 +72,15 @@ class CountStatisticsUpdateServiceTest {
         // given
         Long childProblemId = 1L;
         ChildProblemStatistic childProblemStatistic = new ChildProblemStatistic(childProblemId);
-        given(childProblemStatisticRepository.findByIdElseThrow(childProblemId))
+        given(childProblemStatisticRepository.findByChildProblemIdOrElse(childProblemId))
                 .willReturn(childProblemStatistic);
 
         // when
         countStatisticsUpdateService.updateStatistics(childProblemId, StatisticFieldType.VIEW,
                 StatisticEntityTarget.CHILD_PROBLEM);
 
         // then
-        verify(childProblemStatisticRepository).findByIdElseThrow(childProblemId);
+        verify(childProblemStatisticRepository).findByChildProblemIdOrElse(childProblemId);
         assertThat(childProblemStatistic.getViewCount()).isEqualTo(1L);
         assertThat(childProblemStatistic.getSubmitCount()).isEqualTo(0L);
     }

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,13 @@ default void existsByIdElseThrow(Set<Long> ids) {`
`23`	`23`
`24`	`24`	`default List<ConceptTag> findAllByIdsElseThrow(Set<Long> ids) {`
`25`	`25`	`List<ConceptTag> conceptTags = findAllById(ids);`
	`26`	`+ List<Long> foundIds = conceptTags.stream()`
	`27`	`+ .map(ConceptTag::getId)`
	`28`	`+ .toList();`
	`29`	`+`
`26`	`30`	`if (conceptTags.size() != ids.size()) {`
`27`	`31`	`throw new NotFoundException(ErrorCode.CONCEPT_TAG_NOT_FOUND_IN_LIST,`
`28`		`- "targetIds: " + ids + " / foundIds: " + conceptTags);`
	`32`	`+ "targetIds: " + ids + " / foundIds: " + foundIds);`
`29`	`33`	`}`
`30`	`34`	`return conceptTags;`
`31`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,4 @@ default ProblemSetStatistic findByProblemSetIdElseThrow(Long id) {`
`14`	`14`	`return findByProblemSetId(id)`
`15`	`15`	`.orElseThrow(() -> new NotFoundException(ErrorCode.PROBLEM_SET_STATISTIC_NOT_FOUND));`
`16`	`16`	`}`
`17`		`-`
`18`		`- default ProblemSetStatistic findByIdElseThrow(Long id) {`
`19`		`- return findById(id)`
`20`		`- .orElseThrow(() -> new NotFoundException(ErrorCode.PROBLEM_SET_STATISTIC_NOT_FOUND));`
`21`		`- }`
`22`	`17`	`}`