From a05e6ba8ca136c11677cb47c3252d717eba30b9c Mon Sep 17 00:00:00 2001
From: gahusb <bgg8988@gmail.com>
Date: Wed, 13 May 2026 07:52:17 +0900
Subject: [PATCH] =?UTF-8?q?feat(stock-lab):=20=ED=85=94=EB=A0=88=EA=B7=B8?=
 =?UTF-8?q?=EB=9E=A8=20=EB=85=B8=EB=93=9C=20=ED=92=80=20=EB=9D=BC=EB=B2=A8?=
 =?UTF-8?q?=20+=20=EC=9B=90=20=EB=8B=A8=EC=9C=84=20=ED=91=9C=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 아이콘(👤외/🆙고/...) 제거하고 풀 한글 라벨로 변경
  (외국인/거래량급증/20일모멘텀/52주신고가/RS레이팅/이평선정배열/VCP수축)
- 가격은 "103,917원" 형태로 원 단위 명시
- 활성 노드 없을 때 fallback 문구
- 테스트도 새 포맷으로 갱신 + 원 단위 검증 신규 케이스
---
 stock-lab/app/screener/telegram.py      | 40 +++++++++++++++----------
 stock-lab/app/test_screener_telegram.py | 35 ++++++++++++++++------
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/stock-lab/app/screener/telegram.py b/stock-lab/app/screener/telegram.py
index 842bb69..522a35f 100644
--- a/stock-lab/app/screener/telegram.py
+++ b/stock-lab/app/screener/telegram.py
@@ -4,14 +4,15 @@ from __future__ import annotations
 
 import datetime as dt
 
-NODE_ICONS = {
-    "foreign_buy":  "👤외",
-    "volume_surge": "⚡거",
-    "momentum":     "🚀모",
-    "high52w":      "🆙고",
-    "rs_rating":    "💪RS",
-    "ma_alignment": "📈MA",
-    "vcp_lite":     "🌀VCP",
+# 노드별 풀 라벨 (아이콘 대신 사용 — 사용자가 명확한 이름 선호)
+NODE_LABELS = {
+    "foreign_buy":  "외국인",
+    "volume_surge": "거래량급증",
+    "momentum":     "20일모멘텀",
+    "high52w":      "52주신고가",
+    "rs_rating":    "RS레이팅",
+    "ma_alignment": "이평선정배열",
+    "vcp_lite":     "VCP수축",
 }
 
 PAGE_BASE = "https://gahusb.synology.me/stock/screener"
@@ -25,9 +26,21 @@ def _escape_md(s: str) -> str:
 
 
 def _format_won(n) -> str:
+    """1,234,567원 형태 (None 시 '-')."""
     if n is None:
-        return "-"
-    return f"{int(n):,}"
+        return "\\-"
+    return f"{int(n):,}원"
+
+
+def _format_active_nodes(scores: dict, threshold: int = 70) -> str:
+    """70점 이상 노드를 '라벨 점수' 형태로 나열, 콤마 구분."""
+    active = []
+    for name, sc in scores.items():
+        label = NODE_LABELS.get(name)
+        if label is None or sc < threshold:
+            continue
+        active.append(f"{_escape_md(label)} {int(sc)}")
+    return " · ".join(active) if active else "\\(70점 이상 노드 없음\\)"
 
 
 def build_telegram_payload(asof: dt.date, mode: str, survivors_count: int,
@@ -40,17 +53,14 @@ def build_telegram_payload(asof: dt.date, mode: str, survivors_count: int,
 
     lines = []
     for r in rows[:10]:
-        icons = " ".join(
-            NODE_ICONS[name] for name, sc in r["scores"].items()
-            if sc >= 70 and name in NODE_ICONS
-        )
+        nodes_str = _format_active_nodes(r.get("scores", {}))
         score_str = f"{r['total_score']:.1f}"
         r_pct = r.get("r_pct")
         r_pct_str = f"{r_pct:.1f}" if r_pct is not None else "-"
         lines.append(
             f"{r['rank']}\\. *{_escape_md(r['name'])}*  `{r['ticker']}`   "
             f"⭐ {_escape_md(score_str)}\n"
-            f"   {icons}\n"
+            f"   {nodes_str}\n"
             f"   진입 {_format_won(r.get('entry_price'))}  "
             f"손절 {_format_won(r.get('stop_price'))}  "
             f"익절 {_format_won(r.get('target_price'))}   "
diff --git a/stock-lab/app/test_screener_telegram.py b/stock-lab/app/test_screener_telegram.py
index 606b459..1d5761d 100644
--- a/stock-lab/app/test_screener_telegram.py
+++ b/stock-lab/app/test_screener_telegram.py
@@ -31,7 +31,7 @@ def test_build_payload_includes_top10_and_link():
     assert "42" in text                   # run_id 링크
 
 
-def test_score_threshold_filters_icons():
+def test_score_threshold_filters_node_labels():
     rows = [{
         "rank": 1, "ticker": "A", "name": "A주",
         "total_score": 80,
@@ -41,11 +41,28 @@ def test_score_threshold_filters_icons():
         "target_price": 53750, "r_pct": 3.5,
     }]
     p = build_telegram_payload(dt.date(2026, 5, 12), "auto", 100, 1, rows, run_id=1)
-    # foreign_buy(90), momentum(70), rs_rating(80), ma_alignment(80) 만 표시 (≥70)
-    assert "👤외" in p["text"]
-    assert "🚀모" in p["text"]
-    assert "💪RS" in p["text"]
-    assert "📈MA" in p["text"]
-    assert "⚡거" not in p["text"]
-    assert "🆙고" not in p["text"]
-    assert "🌀VCP" not in p["text"]
+    text = p["text"]
+    # ≥70 노드만 풀 라벨로 표시 (foreign_buy=90, momentum=70, rs_rating=80, ma_alignment=80)
+    assert "외국인 90" in text
+    assert "20일모멘텀 70" in text
+    assert "RS레이팅 80" in text
+    assert "이평선정배열 80" in text
+    # <70 노드는 숨김 (volume_surge=50, high52w=30, vcp_lite=60)
+    assert "거래량급증" not in text
+    assert "52주신고가" not in text
+    assert "VCP수축" not in text
+
+
+def test_prices_have_won_suffix():
+    rows = [{
+        "rank": 1, "ticker": "A", "name": "A주",
+        "total_score": 80,
+        "scores": {"foreign_buy": 80},
+        "close": 50000, "entry_price": 50250, "stop_price": 48500,
+        "target_price": 53750, "r_pct": 3.5,
+    }]
+    p = build_telegram_payload(dt.date(2026, 5, 12), "auto", 100, 1, rows, run_id=1)
+    text = p["text"]
+    assert "50,250원" in text
+    assert "48,500원" in text
+    assert "53,750원" in text