🚀 릴리즈: Staging to Main

src/main/java/com/springboot/api/counselsession/dto/counselsession/CounselSessionStatRes.java

@@ -2,8 +2,8 @@
 
 import lombok.Builder;
 
-public record CounselSessionStatRes(long totalSessionCount, long counseleeCountForThisMonth,
-                                    long totalCaringMessageCount, long counselHoursForThisMonth) {
+public record CounselSessionStatRes(long counselHoursThisMonth, long counseleeCountForThisMonth,
+                                    long medicationCounselCountThisYear, long counselorCountThisYear) {
 
     @Builder
     public CounselSessionStatRes {

src/main/java/com/springboot/api/counselsession/repository/CounselSessionRepositoryCustom.java

@@ -38,4 +38,6 @@ PageRes<CounselSession> findByCounseleeNameAndCounselorNameAndScheduledDateTimeA
     List<CounselSession> findValidCounselSessionsByCounseleeId(String counseleeId);
 
     void bulkUpdateCounselSessionNum(Map<String, Integer> sessionUpdates);
+
+    Long countDistinctCounselorsByCompletedSessionsInYear(int year);
 }

src/main/java/com/springboot/api/counselsession/repository/CounselSessionRepositoryImpl.java

@@ -267,4 +267,17 @@ public void bulkUpdateCounselSessionNum(Map<String, Integer> sessionUpdates) {
             .where(counselSession.id.in(sessionUpdates.keySet()))
             .execute();
     }
+
+    @Override
+    public Long countDistinctCounselorsByCompletedSessionsInYear(int year) {
+        return queryFactory
+            .select(counselSession.counselor.countDistinct())
+            .from(counselSession)
+            .where(
+                counselSession.status.eq(ScheduleStatus.COMPLETED),
+                counselSession.startDateTime.year().eq(year),
+                counselSession.counselor.isNotNull(),
+                counselSession.counselor.status.eq(CounselorStatus.ACTIVE))
+            .fetchOne();
+    }
 }

src/main/java/com/springboot/api/counselsession/repository/MedicationCounselRepository.java

@@ -1,5 +1,6 @@
 package com.springboot.api.counselsession.repository;
 
+import java.time.LocalDateTime;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,4 +10,6 @@
 public interface MedicationCounselRepository extends JpaRepository<MedicationCounsel, String> {
 
     Optional<MedicationCounsel> findByCounselSessionId(String counselSessionId);
+
+    long countByCreatedDatetimeBetween(LocalDateTime startDate, LocalDateTime endDate);
 }

src/main/java/com/springboot/api/counselsession/service/CounselSessionService.java

@@ -301,35 +301,45 @@ public List<LocalDate> getSessionDatesByYearAndMonth(int year, int month) {
     @Cacheable(value = "sessionStats")
     @Transactional(readOnly = true)
     public CounselSessionStatRes getSessionStats() {
-        long totalSessionCount = calculateTotalSessionCount();
-        Long counseleeCount = counselSessionRepository.countDistinctCounseleeForCurrentMonth();
-        long totalCaringMessageCount = counselSessionRepository.count();
-        double counselHours = calculateCounselHoursForThisMonth();
+        long counselHoursThisMonth = calculateCounselHoursForThisMonth();
+        Long counseleeCountForThisMonth = counselSessionRepository.countDistinctCounseleeForCurrentMonth();
+        long medicationCounselCountThisYear = calculateMedicationCounselCountThisYear();
+        long counselorCountThisYear = calculateCounselorCountThisYear();
 
         return CounselSessionStatRes.builder()
-            .totalSessionCount(totalSessionCount)
-            .counseleeCountForThisMonth(counseleeCount)
-            .totalCaringMessageCount(totalCaringMessageCount)
-            .counselHoursForThisMonth((long) counselHours)
+            .counselHoursThisMonth(counselHoursThisMonth)
+            .counseleeCountForThisMonth(counseleeCountForThisMonth)
+            .medicationCounselCountThisYear(medicationCounselCountThisYear)
+            .counselorCountThisYear(counselorCountThisYear)
             .build();
     }
 
-    private long calculateTotalSessionCount() {
-        return counselSessionRepository.countByStatus(ScheduleStatus.COMPLETED);
+    private long calculateMedicationCounselCountThisYear() {
+        int currentYear = LocalDateTime.now().getYear();
+        return medicationCounselRepository.countByCreatedDatetimeBetween(
+            LocalDateTime.of(currentYear, 1, 1, 0, 0, 0),
+            LocalDateTime.of(currentYear + 1, 1, 1, 0, 0, 0)
+        );
     }
 
-    private double calculateCounselHoursForThisMonth() {
+    private long calculateCounselorCountThisYear() {
+        int currentYear = LocalDateTime.now().getYear();
+        Long count = counselSessionRepository.countDistinctCounselorsByCompletedSessionsInYear(currentYear);
+        return count != null ? count : 0L;
+    }
+
+    private long calculateCounselHoursForThisMonth() {
         int year = LocalDateTime.now().getYear();
         int month = LocalDateTime.now().getMonthValue();
         List<CounselSession> completedSessions = counselSessionRepository
             .findCompletedSessionsByYearAndMonth(year, month);
 
         return completedSessions.stream()
-            .mapToDouble(session -> {
+            .mapToLong(session -> {
                 Duration duration = Duration.between(
                     session.getStartDateTime(),
                     session.getEndDateTime());
-                return duration.toMinutes() / 60.0;
+                return (long) (duration.toMinutes() / 60.0);
             })
             .sum();
     }