VED-492: Fix lint errors.

Author: mfjarvis

filenameprocessor/src/elasticache.py

@@ -1,7 +1,10 @@
 import json
 from clients import redis_client
-from constants import VACCINE_TYPE_TO_DISEASES_HASH_KEY, SUPPLIER_PERMISSIONS_HASH_KEY, \
+from constants import (
+    VACCINE_TYPE_TO_DISEASES_HASH_KEY,
+    SUPPLIER_PERMISSIONS_HASH_KEY,
     ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY
+)
 
 
 def get_supplier_permissions_from_cache(supplier_system: str) -> list[str]:
@@ -13,5 +16,6 @@ def get_supplier_permissions_from_cache(supplier_system: str) -> list[str]:
 def get_valid_vaccine_types_from_cache() -> list[str]:
     return redis_client.hkeys(VACCINE_TYPE_TO_DISEASES_HASH_KEY)
 
+
 def get_supplier_system_from_cache(ods_code: str) -> str:
     return redis_client.hget(ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY, ods_code)

filenameprocessor/src/utils_for_filenameprocessor.py

@@ -1,7 +1,7 @@
 """Utils for filenameprocessor lambda"""
 
 import json
-from constants import Constants, SOURCE_BUCKET_NAME, FILE_NAME_PROC_LAMBDA_NAME
+from constants import SOURCE_BUCKET_NAME, FILE_NAME_PROC_LAMBDA_NAME
 from clients import s3_client, logger, lambda_client
 
 

filenameprocessor/tests/test_lambda_handler.py

@@ -39,10 +39,6 @@
     f"{vaccine_type}.CRUDS" for vaccine_type in all_vaccine_types_in_this_test_file
 ]
 
-mock_permissions_map = {
-    supplier: json.dumps(all_permissions_in_this_test_file)
-    for supplier in all_suppliers_in_this_test_file
-}
 
 @patch.dict("os.environ", MOCK_ENVIRONMENT_DICT)
 @mock_s3
