feat: add legacy data transferers and models for AssociatedData, SurfaceWaterPhotos, WeatherPhotos, and SoilRockResults

Author: jirhiker

alembic/versions/c2f4a9d0b1e2_create_nma_associated_data.py

@@ -0,0 +1,50 @@
+"""Create legacy NMA_AssociatedData table.
+
+Revision ID: c2f4a9d0b1e2
+Revises: a7b8c9d0e1f2
+Create Date: 2026-03-05 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import inspect
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "c2f4a9d0b1e2"
+down_revision: Union[str, Sequence[str], None] = "a7b8c9d0e1f2"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Create the legacy associated data table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if not inspector.has_table("NMA_AssociatedData"):
+        op.create_table(
+            "NMA_AssociatedData",
+            sa.Column("LocationId", postgresql.UUID(as_uuid=True), nullable=True),
+            sa.Column("PointID", sa.String(length=10), nullable=True),
+            sa.Column(
+                "AssocID",
+                postgresql.UUID(as_uuid=True),
+                nullable=False,
+                primary_key=True,
+            ),
+            sa.Column("Notes", sa.String(length=255), nullable=True),
+            sa.Column("Formation", sa.String(length=15), nullable=True),
+            sa.Column("OBJECTID", sa.Integer(), nullable=True, unique=True),
+            sa.UniqueConstraint("LocationId", name="AssociatedData$LocationId"),
+        )
+        op.create_index("AssociatedData$PointID", "NMA_AssociatedData", ["PointID"])
+
+
+def downgrade() -> None:
+    """Drop the legacy associated data table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if inspector.has_table("NMA_AssociatedData"):
+        op.drop_table("NMA_AssociatedData")

alembic/versions/d3a4b5c6d7e8_create_nma_surface_water_photos.py

@@ -0,0 +1,53 @@
+"""Create legacy NMA_SurfaceWaterPhotos table.
+
+Revision ID: d3a4b5c6d7e8
+Revises: c2f4a9d0b1e2
+Create Date: 2026-03-05 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import inspect
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "d3a4b5c6d7e8"
+down_revision: Union[str, Sequence[str], None] = "c2f4a9d0b1e2"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Create the legacy surface water photos table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if not inspector.has_table("NMA_SurfaceWaterPhotos"):
+        op.create_table(
+            "NMA_SurfaceWaterPhotos",
+            sa.Column("SurfaceID", postgresql.UUID(as_uuid=True), nullable=True),
+            sa.Column("PointID", sa.String(length=50), nullable=False),
+            sa.Column("OLEPath", sa.String(length=50), nullable=True),
+            sa.Column("OBJECTID", sa.Integer(), nullable=True, unique=True),
+            sa.Column(
+                "GlobalID",
+                postgresql.UUID(as_uuid=True),
+                nullable=False,
+                primary_key=True,
+            ),
+        )
+        op.create_index(
+            "SurfaceWaterPhotos$PointID", "NMA_SurfaceWaterPhotos", ["PointID"]
+        )
+        op.create_index(
+            "SurfaceWaterPhotos$SurfaceID", "NMA_SurfaceWaterPhotos", ["SurfaceID"]
+        )
+
+
+def downgrade() -> None:
+    """Drop the legacy surface water photos table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if inspector.has_table("NMA_SurfaceWaterPhotos"):
+        op.drop_table("NMA_SurfaceWaterPhotos")

alembic/versions/e4b5c6d7e8f9_create_nma_weather_photos.py

