fix: update measuring point height handling and add tests for assumed values

Author: jirhiker

db/measuring_point_history.py

@@ -14,7 +14,7 @@
 
 from typing import TYPE_CHECKING
 
-from sqlalchemy import Integer, ForeignKey, Date, Text, Numeric, Boolean
+from sqlalchemy import Integer, ForeignKey, Date, Text, Numeric, Boolean, false
 from sqlalchemy.orm import relationship, Mapped, mapped_column
 
 from db.base import Base, AutoBaseMixin, ReleaseMixin
@@ -44,7 +44,7 @@ class MeasuringPointHistory(Base, AutoBaseMixin, ReleaseMixin):
         Boolean,
         nullable=False,
         default=False,
-        server_default="false",
+        server_default=false(),
         comment="True when measuring point height is assumed/defaulted rather than explicitly measured.",
     )
     measuring_point_description: Mapped[str] = mapped_column(

tests/test_thing.py

@@ -25,7 +25,8 @@
     viewer_function,
     amp_viewer_function,
 )
-from db import Thing, WellScreen, ThingIdLink
+from db import Thing, WellScreen, ThingIdLink, MeasuringPointHistory
+from db.engine import session_ctx
 from main import app
 from schemas import DT_FMT
 from schemas.location import LocationResponse
@@ -190,6 +191,65 @@ def test_add_water_well_with_measuring_point(location, group):
     cleanup_post_test(Thing, data["id"])
 
 
+def test_add_water_well_missing_measuring_point_height_sets_assumed(location, group):
+    payload = {
+        "location_id": location.id,
+        "group_id": group.id,
+        "release_status": "draft",
+        "name": "Test Well Missing MP Height",
+    }
+
+    response = client.post("/thing/water-well", json=payload)
+    assert response.status_code == 201
+    data = response.json()
+    assert data["measuring_point_height"] == 0
+    assert data["measuring_point_height_is_assumed"] is True
+
+    with session_ctx() as session:
+        mph = (
+            session.query(MeasuringPointHistory)
+            .filter(
+                MeasuringPointHistory.thing_id == data["id"],
+                MeasuringPointHistory.end_date.is_(None),
+            )
+            .one()
+        )
+        assert float(mph.measuring_point_height) == 0.0
+        assert mph.measuring_point_height_is_assumed is True
+
+    cleanup_post_test(Thing, data["id"])
+
+
+def test_add_water_well_explicit_measuring_point_height_not_assumed(location, group):
+    payload = {
+        "location_id": location.id,
+        "group_id": group.id,
+        "release_status": "draft",
+        "name": "Test Well Explicit MP Height",
+        "measuring_point_height": 2.5,
+    }
+
+    response = client.post("/thing/water-well", json=payload)
+    assert response.status_code == 201
+    data = response.json()
+    assert data["measuring_point_height"] == 2.5
+    assert data["measuring_point_height_is_assumed"] is False
+
+    with session_ctx() as session:
+        mph = (
+            session.query(MeasuringPointHistory)
+            .filter(
+                MeasuringPointHistory.thing_id == data["id"],
+                MeasuringPointHistory.end_date.is_(None),
+            )
+            .one()
+        )
+        assert float(mph.measuring_point_height) == 2.5
+        assert mph.measuring_point_height_is_assumed is False
+
+    cleanup_post_test(Thing, data["id"])
+
+
 @pytest.mark.skip("Needs to be updated per changes made from feature files")
 def test_add_water_well_409_bad_group_id(location):
     bad_group_id = 9999

tests/transfers/test_contact_with_multiple_wells.py

@@ -22,7 +22,7 @@
 
 def _run_contact_transfer(pointids: list[str]):
     wt = WellTransferer(pointids=pointids)
-    wt.transfer()
+    wt.transfer_parallel()
 
     ct = ContactTransfer(pointids=pointids)
     ct.transfer()

transfers/util.py

@@ -106,11 +106,17 @@ def estimate_measuring_point_height(
     ) -> tuple[float, str, datetime | None, datetime | None]:
         mph = row.MPHeight
         mph_desc = row.MeasuringPoint
+        # Treat NaN as missing the same as None.
+        if notna(mph):
+            mph_is_missing = False
+        else:
+            mph = None
+            mph_is_missing = True
         try:
             df = self._grouped.get_group(row.PointID)
         except KeyError:
             df = None
-        if mph is None:
+        if mph_is_missing:
             if self.verbose:
                 logger.info(
                     f"No MPHeight found for PointID: {row.PointID}. Estimating from measurements."