@@ -58,7 +54,11 @@ def run(self, result=None):
         class. Using ExitStack allows multiple patches to be applied, whilst ensuring that the mocks are cleaned up
         after the test has run.
         """
-        mock_hget = lambda key, field: create_mock_hget(key, field, mock_permissions_map, MOCK_ODS_CODE_TO_SUPPLIER)
+        mock_permissions_map = {
+            supplier: json.dumps(all_permissions_in_this_test_file)
+            for supplier in all_suppliers_in_this_test_file
+        }
+        mock_hget = create_mock_hget(MOCK_ODS_CODE_TO_SUPPLIER, mock_permissions_map)
 
         # Set up common patches to be applied to all tests in the class (these can be overridden in individual tests.)
         common_patches = [
@@ -357,12 +357,7 @@ def test_lambda_invalid_permissions_other_files_in_queue(self):
         add_entry_to_table(queued_file_details, FileStatus.QUEUED)
 
         # Mock the supplier permissions with a value which doesn't include the requested Flu permissions
-        mock_hget = lambda key, field: create_mock_hget(
-            key,
-            field,
-            {},
-            {"X8E5B": "RAVS"}
-        )
+        mock_hget = create_mock_hget({"X8E5B": "RAVS"}, {})
         with (  # noqa: E999
             patch("file_name_processor.uuid4", return_value=file_details.message_id),  # noqa: E999
             patch("elasticache.redis_client.hget", side_effect=mock_hget),  # noqa: E999
@@ -472,7 +467,7 @@ def setUp(self):
         self.addCleanup(hkeys_patcher.stop)
         hkeys_patcher.start()
 
-        mock_hget = lambda key, field: create_mock_hget(key, field, {}, {"X8E5B": "RAVS"})
+        mock_hget = create_mock_hget({"X8E5B": "RAVS"}, {})
         hget_patcher = patch("elasticache.redis_client.hget", side_effect=mock_hget)
         self.addCleanup(hget_patcher.stop)
         hget_patcher.start()

filenameprocessor/tests/test_logging_decorator.py

@@ -141,11 +141,9 @@ def test_generate_and_send_logs(self):
     def test_logging_successful_validation(self):
         """Tests that the correct logs are sent to cloudwatch and splunk when file validation is successful"""
         # Mock full permissions so that validation will pass
-        mock_hget = lambda key, field: create_mock_hget(
-            key,
-            field,
-            {"EMIS": json.dumps(["FLU.CRUDS"])},
-            {"YGM41": "EMIS"}
+        mock_hget = create_mock_hget(
+            {"YGM41": "EMIS"},
+            {"EMIS": json.dumps(["FLU.CRUDS"])}
         )
         with (  # noqa: E999
             patch("file_name_processor.uuid4", return_value=FILE_DETAILS.message_id),  # noqa: E999
@@ -175,11 +173,9 @@ def test_logging_successful_validation(self):
     def test_logging_failed_validation(self):
         """Tests that the correct logs are sent to cloudwatch and splunk when file validation fails"""
         # Set up permissions for COVID19 only (file is for FLU), so that validation will fail
-        mock_hget = lambda key, field: create_mock_hget(
-            key,
-            field,
-            {"EMIS": json.dumps(["COVID19.CRUDS"])},
-            {"YGM41": "EMIS"}
+        mock_hget = create_mock_hget(
+            {"YGM41": "EMIS"},
+            {"EMIS": json.dumps(["COVID19.CRUDS"])}
         )
         with (  # noqa: E999
             patch("file_name_processor.uuid4", return_value=FILE_DETAILS.message_id),  # noqa: E999
@@ -214,11 +210,9 @@ def test_logging_throws_exception(self):
             operation_name="PutRecord"
         )
 
-        mock_hget = lambda key, field: create_mock_hget(
-            key,
-            field,
-            {"EMIS": json.dumps(["FLU.CRUDS"])},
-            {"YGM41": "EMIS"}
+        mock_hget = create_mock_hget(
+            {"YGM41": "EMIS"},
+            {"EMIS": json.dumps(["FLU.CRUDS"])}
         )
         with (
             patch("file_name_processor.uuid4", return_value=FILE_DETAILS.message_id),

filenameprocessor/tests/utils_for_tests/utils_for_filenameprocessor_tests.py

@@ -1,5 +1,4 @@
 """Utils functions for filenameprocessor tests"""
-import json
 from unittest.mock import patch
 from io import StringIO
 from boto3.dynamodb.types import TypeDeserializer
@@ -12,8 +11,13 @@
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
     from clients import REGION_NAME
     from csv import DictReader
-    from constants import AuditTableKeys, AUDIT_TABLE_NAME, FileStatus, SUPPLIER_PERMISSIONS_HASH_KEY, \
-    ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY
+    from constants import (
+        AuditTableKeys,
+        AUDIT_TABLE_NAME,
+        FileStatus,
+        SUPPLIER_PERMISSIONS_HASH_KEY,
+        ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY
+    )
 
 MOCK_ODS_CODE_TO_SUPPLIER = {
     "YGM41": "EMIS",
@@ -53,13 +57,13 @@ def assert_audit_table_entry(file_details: FileDetails, expected_status: FileSta
 
 
 def create_mock_hget(
-    key: str,
-    field: str,
-    mock_supplier_permissions: dict[str, str],
     mock_ods_code_to_supplier: dict[str, str],
+    mock_supplier_permissions: dict[str, str],
 ):
-    if key == SUPPLIER_PERMISSIONS_HASH_KEY:
-        return mock_supplier_permissions.get(field)
-    if key == ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY:
-        return mock_ods_code_to_supplier.get(field)
-    return None
+    def mock_hget(key, field):
+        if key == ODS_CODE_TO_SUPPLIER_SYSTEM_HASH_KEY:
+            return mock_ods_code_to_supplier.get(field)
+        if key == SUPPLIER_PERMISSIONS_HASH_KEY:
+            return mock_supplier_permissions.get(field)
+        return None
+    return mock_hget