transfer

.github/workflows/tests.yml

@@ -20,14 +20,15 @@ jobs:
         # image: postgis/postgis:17-3.5
         env:
           POSTGRES_PASSWORD: postgres
+          POSTGRES_PORT: 54321
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
         ports:
           # Maps tcp port 5432 on service container to the host
-          - 5432:5432
+          - 54321:5432
 
     steps:
     - name: Check out source repository
@@ -50,12 +51,12 @@ jobs:
       env:
         MODE: development
         POSTGRES_HOST: localhost
-        POSTGRES_PORT: 5432
+        POSTGRES_PORT: 54321
         POSTGRES_USER: postgres
         POSTGRES_PASSWORD: postgres
         DB_DRIVER: postgres
 
-      run: uv run pytest -vv --durations=20 --cov --cov-report=xml --junitxml=junit.xml
+      run: uv run pytest -vv --durations=20 --cov --cov-report=xml --junitxml=junit.xml --ignore=tests/transfers
 
     - name: Checkout BDD repo (features only)
       uses: actions/checkout@v4
@@ -71,7 +72,7 @@ jobs:
     - name: Run BDD tests
       env:
         POSTGRES_HOST: localhost
-        POSTGRES_PORT: 5432
+        POSTGRES_PORT: 54321
         POSTGRES_USER: postgres
         POSTGRES_PASSWORD: postgres
         DB_DRIVER: postgres

.pre-commit-config.yaml

@@ -27,6 +27,7 @@ repos:
         always_run: true
         args:
           - -x
+          - --ignore=tests/transfers
 
   # - repo: https://github.com/pre-commit/mirrors-mypy
   #   rev: v1.10.0  # Use the latest stable version or pin to your preference

core/lexicon.json

@@ -376,30 +376,27 @@
     {"categories": ["organization"], "term": "City of Aztec", "definition": "City of Aztec"},
     {"categories": ["organization"], "term": "Daybreak Investments", "definition": "Daybreak Investments"},
     {"categories": ["organization"], "term": "Vallecitos HOA", "definition": "Vallecitos HOA"},
-    {"categories": ["organization"], "term": "Naiche Development", "definition": "Naiche Corporation"},
-    {"categories": ["organization"], "term": "Santa Fe County; Santa Fe Animal Shelter", "definition": "Santa Fe County; Santa Fe Animal Shelter"},
+    {"categories": ["organization"], "term": "SFC, Santa Fe Animal Shelter", "definition": "Santa Fe County, Santa Fe Animal Shelter"},
     {"categories": ["organization"], "term": "El Guicu Ditch Association", "definition": "El Guicu Ditch Association"},
     {"categories": ["organization"], "term": "Santa Fe Municipal Airport", "definition": "Santa Fe Municipal Airport"},
     {"categories": ["organization"], "term": "Uluru Development", "definition": "Uluru Development"},
     {"categories": ["organization"], "term": "AllSup's Convenience Stores", "definition": "AllSup's Convenience Stores"},
-    {"categories": ["organization"], "term": "Santa Fe Downs", "definition": "Santa Fe Downs Resort"},
+    {"categories": ["organization"], "term": "Santa Fe Downs Resort", "definition": "Santa Fe Downs Resort"},
     {"categories": ["organization"], "term": "City of Truth or Consequences, WWTP", "definition": "City of Truth or Consequences, WWTP"},
     {"categories": ["organization"], "term": "Riverbend Hotsprings", "definition": "Riverbend Hotsprings"},
     {"categories": ["organization"], "term": "Armendaris Ranch", "definition": "Armendaris Ranch"},
     {"categories": ["organization"], "term": "El Paso Water", "definition": "El Paso Water"},
     {"categories": ["organization"], "term": "BLM, Socorro Field Office", "definition": "BLM, Socorro Field Office"},
     {"categories": ["organization"], "term": "USFWS", "definition": "US Fish & Wildlife Service"},
-    {"categories": ["organization"], "term": "NPS", "definition": "National Park Service"},
     {"categories": ["organization"], "term": "Sile MDWCA", "definition": "Sile Municipal Domestic Water Assn."},
     {"categories": ["organization"], "term": "Pena Blanca Water & Sanitation District", "definition": "Pena Blanca Water & Sanitation District"},
     {"categories": ["organization"], "term": "Town of Questa", "definition": "Town of Questa"},
