fix: standardize thing type terminology in lexicon and payloads

Author: jirhiker

core/lexicon.json

@@ -2011,42 +2011,42 @@
       "categories": [
         "thing_type"
       ],
-      "term": "Rock sample location",
+      "term": "rock sample location",
       "definition": "a location where rock samples are collected"
     },
     {
       "categories": [
         "thing_type"
       ],
-      "term": "Diversion of surface water, etc.",
+      "term": "diversion of surface water, etc.",
       "definition": "a diversion structure for surface water such as a ditch, canal, or intake"
     },
     {
       "categories": [
         "thing_type"
       ],
-      "term": "Lake, pond or reservoir",
+      "term": "lake, pond or reservoir",
       "definition": "a natural or artificial standing body of water"
     },
     {
       "categories": [
         "thing_type"
       ],
-      "term": "Soil gas sample location",
+      "term": "soil gas sample location",
       "definition": "a location where soil gas samples are collected"
     },
     {
       "categories": [
         "thing_type"
       ],
-      "term": "Other",
+      "term": "other",
       "definition": "a thing type that does not fit other categories"
     },
     {
       "categories": [
         "thing_type"
       ],
-      "term": "Outfall of wastewater or return flow",
+      "term": "outfall of wastewater or return flow",
       "definition": "a discharge point for wastewater or return flows"
     },
     {

transfers/thing_transfer.py

@@ -146,7 +146,7 @@ def transfer_rock_sample_locations(session, limit=None):
     def make_payload(row):
         return {
             "name": row.PointID,
-            "thing_type": "Rock sample location",
+            "thing_type": "rock sample location",
             "release_status": _release_status(row),
         }
 
@@ -157,7 +157,7 @@ def transfer_diversion_of_surface_water(session, limit=None):
     def make_payload(row):
         return {
             "name": row.PointID,
-            "thing_type": "Diversion of surface water, etc.",
+            "thing_type": "diversion of surface water, etc.",
             "release_status": _release_status(row),
         }
 
@@ -168,7 +168,7 @@ def transfer_lake_pond_reservoir(session, limit=None):
     def make_payload(row):
         return {
             "name": row.PointID,
-            "thing_type": "Lake, pond or reservoir",
+            "thing_type": "lake, pond or reservoir",
             "release_status": _release_status(row),
         }
 
@@ -179,7 +179,7 @@ def transfer_soil_gas_sample_locations(session, limit=None):
     def make_payload(row):
         return {
             "name": row.PointID,
-            "thing_type": "Soil gas sample location",
+            "thing_type": "soil gas sample location",
             "release_status": _release_status(row),
         }
 
@@ -190,7 +190,7 @@ def transfer_other_site_types(session, limit=None):
     def make_payload(row):
         return {
             "name": row.PointID,
-            "thing_type": "Other",
+            "thing_type": "other",
             "release_status": _release_status(row),
         }
 
@@ -201,7 +201,7 @@ def transfer_outfall_wastewater_return_flow(session, limit=None):
     def make_payload(row):
         return {
             "name": row.PointID,
-            "thing_type": "Outfall of wastewater or return flow",
+            "thing_type": "outfall of wastewater or return flow",
             "release_status": _release_status(row),
         }
 

transfers/transfer.py

@@ -21,6 +21,19 @@
 
 from dotenv import load_dotenv
 
+from transfers.thing_transfer import (
+    transfer_rock_sample_locations,
+    transfer_springs,
+    transfer_perennial_streams,
+    transfer_ephemeral_streams,
+    transfer_met_stations,
+    transfer_diversion_of_surface_water,
+    transfer_lake_pond_reservoir,
+    transfer_soil_gas_sample_locations,
+    transfer_other_site_types,
+    transfer_outfall_wastewater_return_flow,
+)
+
 # Load .env file FIRST, before any database imports, to ensure correct port/database settings
 load_dotenv(override=True)
 
@@ -374,7 +387,19 @@ def transfer_all(metrics: Metrics) -> list[ProfileArtifact]:
         # These create Things and Locations that chemistry/other transfers depend on.
         # =========================================================================
         non_well_tasks = []
-        gs = globals()
+        transfer_functions = {
+            "springs": transfer_springs,
+            "perennial_streams": transfer_perennial_streams,
+            "ephemeral_streams": transfer_ephemeral_streams,
+            "met_stations": transfer_met_stations,
+            "rock_sample_locations": transfer_rock_sample_locations,
+            "diversion_of_surface_water": transfer_diversion_of_surface_water,
+            "lake_pond_reservoir": transfer_lake_pond_reservoir,
+            "soil_gas_sample_locations": transfer_soil_gas_sample_locations,
+            "other_site_types": transfer_other_site_types,
+            "outfall_wastewater_return_flow": transfer_outfall_wastewater_return_flow,
+        }
+
         for attr in (
             "springs",
             "perennial_streams",
@@ -390,7 +415,7 @@ def transfer_all(metrics: Metrics) -> list[ProfileArtifact]:
             thing_type = "".join(part.capitalize() for part in attr.split("_"))
             attr_name = f"transfer_{attr}"
             if getattr(transfer_options, attr_name):
-                transfer_func = gs[attr_name]
+                transfer_func = transfer_functions[attr]
                 non_well_tasks.append((thing_type, transfer_func))
 
         if non_well_tasks: