btsk-122: learn-stat-계산방식 변경 및 마이그레이션 api에도 잔디 값 바꾸도록 변경 (#158)

* fix: learn-stat-계산방식 변경 및 마이그레이션 api에도 잔디 값 바꾸도록

* refactor: 코드스타일

* fix: 테스트코드와 로직 fix

* fix: codestyle

* fix: 테스트 제거

* fix: 엔드포인트 경량 웹서버로 노출

Author: Hyeonjun0527

docker-compose.qa.yml

@@ -86,6 +86,8 @@ services:
     environment:
       <<: *pullit-common-env
       SPRING_PROFILES_ACTIVE: qa,worker
+      SPRING_MAIN_WEB_APPLICATION_TYPE: NONE
+      MANAGEMENT_SERVER_PORT: 8080
 
   pullit-qa-worker-green:
     restart: unless-stopped
@@ -109,6 +111,8 @@ services:
     environment:
       <<: *pullit-common-env
       SPRING_PROFILES_ACTIVE: qa,worker
+      SPRING_MAIN_WEB_APPLICATION_TYPE: NONE
+      MANAGEMENT_SERVER_PORT: 8080
 
   pullit-qa-db:
     image: mariadb:10.11

src/main/java/kr/it/pullit/modules/projection/learnstats/api/LearnStatsEventPublicApi.java

@@ -6,5 +6,5 @@ public interface LearnStatsEventPublicApi {
 
   void publishQuestionSetSolved(Long memberId, int solvedQuestionCount);
 
-  void publishCorrectAnswerCount(Long memberId, long correctCount);
+  void publishRecalculateCorrectAnswerCount(Long memberId);
 }

src/main/java/kr/it/pullit/modules/projection/learnstats/domain/LearnStats.java

@@ -8,7 +8,7 @@
 import jakarta.persistence.Table;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
+import java.util.Comparator;
 import java.util.List;
 import kr.it.pullit.modules.projection.learnstats.exception.InvalidSolvedQuestionCountException;
 import kr.it.pullit.shared.jpa.BaseEntity;
@@ -78,7 +78,6 @@ public void onQuestionSetSolved(int solvedQuestionCount, LocalDate today) {
     this.totalSolvedQuestionSetCount++;
     this.totalSolvedQuestionCount += solvedQuestionCount;
     this.weeklySolvedQuestionCount += solvedQuestionCount;
-    updateConsecutiveStreak(today);
   }
 
   public void onQuestionSetDeleted(long correctQuestionsInSet) {
@@ -94,57 +93,54 @@ public void updateTotalSolvedQuestionCount(long realCount) {
     this.totalSolvedQuestionCount = realCount;
   }
 
-  public void increaseCorrectQuestionCount(long correctCount) {
-    if (correctCount > 0) {
-      this.totalCorrectQuestionCount += correctCount;
-    }
+  public void updateTotalCorrectQuestionCount(long totalCorrectQuestionCount) {
+    this.totalCorrectQuestionCount = totalCorrectQuestionCount;
   }
 
   public void recalibrate(
       long totalAttemptedQuestionCount,
       long totalCorrectQuestionCount,
       int weeklySolvedQuestionCount,
-      List<LocalDateTime> completedDates) {
+      List<LocalDateTime> completedDates,
+      LocalDate today) {
     this.totalSolvedQuestionCount = totalAttemptedQuestionCount;
     this.totalCorrectQuestionCount = totalCorrectQuestionCount;
     this.weeklySolvedQuestionCount = weeklySolvedQuestionCount;
-    this.consecutiveLearningDays = calculateConsecutiveDaysFrom(completedDates);
+    this.consecutiveLearningDays = calculateCurrentStreakFrom(completedDates, today);
     this.lastLearningDate = findLastLearningDateFrom(completedDates);
   }
 
-  private int calculateConsecutiveDaysFrom(List<LocalDateTime> completedDates) {
+  private int calculateCurrentStreakFrom(List<LocalDateTime> completedDates, LocalDate today) {
     if (completedDates == null || completedDates.isEmpty()) {
       return 0;
     }
 
-    List<LocalDateTime> sortedCompletedDates = completedDates.stream().sorted().toList();
-
-    int consecutiveDays = 0;
-    LocalDate previousDate = null;
+    List<LocalDate> distinctSortedDates =
+        completedDates.stream()
+            .map(LocalDateTime::toLocalDate)
+            .distinct()
+            .sorted(Comparator.reverseOrder())
+            .toList();
 
-    for (LocalDateTime completedDateTime : sortedCompletedDates) {
-      LocalDate currentDate = completedDateTime.toLocalDate();
-      consecutiveDays = updateConsecutiveCount(consecutiveDays, previousDate, currentDate);
-      previousDate = currentDate;
-    }
-    return consecutiveDays;
-  }
+    LocalDate lastDate = distinctSortedDates.get(0);
 
-  private int updateConsecutiveCount(
-      int currentConsecutiveDays, LocalDate previousDate, LocalDate currentDate) {
-    if (previousDate == null) {
-      return 1;
+    if (DAYS.between(lastDate, today) > 1) {
+      return 0;
     }
 
-    long daysBetween = ChronoUnit.DAYS.between(previousDate, currentDate);
+    int consecutiveDays = 1;
+    LocalDate previousDate = lastDate;
 
-    if (daysBetween == 1) {
-      return currentConsecutiveDays + 1;
-    }
-    if (daysBetween > 1) {
-      return 1;
+    for (int i = 1; i < distinctSortedDates.size(); i++) {
+      LocalDate currentDate = distinctSortedDates.get(i);
+      if (DAYS.between(currentDate, previousDate) == 1) {
+        consecutiveDays++;
+        previousDate = currentDate;
+      } else {
+        break;
+      }
     }
-    return currentConsecutiveDays;
+    return consecutiveDays;
   }
 
   private LocalDate findLastLearningDateFrom(List<LocalDateTime> completedDates) {
@@ -157,38 +153,6 @@ private LocalDate findLastLearningDateFrom(List<LocalDateTime> completedDates) {
         .orElse(null);
   }
 
-  private void updateConsecutiveStreak(LocalDate today) {
-    if (lastLearningDate == null) {
-      consecutiveLearningDays = 1;
-      lastLearningDate = today;
-      return;
-    }
-
-    int delta = (int) DAYS.between(lastLearningDate, today);
-
-    if (isSameOrPastDay(delta)) {
-      updateLastLearningDateIfNeeded(today);
-      return;
-    }
-
-    updateConsecutiveDays(delta);
-    lastLearningDate = today;
-  }
-
-  private void updateConsecutiveDays(int delta) {
-    consecutiveLearningDays = (delta == 1) ? consecutiveLearningDays + 1 : 1;
-  }
-
-  private void updateLastLearningDateIfNeeded(LocalDate today) {
-    if (today.isAfter(lastLearningDate)) {
-      lastLearningDate = today;
-    }
-  }
-
-  private boolean isSameOrPastDay(int delta) {
-    return delta <= 0;
-  }
-
   public void resetConsecutiveDaysIfMissed(LocalDate today) {
     if (lastLearningDate != null) {
       long daysBetween = DAYS.between(lastLearningDate, today);

src/main/java/kr/it/pullit/modules/projection/learnstats/event/handler/LearnStatsEventDispatcher.java

@@ -41,7 +41,7 @@ public boolean dispatch(OutboxEvent e) {
       case CORRECT_ANSWER_COUNT_INCREASED -> {
         CorrectAnswerPayload payload =
             objectMapper.readValue(e.getPayload(), CorrectAnswerPayload.class);
-        projectionService.increaseCorrectQuestionCount(payload.memberId(), payload.correctCount());
+        projectionService.recalculateCorrectQuestionCount(payload.memberId());
       }
       default -> {
         return false;

src/main/java/kr/it/pullit/modules/projection/learnstats/event/publisher/LearnStatsEventPublisher.java

@@ -41,8 +41,8 @@ public void publishQuestionSetSolved(Long memberId, int solvedQuestionCount) {
 
   @Override
   @SneakyThrows
-  public void publishCorrectAnswerCount(Long memberId, long correctCount) {
-    CorrectAnswerPayload payload = new CorrectAnswerPayload(memberId, correctCount);
+  public void publishRecalculateCorrectAnswerCount(Long memberId) {
+    CorrectAnswerPayload payload = new CorrectAnswerPayload(memberId, 0);
     String jsonPayload = objectMapper.writeValueAsString(payload);
     OutboxEvent event =
         OutboxEvent.of(

src/main/java/kr/it/pullit/modules/projection/learnstats/service/LearnStatsRecalibrationService.java

@@ -2,6 +2,7 @@
 
 import java.time.Clock;
 import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.TemporalAdjusters;
 import java.util.List;
@@ -70,7 +71,12 @@ private void recalibrateMember(Long memberId) {
     LearnStats stats =
         learnStatsRepository.findById(memberId).orElseGet(() -> LearnStats.newOf(memberId));
 
-    stats.recalibrate(totalAttemptedCount, totalCorrectCount, weeklySolvedCount, completedDates);
+    stats.recalibrate(
+        totalAttemptedCount,
+        totalCorrectCount,
+        weeklySolvedCount,
+        completedDates,
+        LocalDate.now(clock));
     stats.updateTotalQuestionCount(totalQuestionCount);
 
     learnStatsRepository.save(stats);

src/main/java/kr/it/pullit/modules/projection/learnstats/service/LearnStatsService.java

@@ -6,6 +6,7 @@
 import kr.it.pullit.modules.projection.learnstats.api.LearnStatsPublicApi;
 import kr.it.pullit.modules.projection.learnstats.domain.LearnStats;
 import kr.it.pullit.modules.projection.learnstats.repository.LearnStatsRepository;
+import kr.it.pullit.modules.questionset.api.MarkingResultPublicApi;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +17,7 @@
 public class LearnStatsService implements LearnStatsPublicApi {
 
   private final LearnStatsRepository repo;
+  private final MarkingResultPublicApi markingResultPublicApi;
   private final Clock clock;
 
   @Override
@@ -32,6 +34,14 @@ public void applyQuestionSetSolved(Long memberId, int questionCount) {
     repo.save(p);
   }
 
+  public void recalculateCorrectQuestionCount(Long memberId) {
+    long totalCorrectQuestionCount = markingResultPublicApi.countCorrectAnswersByMemberId(memberId);
+
+    LearnStats p = repo.findById(memberId).orElseGet(() -> LearnStats.newOf(memberId));
+    p.updateTotalCorrectQuestionCount(totalCorrectQuestionCount);
+    repo.save(p);
+  }
+
   @Override
   public void applyQuestionSetDeleted(Long memberId, long correctQuestionCount) {
     repo.findById(memberId)
@@ -42,12 +52,6 @@ public void applyQuestionSetDeleted(Long memberId, long correctQuestionCount) {
             });
   }
 
-  public void increaseCorrectQuestionCount(Long memberId, long correctCount) {
-    LearnStats p = repo.findById(memberId).orElseGet(() -> LearnStats.newOf(memberId));
-    p.increaseCorrectQuestionCount(correctCount);
-    repo.save(p);
-  }
-
   @Override
   @Transactional(readOnly = true)
   public Optional<LearnStats> getLearnStats(Long memberId) {

src/main/java/kr/it/pullit/modules/questionset/api/MarkingResultPublicApi.java

@@ -16,4 +16,6 @@ public interface MarkingResultPublicApi {
    * @return 총 맞힌 문제 수
    */
   long countTotalCorrectQuestionsByMemberId(Long memberId);
+
+  long countCorrectAnswersByMemberId(Long memberId);
 }

src/main/java/kr/it/pullit/modules/questionset/event/MarkingCompletedEventHandler.java

@@ -2,7 +2,6 @@
 
 import kr.it.pullit.modules.projection.learnstats.api.LearnStatsDailyPublicApi;
 import kr.it.pullit.modules.projection.learnstats.api.LearnStatsEventPublicApi;
-import kr.it.pullit.modules.questionset.web.dto.response.MarkingResultDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
@@ -25,10 +24,7 @@ public void handleMarkingCompletedEvent(MarkingCompletedEvent event) {
       return;
     }
 
-    long correctCount = event.results().stream().filter(MarkingResultDto::isCorrect).count();
-    if (correctCount > 0) {
-      learnStatsEventPublicApi.publishCorrectAnswerCount(event.memberId(), correctCount);
-    }
+    learnStatsEventPublicApi.publishRecalculateCorrectAnswerCount(event.memberId());
 
     learnStatsEventPublicApi.publishQuestionSetSolved(event.memberId(), event.results().size());
     learnStatsDailyPublicApi.addDailyStats(event.memberId(), event.results().size(), 1);

src/main/java/kr/it/pullit/modules/questionset/repository/MarkingResultRepository.java

@@ -12,4 +12,6 @@ public interface MarkingResultRepository {
   long countDistinctQuestionByMemberId(Long memberId);
 
   long countByMemberIdAndIsCorrectIsTrue(Long memberId);
+
+  long countCorrectAnswersByMemberId(Long memberId);
 }