BDMS-455

admin/config.py

@@ -43,6 +43,7 @@
     FieldEventAdmin,
     FieldActivityAdmin,
     ParameterAdmin,
+    SurfaceWaterDataAdmin,
 )
 
 from db.engine import engine
@@ -62,7 +63,7 @@
 from db.group import Group
 from db.notes import Notes
 from db.sample import Sample
-from db.nma_legacy import ChemistrySampleInfo
+from db.nma_legacy import ChemistrySampleInfo, SurfaceWaterData
 from db.geologic_formation import GeologicFormation
 from db.data_provenance import DataProvenance
 from db.transducer import TransducerObservation
@@ -130,6 +131,7 @@ def create_admin(app):
     # Samples
     admin.add_view(SampleAdmin(Sample))
     admin.add_view(ChemistrySampleInfoAdmin(ChemistrySampleInfo))
+    admin.add_view(SurfaceWaterDataAdmin(SurfaceWaterData))
 
     # Field
     admin.add_view(FieldEventAdmin(FieldEvent))

admin/views/__init__.py

@@ -41,6 +41,7 @@
     FieldEventParticipantAdmin,
 )
 from admin.views.parameter import ParameterAdmin
+from admin.views.surface_water import SurfaceWaterDataAdmin
 
 __all__ = [
     "LocationAdmin",
@@ -65,4 +66,5 @@
     "FieldActivityAdmin",
     "FieldEventParticipantAdmin",
     "ParameterAdmin",
+    "SurfaceWaterDataAdmin",
 ]

admin/views/surface_water.py

@@ -0,0 +1,118 @@
+# ===============================================================================
+# Copyright 2025
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ===============================================================================
+"""
+SurfaceWaterDataAdmin view for NMSampleLocations.
+"""
+from admin.views.base import OcotilloModelView
+
+
+class SurfaceWaterDataAdmin(OcotilloModelView):
+    """
+    Admin view for SurfaceWaterData legacy model.
+    """
+
+    name = "Surface Water"
+    label = "Surface Water"
+    icon = "fa fa-water"
+    enable_publish_actions = False
+
+    column_list = [
+        "surface_id",
+        "point_id",
+        "date_measured",
+        "discharge",
+        "discharge_units",
+        "discharge_method",
+        "discharge_source",
+        "formation_zone",
+        "aq_class",
+        "data_source",
+    ]
+
+    column_sortable_list = [
+        "surface_id",
+        "point_id",
+        "date_measured",
+        "discharge",
+        "discharge_units",
+        "discharge_method",
+        "discharge_source",
+        "formation_zone",
+        "aq_class",
+    ]
+
+    column_default_sort = ("date_measured", True)
+
+    search_fields = [
+        "point_id",
+        "discharge",
+        "formation_zone",
+        "aq_class",
+        "data_source",
+    ]
+
+    column_filters = [
+        "discharge_units",
+        "discharge_method",
+        "discharge_source",
+        "formation_zone",
+        "aq_class",
+    ]
+
+    can_export = True
+    export_types = ["csv", "excel"]
+
+    page_size = 50
+    page_size_options = [25, 50, 100, 200]
+
+    fields = [
+        "surface_id",
+        "point_id",
+        "object_id",
+        "date_measured",
+        "discharge",
+        "discharge_rate",
+        "discharge_units",
+        "discharge_method",
+        "discharge_source",
+        "formation_zone",
+        "aq_class",
+        "site_notes",
+        "field_method_notes",
+        "source_notes",
+        "data_source",
+    ]
+
+    labels = {
+        "surface_id": "Surface ID",
+        "point_id": "Point ID",
+        "object_id": "Object ID",
+        "date_measured": "Date Measured",
+        "discharge": "Discharge",
+        "discharge_rate": "Discharge Rate",
+        "discharge_units": "Discharge Units",
+        "discharge_method": "Discharge Method",
+        "discharge_source": "Discharge Source",
+        "formation_zone": "Formation Zone",
+        "aq_class": "Aquifer Class",
+        "site_notes": "Site Notes",
+        "field_method_notes": "Field Method Notes",
+        "source_notes": "Source Notes",
+        "data_source": "Data Source",
+    }
+
+
+# ============= EOF =============================================

alembic/versions/1680a4a7cb77_add_surface_water_data_legacy_model.py

