feat: update well inventory fields and improve validation error handling

Author: jirhiker

alembic/versions/h1b2c3d4e5f6_update_group_unique_constraint_to_name_type.py

@@ -0,0 +1,99 @@
+"""update group uniqueness from name to (name, group_type)
+
+Revision ID: h1b2c3d4e5f6
+Revises: 7b8c9d0e1f2a
+Create Date: 2026-02-07 13:15:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "h1b2c3d4e5f6"
+down_revision: Union[str, Sequence[str], None] = "7b8c9d0e1f2a"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def _existing_unique_constraints() -> list[dict]:
+    bind = op.get_bind()
+    inspector = sa.inspect(bind)
+    return inspector.get_unique_constraints("group")
+
+
+def _drop_name_only_unique_constraints() -> None:
+    # Drop any existing unique constraint that enforces uniqueness on name only.
+    for constraint in _existing_unique_constraints():
+        columns = constraint.get("column_names") or []
+        name = constraint.get("name")
+        if name and columns == ["name"]:
+            op.drop_constraint(name, "group", type_="unique")
+
+
+def _ensure_no_duplicate_name_group_type_pairs() -> None:
+    bind = op.get_bind()
+    duplicate = bind.execute(
+        sa.text(
+            """
+            SELECT name, group_type, COUNT(*) AS cnt
+            FROM "group"
+            WHERE group_type IS NOT NULL
+            GROUP BY name, group_type
+            HAVING COUNT(*) > 1
+            LIMIT 1
+            """
+        )
+    ).first()
+    if duplicate:
+        raise RuntimeError(
+            "Cannot create uq_group_name_type: duplicate (name, group_type) rows exist."
+        )
+
+
+def _ensure_no_duplicate_names() -> None:
+    bind = op.get_bind()
+    duplicate = bind.execute(
+        sa.text(
+            """
+            SELECT name, COUNT(*) AS cnt
+            FROM "group"
+            GROUP BY name
+            HAVING COUNT(*) > 1
+            LIMIT 1
+            """
+        )
+    ).first()
+    if duplicate:
+        raise RuntimeError(
+            "Cannot recreate uq_group_name: duplicate group names exist."
+        )
+
+
+def upgrade() -> None:
+    _drop_name_only_unique_constraints()
+    _ensure_no_duplicate_name_group_type_pairs()
+
+    constraint_names = {
+        c.get("name") for c in _existing_unique_constraints() if c.get("name")
+    }
+    if "uq_group_name_type" not in constraint_names:
+        op.create_unique_constraint(
+            "uq_group_name_type", "group", ["name", "group_type"]
+        )
+
+
+def downgrade() -> None:
+    constraint_names = {
+        c.get("name") for c in _existing_unique_constraints() if c.get("name")
+    }
+    if "uq_group_name_type" in constraint_names:
+        op.drop_constraint("uq_group_name_type", "group", type_="unique")
+
+    _ensure_no_duplicate_names()
+
+    constraint_names = {
+        c.get("name") for c in _existing_unique_constraints() if c.get("name")
+    }
+    if "uq_group_name" not in constraint_names:
+        op.create_unique_constraint("uq_group_name", "group", ["name"])

api/well_inventory.py

@@ -371,7 +371,7 @@
 #         well_pump_depth=model.well_pump_depth_ft,
 #         is_suitable_for_datalogger=model.datalogger_possible,
 #         is_open=model.is_open,
-#         well_status=model.well_hole_status,
+#         well_status=model.well_status,
 #         notes=well_notes,
 #         well_purposes=well_purposes,
 #         monitoring_frequencies=monitoring_frequencies,

core/lexicon.json

@@ -100,6 +100,10 @@
       "name": "horizontal_datum",
       "description": null
     },
+    {
+      "name": "level_status",
+      "description": null
+    },
     {
       "name": "limit_type",
       "description": null
@@ -2398,6 +2402,27 @@
       "term": "Observed (required for F, N, and W water level status)",
       "definition": "Observed (required for F, N, and W water level status)"
     },
+    {
+      "categories": [
+        "level_status"
+      ],
+      "term": "stable",
+      "definition": "Water level is stable."
+    },
+    {
+      "categories": [
+        "level_status"
+      ],
+      "term": "rising",
+      "definition": "Water level is rising."
+    },
+    {
+      "categories": [
+        "level_status"
+      ],
+      "term": "falling",
+      "definition": "Water level is falling."
+    },
     {
       "categories": [
         "sample_method"

schemas/well_inventory.py

@@ -249,7 +249,7 @@ class WellInventoryRow(BaseModel):
     measuring_point_description: Optional[str] = None
     well_purpose: WellPurposeField = None
     well_purpose_2: WellPurposeField = None
-    well_hole_status: Optional[str] = None
+    well_status: Optional[str] = None
     monitoring_frequency: MonitoringFrequencyField = None
 
     result_communication_preference: Optional[str] = None

services/well_inventory_csv.py

@@ -529,7 +529,7 @@ def _add_csv_row(session: Session, group: Group, model: WellInventoryRow, user)
         well_pump_depth=model.well_pump_depth_ft,
         is_suitable_for_datalogger=model.datalogger_possible,
         is_open=model.is_open,
-        well_status=model.well_hole_status,
+        well_status=model.well_status,
         notes=well_notes,
         well_purposes=well_purposes,
         monitoring_frequencies=monitoring_frequencies,

tests/features/data/well-inventory-duplicate-columns.csv

@@ -1,3 +1,3 @@
-project,well_name_point_id,site_name,date_time,field_staff,utm_easting,utm_northing,utm_zone,elevation_ft,elevation_method,measuring_point_height_ft,field_staff_2,field_staff_3,contact_1_name,contact_1_organization,contact_1_role,contact_1_type,contact_1_phone_1,contact_1_phone_1_type,contact_1_phone_2,contact_1_phone_2_type,contact_1_email_1,contact_1_email_1_type,contact_1_email_2,contact_1_email_2_type,contact_1_address_1_line_1,contact_1_address_1_line_2,contact_1_address_1_type,contact_1_address_1_state,contact_1_address_1_city,contact_1_address_1_postal_code,contact_1_address_2_line_1,contact_1_address_2_line_2,contact_1_address_2_type,contact_1_address_2_state,contact_1_address_2_city,contact_1_address_2_postal_code,contact_2_name,contact_2_organization,contact_2_role,contact_2_type,contact_2_phone_1,contact_2_phone_1_type,contact_2_phone_2,contact_2_phone_2_type,contact_2_email_1,contact_2_email_1_type,contact_2_email_2,contact_2_email_2_type,contact_2_address_1_line_1,contact_2_address_1_line_2,contact_2_address_1_type,contact_2_address_1_state,contact_2_address_1_city,contact_2_address_1_postal_code,contact_2_address_2_line_1,contact_2_address_2_line_2,contact_2_address_2_type,contact_2_address_2_state,contact_2_address_2_city,contact_2_address_2_postal_code,directions_to_site,specific_location_of_well,repeat_measurement_permission,sampling_permission,datalogger_installation_permission,public_availability_acknowledgement,result_communication_preference,contact_special_requests_notes,ose_well_record_id,date_drilled,completion_source,total_well_depth_ft,historic_depth_to_water_ft,depth_source,well_pump_type,well_pump_depth_ft,is_open,datalogger_possible,casing_diameter_ft,measuring_point_description,well_purpose,well_purpose_2,well_hole_status,monitoring_frequency,sampling_scenario_notes,well_measuring_notes,sample_possible,contact_1_email_1
+project,well_name_point_id,site_name,date_time,field_staff,utm_easting,utm_northing,utm_zone,elevation_ft,elevation_method,measuring_point_height_ft,field_staff_2,field_staff_3,contact_1_name,contact_1_organization,contact_1_role,contact_1_type,contact_1_phone_1,contact_1_phone_1_type,contact_1_phone_2,contact_1_phone_2_type,contact_1_email_1,contact_1_email_1_type,contact_1_email_2,contact_1_email_2_type,contact_1_address_1_line_1,contact_1_address_1_line_2,contact_1_address_1_type,contact_1_address_1_state,contact_1_address_1_city,contact_1_address_1_postal_code,contact_1_address_2_line_1,contact_1_address_2_line_2,contact_1_address_2_type,contact_1_address_2_state,contact_1_address_2_city,contact_1_address_2_postal_code,contact_2_name,contact_2_organization,contact_2_role,contact_2_type,contact_2_phone_1,contact_2_phone_1_type,contact_2_phone_2,contact_2_phone_2_type,contact_2_email_1,contact_2_email_1_type,contact_2_email_2,contact_2_email_2_type,contact_2_address_1_line_1,contact_2_address_1_line_2,contact_2_address_1_type,contact_2_address_1_state,contact_2_address_1_city,contact_2_address_1_postal_code,contact_2_address_2_line_1,contact_2_address_2_line_2,contact_2_address_2_type,contact_2_address_2_state,contact_2_address_2_city,contact_2_address_2_postal_code,directions_to_site,specific_location_of_well,repeat_measurement_permission,sampling_permission,datalogger_installation_permission,public_availability_acknowledgement,result_communication_preference,contact_special_requests_notes,ose_well_record_id,date_drilled,completion_source,total_well_depth_ft,historic_depth_to_water_ft,depth_source,well_pump_type,well_pump_depth_ft,is_open,datalogger_possible,casing_diameter_ft,measuring_point_description,well_purpose,well_purpose_2,well_status,monitoring_frequency,sampling_scenario_notes,well_measuring_notes,sample_possible,contact_1_email_1
 Middle Rio Grande Groundwater Monitoring,MRG-001_MP1,Smith Farm Domestic Well,2025-02-15T10:30:00,A Lopez,250000,4000000,13N,5250,Survey-grade GPS,1.5,B Chen,,John Smith,NMBGMR,Owner,Primary,505-555-0101,Primary,,,john.smith@example.com,Primary,,,123 County Rd 7,,Mailing,NM,Los Lunas,87031,,,,,,,Maria Garcia,NMBGMR,Principal Investigator,Secondary,505-555-0123,Home,,,maria.garcia@mrgcd.nm.gov,Work,,,1931 2nd St SW,Suite 200,Mailing,NM,Albuquerque,87102,,,,,,,Gate off County Rd 7 0.4 miles south of canal crossing,Domestic well in pump house east of residence,True,True,True,True,email,Call before visits during irrigation season,OSE-123456,2010-06-15,OSE well record,280,45,owner estimate,submersible,200,True,True,0.5,Top of steel casing inside pump house marked with orange paint,Domestic,,active,Biannual,Sample only when pump has been off more than 12 hours,Measure before owner starts irrigation,True,john.smith@example.com
 Middle Rio Grande Groundwater Monitoring,MRG-003_MP1,Old Orchard Well,2025-01-20T09:00:00,B Chen,250000,4000000,13N,5320,Global positioning system (GPS),1.8,,,Emily Davis,NMBGMR,Biologist,Primary,505-555-0303,Work,,,emily.davis@example.org,Work,,,78 Orchard Ln,,Mailing,NM,Los Lunas,87031,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,From Main St turn east on Orchard Ln well house at dead end,Abandoned irrigation well in small cinderblock building,False,False,False,True,phone,Owner prefers weekday visits,,1965-04-10,historic log scanned,350,60,historic log,vertical turbine inactive,280,False,False,0.75,Top of steel casing under removable hatch use fixed reference mark,Irrigation,,abandoned,Annual,Sampling not permitted water level only when owner present,Well house can be locked coordinate ahead,False,emily.davis@example.org