-    {"categories": ["organization"], "term": "Lamy MDWCA", "definition": "Lama MDWCA"},
     {"categories": ["organization"], "term": "Town of Cerro", "definition": "Town of Cerro"},
     {"categories": ["organization"], "term": "Farr Cattle Company", "definition": "Farr Cattle Company (Farr Ranch)"},
     {"categories": ["organization"], "term": "Carrizozo Orchard", "definition": "Carrizozo Orchard"},
     {"categories": ["organization"], "term": "USFS, Kiowa Grasslands", "definition": "USFS, Kiowa Grasslands"},
     {"categories": ["organization"], "term": "Cloud Country West Subdivision", "definition": "Cloud Country West Subdivision"},
-    {"categories": ["organization"], "term": "Chama West Water Users Association", "definition": "Chama West Water Users Assn."},
+    {"categories": ["organization"], "term": "Chama West WUA", "definition": "Chama West Water Users Assn."},
     {"categories": ["organization"], "term": "El Rito Regional Water and Waste Water Association", "definition": "El Rito Regional Water + Waste Water Association"},
     {"categories": ["organization"], "term": "West Rim MDWUA", "definition": "West Rim MDWUA"},
     {"categories": ["organization"], "term": "Village of Willard", "definition": "Village of Willard"},
@@ -422,7 +419,6 @@
     {"categories": ["organization"], "term": "Lake Roberts WUA", "definition": "Lake Roberts Water Assn."},
     {"categories": ["organization"], "term": "El Creston MDWCA", "definition": "El Creston MDWCA"},
     {"categories": ["organization"], "term": "Reserve Municipality Water Works", "definition": "Reserve Municipality Water Works"},
-    {"categories": ["organization"], "term": "Bayard", "definition": "Bayard Municipal Water"},
     {"categories": ["organization"], "term": "Town of Estancia", "definition": "Town of Estancia"},
     {"categories": ["organization"], "term": "Pie Town MDWCA", "definition": "Pie Town MDWCA"},
     {"categories": ["organization"], "term": "Roosevelt SWCD", "definition": "Roosevelt Soil & Water Conservation District"},
@@ -438,7 +434,7 @@
     {"categories": ["organization"], "term": "Pinon Ridge WUA", "definition": "Pinon Ridge Water Users Association"},
     {"categories": ["organization"], "term": "McSherry Farms", "definition": "McSherry Farms"},
     {"categories": ["organization"], "term": "Agua Sana WUA", "definition": "Agua Sana Water Users Assn."},
-    {"categories": ["organization"], "term": "Chamita MDWCA", "definition": "Chamita Water Users Association"},
+    {"categories": ["organization"], "term": "Chamita MDWCA", "definition": "Chamita Mutual Domestic Water Consumers Assn."},
     {"categories": ["organization"], "term": "W Spear-bar Ranch", "definition": "W Spear-bar Ranch"},
     {"categories": ["organization"], "term": "Village of Capitan", "definition": "Village of Capitan"},
     {"categories": ["organization"], "term": "Brazos MDWCA", "definition": "Brazos Mutual Domestic Water Consumers Assn."},
@@ -597,14 +593,9 @@
     {"categories": ["organization"], "term": "Rio En Medio MDWCA", "definition": "Rio En Medio MDWCA"},
     {"categories": ["organization"], "term": "San Acacia MDWCA", "definition": "San Acacia MDWCA"},
     {"categories": ["organization"], "term": "San Juan Residences", "definition": "San Juan Residences"},
-    {"categories": ["organization"], "term": "Sangre de Cristo Center", "definition": "Sangre de Cristo Center"},
     {"categories": ["organization"], "term": "Sangre de Cristo Estates", "definition": "Sangre de Cristo Estates"},
     {"categories": ["organization"], "term": "Santa Fe Community College", "definition": "Santa Fe Community College"},
-    {"categories": ["organization"], "term": "Santa Fe County, Fire Facilities", "definition": "Santa Fe County, Fire Facilities"},
-    {"categories": ["organization"], "term": "Santa Fe County, Utilities Dept.", "definition": "Santa Fe County, Utilities Dept."},
     {"categories": ["organization"], "term": "Sangre de Cristo Center", "definition": "Sangre de Cristo Center"},
-    {"categories": ["organization"], "term": "Valle Vista Water Utility", "definition": "Valle Vista Water Utility"},
-    {"categories": ["organization"], "term": "Santa Fe County, Valle Vista Water Utility, Inc.", "definition": "Santa Fe County, Valle Vista Water Utility, Inc."},
     {"categories": ["organization"], "term": "Santa Fe Horse Park", "definition": "Santa Fe Horse Park"},
     {"categories": ["organization"], "term": "Santa Fe Opera", "definition": "Santa Fe Opera"},
     {"categories": ["organization"], "term": "Santa Fe Waldorf School", "definition": "Santa Fe Waldorf School"},
@@ -651,7 +642,6 @@
     {"categories": ["organization"], "term": "Yates Petroleum Corporation", "definition": "Yates Petroleum Corporation"},
     {"categories": ["organization"], "term": "Zamora Accounting Services", "definition": "Zamora Accounting Services"},
     {"categories": ["organization"], "term": "PLSS", "definition": "Public Land Survey System"},
-    {"categories": ["organization"], "term": "Quemado Municipal Water & SWA", "definition": "Quemado Municipal Water & SWA"},
     {"categories": ["collection_method"], "term": "Altimeter", "definition": "ALtimeter"},
     {"categories": ["collection_method"], "term": "Differentially corrected GPS", "definition": "Differentially corrected GPS"},
     {"categories": ["collection_method"], "term": "Survey-grade GPS", "definition": "Survey-grade GPS"},
@@ -1176,9 +1166,10 @@
     {"categories": ["note_type"], "term": "Construction", "definition": "Construction details, well development, drilling notes, etc. Could create separate `types` for each of these if needed."},
     {"categories": ["note_type"], "term": "Maintenance", "definition": "Maintenance observations and issues."},
     {"categories": ["note_type"], "term": "Historical", "definition": "Historical information or context about the well or location."},
-    {"categories": ["note_type"], "term": "Other", "definition": "Other types of notes that do not fit into the predefined categories."},
+    {"categories": ["note_type"], "term": "General", "definition": "Other types of notes that do not fit into the predefined categories."},
     {"categories": ["note_type"], "term": "Water", "definition": "Water bearing zone information and other info from ose reports"},
     {"categories": ["note_type"], "term": "Measuring", "definition": "Notes about measuring/visiting the well, on Access form"},
+    {"categories": ["note_type"], "term": "Coordinate", "definition": "Notes about a location's coordinates"},
     {"categories": ["well_pump_type"], "term": "Submersible", "definition": "Submersible"},
     {"categories": ["well_pump_type"], "term": "Jet", "definition": "Jet Pump"},
     {"categories": ["well_pump_type"], "term": "Line Shaft", "definition": "Line Shaft"},

db/thing.py

@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
-from typing import List, TYPE_CHECKING
 from datetime import date
-from sqlalchemy import Integer, ForeignKey, String, Column, Float, Text, Date
+from typing import List, TYPE_CHECKING
+
+from sqlalchemy import Integer, ForeignKey, String, Column, Float, Date
 from sqlalchemy.ext.associationproxy import association_proxy, AssociationProxy
 from sqlalchemy.orm import relationship, mapped_column, Mapped
 from sqlalchemy_utils import TSVectorType
@@ -27,11 +28,10 @@
     Base,
     ReleaseMixin,
 )
+from db.data_provenance import DataProvenanceMixin
+from db.measuring_point_history import MeasuringPointHistory
 from db.permission_history import PermissionHistoryMixin
-from services.util import retrieve_latest_polymorphic_history_table_record
 from db.status_history import StatusHistoryMixin
-from db.measuring_point_history import MeasuringPointHistory
-from db.data_provenance import DataProvenanceMixin
 from services.util import retrieve_latest_polymorphic_history_table_record
 
 if TYPE_CHECKING:
@@ -117,8 +117,6 @@ class Thing(
         comment="Depth of the well casing from ground surface to the bottom of the casing (in feet).",
     )
 
-    well_construction_notes: Mapped[str] = mapped_column(Text, nullable=True)
-
     well_completion_date: Mapped[date] = mapped_column(
         nullable=True, comment="the date the well was completed if known"
     )
@@ -348,7 +346,10 @@ class Thing(
     )
 
     # Full-text search vector
-    search_vector = Column(TSVectorType("name", "well_construction_notes"))
+    search_vector = Column(TSVectorType("name"))
+
+    # for temporary backwards compatibility
+    well_construction_notes = mapped_column(String(1000), nullable=True)
 
     @property
     def current_location(self):
@@ -372,12 +373,16 @@ def water_notes(self):
 
     @property
     def general_notes(self):
