BDMS 221: updates to transfer scripts

core/lexicon.json

@@ -685,6 +685,7 @@
     {"categories": ["group_type"], "term": "Historical", "definition": "A group of `Things` that share a common historical attribute. E.g., 'Wells drilled before 1950', 'Legacy Wells (Pre-1990)'."},
     {"categories": ["monitoring_frequency"], "term": "Monthly", "definition": "Location is monitored on a monthly basis."},
     {"categories": ["monitoring_frequency"], "term": "Bimonthly", "definition": "Location is monitored every two months."},
+      {"categories": ["monitoring_frequency"], "term": "Bimonthly reported", "definition": "Location is monitored every two months and reported to NMBGMR."},
     {"categories": ["monitoring_frequency"], "term": "Quarterly", "definition": "Location is monitored on a quarterly basis."},
     {"categories": ["monitoring_frequency"], "term": "Biannual", "definition": "Location is monitored twice a year."},
     {"categories": ["monitoring_frequency"], "term": "Annual", "definition": "Location is monitored once a year."},

schemas/thing.py

@@ -37,23 +37,41 @@ class ValidateWell(BaseModel):
     well_depth: float | None = None  # in feet
     hole_depth: float | None = None  # in feet
     well_casing_depth: float | None = None  # in feet
+    measuring_point_height: float | None = None  # in feet
 
     @model_validator(mode="after")
-    def check_depths(self):
-        if (
-            self.hole_depth is not None
-            and self.well_depth is not None
-            and self.well_depth > self.hole_depth
-        ):
-            raise ValueError("well depth must be less than than or equal to hole depth")
-        elif (
-            self.hole_depth is not None
-            and self.well_casing_depth is not None
-            and self.well_casing_depth > self.hole_depth
-        ):
-            raise ValueError(
-                "well casing depth must be less than or equal to hole depth"
-            )
+    def validate_values(self):
+        if self.hole_depth is not None:
+            if self.well_depth is not None and self.well_depth > self.hole_depth:
+                raise ValueError(
+                    "well depth must be less than than or equal to hole depth"
+                )
+            elif (
+                self.well_casing_depth is not None
+                and self.well_casing_depth > self.hole_depth
+            ):
+                raise ValueError(
+                    "well casing depth must be less than or equal to hole depth"
+                )
+
+        if self.measuring_point_height is not None:
+            if (
+                self.hole_depth is not None
+                and self.measuring_point_height >= self.hole_depth
+            ):
+                raise ValueError("measuring point height must be less than hole depth")
+            elif (
+                self.well_casing_depth is not None
+                and self.measuring_point_height >= self.well_casing_depth
+            ):
+                raise ValueError(
+                    "measuring point height must be less than well casing depth"
+                )
+            elif (
+                self.well_depth is not None
+                and self.measuring_point_height >= self.well_depth
+            ):
+                raise ValueError("measuring point height must be less than well depth")
 
         return self
 
@@ -106,6 +124,10 @@ class CreateWell(CreateBaseThing, ValidateWell):
         default=None, gt=0, description="Well casing depth in feet"
     )
     well_casing_materials: list[CasingMaterial] | None = None
+    measuring_point_height: float = Field(
+        ge=0, description="Measuring point height in feet"
+    )
+    measuring_point_description: str | None
 
 
 class CreateSpring(CreateBaseThing):

services/util.py

@@ -132,6 +132,26 @@ def get_epqs_elevation_from_point(lon: float, lat: float) -> float | None:
     return data["value"]
 
 
+def convert_ngvd29_to_navd88(
+    elevation_ngvd29: float, longitude: float, latitude: float
+) -> float:
+    url = "https://geodesy.noaa.gov/api/ncat/llh"
+    params = {
+        "lat": latitude,
+        "lon": longitude,
+        "inDatum": "nad83(2011)",
+        "outDatum": "nad83(2011)",
+        "inVertDatum": "ngvd29",
+        "outVertDatum": "navd88",
+        "orthoHt": elevation_ngvd29,
+    }
+    response = httpx.get(url, params=params)
+    data = response.json()
+
+    elevation_navd88 = data.get("destOrthoht")
+    return elevation_navd88
+
+
 def retrieve_latest_polymorphic_history_table_record(
     target_record: DeclarativeBase,
     polymorphic_relationship: str,

tests/test_thing.py

@@ -78,6 +78,30 @@ def test_validate_hole_depth_casing_depth():
         ValidateWell(hole_depth=100.0, well_casing_depth=110.0)
 
 
+def test_validate_mp_height_hole_depth():
+    with pytest.raises(
+        ValueError,
+        match="measuring point height must be less than hole depth",
+    ):
+        ValidateWell(hole_depth=100.0, measuring_point_height=110.0)
+
+
+def test_validate_mp_height_well_depth():
+    with pytest.raises(
+        ValueError,
+        match="measuring point height must be less than well depth",
+    ):
+        ValidateWell(well_depth=100.0, measuring_point_height=105.0)
+
+
+def test_validate_mp_height_well_casing_depth():
+    with pytest.raises(
+        ValueError,
+        match="measuring point height must be less than well casing depth",
+    ):
+        ValidateWell(well_casing_depth=100.0, measuring_point_height=105.0)
+
+
 # POST tests ===================================================================
 
 

transfers/group_transfer.py

@@ -20,6 +20,7 @@
 from db.engine import session_ctx
 from transfers.util import read_csv
 from transfers.logger import logger
+from services.util import retrieve_latest_polymorphic_history_table_record
 
 
 def transfer_groups(
@@ -44,7 +45,32 @@ def transfer_groups(
                     logger.info(
                         f"Adding {len(records)} things to group {group.name}, prefix {prefix}"
                     )
+                    group_is_monitoring_plan = False
                     for record in records:
+                        # set the group_type to Monitoring Plan if at least one well is currently monitored
+                        if not group_is_monitoring_plan:
+                            if record.status_history:
+                                monitoring_status = [
+                                    sh
+                                    for sh in record.status_history
+                                    if sh.status_type == "Monitoring Status"
+                                ]
+                                if monitoring_status:
+                                    monitoring_status = retrieve_latest_polymorphic_history_table_record(
+                                        record,
+                                        "status_history",
+                                        "Monitoring Status",
+                                    )
+                                    if (
+                                        monitoring_status.status_value
+                                        == "Currently monitored"
+                                    ):
+                                        group_is_monitoring_plan = True
+                                        group.group_type = "Monitoring Plan"
+                                        logger.info(
+                                            f"  Setting group {group.name} type to Monitoring Plan based on thing {record.name}"
+                                        )
+
                         gta = GroupThingAssociation(group=group, thing=record)
                         session.add(gta)
                         group.thing_associations.append(gta)

transfers/thing_transfer.py

@@ -20,7 +20,12 @@
 
 from db import LocationThingAssociation
 from services.thing_helper import add_thing
-from transfers.util import make_location, read_csv, replace_nans
+from transfers.util import (
+    make_location,
+    make_location_data_provenance,
+    read_csv,
+    replace_nans,
+)
 from transfers.logger import logger
 
 
@@ -49,7 +54,15 @@ def transfer_thing(session: Session, site_type: str, make_payload, limit=None) -
             session.commit()
 
         try:
-            location = make_location(row)
+            location, elevation_method = make_location(row)
+            session.add(location)
+            session.flush()
+            data_provenances = make_location_data_provenance(
+                row, location, elevation_method
+            )
+            for dp in data_provenances:
+                session.add(dp)
+
             payload = make_payload(row)
             thing_type = payload.pop("thing_type")
             thing = add_thing(session, payload, thing_type=thing_type)