refactor: update type aliases for optional fields and modify contact names in CSV processing

Author: jirhiker

schemas/well_inventory.py

@@ -118,7 +118,9 @@ def email_validator_function(email_str):
     Optional[AddressType], BeforeValidator(blank_to_none)
 ]
 ContactRoleField: TypeAlias = Annotated[Optional[Role], BeforeValidator(blank_to_none)]
-FloatOrNone: TypeAlias = Annotated[Optional[float], BeforeValidator(empty_str_to_none)]
+OptionalFloat: TypeAlias = Annotated[
+    Optional[float], BeforeValidator(empty_str_to_none)
+]
 MonitoryFrequencyField: TypeAlias = Annotated[
     Optional[MonitoringFrequency], BeforeValidator(blank_to_none)
 ]
@@ -131,6 +133,11 @@ def email_validator_function(email_str):
     Optional[str], BeforeValidator(email_validator_function)
 ]
 
+OptionalBool: TypeAlias = Annotated[Optional[bool], BeforeValidator(empty_str_to_none)]
+OptionalDateTime: TypeAlias = Annotated[
+    Optional[datetime], BeforeValidator(empty_str_to_none)
+]
+
 
 # ============= EOF =============================================
 class WellInventoryRow(BaseModel):
@@ -203,22 +210,22 @@ class WellInventoryRow(BaseModel):
 
     directions_to_site: Optional[str] = None
     specific_location_of_well: Optional[str] = None
-    repeat_measurement_permission: Optional[bool] = None
-    sampling_permission: Optional[bool] = None
-    datalogger_installation_permission: Optional[bool] = None
-    public_availability_acknowledgement: Optional[bool] = None
+    repeat_measurement_permission: OptionalBool = None
+    sampling_permission: OptionalBool = None
+    datalogger_installation_permission: OptionalBool = None
+    public_availability_acknowledgement: OptionalBool = None
     special_requests: Optional[str] = None
     ose_well_record_id: Optional[str] = None
-    date_drilled: Optional[datetime] = None
+    date_drilled: OptionalDateTime = None
     completion_source: Optional[str] = None
-    total_well_depth_ft: FloatOrNone = None
+    total_well_depth_ft: OptionalFloat = None
     historic_depth_to_water_ft: Optional[float] = None
     depth_source: Optional[str] = None
     well_pump_type: Optional[str] = None
-    well_pump_depth_ft: FloatOrNone = None
-    is_open: Optional[bool] = None
-    datalogger_possible: Optional[bool] = None
-    casing_diameter_ft: FloatOrNone = None
+    well_pump_depth_ft: OptionalFloat = None
+    is_open: OptionalBool = None
+    datalogger_possible: OptionalBool = None
+    casing_diameter_ft: OptionalFloat = None
     measuring_point_description: Optional[str] = None
     well_purpose: Optional[WellPurposeEnum] = None
     well_hole_status: Optional[str] = None
@@ -228,7 +235,7 @@ class WellInventoryRow(BaseModel):
     contact_special_requests_notes: Optional[str] = None
     sampling_scenario_notes: Optional[str] = None
     well_measuring_notes: Optional[str] = None
-    sample_possible: Optional[bool] = None
+    sample_possible: OptionalBool = None
 
     # @field_validator("contact_1_address_1_postal_code", mode="before")
     # def validate_postal_code(cls, v):

tests/features/environment.py

@@ -357,7 +357,7 @@ def add_transducer_observation(context, session, block, deployment_id, value):
 def before_all(context):
     context.objects = {}
     rebuild = False
-    # rebuild = True
+    rebuild = True
     if rebuild:
         erase_and_rebuild_db()
 

tests/features/steps/well-inventory-csv-given.py

@@ -303,6 +303,12 @@ def step_impl(context: Context):
 def step_impl(context: Context):
     df = _get_valid_df(context)
     df["well_name_point_id"] = df["well_name_point_id"].apply(lambda x: "XY-")
+
+    # change contact name
+    df.loc[0, "contact_1_name"] = "Contact 1"
+    df.loc[0, "contact_2_name"] = "Contact 2"
+    df.loc[1, "contact_1_name"] = "Contact 3"
+
     _set_content_from_df(context, df)