🚨 ⚠️ 💀 [NO TICKET]: Well inventory csv Feature Tests

.env.example

@@ -46,6 +46,9 @@ MODE=development
 # disable authentication (for development only)
 AUTHENTIK_DISABLE_AUTHENTICATION=1
 
+# erase and rebuild the database for step tests
+REBUILD_DB=1
+
 # authentik
 AUTHENTIK_URL=
 AUTHENTIK_CLIENT_ID=

.github/workflows/tests.yml

@@ -65,6 +65,9 @@ jobs:
       - name: Install the project
         run: uv sync --locked --all-extras --dev
 
+      - name: Show Alembic heads
+        run: uv run alembic heads
+
       - name: Create test database
         run: |
           PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -c "CREATE DATABASE ocotilloapi_test"

.gitignore

@@ -22,6 +22,9 @@ requirements.txt
 
 # VS Code
 
+# macOS
+.DS_Store
+
 # local development files
 development.db
 .env

admin/views/thing.py

@@ -88,7 +88,6 @@ class ThingAdmin(OcotilloModelView):
         "well_pump_type",
         "well_pump_depth",
         "formation_completion_code",
-        "is_suitable_for_datalogger",
         # Spring-specific
         "spring_type",
         # Release Status

alembic/versions/7b8c9d0e1f2a_delete_is_suitable_for_datalogger.py

@@ -0,0 +1,31 @@
+"""
+Revision ID: 7b8c9d0e1f2a
+Revises: c7f8a9b0c1d2
+Create Date: 2026-02-02 00:00:00.000000
+
+Removes the is_suitable_for_datalogger column from the thing and thing_version tables.
+"""
+
+# revision identifiers, used by Alembic.
+revision = "7b8c9d0e1f2a"
+down_revision = "c7f8a9b0c1d2"
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.drop_column("thing", "is_suitable_for_datalogger")
+    op.drop_column("thing_version", "is_suitable_for_datalogger")
+
+
+def downgrade():
+    op.add_column(
+        "thing", sa.Column("is_suitable_for_datalogger", sa.Boolean(), nullable=True)
+    )
+    op.add_column(
+        "thing_version",
+        sa.Column("is_suitable_for_datalogger", sa.Boolean(), nullable=True),
+    )

alembic/versions/h1b2c3d4e5f6_update_group_unique_constraint_to_name_type.py

@@ -0,0 +1,91 @@
+"""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/lexicon.py

@@ -262,13 +262,18 @@ async def get_lexicon_term(
 async def get_lexicon_categories(
     session: session_dependency,
     user: viewer_dependency,
+    name: str | None = None,
     sort: str = "name",
     order: str = "asc",
     filter_: str = Query(alias="filter", default=None),
 ) -> CustomPage[LexiconCategoryResponse]:
     """
     Endpoint to retrieve lexicon categories.
     """
+    if name:
+        sql = select(LexiconCategory).where(LexiconCategory.name.ilike(f"%{name}%"))
+        return paginated_all_getter(session, LexiconCategory, sort, order, filter_, sql)
+
     return paginated_all_getter(session, LexiconCategory, sort, order, filter_)
 
 

api/ogc/features.py

@@ -263,7 +263,6 @@ def _build_feature(row, collection_id: str) -> dict[str, Any]:
             "well_pump_type": model.well_pump_type,
             "well_pump_depth": model.well_pump_depth,
             "formation_completion_code": model.formation_completion_code,
-            "is_suitable_for_datalogger": model.is_suitable_for_datalogger,
         }
         if collection_id == "wells":
             properties["well_purposes"] = [
@@ -281,6 +280,10 @@ def _build_feature(row, collection_id: str) -> dict[str, Any]:
                 }
                 for screen in (model.screens or [])
             ]
+            properties["open_status"] = model.open_status
+            properties["datalogger_suitability_status"] = (
+                model.datalogger_suitability_status
+            )
         if hasattr(model, "nma_formation_zone"):
             properties["nma_formation_zone"] = model.nma_formation_zone
     return {
@@ -350,7 +353,9 @@ def get_items(
             "well_pump_type": Thing.well_pump_type,
             "well_pump_depth": Thing.well_pump_depth,
             "formation_completion_code": Thing.formation_completion_code,
-            "is_suitable_for_datalogger": Thing.is_suitable_for_datalogger,
+            "well_status": Thing.well_status,
+            "open_status": Thing.open_status,
+            "datalogger_suitability_status": Thing.datalogger_suitability_status,
         }
         if hasattr(Thing, "nma_formation_zone"):
             column_map["nma_formation_zone"] = Thing.nma_formation_zone