-        return self._get_notes("Other")
+        return self._get_notes("General")
 
     @property
     def measuring_notes(self):
         return self._get_notes("Measuring")
 
+    @property
+    def construction_notes(self):
+        return self._get_notes("Construction")
+
     @property
     def well_status(self) -> str | None:
         """

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DB=${POSTGRES_DB}
     ports:
-      - 5432:5432
+      - 54321:5432
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:

schemas/thing.py

@@ -24,8 +24,6 @@
     ScreenType,
     Organization,
     MonitoringFrequency,
-    Organization,
-    MonitoringFrequency,
     WellConstructionMethod,
     WellPumpType,
     FormationCode,
@@ -36,14 +34,15 @@
 from schemas.notes import NoteResponse, CreateNote
 from schemas.permission_history import PermissionHistoryResponse
 
+
 # -------- VALIDATE ----------
 
 
 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
+    measuring_point_height: float | None = None
 
     @model_validator(mode="after")
     def validate_values(self):
@@ -60,24 +59,24 @@ def validate_values(self):
                     "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")
+        # 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
 
@@ -122,17 +121,15 @@ class CreateWell(CreateBaseThing, ValidateWell):
     hole_depth: float | None = Field(
         default=None, gt=0, description="Hole depth in feet"
     )
-    well_construction_notes: str | None = None
     well_casing_diameter: float | None = Field(
         default=None, gt=0, description="Well casing diameter in inches"
     )
     well_casing_depth: float | None = Field(
         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_height: float = Field(description="Measuring point height in feet")
     measuring_point_description: str | None = None
     notes: list[CreateNote] | None = None
     well_completion_date: PastOrTodayDate | None = None
@@ -195,13 +192,11 @@ class BaseThingResponse(BaseResponseModel):
     thing_type: str
     current_location: LocationGeoJSONResponse
     first_visit_date: PastOrTodayDate | None
-    # The new relationship to the polymorphic Notes table
-    notes: List[NoteResponse] = []
-
     groups: list[GroupResponse] = []
     monitoring_status: str | None
     links: list[ThingIdLinkResponse] = Field(default=[], alias="alternate_ids")
     monitoring_frequencies: list[MonitoringFrequencyResponse] = []
+    general_notes: list[NoteResponse] | None = None
 
     @field_validator("monitoring_frequencies", mode="before")
     def remove_records_with_end_date(cls, monitoring_frequencies):
@@ -234,7 +229,6 @@ class WellResponse(BaseThingResponse):
     well_casing_depth: float | None = None
     well_casing_depth_unit: str = "ft"
     well_casing_materials: list[CasingMaterial] = []
-    well_construction_notes: str | None = None
     well_completion_date: PastOrTodayDate | None
     well_completion_date_source: str | None
     well_driller_name: str | None
@@ -251,7 +245,8 @@ class WellResponse(BaseThingResponse):
     aquifers: list[dict] = []
     water_notes: list[NoteResponse] | None = None
     measuring_notes: list[NoteResponse] | None = None
-    general_notes: list[NoteResponse] | None = None
+
+    construction_notes: list[NoteResponse] | None = None
     permissions: list[PermissionHistoryResponse]
     formation_completion_code: FormationCode | None
 

services/util.py

@@ -81,7 +81,7 @@ def get_tiger_data(
         "returnGeometry": "false",
     }
     try:
-        resp = httpx.get(url, params=params, timeout=30)
+        resp = httpx.get(url, params=params, timeout=5)
     except Exception as e:
         print(f"Error getting TIGER data for POINT ({lon} {lat}) {e}")
         return None

tests/__init__.py

@@ -15,10 +15,15 @@
 # ===============================================================================
 # Load .env file BEFORE importing anything else
 # Use override=True to override conflicting shell environment variables
+import os
+
 from dotenv import load_dotenv
 
 load_dotenv(override=True)
 
+# for safety dont test on the production database port
+os.environ["POSTGRES_PORT"] = "54321"
+
 # this should not be needed since all Pydantic serializes all datetimes as UTC
 # furthermore, tzset is not supported on Windows, so this breaks cross-platform compatibility
 # # Set timezone to UTC for consistent datetime handling in tests

tests/conftest.py

@@ -57,7 +57,6 @@ def water_well_thing(location):
             release_status="draft",
             well_depth=10,
             hole_depth=10,
-            well_construction_notes="Test well construction notes",
             well_casing_diameter=5.0,
             well_casing_depth=10.0,
         )