실시간 차트 보조지표 탭 문제 수정

2026-05-28 01:26:53 +09:00
parent 4f6694b206
commit 98dfb3613c
19 changed files with 801 additions and 182 deletions
@@ -83,6 +83,70 @@ public class StrategyDslTimeframeNormalizer {
        }
    }

+    /**
+     * 매도 DSL START TIMEFRAME 을 매수와 동일 분봉으로 맞춤.
+     * (편집기 저장 전 매도만 1m 이 남은 레거시 전략 보정)
+     */
+    public String alignSellStartTimeframeToBuy(String buyJson, String sellJson) {
+        if (buyJson == null || buyJson.isBlank() || sellJson == null || sellJson.isBlank()) {
+            return sellJson;
+        }
+        try {
+            JsonNode buyRoot = objectMapper.readTree(buyJson);
+            JsonNode sellRoot = objectMapper.readTree(sellJson);
+            JsonNode buyTf = primaryStartTimeframeNode(buyRoot);
+            if (buyTf == null || !hasExplicitStartTimeframe(buyTf)) return sellJson;
+
+            ObjectNode sellCopy = (ObjectNode) sellRoot.deepCopy();
+            JsonNode sellTf = primaryStartTimeframeNode(sellCopy);
+            if (sellTf == null || !sellTf.isObject()) return sellJson;
+            copyIntoStartTimeframe(buyTf, (ObjectNode) sellTf);
+            return objectMapper.writeValueAsString(sellCopy);
+        } catch (Exception e) {
+            return sellJson;
+        }
+    }
+
+    private static boolean hasExplicitStartTimeframe(JsonNode buyTf) {
+        if (hasCandleTypesArray(buyTf)) return true;
+        String ct = LiveStrategyTimeframeService.normalize(buyTf.path("candleType").asText("1m"));
+        return !"1m".equals(ct);
+    }
+
+    private static JsonNode primaryStartTimeframeNode(JsonNode root) {
+        if (root == null || root.isNull()) return null;
+        String type = root.path("type").asText("");
+        if ("TIMEFRAME".equals(type)) return root;
+        if ("AND".equals(type) || "OR".equals(type)) {
+            JsonNode children = root.path("children");
+            if (children.isArray() && !children.isEmpty() && allTimeframeChildren(children)) {
+                return children.get(0);
+            }
+        }
+        return null;
+    }
+
+    private void copyIntoStartTimeframe(JsonNode from, ObjectNode to) {
+        if (hasCandleTypesArray(from)) {
+            ArrayNode arr = objectMapper.createArrayNode();
+            for (JsonNode t : from.path("candleTypes")) {
+                arr.add(LiveStrategyTimeframeService.normalize(t.asText("")));
+            }
+            to.set("candleTypes", arr);
+            to.put("candleType", LiveStrategyTimeframeService.normalize(arr.get(0).asText("1m")));
+        } else {
+            to.remove("candleTypes");
+            to.put("candleType", LiveStrategyTimeframeService.normalize(from.path("candleType").asText("1m")));
+        }
+    }
+
+    private static boolean allTimeframeChildren(JsonNode children) {
+        for (JsonNode c : children) {
+            if (!"TIMEFRAME".equals(c.path("type").asText(""))) return false;
+        }
+        return true;
+    }
+
    /** 전략 이름에서 평가 분봉 추론 (예: cci_3분봉 테스트 → 3m) */
    public static String inferFromStrategyName(String name) {
        if (name == null || name.isBlank()) return null;