VED-386: ods code test change and increase coverage

Author: Akol125

filenameprocessor/src/elasticache.py

@@ -1,5 +1,3 @@
-"Upload the content from a config file in S3 to ElastiCache (Redis)"
-
 import json
 from clients import redis_client
 from constants import VACCINE_TYPE_TO_DISEASES_HASH_KEY, SUPPLIER_PERMISSIONS_HASH_KEY

filenameprocessor/tests/test_elasticache.py

@@ -10,7 +10,7 @@
 
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
-    from elasticache import get_supplier_permissions_from_cache
+    from elasticache import get_supplier_permissions_from_cache, get_valid_vaccine_types_from_cache
     from clients import REGION_NAME
 
 s3_client = boto3_client("s3", region_name=REGION_NAME)
@@ -40,3 +40,9 @@ def test_get_supplier_permissions_from_cache_not_found(self, mock_hget):
         result = get_supplier_permissions_from_cache("TEST_SUPPLIER")
         self.assertEqual(result, [])
         mock_hget.assert_called_once_with("supplier_permissions", "TEST_SUPPLIER")
+
+    @patch("elasticache.redis_client.hkeys", return_value=["COVID19", "RSV", "FLU"])
+    def test_get_valid_vaccine_types_from_cache(self, mock_hkeys):
+        result = get_valid_vaccine_types_from_cache()
+        self.assertEqual(result, ["COVID19", "RSV", "FLU"])
+        mock_hkeys.assert_called_once_with("vacc_to_diseases")

filenameprocessor/tests/test_utils_for_filenameprocessor.py

@@ -62,7 +62,7 @@ def test_identify_supplier(self):
             ("0DE", "AGEM-NIVS"),
             ("0DF", "NIMS"),
             ("8HA94", "EVA"),
-            ("X26", "RAVS"),
+            ("X8E5B", "RAVS"),
             ("YGMYH", "MEDICAL_DIRECTOR"),
             ("W00", "WELSH_DA_1"),
             ("W000", "WELSH_DA_2"),

filenameprocessor/tests/utils_for_tests/values_for_tests.py

@@ -67,11 +67,11 @@ def __init__(self, supplier: str, vaccine_type: str, ods_code: str, file_number:
 class MockFileDetails:
     """Class containing mock file details for use in tests"""
 
-    ravs_rsv_1 = FileDetails("RAVS", "RSV", "X26", file_number=1)
-    ravs_rsv_2 = FileDetails("RAVS", "RSV", "X26", file_number=2)
-    ravs_rsv_3 = FileDetails("RAVS", "RSV", "X26", file_number=3)
-    ravs_rsv_4 = FileDetails("RAVS", "RSV", "X26", file_number=4)
-    ravs_rsv_5 = FileDetails("RAVS", "RSV", "X26", file_number=5)
+    ravs_rsv_1 = FileDetails("RAVS", "RSV", "X8E5B", file_number=1)
+    ravs_rsv_2 = FileDetails("RAVS", "RSV", "X8E5B", file_number=2)
+    ravs_rsv_3 = FileDetails("RAVS", "RSV", "X8E5B", file_number=3)
+    ravs_rsv_4 = FileDetails("RAVS", "RSV", "X8E5B", file_number=4)
+    ravs_rsv_5 = FileDetails("RAVS", "RSV", "X8E5B", file_number=5)
     emis_flu = FileDetails("EMIS", "FLU", "YGM41")
     emis_rsv = FileDetails("EMIS", "RSV", "YGM41")
-    ravs_flu = FileDetails("RAVS", "FLU", "X26")
+    ravs_flu = FileDetails("RAVS", "FLU", "X8E5B")