Big refactoring

app/routers/trades.py

@@ -5,8 +5,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.dependencies import get_db, require_access
 from app.schemas.common import APIEnvelope
-from app.schemas.trade_setup import TradeSetupResponse
-from app.services.rr_scanner_service import get_trade_setups
+from app.schemas.trade_setup import RecommendationSummaryResponse, TradeSetupResponse
+from app.services.rr_scanner_service import get_trade_setup_history, get_trade_setups
 
 router = APIRouter(tags=["trades"])
 
@@ -16,13 +16,73 @@ async def list_trade_setups(
     direction: str | None = Query(
         None, description="Filter by direction: long or short"
     ),
+    min_confidence: float | None = Query(
+        None, ge=0, le=100, description="Minimum confidence score"
+    ),
+    recommended_action: str | None = Query(
+        None,
+        description="Filter by action: LONG_HIGH, LONG_MODERATE, SHORT_HIGH, SHORT_MODERATE, NEUTRAL",
+    ),
     _user=Depends(require_access),
     db: AsyncSession = Depends(get_db),
 ) -> APIEnvelope:
-    """Get all trade setups sorted by R:R desc, secondary composite desc.
+    """Get latest trade setups with recommendation data."""
+    rows = await get_trade_setups(
+        db,
+        direction=direction,
+        min_confidence=min_confidence,
+        recommended_action=recommended_action,
+    )
+
+    data = []
+    for row in rows:
+        summary = RecommendationSummaryResponse(
+            action=row.get("recommended_action") or "NEUTRAL",
+            reasoning=row.get("reasoning"),
+            risk_level=row.get("risk_level"),
+            composite_score=row["composite_score"],
+        )
+        payload = {**row, "recommendation_summary": summary}
+        data.append(TradeSetupResponse(**payload).model_dump(mode="json"))
 
-    Optional direction filter (long/short).
-    """
-    rows = await get_trade_setups(db, direction=direction)
-    data = [TradeSetupResponse(**r).model_dump(mode="json") for r in rows]
+    return APIEnvelope(status="success", data=data)
+
+
+@router.get("/trades/{symbol}", response_model=APIEnvelope)
+async def get_ticker_trade_setups(
+    symbol: str,
+    _user=Depends(require_access),
+    db: AsyncSession = Depends(get_db),
+) -> APIEnvelope:
+    rows = await get_trade_setups(db, symbol=symbol)
+    data = []
+    for row in rows:
+        summary = RecommendationSummaryResponse(
+            action=row.get("recommended_action") or "NEUTRAL",
+            reasoning=row.get("reasoning"),
+            risk_level=row.get("risk_level"),
+            composite_score=row["composite_score"],
+        )
+        payload = {**row, "recommendation_summary": summary}
+        data.append(TradeSetupResponse(**payload).model_dump(mode="json"))
+    return APIEnvelope(status="success", data=data)
+
+
+@router.get("/trades/{symbol}/history", response_model=APIEnvelope)
+async def get_ticker_trade_history(
+    symbol: str,
+    _user=Depends(require_access),
+    db: AsyncSession = Depends(get_db),
+) -> APIEnvelope:
+    rows = await get_trade_setup_history(db, symbol=symbol)
+    data = []
+    for row in rows:
+        summary = RecommendationSummaryResponse(
+            action=row.get("recommended_action") or "NEUTRAL",
+            reasoning=row.get("reasoning"),
+            risk_level=row.get("risk_level"),
+            composite_score=row["composite_score"],
+        )
+        payload = {**row, "recommendation_summary": summary}
+        data.append(TradeSetupResponse(**payload).model_dump(mode="json"))
     return APIEnvelope(status="success", data=data)