Merge branch 'staging' into well-inventory-csv

# Conflicts:
#	schemas/location.py
#	services/util.py
#	tests/features/environment.py

Author: jirhiker

.gitignore

@@ -6,6 +6,13 @@ dist/
 wheels/
 *.egg-info
 
+# Test coverage reports
+*.cover
+.coverage
+.coverage.*
+htmlcov/
+coverage.xml
+
 # Virtual environments
 .venv
 requirements.txt
@@ -25,11 +32,11 @@ launcher.sh
 gcs_credentials.json
 transfers/data/assets*
 transfers/data/nma_csv_cache/*
+transfers/data/*.csv
 transfers/transfer*.log
 transfer*.log
 transfers/data/nma_csv_cache/*
 !transfers/data/nma_csv_cache/.gitkeep
-tests/features/*.feature
 transfers/metrics/*
 transfers/logs/*
 run_bdd-local.sh

.pre-commit-config.yaml

@@ -25,6 +25,8 @@ repos:
         types: [python] # Specify relevant file types for your tests
         pass_filenames: false
         always_run: true
+        args:
+          - -x
 
   # - repo: https://github.com/pre-commit/mirrors-mypy
   #   rev: v1.10.0  # Use the latest stable version or pin to your preference

api/search.py

@@ -175,6 +175,7 @@ async def search_api(
     user: viewer_dependency,
     session: session_dependency,
     q: str,
+    size: int = 100,
     limit: int = 25,
 ) -> CustomPage[dict]:
     """

api/well_inventory.py

@@ -53,7 +53,7 @@
 from schemas.well_inventory import WellInventoryRow
 from services.contact_helper import add_contact
 from services.exceptions_helper import PydanticStyleException
-from services.thing_helper import add_thing, modify_well_descriptor_tables
+from services.thing_helper import add_thing
 from services.util import transform_srid, convert_ft_to_m
 
 router = APIRouter(prefix="/well-inventory-csv")
@@ -93,34 +93,33 @@ def _make_contact(model: WellInventoryRow, well: Thing, idx) -> dict:
     addresses = []
     name = getattr(model, f"contact_{idx}_name")
     if name:
-        for j in (1, 2):
-            for i in (1, 2):
-                email = getattr(model, f"contact_{j}_email_{i}")
-                etype = getattr(model, f"contact_{j}_email_{i}_type")
-                if email and etype:
-                    emails.append({"email": email, "email_type": etype})
-                phone = getattr(model, f"contact_{j}_phone_{i}")
-                ptype = getattr(model, f"contact_{j}_phone_{i}_type")
-                if phone and ptype:
-                    phones.append({"phone_number": phone, "phone_type": ptype})
-
-                address_line_1 = getattr(model, f"contact_{j}_address_{i}_line_1")
-                address_line_2 = getattr(model, f"contact_{j}_address_{i}_line_2")
-                city = getattr(model, f"contact_{j}_address_{i}_city")
-                state = getattr(model, f"contact_{j}_address_{i}_state")
-                postal_code = getattr(model, f"contact_{j}_address_{i}_postal_code")
-                address_type = getattr(model, f"contact_{j}_address_{i}_type")
-                if address_line_1 and city and state and postal_code and address_type:
-                    addresses.append(
-                        {
-                            "address_line_1": address_line_1,
-                            "address_line_2": address_line_2,
-                            "city": city,
-                            "state": state,
-                            "postal_code": postal_code,
-                            "address_type": address_type,
-                        }
-                    )
+        for i in (1, 2):
+            email = getattr(model, f"contact_{idx}_email_{i}")
+            etype = getattr(model, f"contact_{idx}_email_{i}_type")
+            if email and etype:
+                emails.append({"email": email, "email_type": etype})
+            phone = getattr(model, f"contact_{idx}_phone_{i}")
+            ptype = getattr(model, f"contact_{idx}_phone_{i}_type")
+            if phone and ptype:
+                phones.append({"phone_number": phone, "phone_type": ptype})
+
+            address_line_1 = getattr(model, f"contact_{idx}_address_{i}_line_1")
+            address_line_2 = getattr(model, f"contact_{idx}_address_{i}_line_2")
+            city = getattr(model, f"contact_{idx}_address_{i}_city")
+            state = getattr(model, f"contact_{idx}_address_{i}_state")
+            postal_code = getattr(model, f"contact_{idx}_address_{i}_postal_code")
+            address_type = getattr(model, f"contact_{idx}_address_{i}_type")
+            if address_line_1 and city and state and postal_code and address_type:
+                addresses.append(
+                    {
+                        "address_line_1": address_line_1,
+                        "address_line_2": address_line_2,
+                        "city": city,
+                        "state": state,
+                        "postal_code": postal_code,
+                        "address_type": address_type,
+                    }
+                )
 
         return {
             "thing_id": well.id,
@@ -439,7 +438,6 @@ def _add_csv_row(session: Session, group: Group, model: WellInventoryRow, user)
     well = add_thing(
         session=session, data=well_data, user=user, thing_type="water well"
     )
-    modify_well_descriptor_tables(session, well, data, user)
     session.refresh(well)
 
     # add field event

core/enums.py

@@ -24,7 +24,9 @@
 )
 CasingMaterial: type[Enum] = build_enum_from_lexicon_category("casing_material")
 CollectionMethod: type[Enum] = build_enum_from_lexicon_category("collection_method")
-ConstructionMethod: type[Enum] = build_enum_from_lexicon_category("construction_method")
+WellConstructionMethod: type[Enum] = build_enum_from_lexicon_category(
+    "well_construction_method"
+)
 ContactType: type[Enum] = build_enum_from_lexicon_category("contact_type")
 CoordinateMethod: type[Enum] = build_enum_from_lexicon_category("coordinate_method")
 WellPurpose: type[Enum] = build_enum_from_lexicon_category("well_purpose")
@@ -68,8 +70,14 @@
 Vertical_datum: type[Enum] = build_enum_from_lexicon_category("vertical_datum")
 ScreenType: type[Enum] = build_enum_from_lexicon_category("screen_type")
 SensorType: type[Enum] = build_enum_from_lexicon_category("sensor_type")
+WellPumpType: type[Enum] = build_enum_from_lexicon_category("well_pump_type")
+PermissionType: type[Enum] = build_enum_from_lexicon_category("permission_type")
 GroupType: type[Enum] = build_enum_from_lexicon_category("group_type")
 MonitoringFrequency: type[Enum] = build_enum_from_lexicon_category(
     "monitoring_frequency"
 )
+AquiferType: type[Enum] = build_enum_from_lexicon_category("aquifer_type")
+GeographicScale: type[Enum] = build_enum_from_lexicon_category("geographic_scale")
+Lithology: type[Enum] = build_enum_from_lexicon_category("lithology")
+FormationCode: type[Enum] = build_enum_from_lexicon_category("formation_code")
 # ============= EOF =============================================