smells

Author: JamesW1-NHS

lambdas/ack_backend/src/convert_message_to_ack_row.py

@@ -1,11 +1,10 @@
 """Functions for converting the incoming message body into a row of ack data"""
 
-from typing import Union
 from logging_decorators import convert_message_to_ack_row_logging_decorator
 from update_ack_file import create_ack_data
 
 
-def get_error_message_for_ack_file(message_diagnostics) -> Union[None, str]:
+def get_error_message_for_ack_file(message_diagnostics) -> None | str:
     """Determines and returns the error message to be displayed in the ack file"""
     if message_diagnostics is None:
         return None

lambdas/ack_backend/src/logging_decorators.py

@@ -7,8 +7,6 @@
 from functools import wraps
 from common.clients import firehose_client, logger
 
-# TODO: can we factor the basic decorator into shared?
-
 STREAM_NAME = os.getenv("SPLUNK_FIREHOSE_NAME", "immunisation-fhir-api-internal-dev-splunk-firehose")
 
 

lambdas/ack_backend/src/update_ack_file.py

@@ -1,7 +1,7 @@
 """Functions for uploading the data to the ack file"""
 
 from io import StringIO, BytesIO
-from typing import Union, Optional
+from typing import Optional
 from botocore.exceptions import ClientError
 from constants import ACK_HEADERS, get_source_bucket_name, get_ack_bucket_name
 from audit_table import change_audit_table_status_to_processed
@@ -15,7 +15,7 @@ def create_ack_data(
     local_id: str,
     row_id: str,
     successful_api_response: bool,
-    diagnostics: Union[None, str] = None,
+    diagnostics: None | str = None,
     imms_id: str = None,
 ) -> dict:
     """Returns a dictionary containing the ack headers as keys, along with the relevant values."""

lambdas/ack_backend/tests/test_splunk_logging.py

@@ -139,7 +139,7 @@ def test_splunk_logging_missing_data(self):
             with self.assertRaises(Exception):
                 lambda_handler(event={"Records": [{"body": json.dumps([{"": "456"}])}]}, context={})
 
-            expected_first_logger_info_data = {**InvalidValues.Logging_with_no_values}
+            expected_first_logger_info_data = {**InvalidValues.logging_with_no_values}
 
             expected_first_logger_error_data = self.expected_lambda_handler_logs(
                 success=False, number_of_rows=1, ingestion_complete=False,

lambdas/ack_backend/tests/utils/values_for_ack_backend_tests.py

@@ -251,7 +251,7 @@ class InvalidValues:
 
     fixed_datetime = datetime(2024, 10, 29, 12, 0, 0)
 
-    Logging_with_no_values = {
+    logging_with_no_values = {
         "function_name": "ack_processor_convert_message_to_ack_row",
         "date_time": fixed_datetime.strftime("%Y-%m-%d %H:%M:%S"),
         "operation_start_time": "unknown",

lambdas/shared/src/common/models/errors.py

@@ -1,7 +1,6 @@
 import uuid
 from dataclasses import dataclass
 from enum import Enum
-from typing import Union
 
 
 class Severity(str, Enum):
@@ -102,7 +101,7 @@ def to_operation_outcome(self) -> dict:
 class UnhandledResponseError(RuntimeError):
     """Use this error when the response from an external service (ex: dynamodb) can't be handled"""
 
-    response: Union[dict, str]
+    response: dict | str
     message: str
 
     def __str__(self):