smells

Author: JamesW1-NHS

lambdas/shared/src/common/models/fhir_immunization.py

@@ -60,9 +60,7 @@ def validate(self, immunization_json_data: dict) -> Immunization:
         if self.add_post_validators and not reduce_validation:
             self.run_post_validators(immunization_json_data, vaccine_type)
 
-    def run_postalCode_validator(self, values: dict) -> None:
+    def run_postal_code_validator(self, values: dict) -> None:
         """Run pre validation on the FHIR Immunization Resource JSON data"""
         if error := PreValidators.pre_validate_patient_address_postal_code(self, values):
             raise ValueError(error)
-        else:
-            pass

lambdas/shared/src/common/models/fhir_immunization_pre_validators.py

@@ -13,9 +13,6 @@
 class ObtainFieldValue:
     """Functions for obtaining a field value from the FHIR immunization resource json data"""
 
-    def __init__(self) -> None:
-        pass
-
     @staticmethod
     def target_disease(imms: dict):
         return imms["protocolApplied"][0]["targetDisease"]

lambdas/shared/src/common/models/obtain_field_value.py

@@ -4,7 +4,7 @@
 import datetime
 import json
 import urllib.parse
-from typing import Any, Dict, Literal, Optional, Union
+from typing import Any, Dict, Literal, Optional
 
 from fhir.resources.R4B.bundle import (
     Bundle as FhirBundle,
@@ -37,7 +37,7 @@ def get_contained_practitioner(imms: dict):
 
 def get_generic_extension_value(
     json_data: dict, url: str, system: str, field_type: Literal["code", "display"]
-) -> Union[str, None]:
+) -> str | None:
     """Get the value of an extension field, given its url, field_type, and system"""
     value_codeable_concept = [x for x in json_data["extension"] if x.get("url") == url][0]["valueCodeableConcept"]
     value_codeable_concept_coding = value_codeable_concept["coding"]
@@ -67,7 +67,7 @@ def is_actor_referencing_contained_resource(element, contained_resource_id):
         return False
 
 
-def check_for_unknown_elements(resource, resource_type) -> Union[None, list]:
+def check_for_unknown_elements(resource, resource_type) -> list | None:
     """
     Checks each key in the resource to see if it is allowed. If any disallowed keys are found,
     returns a list containing an error message for each disallowed element
@@ -256,7 +256,7 @@ def obtain_current_name_period(period: dict, occurrence_date: datetime) -> bool:
     return True
 
 
-def get_current_name_instance(names: list, occurrence_date: datetime) -> dict:
+def get_current_name_instance(names: list, occurrence_date: datetime) -> dict | tuple:
     """Selects the correct "current" name instance based on the 'period' and 'use' criteria."""
 
     # DUE TO RUNNING PRE_VALIDATE_PATIENT_NAME AND PRE_VALIDATE_PRACTITIONER NAME BEFORE THE RESPECTIVE CHECKS
@@ -278,9 +278,10 @@ def get_current_name_instance(names: list, occurrence_date: datetime) -> dict:
     for index, name in valid_name_instances:
         try:
             # Check for 'period' and occurrence date
-            if isinstance(name, dict):
-                if "period" not in name or obtain_current_name_period(name.get("period", {}), occurrence_date):
-                    current_names.append((index, name))
+            if isinstance(name, dict) and (
+                "period" not in name or obtain_current_name_period(name.get("period", {}), occurrence_date)
+            ):
+                current_names.append((index, name))
         except (KeyError, ValueError):
             continue
 

lambdas/shared/src/common/models/utils/generic_utils.py

@@ -1,6 +1,6 @@
 from datetime import date, datetime
 from decimal import Decimal
-from typing import Optional, Union
+from typing import Optional
 
 from .generic_utils import is_valid_simple_snomed, nhs_number_mod11_check
 
@@ -33,16 +33,13 @@ def for_string(
             if len(field_value) == 0:
                 raise ValueError(f"{field_location} must be a non-empty string")
 
-        if max_length:
-            if len(field_value) > max_length:
+        if max_length and len(field_value) > max_length:
                 raise ValueError(f"{field_location} must be {max_length} or fewer characters")
 
-        if predefined_values:
-            if field_value not in predefined_values:
+        if predefined_values and field_value not in predefined_values:
                 raise ValueError(f"{field_location} must be one of the following: " + str(", ".join(predefined_values)))
 
-        if not spaces_allowed:
-            if " " in field_value:
+        if not spaces_allowed and " " in field_value:
                 raise ValueError(f"{field_location} must not contain spaces")
 
     @staticmethod
@@ -192,12 +189,11 @@ def for_positive_integer(field_value: int, field_location: str, max_value: int =
         if field_value <= 0:
             raise ValueError(f"{field_location} must be a positive integer")
 
-        if max_value:
-            if field_value > max_value:
+        if max_value and field_value > max_value:
                 raise ValueError(f"{field_location} must be an integer in the range 1 to {max_value}")
 
     @staticmethod
-    def for_integer_or_decimal(field_value: Union[int, Decimal], field_location: str):
+    def for_integer_or_decimal(field_value: int | Decimal, field_location: str):
         """
         Apply pre-validation to a decimal field to ensure that it is an integer or decimal,
         which does not exceed the maximum allowed number of decimal places (if applicable)

lambdas/shared/src/common/models/utils/pre_validator_utils.py

@@ -17,9 +17,6 @@ class ValidationSets:
     The validator will then automatically pick up the correct validation set.
     """
 
-    def __init__(self) -> None:
-        pass
-
     vaccine_type_agnostic = {
         "patient_identifier_value": MandationRules.required,
         "patient_name_given": MandationRules.mandatory,

lambdas/shared/src/common/models/validation_sets.py

@@ -593,7 +593,7 @@ def test_pre_validate_patient_address_postal_code(self):
                 }
             ]
         }
-        result = self.validator.run_postalCode_validator(values)
+        result = self.validator.run_postal_code_validator(values)
         self.assertIsNone(result)
 
     def test_pre_validate_occurrence_date_time(self):