@@ -0,0 +1,49 @@
+"""Create legacy NMA_WeatherPhotos table.
+
+Revision ID: e4b5c6d7e8f9
+Revises: d3a4b5c6d7e8
+Create Date: 2026-03-05 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import inspect
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "e4b5c6d7e8f9"
+down_revision: Union[str, Sequence[str], None] = "d3a4b5c6d7e8"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Create the legacy weather photos table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if not inspector.has_table("NMA_WeatherPhotos"):
+        op.create_table(
+            "NMA_WeatherPhotos",
+            sa.Column("WeatherID", postgresql.UUID(as_uuid=True), nullable=True),
+            sa.Column("PointID", sa.String(length=50), nullable=False),
+            sa.Column("OLEPath", sa.String(length=50), nullable=True),
+            sa.Column("OBJECTID", sa.Integer(), nullable=True, unique=True),
+            sa.Column(
+                "GlobalID",
+                postgresql.UUID(as_uuid=True),
+                nullable=False,
+                primary_key=True,
+            ),
+        )
+        op.create_index("WeatherPhotos$PointID", "NMA_WeatherPhotos", ["PointID"])
+        op.create_index("WeatherPhotos$WeatherID", "NMA_WeatherPhotos", ["WeatherID"])
+
+
+def downgrade() -> None:
+    """Drop the legacy weather photos table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if inspector.has_table("NMA_WeatherPhotos"):
+        op.drop_table("NMA_WeatherPhotos")

alembic/versions/f5a6b7c8d9e0_create_nma_soil_rock_results.py

@@ -0,0 +1,46 @@
+"""Create legacy NMA_Soil_Rock_Results table.
+
+Revision ID: f5a6b7c8d9e0
+Revises: e4b5c6d7e8f9
+Create Date: 2026-03-05 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy import inspect
+
+# revision identifiers, used by Alembic.
+revision: str = "f5a6b7c8d9e0"
+down_revision: Union[str, Sequence[str], None] = "e4b5c6d7e8f9"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Create the legacy soil/rock results table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if not inspector.has_table("NMA_Soil_Rock_Results"):
+        op.create_table(
+            "NMA_Soil_Rock_Results",
+            sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
+            sa.Column("Point_ID", sa.String(length=255), nullable=True),
+            sa.Column("Sample Type", sa.String(length=255), nullable=True),
+            sa.Column("Date Sampled", sa.String(length=255), nullable=True),
+            sa.Column("d13C", sa.Float(), nullable=True),
+            sa.Column("d18O", sa.Float(), nullable=True),
+            sa.Column("Sampled by", sa.String(length=255), nullable=True),
+        )
+        op.create_index(
+            "Soil_Rock_Results$Point_ID", "NMA_Soil_Rock_Results", ["Point_ID"]
+        )
+
+
+def downgrade() -> None:
+    """Drop the legacy soil/rock results table."""
+    bind = op.get_bind()
+    inspector = inspect(bind)
+    if inspector.has_table("NMA_Soil_Rock_Results"):
+        op.drop_table("NMA_Soil_Rock_Results")

db/nma_legacy.py

@@ -278,6 +278,25 @@ class ChemistrySampleInfo(Base):
         passive_deletes=True,
     )
 
+
+class AssociatedData(Base):
+    """
+    Legacy AssociatedData table from NM_Aquifer.
+    """
+
+    __tablename__ = "NMA_AssociatedData"
+
+    location_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        "LocationId", UUID(as_uuid=True), unique=True
+    )
+    point_id: Mapped[Optional[str]] = mapped_column("PointID", String(10))
+    assoc_id: Mapped[uuid.UUID] = mapped_column(
+        "AssocID", UUID(as_uuid=True), primary_key=True
+    )
+    notes: Mapped[Optional[str]] = mapped_column("Notes", String(255))
+    formation: Mapped[Optional[str]] = mapped_column("Formation", String(15))
+    object_id: Mapped[Optional[int]] = mapped_column("OBJECTID", Integer, unique=True)
+
     major_chemistries: Mapped[List["NMAMajorChemistry"]] = relationship(
         "NMAMajorChemistry",
         back_populates="chemistry_sample_info",
@@ -328,6 +347,24 @@ class SurfaceWaterData(Base):
     data_source: Mapped[Optional[str]] = mapped_column("DataSource", String(255))
 
 
+class SurfaceWaterPhotos(Base):
+    """
+    Legacy SurfaceWaterPhotos table from NM_Aquifer.
+    """
+
+    __tablename__ = "NMA_SurfaceWaterPhotos"
+
+    surface_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        "SurfaceID", UUID(as_uuid=True)
+    )
+    point_id: Mapped[str] = mapped_column("PointID", String(50), nullable=False)
+    ole_path: Mapped[Optional[str]] = mapped_column("OLEPath", String(50))
+    object_id: Mapped[Optional[int]] = mapped_column("OBJECTID", Integer, unique=True)
+    global_id: Mapped[uuid.UUID] = mapped_column(
+        "GlobalID", UUID(as_uuid=True), primary_key=True
+    )
+
+
 class WeatherData(Base):
     """
     Legacy WeatherData table from AMPAPI.
