This commit is contained in:
xds
2026-03-17 10:51:01 +03:00
parent e98ef3eae3
commit 195f96bb20
7 changed files with 370 additions and 51 deletions

View File

@@ -91,6 +91,9 @@ async def get_weekly_stats(
func.sum(Activity.duration).label("duration"),
func.sum(Activity.distance).label("distance"),
func.sum(ActivityMetrics.tss).label("tss"),
func.avg(ActivityMetrics.avg_power).label("avg_power"),
func.avg(ActivityMetrics.normalized_power).label("avg_np"),
func.avg(ActivityMetrics.avg_hr).label("avg_hr"),
)
.select_from(Activity)
.outerjoin(ActivityMetrics, ActivityMetrics.activity_id == Activity.id)
@@ -102,6 +105,7 @@ async def get_weekly_stats(
result = await session.execute(query)
weight = rider.weight
return [
{
"week": row.week.strftime("%Y-%m-%d") if row.week else None,
@@ -109,6 +113,10 @@ async def get_weekly_stats(
"duration": row.duration or 0,
"distance": round(float(row.distance or 0) / 1000, 1),
"tss": round(float(row.tss or 0), 0),
"avg_power": round(float(row.avg_power), 0) if row.avg_power else None,
"avg_np": round(float(row.avg_np), 0) if row.avg_np else None,
"avg_hr": round(float(row.avg_hr), 0) if row.avg_hr else None,
"w_per_kg": round(float(row.avg_power) / weight, 2) if row.avg_power and weight else None,
}
for row in result
]

View File

@@ -18,6 +18,7 @@ class Rider(Base):
name: Mapped[str] = mapped_column(String(100))
ftp: Mapped[float | None] = mapped_column(Float, nullable=True)
lthr: Mapped[int | None] = mapped_column(nullable=True)
max_hr: Mapped[int | None] = mapped_column(nullable=True)
weight: Mapped[float | None] = mapped_column(Float, nullable=True)
zones_config: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
goals: Mapped[str | None] = mapped_column(String(500), nullable=True)

View File

@@ -8,6 +8,7 @@ class RiderCreate(BaseModel):
name: str
ftp: float | None = None
lthr: int | None = None
max_hr: int | None = None
weight: float | None = None
goals: str | None = None
experience_level: str | None = None
@@ -17,6 +18,7 @@ class RiderUpdate(BaseModel):
name: str | None = None
ftp: float | None = None
lthr: int | None = None
max_hr: int | None = None
weight: float | None = None
zones_config: dict | None = None
goals: str | None = None
@@ -43,6 +45,7 @@ class RiderResponse(BaseModel):
name: str
ftp: float | None = None
lthr: int | None = None
max_hr: int | None = None
weight: float | None = None
zones_config: dict | None = None
goals: str | None = None