BDMS-626: Improve validation, schema alignment, and well inventory handling

alembic/versions/p9c1d2e3f4a5_make_contact_role_nullable.py

@@ -0,0 +1,29 @@
+"""make contact role nullable
+
+Revision ID: p9c1d2e3f4a5
+Revises: o8b9c0d1e2f3
+Create Date: 2026-03-11 10:30:00.000000
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision: str = "p9c1d2e3f4a5"
+down_revision: Union[str, Sequence[str], None] = "o8b9c0d1e2f3"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.alter_column(
+        "contact", "role", existing_type=sa.String(length=100), nullable=True
+    )
+
+
+def downgrade() -> None:
+    op.alter_column(
+        "contact", "role", existing_type=sa.String(length=100), nullable=False
+    )

alembic/versions/q0d1e2f3a4b5_make_contact_type_nullable.py

@@ -0,0 +1,35 @@
+"""make contact type nullable
+
+Revision ID: q0d1e2f3a4b5
+Revises: p9c1d2e3f4a5
+Create Date: 2026-03-11 17:10:00.000000
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision: str = "q0d1e2f3a4b5"
+down_revision: Union[str, Sequence[str], None] = "p9c1d2e3f4a5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.alter_column(
+        "contact",
+        "contact_type",
+        existing_type=sa.String(length=100),
+        nullable=True,
+    )
+
+
+def downgrade() -> None:
+    op.alter_column(
+        "contact",
+        "contact_type",
+        existing_type=sa.String(length=100),
+        nullable=False,
+    )

cli/service_adapter.py

@@ -50,7 +50,8 @@ def well_inventory_csv(source_file: Path | str):
         payload = {"detail": "Empty file"}
         return WellInventoryResult(1, json.dumps(payload), payload["detail"], payload)
     try:
-        text = content.decode("utf-8")
+        # Accept UTF-8 CSVs saved with a BOM so the first header is parsed correctly.
+        text = content.decode("utf-8-sig")
     except UnicodeDecodeError:
         payload = {"detail": "File encoding error"}
         return WellInventoryResult(1, json.dumps(payload), payload["detail"], payload)
@@ -61,8 +62,16 @@ def well_inventory_csv(source_file: Path | str):
     except ValueError as exc:
         payload = {"detail": str(exc)}
         return WellInventoryResult(1, json.dumps(payload), payload["detail"], payload)
-    exit_code = 0 if not payload.get("validation_errors") else 1
-    return WellInventoryResult(exit_code, json.dumps(payload), "", payload)
+    exit_code = (
+        0 if not payload.get("validation_errors") and not payload.get("detail") else 1
+    )
+    stderr = ""
+    if exit_code != 0:
+        if payload.get("validation_errors"):
+            stderr = f"Validation errors: {json.dumps(payload.get('validation_errors'), indent=2)}"
+        else:
+            stderr = f"Error: {payload.get('detail')}"
+    return WellInventoryResult(exit_code, json.dumps(payload), stderr, payload)
 
 
 def water_levels_csv(source_file: Path | str, *, pretty_json: bool = False):

core/enums.py

@@ -48,7 +48,7 @@
 )
 LimitType: type[Enum] = build_enum_from_lexicon_category("limit_type")
 MeasurementMethod: type[Enum] = build_enum_from_lexicon_category("measurement_method")
-MonitoringStatus: type[Enum] = build_enum_from_lexicon_category("monitoring_status")
+MonitoringStatus: type[Enum] = build_enum_from_lexicon_category("status_value")
 ParameterName: type[Enum] = build_enum_from_lexicon_category("parameter_name")
 Organization: type[Enum] = build_enum_from_lexicon_category("organization")
 OriginType: type[Enum] = build_enum_from_lexicon_category("origin_type")

core/lexicon.json

@@ -8185,6 +8185,13 @@
       "term": "Water",
       "definition": "Water bearing zone information and other info from ose reports"
     },
+    {
+      "categories": [
+        "note_type"
+      ],
+      "term": "Water Quality",
+      "definition": "Water quality information"
+    },
     {
       "categories": [
         "note_type"

db/contact.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ===============================================================================
-from typing import List, TYPE_CHECKING
+from typing import List, TYPE_CHECKING, Optional
 
 from sqlalchemy import Integer, ForeignKey, String, UniqueConstraint
 from sqlalchemy.ext.associationproxy import association_proxy, AssociationProxy
@@ -49,8 +49,8 @@ class ThingContactAssociation(Base, AutoBaseMixin):
 class Contact(Base, AutoBaseMixin, ReleaseMixin, NotesMixin):
     name: Mapped[str] = mapped_column(String(100), nullable=True)
     organization: Mapped[str] = lexicon_term(nullable=True)
-    role: Mapped[str] = lexicon_term(nullable=False)
-    contact_type: Mapped[str] = lexicon_term(nullable=False)
+    role: Mapped[Optional[str]] = lexicon_term(nullable=True)
+    contact_type: Mapped[Optional[str]] = lexicon_term(nullable=True)
 
     # primary keys of the nm aquifer tables from which the contacts originate
     nma_pk_owners: Mapped[str] = mapped_column(String(100), nullable=True)

schemas/contact.py

@@ -150,8 +150,8 @@ class CreateContact(BaseCreateModel, ValidateContact):
     thing_id: int
     name: str | None = None
     organization: str | None = None
-    role: Role
-    contact_type: ContactType = "Primary"
+    role: Role | None = None
+    contact_type: ContactType | None = None
     nma_pk_owners: str | None = None
     # description: str | None = None
     # email: str | None = None
@@ -218,8 +218,8 @@ class ContactResponse(BaseResponseModel):
 
     name: str | None
     organization: str | None
-    role: Role
-    contact_type: ContactType
+    role: Role | None
+    contact_type: ContactType | None
     incomplete_nma_phones: List[str] = []
     emails: List[EmailResponse] = []
     phones: List[PhoneResponse] = []

schemas/thing.py

@@ -143,6 +143,7 @@ class CreateWell(CreateBaseThing, ValidateWell):
     is_suitable_for_datalogger: bool | None = None
     is_open: bool | None = None
     well_status: str | None = None
+    monitoring_status: str | None = None
     formation_completion_code: FormationCode | None = None
     nma_formation_zone: str | None = None