feat: add method and risk to fishing plans

apps/api/app/routers/activity.py

@@ -92,7 +92,7 @@ def _report_source(report: CatchReport) -> str:
 def spot_catches(spot_id: UUID, db: Db, limit: int = Query(50, ge=1, le=100), offset: int = Query(0, ge=0)) -> list[CatchOut]:
     _spot_or_404(db, spot_id)
     reports = list(db.scalars(select(CatchReport).options(joinedload(CatchReport.fish), joinedload(CatchReport.bait), selectinload(CatchReport.tackle_components)).where(CatchReport.spot_id == spot_id, CatchReport.moderation_status == ModerationStatus.approved, CatchReport.deleted_at.is_(None)).order_by(CatchReport.reported_at.desc(), CatchReport.id.desc()).offset(offset).limit(limit)))
-    return [CatchOut(id=report.id, fish=report.fish.name_ru, weight_g=report.weight_g, bait=report.bait.name if report.bait else None, player_name=report.player_name, caught_at=report.caught_at, reported_at=report.reported_at, retrieve_method=report.retrieve_method, retrieve_speed=report.retrieve_speed, source_system=_report_source(report), source_url=report.source_url, tackle_components=[{
+    return [CatchOut(id=report.id, fish=report.fish.name_ru, weight_g=report.weight_g, bait=report.bait.name if report.bait else None, player_name=report.player_name, caught_at=report.caught_at, reported_at=report.reported_at, fishing_method=report.fishing_method, retrieve_method=report.retrieve_method, retrieve_speed=report.retrieve_speed, source_system=_report_source(report), source_url=report.source_url, tackle_components=[{
         "id": component.id, "role": component.role, "position": component.position,
         "raw_value": component.raw_value, "tackle_item_id": component.tackle_item_id,
         "rig_id": component.rig_id, "source_system": component.source_system,

apps/api/app/schemas.py

@@ -130,6 +130,7 @@ class CatchOut(BaseModel):
     player_name: str | None
     caught_at: datetime | None
     reported_at: datetime
+    fishing_method: str | None
     retrieve_method: str | None
     retrieve_speed: int | None
     source_system: str