Segments and Av HR update

backend/app/api/routes.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, desc
+from sqlalchemy import select, desc, func
 from pydantic import BaseModel
 from typing import Optional, List
 from datetime import datetime, timedelta, timezone
@@ -36,6 +36,7 @@ class RouteOut(BaseModel):
     distance_m: Optional[float]
     auto_detected: Optional[bool]
     created_at: datetime
+    activity_count: int = 0
 
     class Config:
         from_attributes = True
@@ -48,6 +49,7 @@ class SegmentOut(BaseModel):
     end_distance_m: float
     description: Optional[str]
     auto_generated: Optional[bool] = False
+    auto_generated_type: Optional[str] = None
 
     class Config:
         from_attributes = True
@@ -71,12 +73,26 @@ async def list_routes(
     db: AsyncSession = Depends(get_db),
     current_user: User = Depends(get_current_user),
 ):
+    # Fetch routes with activity counts in one query
+    count_subq = (
+        select(Activity.named_route_id, func.count(Activity.id).label("cnt"))
+        .where(Activity.user_id == current_user.id, Activity.named_route_id.isnot(None))
+        .group_by(Activity.named_route_id)
+        .subquery()
+    )
     result = await db.execute(
-        select(NamedRoute)
+        select(NamedRoute, func.coalesce(count_subq.c.cnt, 0).label("activity_count"))
+        .outerjoin(count_subq, NamedRoute.id == count_subq.c.named_route_id)
         .where(NamedRoute.user_id == current_user.id)
         .order_by(desc(NamedRoute.created_at))
     )
-    return result.scalars().all()
+    rows = result.all()
+    out = []
+    for route, cnt in rows:
+        d = {c.name: getattr(route, c.name) for c in route.__table__.columns}
+        d["activity_count"] = cnt
+        out.append(RouteOut(**d))
+    return out
 
 
 @router.get("/recent-activities")
@@ -352,11 +368,12 @@ async def auto_generate_segments(
     if body.type not in ("1km", "turns", "hills"):
         raise HTTPException(status_code=400, detail="type must be '1km', 'turns', or 'hills'")
 
-    # Clear existing auto-generated segments of this type
+    # Clear only auto-generated segments of the same type so other auto types are preserved
     await db.execute(
         sql_delete(RouteSegment).where(
             RouteSegment.route_id == route_id,
             RouteSegment.auto_generated == True,
+            RouteSegment.auto_generated_type == body.type,
         )
     )
 
@@ -403,6 +420,7 @@ async def auto_generate_segments(
             start_distance_m=start_m,
             end_distance_m=end_m,
             auto_generated=True,
+            auto_generated_type=body.type,
         )
         db.add(seg)
         new_segments.append(seg)