feat: update latest TDS materialized view to use observation datetime and add tests for timestamp accuracy

Author: jirhiker

alembic/versions/i2b3c4d5e6f7_add_latest_tds_pygeoapi_materialized_view.py

@@ -37,7 +37,7 @@ def _create_latest_tds_view() -> str:
             SELECT
                 csi.thing_id,
                 mc.id AS major_chemistry_id,
-                COALESCE(mc."AnalysisDate", csi."CollectionDate")::date AS observation_date,
+                COALESCE(mc."AnalysisDate", csi."CollectionDate") AS observation_datetime,
                 mc."SampleValue" AS sample_value,
                 mc."Units" AS units
             FROM "NMA_MajorChemistry" AS mc
@@ -59,12 +59,12 @@ def _create_latest_tds_view() -> str:
             SELECT
                 to2.thing_id,
                 to2.major_chemistry_id,
-                to2.observation_date,
+                to2.observation_datetime,
                 to2.sample_value,
                 to2.units,
                 ROW_NUMBER() OVER (
                     PARTITION BY to2.thing_id
-                    ORDER BY to2.observation_date DESC NULLS LAST, to2.major_chemistry_id DESC
+                    ORDER BY to2.observation_datetime DESC NULLS LAST, to2.major_chemistry_id DESC
                 ) AS rn
             FROM tds_obs AS to2
         )
@@ -73,7 +73,7 @@ def _create_latest_tds_view() -> str:
             t.name,
             t.thing_type,
             rt.major_chemistry_id,
-            rt.observation_date AS latest_tds_observation_date,
+            rt.observation_datetime::date AS latest_tds_observation_date,
             rt.sample_value AS latest_tds_value,
             rt.units AS latest_tds_units,
             l.point

tests/test_ogc.py

@@ -138,12 +138,83 @@ def test_latest_tds_observation_date_falls_back_to_collection_date(water_well_th
         session.commit()
 
 
+def test_latest_tds_uses_latest_timestamp_within_same_day(water_well_thing):
+    with session_ctx() as session:
+        csi = NMA_Chemistry_SampleInfo(
+            thing_id=water_well_thing.id,
+            nma_sample_point_id="TDS-TIME",
+            collection_date=datetime(2024, 2, 1, 9, 0, 0),
+        )
+        session.add(csi)
+        session.flush()
+
+        mc_early = NMA_MajorChemistry(
+            chemistry_sample_info_id=csi.id,
+            analyte="Total Dissolved Solids",
+            symbol="TDS",
+            sample_value=300.0,
+            units="mg/L",
+            analysis_date=datetime(2024, 2, 1, 8, 0, 0),
+        )
+        mc_late = NMA_MajorChemistry(
+            chemistry_sample_info_id=csi.id,
+            analyte="Total Dissolved Solids",
+            symbol="TDS",
+            sample_value=700.0,
+            units="mg/L",
+            analysis_date=datetime(2024, 2, 1, 18, 0, 0),
+        )
+        session.add(mc_early)
+        session.add(mc_late)
+        session.commit()
+
+        session.execute(text("REFRESH MATERIALIZED VIEW ogc_avg_tds_wells"))
+        session.commit()
+
+        row = session.execute(
+            text(
+                "SELECT latest_tds_observation_date, latest_tds_value "
+                "FROM ogc_latest_tds_wells WHERE id = :thing_id"
+            ),
+            {"thing_id": water_well_thing.id},
+        ).one()
+
+        assert row.latest_tds_observation_date.isoformat() == "2024-02-01"
+        assert float(row.latest_tds_value) == 700.0
+
+        session.delete(mc_late)
+        session.delete(mc_early)
+        session.delete(csi)
+        session.commit()
+        session.execute(text("REFRESH MATERIALIZED VIEW ogc_avg_tds_wells"))
+        session.commit()
+
+
 def test_ogc_collections():
     response = client.get("/ogcapi/collections")
     assert response.status_code == 200
     payload = response.json()
     ids = {collection["id"] for collection in payload["collections"]}
-    assert {"locations", "water_wells", "springs"}.issubset(ids)
+    assert {
+        "locations",
+        "water_wells",
+        "springs",
+        "latest_tds_wells",
+        "depth_to_water_trend_wells",
+        "water_well_summary",
+    }.issubset(ids)
+
+
+def test_ogc_new_collection_items_endpoints():
+    for collection_id in (
+        "latest_tds_wells",
+        "depth_to_water_trend_wells",
+        "water_well_summary",
+    ):
+        response = client.get(f"/ogcapi/collections/{collection_id}/items?limit=10")
+        assert response.status_code == 200
+        payload = response.json()
+        assert payload["type"] == "FeatureCollection"
 
 
 @pytest.mark.skip("PostGIS spatial operators not available in CI - see issue #449")