Merge pull request #222 from FunD-StockProject/fix/experiment-success-rate

Fix/experiment success rate

Author: MuuiGong

src/main/java/com/fund/stockProject/experiment/repository/ExperimentRepository.java

@@ -59,14 +59,15 @@ public interface ExperimentRepository extends JpaRepository<Experiment, Integer>
         + " SELECT u.email, COUNT(e.id) AS cnt "
         + " FROM experiment e "
         + " JOIN users u ON e.user_id = u.id "
+        + " WHERE e.status = 'COMPLETE' "
         + " GROUP BY u.email "
         + " ) AS total "
         + "LEFT JOIN "
         + " ( "
         + " SELECT u.email, COUNT(e.id) AS cnt "
         + " FROM experiment e "
         + " JOIN users u ON e.user_id = u.id "
-        + " WHERE e.roi > 0 "
+        + " WHERE e.status = 'COMPLETE' AND e.roi > 0 "
         + " GROUP BY u.email "
         + " ) AS profitable "
         + "ON total.email = profitable.email "

src/main/java/com/fund/stockProject/experiment/service/ExperimentService.java

@@ -198,8 +198,10 @@ public ExperimentStatusResponse getExperimentStatus(final CustomUserDetails cust
             .average()                            // OptionalDouble 반환
             .orElse(0.0);
 
-        final long count = experimentsByUserId.stream().filter(p -> p.getSellPrice() != null && p.getSellPrice() - p.getBuyPrice() > 0).count(); // 모의투자에 성공한 종목 개수
-        double successRate = experimentsByUserId.size() > 0 ? ((double) count / experimentsByUserId.size()) * 100 : 0.0;
+        // 완료된 실험 중 ROI > 0인 실험 수 계산
+        final long completedCount = experimentsByUserId.stream().filter(p -> "COMPLETE".equals(p.getStatus())).count();
+        final long profitCount = experimentsByUserId.stream().filter(p -> "COMPLETE".equals(p.getStatus()) && p.getRoi() != null && p.getRoi() > 0).count();
+        double successRate = completedCount > 0 ? ((double) profitCount / completedCount) * 100 : 0.0;
 
         return ExperimentStatusResponse.builder()
             .progressExperiments(progressExperimentsInfo) // 진행중인 실험 정보

src/main/java/com/fund/stockProject/notification/controller/NotificationController.java

@@ -162,7 +162,7 @@ public ResponseEntity<NotificationResponse> createTestNotification(
 
         Notification testNotification = Notification.builder()
                 .user(user)
-                .notificationType(NotificationType.SCORE_SPIKE)
+                .notificationType(NotificationType.TEST)
                 .title("테스트 알림")
                 .body("이것은 테스트 알림입니다. " + System.currentTimeMillis())
                 .isRead(false)

src/main/java/com/fund/stockProject/notification/domain/NotificationType.java

@@ -5,7 +5,10 @@
 @Schema(description = "알림 타입 Enum. 시스템이 사용자에게 전달할 수 있는 알림 분류")
 public enum NotificationType {
     @Schema(description = "점수 급변 (스파이크) 발생 시 전달되는 알림")
-    SCORE_SPIKE("점수 급변 알림");
+    SCORE_SPIKE("점수 급변 알림"),
+    
+    @Schema(description = "테스트/개발용 알림")
+    TEST("테스트 알림");
 
     private final String description;