Merge pull request #204 from FunD-StockProject/fix/experiment-public-api

MuuiGong · web-flow · commit cf77a85b6cfc · 2025-12-07T12:17:15.000+09:00
Fix/experiment public api
diff --git a/scripts/stocks_info/overseas_stock_code.py b/scripts/stocks_info/overseas_stock_code.py
@@ -26,26 +26,52 @@
 def get_overseas_master_dataframe(base_dir,val):
 
     ssl._create_default_https_context = ssl._create_unverified_context
-    # urllib.request.urlretrieve(f"https://new.real.download.dws.co.kr/common/master/{val}mst.cod.zip", base_dir + f"\\{val}mst.cod.zip")
-    urllib.request.urlretrieve(f"https://new.real.download.dws.co.kr/common/master/{val}mst.cod.zip", os.path.join(base_dir, f"{val}mst.cod.zip"))
-    os.chdir(base_dir)
-
-    overseas_zip = zipfile.ZipFile(f'{val}mst.cod.zip')
-    overseas_zip.extractall()
-    overseas_zip.close()
-
-    # file_name = base_dir + f"\\{val}mst.cod"
-    file_name = os.path.join(base_dir, f"{val}mst.cod")
-    columns = ['National code', 'Exchange id', 'Exchange code', 'Exchange name', 'Symbol', 'realtime symbol', 'Korea name', 'English name', 'Security type(1:Index,2:Stock,3:ETP(ETF),4:Warrant)', 'currency', 'float position', 'data type', 'base price', 'Bid order size', 'Ask order size', 'market start time(HHMM)', 'market end time(HHMM)', 'DR 여부(Y/N)', 'DR 국가코드', '업종분류코드', '지수구성종목 존재 여부(0:구성종목없음,1:구성종목있음)', 'Tick size Type', '구분코드(001:ETF,002:ETN,003:ETC,004:Others,005:VIX Underlying ETF,006:VIX Underlying ETN)','Tick size type 상세']
     
-    print(f"Downloading...{val}mst.cod")
-    # df = pd.read_table(base_dir+f"\\{val}mst.cod",sep='\t',encoding='cp949')
-    df = pd.read_table(os.path.join(base_dir, f"{val}mst.cod"), sep='\t',encoding='cp949')
-    df.columns = columns
-    df.to_excel(f'{val}_code.xlsx',index=False)  # 현재 위치에 엑셀파일로 저장
-
+    # ZIP 파일 경로
+    zip_file_path = os.path.join(base_dir, f"{val}mst.cod.zip")
+    # 압축 해제된 파일 경로
+    cod_file_path = os.path.join(base_dir, f"{val}mst.cod")
     
-    return df
+    try:
+        # ZIP 파일 다운로드
+        print(f"Downloading...{val}mst.cod.zip")
+        urllib.request.urlretrieve(
+            f"https://new.real.download.dws.co.kr/common/master/{val}mst.cod.zip", 
+            zip_file_path
+        )
+        
+        # ZIP 파일이 다운로드되었는지 확인
+        if not os.path.exists(zip_file_path):
+            raise FileNotFoundError(f"ZIP file not found after download: {zip_file_path}")
+        
+        # ZIP 파일 압축 해제
+        with zipfile.ZipFile(zip_file_path, 'r') as overseas_zip:
+            overseas_zip.extractall(base_dir)
+        
+        # 압축 해제된 파일이 존재하는지 확인
+        if not os.path.exists(cod_file_path):
+            raise FileNotFoundError(f"Extracted file not found: {cod_file_path}")
+        
+        # 파일 읽기
+        columns = ['National code', 'Exchange id', 'Exchange code', 'Exchange name', 'Symbol', 'realtime symbol', 'Korea name', 'English name', 'Security type(1:Index,2:Stock,3:ETP(ETF),4:Warrant)', 'currency', 'float position', 'data type', 'base price', 'Bid order size', 'Ask order size', 'market start time(HHMM)', 'market end time(HHMM)', 'DR 여부(Y/N)', 'DR 국가코드', '업종분류코드', '지수구성종목 존재 여부(0:구성종목없음,1:구성종목있음)', 'Tick size Type', '구분코드(001:ETF,002:ETN,003:ETC,004:Others,005:VIX Underlying ETF,006:VIX Underlying ETN)','Tick size type 상세']
+        
+        df = pd.read_table(cod_file_path, sep='\t', encoding='cp949')
+        df.columns = columns
+        
+        # 엑셀 파일 저장 (선택사항)
+        excel_path = os.path.join(base_dir, f'{val}_code.xlsx')
+        df.to_excel(excel_path, index=False)
+        
+        return df
+        
+    except Exception as e:
+        # 에러 발생 시 정리
+        if os.path.exists(zip_file_path):
+            try:
+                os.remove(zip_file_path)
+            except:
+                pass
+        raise e
 
 # 자동 실행 코드 주석 처리 (테스트를 위해)
 # cmd = input("1:전부 다운로드, 2:1개의 시장을 다운로드 \n")
