Modified the validation to accept country of origin in uppercase

sanger · Aug 22, 2023 · a992add · a992add
1 parent fdd6f5b
commit a992add
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/tests/message_properties/definitions/test_country_of_origin.py b/tests/message_properties/definitions/test_country_of_origin.py
@@ -23,6 +23,6 @@ def test_CountryOfOrigin_check_CountryOfOrigin_is_valid():
     assert instance.validate() is False
     assert len(instance.errors) > 0
 
-    instance = CountryOfOrigin(Input("United Kingdom"))
+    instance = CountryOfOrigin(Input("UNITED KINGDOM"))
     assert instance.validate() is True
     assert len(instance.errors) == 0
diff --git a/tests/message_properties/definitions/test_sample.py b/tests/message_properties/definitions/test_sample.py
@@ -55,4 +55,4 @@ def test_sample_is_invalid(invalid_sample):
     check_presence_error(instance.errors, error_codes.ERROR_2_NOT_STRING, "cost_code")
     check_presence_error(instance.errors, error_codes.ERROR_2_NOT_STRING, "final_nano_drop_280")
     check_presence_error(instance.errors, error_codes.ERROR_2_NOT_STRING, "final_nano_drop_230")
-    assert len(instance.errors) == 14
+    assert len(instance.errors) == 15
diff --git a/tol_lab_share/message_properties/definitions/country_of_origin.py b/tol_lab_share/message_properties/definitions/country_of_origin.py
@@ -9,7 +9,7 @@
 
 class CountryOfOrigin(MessageProperty):
     """MessageProperty subclass to manage parsing of a valid country of origin provided by another
-    MessageProperty. The concentration has to be a country string from the list provided in
+    MessageProperty. The country has to be a country string from the list provided in
     tol_lab_share.config.insdc.
     Eg: 'Australia'
     """
@@ -25,10 +25,16 @@ def check_is_valid_country(self):
         If that is not the case, it will trigger an error (not valid country insdc).
         """
         logger.debug("CountryOfOrigin::check_is_valid_country")
+        result = False
         if not self._input.validate():
-            return False
+            return result
+
+        if self.check_is_string():
+            for country in COUNTRIES:
+                if self._input.value.lower() == country.lower():
+                    result = True
+                    self._input.value = country
 
-        result = self._input.value.lower() in [country.lower() for country in COUNTRIES]
         if not result:
             self.trigger_error(error_codes.ERROR_4_NOT_VALID_COUNTRY_INSDC, text=f"input_value: {self._input.value}")
         return result