fix: R06 community_observations filters by fish/waterbody slug via JOIN (#1788956171115)

2026-09-10 05:38:22 +07:00
parent fc878c81d4
commit 0b3a5ece4b
1 changed files with 2 additions and 2 deletions
@@ -229,9 +229,9 @@ def community_observations(
        DataSource.enabled.is_(True),
    )
    if waterbody:
-        query = query.where(ExternalObservation.waterbody_name == waterbody)
+        query = query.join(ExternalObservation.waterbody).where(Waterbody.slug == waterbody)
    if fish:
-        query = query.where(ExternalObservation.fish_name == fish)
+        query = query.join(ExternalObservation.fish).where(Fish.slug == fish)
    items = list(db.scalars(query.order_by(ExternalObservation.last_seen_at.desc(), ExternalObservation.id.desc()).offset(offset).limit(limit)))
    result: list[PublicObservationOut] = []
    for item in items: