Merge branch 'water-level-csv' into water-level-csv-refactor

Author: jacob-a-brown

schemas/well_inventory.py

@@ -130,7 +130,7 @@ def email_validator_function(email_str):
 OptionalFloat: TypeAlias = Annotated[
     Optional[float], BeforeValidator(empty_str_to_none)
 ]
-MonitoryFrequencyField: TypeAlias = Annotated[
+MonitoringFrequencyField: TypeAlias = Annotated[
     Optional[MonitoringFrequency], BeforeValidator(blank_to_none)
 ]
 WellPurposeField: TypeAlias = Annotated[
@@ -249,7 +249,7 @@ class WellInventoryRow(BaseModel):
     well_purpose: WellPurposeField = None
     well_purpose_2: WellPurposeField = None
     well_hole_status: Optional[str] = None
-    monitoring_frequency: MonitoryFrequencyField = None
+    monitoring_frequency: MonitoringFrequencyField = None
 
     result_communication_preference: Optional[str] = None
     contact_special_requests_notes: Optional[str] = None

tests/test_well_inventory.py

@@ -25,7 +25,6 @@
     amp_viewer_function,
 )
 from db import (
-    Group,
     Location,
     LocationThingAssociation,
     Thing,
@@ -87,8 +86,7 @@ def test_well_inventory_db_contents():
         "/well-inventory-csv",
         files={"file": open(file, "rb")},
     )
-    data = response.json()
-    print(data)
+
     assert (
         response.status_code == 201
     ), f"Unexpected status code: {response.status_code}"
@@ -237,6 +235,18 @@ def test_well_inventory_db_contents():
                         == "true"
                     )
 
+            assert thing.well_status == file_content["well_hole_status"]
+            assert (
+                thing.datalogger_suitability_status == "Datalogger can be installed"
+                if file_content["datalogger_possible"].lower() == "true"
+                else "Datalogger cannot be installed"
+            )
+            assert (
+                thing.open_status == "Open"
+                if file_content["is_open"].lower() == "true"
+                else "Closed"
+            )
+
             # LOCATION AND RELATED RECORDS
             location_thing_association = (
                 session.query(LocationThingAssociation)