diff --git a/src/main/java/com/fund/stockProject/experiment/dto/ExperimentStatusDetailResponse.java b/src/main/java/com/fund/stockProject/experiment/dto/ExperimentStatusDetailResponse.java
@@ -1,5 +1,6 @@
 package com.fund.stockProject.experiment.dto;
 
+import com.fund.stockProject.stock.domain.COUNTRY;
 import java.time.LocalDateTime;
 import java.util.List;
 import lombok.Builder;
@@ -17,6 +18,7 @@ public class ExperimentStatusDetailResponse {
     private Integer buyPrice; // 매수 가격
     private Integer currentPrice; // 현재 가격
     private LocalDateTime buyAt; // 매수일
+    private COUNTRY country; // 국가
 
     @Getter
     public static class TradeInfo {
diff --git a/src/main/java/com/fund/stockProject/experiment/service/ExperimentService.java b/src/main/java/com/fund/stockProject/experiment/service/ExperimentService.java
@@ -287,6 +287,9 @@ public ExperimentStatusDetailResponse getExperimentStatusDetail(final Integer ex
             // 최종 수익률 계산: 현재 가격 기준
             double roi = ((currentPrice - experiment.getBuyPrice()) / experiment.getBuyPrice()) * 100;
             
+            // country 설정
+            final COUNTRY country = stockInfo != null ? stockInfo.getCountry() : getCountryFromExchangeNum(stock.getExchangeNum());
+            
             return ExperimentStatusDetailResponse.builder()
                 .tradeInfos(new ArrayList<>())
                 .roi(roi)
@@ -297,6 +300,7 @@ public ExperimentStatusDetailResponse getExperimentStatusDetail(final Integer ex
                 .buyPrice(experiment.getBuyPrice().intValue())
                 .currentPrice(currentPrice)
                 .buyAt(experiment.getBuyAt())
+                .country(country)
                 .build();
         }
         
@@ -322,6 +326,9 @@ public ExperimentStatusDetailResponse getExperimentStatusDetail(final Integer ex
             );
         }
 
+        // country 설정
+        final COUNTRY country = stockInfo != null ? stockInfo.getCountry() : getCountryFromExchangeNum(stock.getExchangeNum());
+
         return ExperimentStatusDetailResponse.builder()
             .tradeInfos(tradeInfos)
             .roi(roi)
@@ -332,6 +339,7 @@ public ExperimentStatusDetailResponse getExperimentStatusDetail(final Integer ex
             .buyPrice(experiment.getBuyPrice().intValue())
             .currentPrice(currentPrice)
             .buyAt(experiment.getBuyAt())
+            .country(country)
             .build();
     }
 
diff --git a/src/main/java/com/fund/stockProject/global/config/SecurityConfig.java b/src/main/java/com/fund/stockProject/global/config/SecurityConfig.java
@@ -77,11 +77,7 @@ public class SecurityConfig {
             "/stock/{id}/info/{country}",
             "/stock/category/{category}/{country}",
             "/stock/rankings/hot",
-            "/stock/summary/{symbol}/{country}",
-            "/experiment/status",
-            "/experiment/{id}/buy/{country}",
-            "/experiment/status/{id}/detail",
-            "/experiment/report"
+            "/stock/summary/{symbol}/{country}"
     };
 
     @Bean
diff --git a/src/main/java/com/fund/stockProject/global/scheduler/StockUpdateScheduler.java b/src/main/java/com/fund/stockProject/global/scheduler/StockUpdateScheduler.java
@@ -1,21 +1,17 @@
 package com.fund.stockProject.global.scheduler;
 
-import com.fund.stockProject.stock.service.StockImportService;
+import com.fund.stockProject.stock.service.StockMasterUpdateService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class StockUpdateScheduler {
 
-    private final StockImportService stockImportService;
+    private final StockMasterUpdateService stockMasterUpdateService;
 
     /**
      * 매주 목요일 새벽 3시에 종목 마스터 데이터 업데이트
@@ -24,71 +20,7 @@ public class StockUpdateScheduler {
     @Scheduled(cron = "0 0 3 * * THU", zone = "Asia/Seoul") // 매주 목요일 3시 실행
     public void updateStockMaster() {
         log.info("Starting weekly stock master update scheduler");
-        
-        try {
-            // 1. Python 스크립트 실행하여 종목 데이터 수집
-            String scriptPath = "scripts/import_stocks.py";
-            File scriptFile = new File(scriptPath);
-            
-            // Docker 환경에서는 /app 경로 기준으로 실행
-            if (!scriptFile.exists()) {
-                scriptPath = "/app/scripts/import_stocks.py";
-                scriptFile = new File(scriptPath);
-            }
-            
-            if (!scriptFile.exists()) {
-                log.error("Stock import script not found: {}", scriptPath);
-                return;
-            }
-
-            log.info("Executing Python script: {}", scriptPath);
-            // 스크립트 파일명만 사용 (작업 디렉토리를 스크립트 디렉토리로 설정하므로)
-            String scriptFileName = scriptFile.getName();
-            File scriptDir = scriptFile.getParentFile();
-            
-            ProcessBuilder processBuilder = new ProcessBuilder("python3", scriptFileName);
-            // 스크립트가 있는 디렉토리를 작업 디렉토리로 설정
-            processBuilder.directory(scriptDir != null ? scriptDir : new File("."));
-            processBuilder.redirectErrorStream(true);
-            
-            Process process = processBuilder.start();
-            
-            // 스크립트 출력 읽기
-            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                log.info("Python script output: {}", line);
-            }
-            
-            int exitCode = process.waitFor();
-            if (exitCode != 0) {
-                log.error("Python script execution failed with exit code: {}", exitCode);
-                return;
-            }
-            
-            log.info("Python script executed successfully");
-            
-            // 2. 생성된 JSON 파일을 DB에 반영
-            String jsonFilePath = "scripts/stocks_data.json";
-            File jsonFile = new File(jsonFilePath);
-            // Docker 환경에서는 /app 경로 기준으로 확인
-            if (!jsonFile.exists()) {
-                jsonFilePath = "/app/scripts/stocks_data.json";
-                jsonFile = new File(jsonFilePath);
-            }
-            if (!jsonFile.exists()) {
-                log.error("Generated JSON file not found: {}", jsonFilePath);
-                return;
-            }
-            log.info("Importing stocks from JSON file: {}", jsonFilePath);
-            stockImportService.importStocksFromJson(jsonFilePath);
-            
-            log.info("Weekly stock master update completed successfully");
-            
-        } catch (Exception e) {
-            log.error("Weekly stock master update scheduler failed", e);
-            throw new RuntimeException("Failed to update stock master", e);
-        }
+        stockMasterUpdateService.updateStockMaster();
     }
 }
 
diff --git a/src/main/java/com/fund/stockProject/stock/controller/StockImportController.java b/src/main/java/com/fund/stockProject/stock/controller/StockImportController.java
@@ -1,12 +1,17 @@
 package com.fund.stockProject.stock.controller;
 
+import com.fund.stockProject.security.principle.CustomUserDetails;
 import com.fund.stockProject.stock.service.StockImportService;
+import com.fund.stockProject.stock.service.StockMasterUpdateService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -20,12 +25,28 @@
 public class StockImportController {
 
     private final StockImportService stockImportService;
+    private final StockMasterUpdateService stockMasterUpdateService;
 
     @PostMapping("/import")
     @Operation(summary = "종목 데이터 임포트", description = "JSON 파일에서 종목 데이터를 읽어서 DB에 저장합니다. 기본 경로: scripts/stocks_data.json")
     public ResponseEntity<Map<String, String>> importStocks(
-            @RequestParam(required = false, defaultValue = "scripts/stocks_data.json") String jsonFilePath) {
+            @RequestParam(required = false, defaultValue = "scripts/stocks_data.json") String jsonFilePath,
+            @Parameter(hidden = true) @AuthenticationPrincipal CustomUserDetails customUserDetails) {
         try {
+            // ADMIN 권한 체크
+            if (customUserDetails == null) {
+                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                        .body(Map.of("error", "Authentication required"));
+            }
+            
+            boolean isAdmin = customUserDetails.getAuthorities().stream()
+                    .anyMatch(authority -> authority.getAuthority().equals("ROLE_ADMIN"));
+            
+            if (!isAdmin) {
+                return ResponseEntity.status(HttpStatus.FORBIDDEN)
+                        .body(Map.of("error", "Only ADMIN users can import stocks"));
+            }
+            
             stockImportService.importStocksFromJson(jsonFilePath);
             return ResponseEntity.ok(Map.of("message", "Stocks imported successfully"));
         } catch (Exception e) {
@@ -34,5 +55,36 @@ public ResponseEntity<Map<String, String>> importStocks(
                     .body(Map.of("error", "Failed to import stocks: " + e.getMessage()));
         }
     }
+
+    @PostMapping("/update-master")
+    @Operation(
+            summary = "종목 마스터 업데이트 (배치 작업)",
+            description = "Python 스크립트를 실행하여 최신 종목 데이터를 수집하고 DB에 반영합니다. ADMIN만 가능합니다."
+    )
+    public ResponseEntity<Map<String, String>> updateStockMaster(
+            @Parameter(hidden = true) @AuthenticationPrincipal CustomUserDetails customUserDetails) {
+        try {
+            // ADMIN 권한 체크
+            if (customUserDetails == null) {
+                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                        .body(Map.of("error", "Authentication required"));
+            }
+            
+            boolean isAdmin = customUserDetails.getAuthorities().stream()
+                    .anyMatch(authority -> authority.getAuthority().equals("ROLE_ADMIN"));
+            
+            if (!isAdmin) {
+                return ResponseEntity.status(HttpStatus.FORBIDDEN)
+                        .body(Map.of("error", "Only ADMIN users can trigger stock master update"));
+            }
+            
+            stockMasterUpdateService.updateStockMaster();
+            return ResponseEntity.ok(Map.of("message", "Stock master update completed successfully"));
+        } catch (Exception e) {
+            log.error("Error updating stock master", e);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(Map.of("error", "Failed to update stock master: " + e.getMessage()));
+        }
+    }
 }
 
diff --git a/src/main/java/com/fund/stockProject/stock/service/StockImportService.java b/src/main/java/com/fund/stockProject/stock/service/StockImportService.java
diff --git a/src/main/java/com/fund/stockProject/stock/service/StockMasterUpdateService.java b/src/main/java/com/fund/stockProject/stock/service/StockMasterUpdateService.java