@@ -345,6 +382,40 @@ class WeatherData(Base):
     object_id: Mapped[int] = mapped_column("OBJECTID", Integer, primary_key=True)
 
 
+class WeatherPhotos(Base):
+    """
+    Legacy WeatherPhotos table from NM_Aquifer.
+    """
+
+    __tablename__ = "NMA_WeatherPhotos"
+
+    weather_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        "WeatherID", UUID(as_uuid=True)
+    )
+    point_id: Mapped[str] = mapped_column("PointID", String(50), nullable=False)
+    ole_path: Mapped[Optional[str]] = mapped_column("OLEPath", String(50))
+    object_id: Mapped[Optional[int]] = mapped_column("OBJECTID", Integer, unique=True)
+    global_id: Mapped[uuid.UUID] = mapped_column(
+        "GlobalID", UUID(as_uuid=True), primary_key=True
+    )
+
+
+class SoilRockResults(Base):
+    """
+    Legacy Soil_Rock_Results table from NM_Aquifer.
+    """
+
+    __tablename__ = "NMA_Soil_Rock_Results"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    point_id: Mapped[Optional[str]] = mapped_column("Point_ID", String(255))
+    sample_type: Mapped[Optional[str]] = mapped_column("Sample Type", String(255))
+    date_sampled: Mapped[Optional[str]] = mapped_column("Date Sampled", String(255))
+    d13c: Mapped[Optional[float]] = mapped_column("d13C", Float)
+    d18o: Mapped[Optional[float]] = mapped_column("d18O", Float)
+    sampled_by: Mapped[Optional[str]] = mapped_column("Sampled by", String(255))
+
+
 class NMAMinorTraceChemistry(Base):
     """
     Legacy MinorandTraceChemistry table from AMPAPI.

tests/test_associated_data_legacy.py

@@ -0,0 +1,80 @@
+# ==============================================================================
+# Copyright 2026 ross
+#
+# 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.
+# ==============================================================================
+"""
+Unit tests for AssociatedData legacy model.
+
+These tests verify the migration of columns from the legacy AssociatedData table.
+Migrated columns:
+- LocationId -> location_id
+- PointID -> point_id
+- AssocID -> assoc_id
+- Notes -> notes
+- Formation -> formation
+- OBJECTID -> object_id
+"""
+
+from uuid import uuid4
+
+from db.engine import session_ctx
+from db.nma_legacy import AssociatedData
+
+
+def test_create_associated_data_all_fields():
+    """Test creating an associated data record with all fields."""
+    with session_ctx() as session:
+        record = AssociatedData(
+            location_id=uuid4(),
+            point_id="AA-0001",
+            assoc_id=uuid4(),
+            notes="Legacy notes",
+            formation="TEST",
+            object_id=42,
+        )
+        session.add(record)
+        session.commit()
+        session.refresh(record)
+
+        assert record.assoc_id is not None
+        assert record.location_id is not None
+        assert record.point_id == "AA-0001"
+        assert record.notes == "Legacy notes"
+        assert record.formation == "TEST"
+        assert record.object_id == 42
+
+        session.delete(record)
+        session.commit()
+
+
+def test_create_associated_data_minimal():
+    """Test creating an associated data record with required fields only."""
+    with session_ctx() as session:
+        record = AssociatedData(assoc_id=uuid4())
+        session.add(record)
+        session.commit()
+        session.refresh(record)
+
+        assert record.assoc_id is not None
+        assert record.location_id is None
+        assert record.point_id is None
+        assert record.notes is None
+        assert record.formation is None
+        assert record.object_id is None
+
+        session.delete(record)
+        session.commit()
+
+
+# ============= EOF =============================================