fix: audit P0-P1 — T03-T07, D01-D08, U01-U02 (#1788956171115)

apps/api/app/community_importer.py

@@ -9,7 +9,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from .community_review import publish_observation
-from .models import DataSource, ExternalEntityAlias, ExternalObservation, ModerationStatus
+from .models import DataSource, ExternalEntityAlias, ExternalObservation, ModerationStatus, Waterbody
 
 
 SOURCE_DEFAULTS = {
@@ -107,7 +107,6 @@ def _auto_publish(session: Session, observation: ExternalObservation) -> bool:
         observation.status not in {"staged", "mapped", "ready"}
         or not observation.source.enabled
         or observation.fish_external_id is None
-        or observation.waterbody_external_id is None
         or observation.x is None
         or observation.y is None
         or observation.weight_g is None
@@ -118,15 +117,27 @@ def _auto_publish(session: Session, observation: ExternalObservation) -> bool:
         ExternalEntityAlias.entity_type == "fish",
         ExternalEntityAlias.external_id == observation.fish_external_id,
     ))
-    waterbody_alias = session.scalar(select(ExternalEntityAlias).where(
-        ExternalEntityAlias.source_system == observation.source_system,
-        ExternalEntityAlias.entity_type == "waterbody",
-        ExternalEntityAlias.external_id == observation.waterbody_external_id,
-    ))
-    if fish_alias is None or fish_alias.fish is None or waterbody_alias is None or waterbody_alias.waterbody is None:
+    if fish_alias is None or fish_alias.fish is None:
+        return False
+    # Waterbody: prefer external alias, fall back to exact name match
+    waterbody = None
+    if observation.waterbody_external_id is not None:
+        waterbody_alias = session.scalar(select(ExternalEntityAlias).where(
+            ExternalEntityAlias.source_system == observation.source_system,
+            ExternalEntityAlias.entity_type == "waterbody",
+            ExternalEntityAlias.external_id == observation.waterbody_external_id,
+        ))
+        if waterbody_alias and waterbody_alias.waterbody:
+            waterbody = waterbody_alias.waterbody
+    if waterbody is None:
+        # Fallback: exact name match
+        waterbody = session.scalar(
+            select(Waterbody).where(Waterbody.name_ru == observation.waterbody_name)
+        )
+    if waterbody is None:
         return False
     observation.fish = fish_alias.fish
-    observation.waterbody = waterbody_alias.waterbody
+    observation.waterbody = waterbody
     observation.status = "ready"
     observation.review_note = "Automatically matched by previously reviewed source aliases"
     publish_observation(session, observation)