Amb 1748 create unit tests for validations 10 to 19

lambda_code/src/models/constants.py

@@ -1,12 +1,36 @@
+"""Constants"""
+
 import re
 from datetime import datetime
+from typing import Union
 
 
 class Constants:
-    genders = {"male", "female", "other", "unknown"}
-    action_flags = {"completed", "entered-in-error"}
-    vaccination_not_given_flag: str = "not-done"
-    vaccination_given_flag: str = "empty"
+    """ "Constants used for the models"""
+
+    # Constants
+    STATUSES = ("completed", "entered-in-error", "not-done")
+    PRIMARY_SOURCE = {True, False}
+    GENDERS = ("male", "female", "other", "unknown")
+    VACCINATION_NOT_GIVEN_FLAG: str = "not-done"
+    VACCINATION_GIVEN_FLAG: str = "empty"
+    # TODO: valid_disease_types needs updated to reprent agreed list (needs to consider the
+    # mapping used for converting snomed code to disease type)
+    VALID_DISEASE_TYPES = {"COVID-19", "FLU"}
+
+    @staticmethod
+    def convert_snomed_code_to_target_disease_type(
+        snomed_code: str,
+    ) -> Union[str, None]:
+        """Convert a disease type snomed code to the disease type"""
+        # TODO: disease_types needs to change to be the confirmed
+        # list mapping of snomed to disease type
+        disease_types = {
+            "6142004": "FLU",
+            "840539006": "COVID-19",
+            "00000": "Invalid disease",
+        }
+        return disease_types.get(snomed_code)
 
     @staticmethod
     def convert_iso8601_to_datetime(iso_datetime_str):
@@ -48,10 +72,10 @@ def is_urn_resource(s):
 
     @staticmethod
     def if_vaccine_not_give(not_given_flag):
-        if not not_given_flag or not_given_flag == Constants.vaccination_given_flag:
+        if not not_given_flag or not_given_flag == Constants.VACCINATION_GIVEN_FLAG:
             return False
         else:
-            if not_given_flag == Constants.vaccination_not_given_flag:
+            if not_given_flag == Constants.VACCINATION_NOT_GIVEN_FLAG:
                 return True
 
     @staticmethod

lambda_code/src/models/csv_immunization.py

@@ -113,13 +113,15 @@ def validate_site_code(cls, value):
     @validator("ACTION_FLAG", pre=True, always=True)
     def validate_action_flag(cls, value):
         """Validate action flag"""
-        return NHSImmunizationValidators.validate_action_flag(value)
+        return NHSImmunizationValidators.validate_status(value)
 
     @validator("PERFORMING_PROFESSIONAL_FORENAME", pre=True, always=True)
     def validate_professional_forename(cls, v, values):
         """Validate performing professional forename"""
         return NHSPractitionerValidators.validate_performing_professional_forename(
-            v, values.get("PERFORMING_PROFESSIONAL_SURNAME", None)
+            "FLU",  # TODO: This is hardcoded for now. We need to get this from the CSV
+            values.get("PERFORMING_PROFESSIONAL_SURNAME"),
+            values.get("PERFORMING_PROFESSIONAL_FORENAME"),
         )
 
     @validator("PERFORMING_PROFESSIONAL_BODY_REG_CODE", pre=True, always=True)
@@ -132,13 +134,13 @@ def validate_professional_reg_code(cls, v, values):
     @validator("RECORDED_DATE", pre=True, always=True)
     def validate_recorded_date(cls, value):
         """Validate recorded date"""
-        return NHSImmunizationValidators.validate_recorded_date(value)
+        return NHSImmunizationValidators.validate_recorded(value)
 
     @validator("REPORT_ORIGIN", pre=True, always=True)
     def validate_report_origin(cls, v, values):
         """Validate report origin"""
         primary_source = values["PRIMARY_SOURCE"]
-        return NHSImmunizationValidators.validate_report_origin(v, primary_source)
+        return NHSImmunizationValidators.validate_report_origin_text(v, primary_source)
 
     @validator("NOT_GIVEN", pre=True, always=True)
     def validate_not_given_flag(cls, value):