fix(review-feedback-1235): address latest review comments

Author: ZhuLinsen

src/services/stock_code_utils.py

@@ -8,6 +8,8 @@
 import re
 from typing import Optional
 
+from data_provider.base import is_bse_code
+
 
 # Known exchange prefixes (case-insensitive) and the digit lengths they accept.
 # e.g. SH600519 -> 600519, HK00700 -> 00700
@@ -28,12 +30,20 @@
 }
 
 
+def _valid_exchange_code(exchange: str, base: str, digit_lens: tuple[int, ...]) -> bool:
+    if not (base.isdigit() and len(base) in digit_lens):
+        return False
+    if exchange == "BJ":
+        return is_bse_code(base)
+    return True
+
+
 def _strip_exchange_prefix(text: str) -> Optional[str]:
     """Strip leading exchange prefix (SH/SZ/HK etc.) and return the bare digits, or None."""
     for prefix, digit_lens in _PREFIX_DIGIT_LENS.items():
         if text.startswith(prefix):
             base = text[len(prefix):]
-            if base.isdigit() and len(base) in digit_lens:
+            if _valid_exchange_code(prefix, base, digit_lens):
                 return base.zfill(5) if prefix == "HK" else base
     return None
 
@@ -43,7 +53,8 @@ def _strip_exchange_suffix(text: str) -> Optional[str]:
     for suffix, digit_lens in _SUFFIX_DIGIT_LENS.items():
         if text.endswith(suffix):
             base = text[: -len(suffix)].strip()
-            if base.isdigit() and len(base) in digit_lens:
+            exchange = suffix.lstrip(".")
+            if _valid_exchange_code(exchange, base, digit_lens):
                 return base.zfill(5) if suffix == ".HK" else base
     return None
 
@@ -70,7 +81,7 @@ def normalize_code(raw: str) -> Optional[str]:
 
     Supports:
     - Plain digit codes: 600519, 00700
-    - Suffix format: 600519.SH, 600519.SZ, 00700.HK
+    - Suffix format: 600519.SH, 600519.SZ, 920493.BJ, 00700.HK
     - Prefix format: SH600519, SZ000001, BJ920493, HK00700 (case-insensitive)
     - US ticker symbols: AAPL, TSLA
     """

tests/test_analysis_api_contract.py

@@ -725,6 +725,37 @@ def test_trigger_analysis_accepts_bse_suffix_code_from_autocomplete(self) -> Non
             notify=True,
         )
 
+    def test_trigger_analysis_rejects_non_bse_code_with_bj_exchange_hint(self) -> None:
+        if trigger_analysis is None:
+            self.skipTest("fastapi is not installed in this test environment")
+
+        for bad_code in ("600519.BJ", "BJ600519"):
+            with self.subTest(bad_code=bad_code):
+                queue = MagicMock()
+
+                with patch("api.v1.endpoints.analysis.get_task_queue", return_value=queue), \
+                     patch("api.v1.endpoints.analysis.resolve_name_to_code") as resolve_mock:
+                    with self.assertRaises(Exception) as exc:
+                        trigger_analysis(
+                            request=SimpleNamespace(
+                                stock_code=bad_code,
+                                stock_codes=None,
+                                stock_name=None,
+                                original_query=bad_code,
+                                selection_source="manual",
+                                report_type="detailed",
+                                force_refresh=False,
+                                async_mode=True,
+                                notify=True,
+                            ),
+                            config=SimpleNamespace(),
+                        )
+
+                self.assertEqual(exc.exception.status_code, 400)
+                self.assertEqual(exc.exception.detail["error"], "validation_error")
+                resolve_mock.assert_not_called()
+                queue.submit_tasks_batch.assert_not_called()
+
     def test_trigger_analysis_accepts_hk_prefixed_code(self) -> None:
         if trigger_analysis is None:
             self.skipTest("fastapi is not installed in this test environment")

tests/test_name_to_code_resolver.py

@@ -37,6 +37,10 @@ def test_bse_with_exchange_hint(self):
         assert _is_code_like("920493.BJ") is True
         assert _is_code_like("BJ920493") is True
 
+    def test_bj_exchange_hint_rejects_non_bse_code(self):
+        assert _is_code_like("600519.BJ") is False
+        assert _is_code_like("BJ600519") is False
+
     def test_hk_5_digits(self):
         assert _is_code_like("00700") is True
 
@@ -70,6 +74,10 @@ def test_strips_suffix(self):
     def test_strips_bse_prefix(self):
         assert _normalize_code("BJ920493") == "920493"
 
+    def test_bj_exchange_hint_rejects_non_bse_code(self):
+        assert _normalize_code("600519.BJ") is None
+        assert _normalize_code("BJ600519") is None
+
     def test_preserves_us_stock(self):
         assert _normalize_code("AAPL") == "AAPL"
         assert _normalize_code("brk.b") == "BRK.B"

tests/test_stock_code_utils.py

@@ -30,6 +30,9 @@ def test_suffix_sz(self):
     def test_suffix_bj(self):
         assert is_code_like("920493.BJ") is True
 
+    def test_suffix_bj_rejects_non_bse_base(self):
+        assert is_code_like("600519.BJ") is False
+
     def test_suffix_lowercase(self):
         assert is_code_like("600519.sh") is True
 
@@ -62,6 +65,9 @@ def test_prefix_sz(self):
     def test_prefix_bj(self):
         assert is_code_like("BJ920493") is True
 
+    def test_prefix_bj_rejects_non_bse_base(self):
+        assert is_code_like("BJ600519") is False
+
     def test_prefix_hk(self):
         assert is_code_like("HK00700") is True
 
@@ -113,6 +119,9 @@ def test_suffix_sz_strips(self):
     def test_suffix_bj_strips(self):
         assert normalize_code("920493.BJ") == "920493"
 
+    def test_suffix_bj_rejects_non_bse_base(self):
+        assert normalize_code("600519.BJ") is None
+
     def test_suffix_ss_strips(self):
         assert normalize_code("600000.SS") == "600000"
 
@@ -144,6 +153,9 @@ def test_prefix_sz(self):
     def test_prefix_bj(self):
         assert normalize_code("BJ920493") == "920493"
 
+    def test_prefix_bj_rejects_non_bse_base(self):
+        assert normalize_code("BJ600519") is None
+
     def test_prefix_hk(self):
         assert normalize_code("HK00700") == "00700"