refactor(quick-trade): move fill history orchestration into service

Author: tianhe

backend_api_python/app/routes/quick_trade.py

@@ -55,6 +55,7 @@
 )
 from app.services.quick_trade.symbols import is_supported_crypto_exchange, symbols_match as quick_trade_symbols_match
 from app.services.quick_trade.history import parse_quick_trade_metadata, history_order_status
+from app.services.quick_trade.trade_history import resolve_trade_history
 from app.services.quick_trade.fee_reconciliation import fee_update_from_fill, reconcile_quick_trade_fees
 from app.services.quick_trade.order_reconciliation import reconcile_quick_trade_orders
 from app.services.quick_trade.account_warmup import configure_quick_trade_derivatives, warm_quick_trade_account
@@ -1876,43 +1877,8 @@ def get_history():
                 "created_at": to_utc_iso(r.get("created_at")) or str(r.get("created_at") or ""),
             })
 
-        exchange_history = {"supported": False, "trades": []}
-        if credential_id > 0 and symbol and market_type in ("spot", "swap"):
-            try:
-                from app.services.quick_trade.trade_history import exchange_trade_history
-
-                config = build_exchange_config(credential_id, user_id, {"market_type": market_type})
-                client = create_exchange_client(config, market_type=market_type)
-                exchange_history = exchange_trade_history(
-                    client,
-                    symbol,
-                    market_type=market_type,
-                    limit=limit,
-                    offset=offset,
-                )
-            except Exception as exc:
-                logger.info("Native exchange trade history unavailable: %s", exc)
-
-        if exchange_history.get("supported"):
-            active_statuses = {
-                "new", "open", "pending", "submitted", "partially_filled",
-                "partially-filled", "accepted", "cancel_pending",
-            }
-            pending_orders = [
-                trade for trade in trades
-                if str(trade.get("status") or "").strip().lower() in active_statuses
-            ]
-            trades = pending_orders + list(exchange_history.get("trades") or [])
-            trades.sort(key=lambda trade: str(trade.get("created_at") or ""), reverse=True)
-
-        return jsonify({
-            "code": 1,
-            "msg": "success",
-            "data": {
-                "trades": trades,
-                "source": "exchange" if exchange_history.get("supported") else "local_fallback",
-            },
-        })
+        data = resolve_trade_history(trades, user_id, credential_id, symbol, market_type, limit, offset)
+        return jsonify({"code": 1, "msg": "success", "data": data})
     except Exception as e:
         logger.error(f"get_history failed: {e}")
         return jsonify({"code": 0, "msg": str(e)}), 500

backend_api_python/app/services/quick_trade/trade_history.py

@@ -24,11 +24,17 @@
     to_okx_spot_inst_id,
     to_okx_swap_inst_id,
 )
+from app.services.quick_trade.credentials import build_exchange_config, create_exchange_client
 from app.utils.logger import get_logger
 
 
 logger = get_logger(__name__)
 
+ACTIVE_ORDER_STATUSES = frozenset({
+    "new", "open", "pending", "submitted", "partially_filled",
+    "partially-filled", "accepted", "cancel_pending",
+})
+
 
 def _number(value: Any, default: float = 0.0) -> float:
     try:
@@ -617,3 +623,41 @@ def exchange_trade_history(
                 result["trades"] = _normalize_rows(result.get("trades") or [], limit=limit, offset=offset)
             return result
     return {"supported": False, "trades": []}
+
+
+def resolve_trade_history(
+    local_trades: Iterable[Dict[str, Any]],
+    user_id: int,
+    credential_id: int,
+    symbol: str,
+    market_type: str,
+    limit: int,
+    offset: int,
+) -> Dict[str, Any]:
+    """Prefer authoritative exchange fills while retaining active local orders."""
+    local_rows = list(local_trades)
+    fallback = {"trades": local_rows, "source": "local_fallback"}
+    if credential_id <= 0 or not symbol or market_type not in {"spot", "swap"}:
+        return fallback
+    try:
+        config = build_exchange_config(credential_id, user_id, {"market_type": market_type})
+        client = create_exchange_client(config, market_type=market_type)
+        exchange_history = exchange_trade_history(
+            client,
+            symbol,
+            market_type=market_type,
+            limit=limit,
+            offset=offset,
+        )
+    except Exception as exc:
+        logger.info("Native exchange trade history unavailable: %s", exc)
+        return fallback
+    if not exchange_history.get("supported"):
+        return fallback
+    pending_orders = [
+        trade for trade in local_rows
+        if str(trade.get("status") or "").strip().lower() in ACTIVE_ORDER_STATUSES
+    ]
+    trades = pending_orders + list(exchange_history.get("trades") or [])
+    trades.sort(key=lambda trade: str(trade.get("created_at") or ""), reverse=True)
+    return {"trades": trades, "source": "exchange"}

backend_api_python/tests/test_quick_trade_history.py

@@ -184,9 +184,9 @@ def fake_connection():
     }
     monkeypatch.setattr(quick_trade, "get_db_connection", fake_connection)
     monkeypatch.setattr(quick_trade, "_sync_exchange_close_fills", lambda **kwargs: 0)
-    monkeypatch.setattr(quick_trade, "build_exchange_config", lambda *args, **kwargs: {})
-    monkeypatch.setattr(quick_trade, "create_exchange_client", lambda *args, **kwargs: object())
     from app.services.quick_trade import trade_history
+    monkeypatch.setattr(trade_history, "build_exchange_config", lambda *args, **kwargs: {})
+    monkeypatch.setattr(trade_history, "create_exchange_client", lambda *args, **kwargs: object())
     monkeypatch.setattr(
         trade_history,
         "exchange_trade_history",