docs/RELEASE-NOTES.md

@@ -4,6 +4,14 @@
 
 ## [Unreleased]
 
+## [2026-03-27.3]
+
+### 추가
+- 비정상 궤적 포함 저장 플래그 (`include-abnormal-in-tracks`) — 강화학습 데이터 수집용
+
+### 수정
+- REST API 경로 client_id 수집 누락 수정 — JWT 쿠키 파싱 공용 메서드 추출
+
 ## [2026-03-27.2]
 
 ### 수정

src/main/java/gc/mda/signal_batch/batch/job/DailyAggregationStepConfig.java

@@ -62,6 +62,9 @@ public class DailyAggregationStepConfig {
     @Value("${vessel.batch.chunk-size:5000}")
     private int chunkSize;
 
+    @Value("${vessel.batch.track.include-abnormal-in-tracks:false}")
+    private boolean includeAbnormalInTracks;
+
     @Bean
     public Step mergeDailyTracksStep() {
         log.info("Building mergeDailyTracksStep with cache-based in-memory merge");
@@ -110,7 +113,9 @@ public class DailyAggregationStepConfig {
         return new CompositeTrackWriter(
             vesselTrackBulkWriter,
             abnormalTrackWriter,
-            "daily"
+            "daily",
+            null,
+            includeAbnormalInTracks
         );
     }
 

src/main/java/gc/mda/signal_batch/batch/job/HourlyAggregationStepConfig.java

@@ -69,6 +69,9 @@ public class HourlyAggregationStepConfig {
     @Value("${vessel.batch.chunk-size:5000}")
     private int chunkSize;
 
+    @Value("${vessel.batch.track.include-abnormal-in-tracks:false}")
+    private boolean includeAbnormalInTracks;
+
     // ──────────────────────────────────────────────
     // Step 1: 5분 → 시간 병합 (인메모리 캐시 기반)
     // ──────────────────────────────────────────────
@@ -122,7 +125,8 @@ public class HourlyAggregationStepConfig {
                 vesselTrackBulkWriter,
                 abnormalTrackWriter,
                 "hourly",
-                hourlyTrackCache
+                hourlyTrackCache,
+                includeAbnormalInTracks
         );
     }
 

src/main/java/gc/mda/signal_batch/batch/job/VesselTrackStepConfig.java

@@ -96,6 +96,9 @@ public class VesselTrackStepConfig {
     @Value("${vessel.batch.chunk-size:1000}")
     private int chunkSize;
 
+    @Value("${vessel.batch.track.include-abnormal-in-tracks:false}")
+    private boolean includeAbnormalInTracks;
+
     @PostConstruct
     public void init() {
         // 5분 Job의 이름을 명시적으로 설정
@@ -203,18 +206,21 @@ public class VesselTrackStepConfig {
                     log.warn("비정상 궤적 감지 [{}]: vessel={}, avg_speed={}, distance={}",
                         abnormalReason, track.getVesselKey(), track.getAvgSpeed(), track.getDistanceNm());
                     saveAbnormalTrack(track, abnormalReason);
+                    if (includeAbnormalInTracks) {
+                        filteredTracks.add(track);  // 플래그 true → 정상 테이블+캐시에도 포함
+                    }
                 } else {
                     filteredTracks.add(track);
+                }
 
-                    // 정상 궤적의 종료 위치 저장 (캐시 업데이트용)
-                    if (track.getEndPosition() != null) {
-                        currentBucketEndPositions.put(track.getMmsi(), VesselBucketPositionDto.builder()
-                                .mmsi(track.getMmsi())
-                                .endLon(track.getEndPosition().getLon())
-                                .endLat(track.getEndPosition().getLat())
-                                .endTime(track.getEndPosition().getTime())
-                                .build());
-                    }
+                // 궤적의 종료 위치 저장 (캐시 업데이트용) — 비정상 포함 시에도 위치 추적
+                if (filteredTracks.contains(track) && track.getEndPosition() != null) {
+                    currentBucketEndPositions.put(track.getMmsi(), VesselBucketPositionDto.builder()
+                            .mmsi(track.getMmsi())
+                            .endLon(track.getEndPosition().getLon())
+                            .endLat(track.getEndPosition().getLat())
+                            .endTime(track.getEndPosition().getTime())
+                            .build());
                 }
             }
 

src/main/java/gc/mda/signal_batch/batch/writer/CompositeTrackWriter.java

@@ -25,21 +25,24 @@ public class CompositeTrackWriter implements ItemWriter<AbnormalDetectionResult>
     private final AbnormalTrackWriter abnormalTrackWriter;
     private final String targetTable;
     private final HourlyTrackCache hourlyTrackCache;  // nullable (daily writer는 미사용)
+    private final boolean includeAbnormalInTracks;
 
     public CompositeTrackWriter(VesselTrackBulkWriter vesselTrackBulkWriter,
                                 AbnormalTrackWriter abnormalTrackWriter,
                                 String targetTable,
-                                HourlyTrackCache hourlyTrackCache) {
+                                HourlyTrackCache hourlyTrackCache,
+                                boolean includeAbnormalInTracks) {
         this.vesselTrackBulkWriter = vesselTrackBulkWriter;
         this.abnormalTrackWriter = abnormalTrackWriter;
         this.targetTable = targetTable;
         this.hourlyTrackCache = hourlyTrackCache;
+        this.includeAbnormalInTracks = includeAbnormalInTracks;
     }
 
     public CompositeTrackWriter(VesselTrackBulkWriter vesselTrackBulkWriter,
                                 AbnormalTrackWriter abnormalTrackWriter,
                                 String targetTable) {
-        this(vesselTrackBulkWriter, abnormalTrackWriter, targetTable, null);
+        this(vesselTrackBulkWriter, abnormalTrackWriter, targetTable, null, false);
     }
     
     @BeforeStep
@@ -66,9 +69,11 @@ public class CompositeTrackWriter implements ItemWriter<AbnormalDetectionResult>
                 abnormalResults.add(result);
 
                 // 정정된 궤적이 있으면 정상 궤적으로 저장
-                // null이면 전체 궤적이 비정상이므로 제외
+                // null이면 전체 궤적이 비정상이므로 제외 (플래그 true면 원본 포함)
                 if (result.getCorrectedTrack() != null) {
                     normalTracks.add(result.getCorrectedTrack());
+                } else if (includeAbnormalInTracks) {
+                    normalTracks.add(result.getOriginalTrack());
                 } else {
                     log.debug("비정상 궤적 전체 제외: vessel={}",
                         result.getOriginalTrack().getVesselKey());

src/main/java/gc/mda/signal_batch/domain/gis/controller/GisControllerV2.java

@@ -191,7 +191,11 @@ public class GisControllerV2 {
             )
             @RequestBody VesselTracksRequest request,
             HttpServletRequest httpRequest) {
-        return gisServiceV2.getVesselTracksV2(request, getClientIp(httpRequest));
+        return gisServiceV2.getVesselTracksV2(request, getClientIp(httpRequest), getClientId(httpRequest));
+    }
+
+    private String getClientId(HttpServletRequest request) {
+        return gc.mda.signal_batch.global.config.WebSocketStompConfig.extractClientIdFromRequest(request);
     }
 
     private String getClientIp(HttpServletRequest request) {

src/main/java/gc/mda/signal_batch/domain/gis/service/GisServiceV2.java

@@ -285,7 +285,7 @@ public class GisServiceV2 {
     /**
      * 선박별 항적 조회 V2 (캐시 + Semaphore + 간소화 + ChnPrmShip enrichment)
      */
-    public List<CompactVesselTrack> getVesselTracksV2(VesselTracksRequest request, String clientIp) {
+    public List<CompactVesselTrack> getVesselTracksV2(VesselTracksRequest request, String clientIp, String clientId) {
         String queryId = "rest-vessels-" + UUID.randomUUID().toString().substring(0, 8);
         long startMs = System.currentTimeMillis();
         boolean slotAcquired = false;
@@ -329,7 +329,7 @@ public class GisServiceV2 {
                     result.size(), request.getVessels().size(),
                     dailyTrackCacheManager.isEnabled(), request.isIncludeChnPrmShip());
 
-            enqueueRestMetric(queryId, request, result, startMs, clientIp);
+            enqueueRestMetric(queryId, request, result, startMs, clientIp, clientId);
 
             return result;
 
@@ -347,7 +347,7 @@ public class GisServiceV2 {
     }
 
     private void enqueueRestMetric(String queryId, VesselTracksRequest request,
-                                   List<CompactVesselTrack> result, long startMs, String clientIp) {
+                                   List<CompactVesselTrack> result, long startMs, String clientIp, String clientId) {
         try {
             int totalPoints = result.stream().mapToInt(CompactVesselTrack::getPointCount).sum();
             long responseBytes = (long) result.size() * 200 + (long) totalPoints * 40;
@@ -367,6 +367,7 @@ public class GisServiceV2 {
                     .elapsedMs(System.currentTimeMillis() - startMs)
                     .status("COMPLETED")
                     .clientIp(clientIp)
+                    .clientId(clientId)
                     .build());
         } catch (Exception e) {
             log.debug("Failed to enqueue REST metric: {}", e.getMessage());

src/main/java/gc/mda/signal_batch/global/config/WebSocketStompConfig.java

@@ -235,42 +235,44 @@ public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
             return "unknown";
         }
 
-        /**
-         * GC_SESSION 쿠키에서 JWT payload의 email 클레임 추출.
-         * JWT 검증은 nginx auth_request에서 이미 완료 — 여기서는 payload 디코딩만 수행.
-         */
         private String extractEmailFromJwtCookie(HttpServletRequest request) {
-            Cookie[] cookies = request.getCookies();
-            if (cookies == null) return null;
+            return extractClientIdFromRequest(request);
+        }
+    }
 
-            String token = null;
-            for (Cookie cookie : cookies) {
-                if ("GC_SESSION".equals(cookie.getName())) {
-                    token = cookie.getValue();
-                    break;
-                }
+    /**
+     * GC_SESSION 쿠키에서 JWT payload의 email 클레임 추출 (REST/WebSocket 공용).
+     * JWT 검증은 nginx auth_request에서 이미 완료 — 여기서는 payload 디코딩만 수행.
+     */
+    public static String extractClientIdFromRequest(HttpServletRequest request) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies == null) return null;
+
+        String token = null;
+        for (Cookie cookie : cookies) {
+            if ("GC_SESSION".equals(cookie.getName())) {
+                token = cookie.getValue();
+                break;
             }
-            if (token == null || token.isEmpty()) return null;
+        }
+        if (token == null || token.isEmpty()) return null;
 
-            try {
-                // JWT: header.payload.signature — payload만 Base64URL 디코딩
-                String[] parts = token.split("\\.");
-                if (parts.length < 2) return null;
+        try {
+            String[] parts = token.split("\\.");
+            if (parts.length < 2) return null;
 
-                String payload = new String(Base64.getUrlDecoder().decode(parts[1]));
-                // 간단한 JSON 파싱 (Jackson 의존 없이): "email":"value" 추출
-                int emailIdx = payload.indexOf("\"email\"");
-                if (emailIdx < 0) return null;
+            String payload = new String(Base64.getUrlDecoder().decode(parts[1]));
+            int emailIdx = payload.indexOf("\"email\"");
+            if (emailIdx < 0) return null;
 
-                int colonIdx = payload.indexOf(':', emailIdx);
-                int quoteStart = payload.indexOf('"', colonIdx + 1);
-                int quoteEnd = payload.indexOf('"', quoteStart + 1);
-                if (quoteStart < 0 || quoteEnd < 0) return null;
+            int colonIdx = payload.indexOf(':', emailIdx);
+            int quoteStart = payload.indexOf('"', colonIdx + 1);
+            int quoteEnd = payload.indexOf('"', quoteStart + 1);
+            if (quoteStart < 0 || quoteEnd < 0) return null;
 
-                return payload.substring(quoteStart + 1, quoteEnd);
-            } catch (Exception e) {
-                return null;
-            }
+            return payload.substring(quoteStart + 1, quoteEnd);
+        } catch (Exception e) {
+            return null;
         }
     }
 }

src/main/resources/application-prod.yml

@@ -173,6 +173,7 @@ vessel:  # spring 하위가 아닌 최상위 레벨
 
     # 궤적 비정상 검출 설정
     track:
+      include-abnormal-in-tracks: true    # 비정상 궤적도 정상 테이블+캐시에 포함 (강화학습 데이터 수집용)
       abnormal-detection:
         large-gap-threshold-hours: 4      # 이 시간 이상 gap은 연결 안함
         extreme-speed-threshold: 1000     # 이 속도 이상은 무조건 비정상 (knots)

src/main/resources/application.yml

@@ -159,6 +159,8 @@ vessel:
     page-size: ${BATCH_PAGE_SIZE:10000}
     partition-size: ${BATCH_PARTITION_SIZE:24}
     skip-limit: 100
+    track:
+      include-abnormal-in-tracks: false   # true: 비정상 궤적도 정상 테이블+캐시에 포함 (강화학습 데이터 수집용)
     retry-limit: 3
     # Reader 설정
     use-cursor-reader: true  # Cursor Reader 사용 여부