@@ -0,0 +1,47 @@
+"""add surface water data legacy model
+
+Revision ID: 1680a4a7cb77
+Revises: c9f1d2e3a4b5
+Create Date: 2026-01-07 20:46:51.010596
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision: str = "1680a4a7cb77"
+down_revision: Union[str, Sequence[str], None] = "c9f1d2e3a4b5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    op.create_table(
+        "NMA_SurfaceWaterData",
+        sa.Column("SurfaceID", postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column("PointID", sa.String(length=10), nullable=False),
+        sa.Column("OBJECTID", sa.Integer(), primary_key=True),
+        sa.Column("Discharge", sa.String(length=50), nullable=True),
+        sa.Column("DischargeMethod", sa.String(length=50), nullable=True),
+        sa.Column("DischargeRate", sa.Float(), nullable=True),
+        sa.Column("DischargeUnits", sa.String(length=3), nullable=True),
+        sa.Column("DateMeasured", sa.DateTime(), nullable=True),
+        sa.Column("DischargeSource", sa.String(length=50), nullable=True),
+        sa.Column("SiteNotes", sa.String(length=200), nullable=True),
+        sa.Column("FieldMethodNotes", sa.String(length=200), nullable=True),
+        sa.Column("FormationZone", sa.String(length=15), nullable=True),
+        sa.Column("AqClass", sa.String(length=50), nullable=True),
+        sa.Column("SourceNotes", sa.String(length=200), nullable=True),
+        sa.Column("DataSource", sa.String(length=255), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    op.drop_table("NMA_SurfaceWaterData")

db/nma_legacy.py

@@ -16,6 +16,8 @@
 
 """Legacy NM Aquifer models copied from AMPAPI."""
 
+import uuid
+
 from datetime import date, datetime
 from typing import Optional
 
@@ -28,6 +30,7 @@
     String,
     Text,
 )
+from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Mapped, mapped_column
 
 from db.base import Base
@@ -190,4 +193,37 @@ class ChemistrySampleInfo(Base):
     sample_notes: Mapped[Optional[str]] = mapped_column("SampleNotes", Text)
 
 
+class SurfaceWaterData(Base):
+    """
+    Legacy SurfaceWaterData table from AMPAPI.
+    """
+
+    __tablename__ = "NMA_SurfaceWaterData"
+
+    surface_id: Mapped[uuid.UUID] = mapped_column(
+        "SurfaceID", UUID(as_uuid=True), nullable=False
+    )
+    point_id: Mapped[str] = mapped_column("PointID", String(10))
+    object_id: Mapped[int] = mapped_column("OBJECTID", Integer, primary_key=True)
+
+    discharge: Mapped[Optional[str]] = mapped_column("Discharge", String(50))
+    discharge_method: Mapped[Optional[str]] = mapped_column(
+        "DischargeMethod", String(50)
+    )
+    discharge_rate: Mapped[Optional[float]] = mapped_column("DischargeRate", Float)
+    discharge_units: Mapped[Optional[str]] = mapped_column("DischargeUnits", String(3))
+    date_measured: Mapped[Optional[datetime]] = mapped_column("DateMeasured", DateTime)
+    discharge_source: Mapped[Optional[str]] = mapped_column(
+        "DischargeSource", String(50)
+    )
+    site_notes: Mapped[Optional[str]] = mapped_column("SiteNotes", String(200))
+    field_method_notes: Mapped[Optional[str]] = mapped_column(
+        "FieldMethodNotes", String(200)
+    )
+    formation_zone: Mapped[Optional[str]] = mapped_column("FormationZone", String(15))
+    aq_class: Mapped[Optional[str]] = mapped_column("AqClass", String(50))
+    source_notes: Mapped[Optional[str]] = mapped_column("SourceNotes", String(200))
+    data_source: Mapped[Optional[str]] = mapped_column("DataSource", String(255))
+
+
 # ============= EOF =============================================

transfers/backfill/staging.py

@@ -29,10 +29,12 @@
 if str(ROOT) not in sys.path:
     sys.path.insert(0, str(ROOT))
 from transfers.backfill.ngwmn_views import run as run_ngwmn_views
+from transfers.backfill.surface_water_data import run as run_surface_water_data
 from transfers.backfill.waterlevelscontinuous_pressure_daily import (
     run as run_pressure_daily,
 )
 from transfers.backfill.chemistry_sampleinfo import run as run_chemistry_sampleinfo
+from services.util import get_bool_env
 from transfers.logger import logger
 
 
@@ -41,12 +43,24 @@ def run(batch_size: int = 1000) -> None:
     Execute all backfill steps in a deterministic order.
     """
     steps = (
-        ("WaterLevelsContinuous_Pressure_Daily", run_pressure_daily),
-        ("Chemistry_SampleInfo", run_chemistry_sampleinfo),
-        ("NGWMN views", run_ngwmn_views),
+        ("SurfaceWaterData", run_surface_water_data, "BACKFILL_SURFACE_WATER_DATA"),
+        (
+            "Chemistry_SampleInfo",
+            run_chemistry_sampleinfo,
+            "BACKFILL_CHEMISTRY_SAMPLEINFO",
+        ),
+        ("NGWMN views", run_ngwmn_views, "BACKFILL_NGWMN_VIEWS"),
+        (
+            "WaterLevelsContinuous_Pressure_Daily",
+            run_pressure_daily,
+            "BACKFILL_WATERLEVELS_PRESSURE_DAILY",
+        ),
     )
 
-    for name, fn in steps:
+    for name, fn, flag in steps:
+        if not get_bool_env(flag, True):
+            logger.info(f"Skipping backfill: {name} ({flag}=false)")
+            continue
         logger.info(f"Starting backfill: {name}")
         fn(batch_size)
         logger.info(f"Completed backfill: {name}")