aidev/goldenChart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

전략편집기 수정, 보조지표 설정 수정

Browse Source
This commit is contained in:
Macbook
2026-05-27 23:59:30 +09:00
parent 8cc0d1c88c
commit 2713b2951d
17 changed files with 210 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/test/java/com/goldenchart/service/StrategyConditionTimeframeServiceTest.java
+24
View File
@@ -55,6 +55,30 @@ class StrategyConditionTimeframeServiceTest {
assertFalse(service.usesTimeframe(1L, "1m"));
}
@Test
void collectForStrategy_reads3mAnd5mWithout1m() {
GcStrategy onlyUpper = new GcStrategy();
onlyUpper.setId(4L);
onlyUpper.setBuyConditionJson("""
{
"type": "TIMEFRAME",
"candleType": "3m",
"candleTypes": ["3m", "5m"],
"children": [{
"type": "CONDITION",
"condition": { "indicatorType": "RSI", "period": 14 }
}]
}
""");
when(strategyRepo.findById(4L)).thenReturn(Optional.of(onlyUpper));
Set<String> tfs = service.collectForStrategy(4L);
assertEquals(Set.of("3m", "5m"), tfs);
assertFalse(service.usesTimeframe(4L, "1m"));
assertTrue(service.usesTimeframe(4L, "3m"));
assertTrue(service.usesTimeframe(4L, "5m"));
}
@Test
void collectForStrategy_readsMultipleCandleTypesFromTimeframeNode() {
GcStrategy multi = new GcStrategy();
backend/src/test/java/com/goldenchart/service/StrategyDslTimeframeNormalizerTest.java
+38
View File
@@ -11,6 +11,44 @@ class StrategyDslTimeframeNormalizerTest {
private final ObjectMapper objectMapper = new ObjectMapper();
private final StrategyDslTimeframeNormalizer normalizer = new StrategyDslTimeframeNormalizer(objectMapper);
@Test
void normalize_preserves3mAnd5mWithout1m() throws Exception {
String json = """
{
"type": "TIMEFRAME",
"candleType": "1m",
"candleTypes": ["3m", "5m"],
"children": [{
"type": "CONDITION",
"condition": { "indicatorType": "RSI", "period": 14 }
}]
}
""";
String normalized = normalizer.normalizeJson(json, "테스트");
JsonNode root = objectMapper.readTree(normalized);
assertEquals(2, root.path("candleTypes").size());
assertEquals("3m", root.path("candleTypes").get(0).asText());
assertEquals("5m", root.path("candleTypes").get(1).asText());
assertEquals("3m", root.path("candleType").asText());
}
@Test
void normalize_preservesSingleExplicit3m() throws Exception {
String json = """
{
"type": "TIMEFRAME",
"candleType": "3m",
"children": [{
"type": "CONDITION",
"condition": { "indicatorType": "RSI", "period": 14 }
}]
}
""";
String normalized = normalizer.normalizeJson(json, "테스트");
JsonNode root = objectMapper.readTree(normalized);
assertEquals("3m", root.path("candleType").asText());
}
@Test
void normalize_preservesMultiCandleTypesOnSave() throws Exception {
String json = """