feat: prioritize risky moderation records

apps/api/app/main.py

@@ -15,7 +15,7 @@ import httpx
 from fastapi import Depends, FastAPI, File, Header, HTTPException, Query, Request, Response, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
-from sqlalchemy import func, or_, select
+from sqlalchemy import case, func, or_, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session, joinedload
 
@@ -180,7 +180,7 @@ def admin_external_observations(
     status: Literal["staged", "mapped", "ready", "published", "rejected", "review"] | None = None,
     source_system: str | None = None,
     completeness: Literal["all", "complete", "incomplete"] = "all",
-    order: Literal["newest", "oldest"] = "newest",
+    order: Literal["newest", "oldest", "risk"] = "newest",
     q: str | None = Query(None, max_length=100),
     limit: int = Query(50, ge=1, le=200), offset: int = Query(0, ge=0),
 ) -> list[ExternalObservationOut]:
@@ -209,8 +209,21 @@ def admin_external_observations(
             ExternalObservation.fish_name.icontains(term, autoescape=True),
             ExternalObservation.waterbody_name.icontains(term, autoescape=True),
         ))
-    direction = ExternalObservation.last_seen_at.asc() if order == "oldest" else ExternalObservation.last_seen_at.desc()
-    items = db.scalars(query.order_by(direction, ExternalObservation.id.desc()).offset(offset).limit(limit))
+    if order == "risk":
+        incomplete = case(
+            (or_(ExternalObservation.x.is_(None), ExternalObservation.y.is_(None), ExternalObservation.weight_g.is_(None)), 0),
+            else_=1,
+        )
+        workflow = case(
+            (ExternalObservation.status == "staged", 0),
+            (ExternalObservation.status == "mapped", 1),
+            else_=2,
+        )
+        ordering = (incomplete, workflow, ExternalObservation.last_seen_at.asc(), ExternalObservation.id.desc())
+    else:
+        direction = ExternalObservation.last_seen_at.asc() if order == "oldest" else ExternalObservation.last_seen_at.desc()
+        ordering = (direction, ExternalObservation.id.desc())
+    items = db.scalars(query.order_by(*ordering).offset(offset).limit(limit))
     return [_external_out(item) for item in items]
 
 

apps/api/openapi.json

@@ -2002,7 +2002,8 @@
               "default": "newest",
               "enum": [
                 "newest",
-                "oldest"
+                "oldest",
+                "risk"
               ],
               "title": "Order",
               "type": "string"

apps/api/tests/test_api.py

@@ -344,6 +344,9 @@ def test_incomplete_external_observation_is_publicly_labelled_but_not_counted()
     assert any(item["id"] == str(observation_id) for item in incomplete.json())
     complete = client.get("/api/v1/admin/external-observations?status=review&completeness=complete&q=Pike", headers=headers)
     assert all(item["id"] != str(observation_id) for item in complete.json())
+    prioritized = client.get("/api/v1/admin/external-observations?status=review&order=risk", headers=headers)
+    assert prioritized.status_code == 200
+    assert prioritized.json()[0]["weight_g"] is None
     assert all(item["x"] != 32 or item["y"] != 42 for item in client.get("/api/v1/activity").json()["items"])
     mapped = client.patch(
         f"/api/v1/admin/external-observations/{observation_id}/mapping", headers=headers,

apps/web/src/pages/admin/external-sources.astro

@@ -12,7 +12,7 @@ const apiUrl = import.meta.env.PUBLIC_API_URL || "http://localhost:8000";
       <label>Поиск<input name="q" type="search" maxlength="100" placeholder="Рыба или водоём" /></label>
       <label>Источник<select name="source"><option value="">Все источники</option></select></label>
       <label>Полнота<select name="completeness"><option value="all">Все записи</option><option value="complete">Только полные</option><option value="incomplete">Только неполные</option></select></label>
-      <label>Порядок<select name="order"><option value="newest">Сначала новые</option><option value="oldest">Сначала старые</option></select></label>
+      <label>Порядок<select name="order"><option value="risk">Сначала требуют внимания</option><option value="newest">Сначала новые</option><option value="oldest">Сначала старые</option></select></label>
       <button data-action="primary" type="submit">Применить</button>
     </form>
     <div class="notice error" data-admin-error role="alert" hidden></div><div class="notice success" data-admin-status role="status" hidden></div><div class="moderation-list" data-external-list aria-live="polite"></div>