VED-492: Add missing test. Use util function in more tests.

Author: mfjarvis

filenameprocessor/tests/test_elasticache.py

@@ -7,10 +7,12 @@
 
 from tests.utils_for_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT
 from tests.utils_for_tests.generic_setup_and_teardown import GenericSetUp, GenericTearDown
+from tests.utils_for_tests.utils_for_filenameprocessor_tests import create_mock_hget
 
 # 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, get_valid_vaccine_types_from_cache
+    from elasticache import get_supplier_permissions_from_cache, get_valid_vaccine_types_from_cache, \
+    get_supplier_system_from_cache
     from clients import REGION_NAME
 
 s3_client = boto3_client("s3", region_name=REGION_NAME)
@@ -29,13 +31,25 @@ def tearDown(self):
         """Tear down the S3 buckets"""
         GenericTearDown(s3_client)
 
-    @patch("elasticache.redis_client.hget", return_value=json.dumps(["COVID19.CRUDS", "RSV.CRUDS"]))
+    @patch("elasticache.redis_client.hget", side_effect=create_mock_hget(
+        {"TEST_ODS_CODE": "TEST_SUPPLIER"},
+        {}
+    ))
+    def test_get_supplier_system_from_cache(self, mock_hget):
+        result = get_supplier_system_from_cache("TEST_ODS_CODE")
+        self.assertEqual(result, "TEST_SUPPLIER")
+        mock_hget.assert_called_once_with("ods_code_to_supplier", "TEST_ODS_CODE")
+
+    @patch("elasticache.redis_client.hget", side_effect=create_mock_hget(
+        {},
+        {"TEST_SUPPLIER": json.dumps(["COVID19.CRUDS", "RSV.CRUDS"])}
+    ))
     def test_get_supplier_permissions_from_cache(self, mock_hget):
         result = get_supplier_permissions_from_cache("TEST_SUPPLIER")
         self.assertEqual(result, ["COVID19.CRUDS", "RSV.CRUDS"])
         mock_hget.assert_called_once_with("supplier_permissions", "TEST_SUPPLIER")
 
-    @patch("elasticache.redis_client.hget", return_value=None)
+    @patch("elasticache.redis_client.hget", side_effect=create_mock_hget({}, {}))
     def test_get_supplier_permissions_from_cache_not_found(self, mock_hget):
         result = get_supplier_permissions_from_cache("TEST_SUPPLIER")
         self.assertEqual(result, [])

filenameprocessor/tests/test_file_key_validation.py

@@ -5,7 +5,7 @@
 
 from tests.utils_for_tests.values_for_tests import MockFileDetails
 from tests.utils_for_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT
-from tests.utils_for_tests.utils_for_filenameprocessor_tests import MOCK_ODS_CODE_TO_SUPPLIER
+from tests.utils_for_tests.utils_for_filenameprocessor_tests import MOCK_ODS_CODE_TO_SUPPLIER, create_mock_hget
 
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
@@ -39,7 +39,7 @@ def test_is_valid_datetime(self):
             with self.subTest():
                 self.assertEqual(is_valid_datetime(date_time_string), expected_result)
 
-    @patch("elasticache.redis_client.hget", side_effect=lambda key, field: MOCK_ODS_CODE_TO_SUPPLIER.get(field))
+    @patch("elasticache.redis_client.hget", side_effect=create_mock_hget(MOCK_ODS_CODE_TO_SUPPLIER, {}))
     @patch("elasticache.redis_client.hkeys", return_value=["FLU", "RSV"])
     def test_validate_file_key(self, mock_hkeys, mock_hget):
         """Tests that file_key_validation returns True if all elements pass validation, and False otherwise"""