Merge pull request #256 from FunD-StockProject/fix/schedular-external-api

MuuiGong · web-flow · commit 5009cee0146c · 2026-02-22T16:25:28.000+09:00
Fix: 스케줄러와 외부 API 호출 관련 안정화
diff --git a/src/main/java/com/fund/stockProject/experiment/service/HolidayService.java b/src/main/java/com/fund/stockProject/experiment/service/HolidayService.java
@@ -8,6 +8,7 @@
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDate;
+import java.time.Duration;
 import java.time.format.DateTimeFormatter;
 import java.util.HashSet;
 import java.util.Set;
@@ -24,6 +25,7 @@ public class HolidayService {
     private String serviceKey;
 
     private static final String API_BASE_URL = "http://apis.data.go.kr/B090041/openapi/service/SpcdeInfoService";
+    private static final Duration HOLIDAY_API_TIMEOUT = Duration.ofSeconds(8);
     
     // 간단한 메모리 캐시 (연도별)
     private final ConcurrentHashMap<Integer, Set<LocalDate>> holidayCache = new ConcurrentHashMap<>();
@@ -51,6 +53,7 @@ public Mono<Set<LocalDate>> getHolidays(int year) {
                         .build())
                 .retrieve()
                 .bodyToMono(String.class)
+                .timeout(HOLIDAY_API_TIMEOUT)
                 .map(xmlResponse -> {
                     Set<LocalDate> holidays = parseHolidays(xmlResponse);
                     // 캐시에 저장
@@ -107,12 +110,11 @@ private Set<LocalDate> parseHolidays(String xmlResponse) {
      */
     public boolean isHolidaySync(LocalDate date) {
         try {
-            Set<LocalDate> holidays = getHolidays(date.getYear()).block();
+            Set<LocalDate> holidays = getHolidays(date.getYear()).block(HOLIDAY_API_TIMEOUT.plusSeconds(1));
             return holidays != null && holidays.contains(date);
         } catch (Exception e) {
             log.error("Failed to check holiday synchronously", e);
             return false; // 에러 시 공휴일이 아닌 것으로 처리
         }
     }
 }
-
diff --git a/src/main/java/com/fund/stockProject/global/config/SecurityHttpConfig.java b/src/main/java/com/fund/stockProject/global/config/SecurityHttpConfig.java
@@ -1,25 +1,32 @@
 package com.fund.stockProject.global.config;
 
 import java.time.LocalDateTime;
+import java.time.Duration;
 import java.time.format.DateTimeFormatter;
 
 import jakarta.annotation.PostConstruct;
+import io.netty.channel.ChannelOption;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.reactive.function.client.WebClient;
 
 import com.fund.stockProject.global.dto.request.AccessTokenRequest;
 import com.fund.stockProject.global.dto.response.AccessTokenResponse;
 
 import lombok.extern.slf4j.Slf4j;
+import reactor.netty.http.client.HttpClient;
 
 @Slf4j
 @Configuration
 public class SecurityHttpConfig {
+    private static final int CONNECT_TIMEOUT_MILLIS = 5000;
+    private static final Duration RESPONSE_TIMEOUT = Duration.ofSeconds(10);
+    private static final String KIS_BASE_URL = "https://openapi.koreainvestment.com:9443";
 
     @Value("${spring.security.appkey}")
     private String appkey;
@@ -41,9 +48,7 @@ public void warmUpAccessToken() {
 
     @Bean
     public WebClient webClient() {
-        return WebClient.builder()
-                        .baseUrl("https://openapi.koreainvestment.com:9443")
-                        .build(); // 기본 헤더는 WebClient 호출 시 동적으로 설정
+        return buildKisWebClient(); // 기본 헤더는 WebClient 호출 시 동적으로 설정
     }
 
     public HttpHeaders createSecurityHeaders() {
@@ -59,17 +64,18 @@ public HttpHeaders createSecurityHeaders() {
 
     private String fetchAccessTokenFromApi() {
         log.info("Fetching access token from Korea Investment API");
-        WebClient webClient = WebClient.create();
+        final WebClient webClient = buildKisWebClient();
         AccessTokenRequest request = new AccessTokenRequest("client_credentials", appkey, appSecret);
 
         try {
             AccessTokenResponse response = webClient.post()
-                                                    .uri("https://openapi.koreainvestment.com:9443/oauth2/tokenP")
+                                                    .uri("/oauth2/tokenP")
                                                     .headers(headers -> headers.setContentType(MediaType.APPLICATION_JSON))
                                                     .bodyValue(request)
                                                     .retrieve()
                                                     .bodyToMono(AccessTokenResponse.class)
-                                                    .block();
+                                                    .timeout(RESPONSE_TIMEOUT)
+                                                    .block(RESPONSE_TIMEOUT.plusSeconds(1));
 
             if (response != null) {
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -87,6 +93,17 @@ private String fetchAccessTokenFromApi() {
         }
     }
 
+    private WebClient buildKisWebClient() {
+        final HttpClient httpClient = HttpClient.create()
+            .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, CONNECT_TIMEOUT_MILLIS)
+            .responseTimeout(RESPONSE_TIMEOUT);
+
+        return WebClient.builder()
+            .baseUrl(KIS_BASE_URL)
+            .clientConnector(new ReactorClientHttpConnector(httpClient))
+            .build();
+    }
+
     public void refreshTokenIfNeeded() {
         if (accessToken == null || LocalDateTime.now().isAfter(expiredDateTime)) {
             synchronized (this) {
diff --git a/src/main/java/com/fund/stockProject/global/exception/GlobalExceptionHandler.java b/src/main/java/com/fund/stockProject/global/exception/GlobalExceptionHandler.java
@@ -7,6 +7,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -64,6 +65,26 @@ public ResponseEntity<Map<String, Object>> handleIllegalState(
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(body);
     }
 
+    @ExceptionHandler(NoResourceFoundException.class)
+    public ResponseEntity<Map<String, Object>> handleNoResourceFound(
+            NoResourceFoundException ex, HttpServletRequest request) {
+        if ("/favicon.ico".equals(request.getRequestURI())) {
+            log.debug("Favicon not found - URI: {}, Method: {}", request.getRequestURI(), request.getMethod());
+        } else {
+            log.warn("Resource not found - URI: {}, Method: {}, Error: {}",
+                request.getRequestURI(), request.getMethod(), ex.getMessage());
+        }
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("timestamp", LocalDateTime.now());
+        body.put("status", HttpStatus.NOT_FOUND.value());
+        body.put("error", "Not Found");
+        body.put("message", "Resource not found");
+        body.put("path", request.getRequestURI());
+
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(body);
+    }
+
     @ExceptionHandler(RuntimeException.class)
     public ResponseEntity<Map<String, Object>> handleRuntimeException(
             RuntimeException ex, HttpServletRequest request) {
@@ -99,4 +120,3 @@ public ResponseEntity<Map<String, Object>> handleGenericException(
 
 
 
-
diff --git a/src/main/java/com/fund/stockProject/global/scheduler/KeywordCleanupScheduler.java b/src/main/java/com/fund/stockProject/global/scheduler/KeywordCleanupScheduler.java
@@ -1,17 +1,17 @@
 package com.fund.stockProject.global.scheduler;
 
 import java.time.LocalDate;
-import java.util.List;
 
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.fund.stockProject.keyword.entity.Keyword;
 import com.fund.stockProject.keyword.repository.KeywordRepository;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class KeywordCleanupScheduler {
@@ -22,10 +22,11 @@ public class KeywordCleanupScheduler {
     @Scheduled(cron = "0 0 0 * * MON") // 매주 월요일 0시 실행
     @Transactional
     public void cleanupUnusedKeywords() {
-        LocalDate cutoffDate = LocalDate.now().minusDays(30);
-        List<Keyword> unusedKeywords = keywordRepository.findByLastUsedAtBefore(cutoffDate);
-        keywordRepository.deleteAll(unusedKeywords);
+        final LocalDate cutoffDate = LocalDate.now().minusDays(30);
+        final int agedOrphanDeleted = keywordRepository.deleteOrphanKeywordsByLastUsedAtBefore(cutoffDate);
+        final int orphanDeleted = keywordRepository.deleteAllOrphanKeywords();
 
-        System.out.println("Unused keywords cleanup completed: " + unusedKeywords.size() + " keywords deleted.");
+        log.info("Unused keywords cleanup completed - agedOrphanDeleted: {}, orphanDeleted: {}",
+            agedOrphanDeleted, orphanDeleted);
     }
-}
+}
diff --git a/src/main/java/com/fund/stockProject/keyword/repository/KeywordRepository.java b/src/main/java/com/fund/stockProject/keyword/repository/KeywordRepository.java
@@ -7,12 +7,14 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
-public interface KeywordRepository extends JpaRepository<Keyword, Integer> {
+public interface KeywordRepository extends JpaRepository<Keyword, Long> {
     @Query("SELECT k FROM Keyword k WHERE k.lastUsedAt < :cutoffDate")
     List<Keyword> findByLastUsedAtBefore(@Param("cutoffDate") LocalDate cutoffDate);
 
@@ -51,4 +53,25 @@ public interface KeywordRepository extends JpaRepository<Keyword, Integer> {
     List<Keyword> findKeywords(@Param("today") LocalDate today,
                                @Param("yesterday") LocalDate yesterday,
                                PageRequest pageRequest);
+
+    @Modifying
+    @Transactional
+    @Query("""
+        DELETE FROM Keyword k
+        WHERE k.lastUsedAt < :cutoffDate
+        AND NOT EXISTS (
+            SELECT 1 FROM StockKeyword sk WHERE sk.keyword = k
+        )
+    """)
+    int deleteOrphanKeywordsByLastUsedAtBefore(@Param("cutoffDate") LocalDate cutoffDate);
+
+    @Modifying
+    @Transactional
+    @Query("""
+        DELETE FROM Keyword k
+        WHERE NOT EXISTS (
+            SELECT 1 FROM StockKeyword sk WHERE sk.keyword = k
+        )
+    """)
+    int deleteAllOrphanKeywords();
 }
diff --git a/src/main/java/com/fund/stockProject/keyword/repository/StockKeywordRepository.java b/src/main/java/com/fund/stockProject/keyword/repository/StockKeywordRepository.java
@@ -10,7 +10,7 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface StockKeywordRepository extends JpaRepository<StockKeyword, Integer> {
+public interface StockKeywordRepository extends JpaRepository<StockKeyword, Long> {
 
     @Query("SELECT sk FROM StockKeyword sk WHERE sk.keyword.name = :keywordName ORDER BY sk.keyword.frequency DESC")
     List<StockKeyword> findByKeywordName(@Param("keywordName") String keywordName);
diff --git a/src/main/java/com/fund/stockProject/notification/service/OutboxDispatcher.java b/src/main/java/com/fund/stockProject/notification/service/OutboxDispatcher.java
@@ -147,8 +147,9 @@ private void handleError(OutboxEvent e, Exception ex) {
         int retryCount = e.getRetryCount() + 1;
         e.setRetryCount(retryCount);
         
-        // 지수 백오프: 1분, 2분, 4분, 8분, 16분, 32분, 64분, 128분, 256분, 300분(최대)
-        long backoffSec = Math.min(300, 1L << Math.min(10, retryCount));
+        // 지수 백오프(분 단위): 1분, 2분, 4분 ... 최대 300분
+        final long backoffMinutes = Math.min(300L, 1L << Math.min(10, Math.max(0, retryCount - 1)));
+        long backoffSec = backoffMinutes * 60L;
         e.setNextAttemptAt(Instant.now().plusSeconds(backoffSec));
         e.setStatus("RETRY");
         outboxRepo.save(e);
diff --git a/src/main/java/com/fund/stockProject/score/repository/ScoreRepository.java b/src/main/java/com/fund/stockProject/score/repository/ScoreRepository.java
@@ -7,18 +7,17 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.fund.stockProject.score.entity.Score;
+import com.fund.stockProject.score.entity.ScoreId;
 import com.fund.stockProject.stock.domain.DomesticSector;
 import com.fund.stockProject.stock.domain.OverseasSector;
 
 @Repository
-@EnableJpaRepositories
-public interface ScoreRepository extends JpaRepository<Score, Integer> {
+public interface ScoreRepository extends JpaRepository<Score, ScoreId> {
 
     /**
      * stock_id와 date로 특정 데이터가 존재하는지 확인
diff --git a/src/main/java/com/fund/stockProject/score/service/NoCrawlerDataException.java b/src/main/java/com/fund/stockProject/score/service/NoCrawlerDataException.java
@@ -0,0 +1,8 @@
+package com.fund.stockProject.score.service;
+
+public class NoCrawlerDataException extends RuntimeException {
+
+    public NoCrawlerDataException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/fund/stockProject/score/service/ScoreBatchService.java b/src/main/java/com/fund/stockProject/score/service/ScoreBatchService.java
@@ -30,11 +30,14 @@ public void runCountryBatch(COUNTRY country) {
         int processedCount = 0;
         int successCount = 0;
         int skippedCount = 0;
+        int existsSkipCount = 0;
+        int noDataSkipCount = 0;
         int errorCount = 0;
 
         for (Integer stockId : targetStockIds) {
             if (scoreRepository.existsByStockIdAndDate(stockId, today)) {
                 skippedCount++;
+                existsSkipCount++;
                 continue;
             }
 
@@ -43,14 +46,18 @@ public void runCountryBatch(COUNTRY country) {
                 int yesterdayScore = resolveYesterdayScore(stockId, country, yesterday, today);
                 scoreService.updateScoreAndKeyword(stockId, country, yesterdayScore);
                 successCount++;
+            } catch (NoCrawlerDataException e) {
+                skippedCount++;
+                noDataSkipCount++;
+                log.info("Skipping score update due to no crawler data - stockId: {}, country: {}", stockId, country);
             } catch (Exception e) {
                 errorCount++;
                 log.error("Error processing score for stockId: {}", stockId, e);
             }
         }
 
-        log.info("Score batch completed for {}: processed={}, success={}, skipped={}, errors={}", 
-            country, processedCount, successCount, skippedCount, errorCount);
+        log.info("Score batch completed for {}: processed={}, success={}, skipped={} (exists={}, noData={}), errors={}",
+            country, processedCount, successCount, skippedCount, existsSkipCount, noDataSkipCount, errorCount);
     }
 
     public void runIndexBatch() {
diff --git a/src/main/java/com/fund/stockProject/score/service/ScoreService.java b/src/main/java/com/fund/stockProject/score/service/ScoreService.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
