[NRL-1922] Use python language features where possible

Author: mattdean3-nhs

layer/nrlf/core/dynamodb/repository.py

@@ -1,19 +1,16 @@
 import sys
-from abc import ABC
-from typing import Generic, Iterator, List, Optional, Type, TypeVar
+from typing import Iterator, List, Optional, Type
 
 from botocore.exceptions import ClientError
 from pydantic import ValidationError
 
 from nrlf.core.boto import get_dynamodb_resource, get_dynamodb_table
 from nrlf.core.codes import SpineErrorConcept
 from nrlf.core.constants import SYSTEM_SHORT_IDS, TYPE_CATEGORIES
-from nrlf.core.dynamodb.model import DocumentPointer, DynamoDBModel
+from nrlf.core.dynamodb.model import DocumentPointer, DynamoDBModel  # noqa: F401
 from nrlf.core.errors import OperationOutcomeError
 from nrlf.core.logger import LogReference, logger
 
-RepositoryModel = TypeVar("RepositoryModel", bound=DynamoDBModel)
-
 
 def _get_sk_ids_for_type(pointer_type: str) -> tuple:
     if pointer_type not in TYPE_CATEGORIES:
@@ -33,8 +30,8 @@ def _get_sk_ids_for_type(pointer_type: str) -> tuple:
     return category_id, type_id
 
 
-class Repository(ABC, Generic[RepositoryModel]):
-    ITEM_TYPE: Type[RepositoryModel]
+class Repository[T: DynamoDBModel]:
+    ITEM_TYPE: Type[T]
 
     def __init__(self, table_name: str):
         self.dynamodb = get_dynamodb_resource()

layer/nrlf/core/model.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 from nhs_number import is_valid as is_valid_nhs_number
 from pydantic import BaseModel, Field, StrictStr
 
@@ -9,7 +7,7 @@
 
 class _NhsNumberMixin:
     @property
-    def nhs_number(self) -> Union[str, None]:
+    def nhs_number(self) -> str | None:
         if self.subject_identifier is None:
             return None
 

layer/nrlf/core/validators.py

@@ -395,7 +395,7 @@ def _validate_category(self, model: DocumentReference):
                 issue_code="business-rule",
                 error_code="UNPROCESSABLE_ENTITY",
                 diagnostics=f"Invalid category length: {len(model.category)} Category must only contain a single value",
-                field=f"category",
+                field="category",
             )
             return
 
@@ -406,7 +406,7 @@ def _validate_category(self, model: DocumentReference):
                 issue_code="business-rule",
                 error_code="UNPROCESSABLE_ENTITY",
                 diagnostics=f"Invalid category coding length: {len(model.category[0].coding)} Category Coding must only contain a single value",
-                field=f"category[0].coding",
+                field="category[0].coding",
             )
             return
 

terraform/account-wide-infrastructure/modules/athena/sql/rep_producer.sql

@@ -33,49 +33,10 @@ WITH
    , event_function_request_id
    , event_correlation_id
    , event_xray_trace_id
-   --, event_pointer_types
    , COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
    FROM
      producer_deletedocumentreference
 )
-/*, pr AS (
-   SELECT
-     time
-   , event_timestamp
-   , date
-   , host
-   , event_log_reference
-   , event_level
-   , event_location
-   , event_message
-   , event_service
-   , event_function_request_id
-   , event_correlation_id
-   , event_xray_trace_id
-   , event_pointer_types
-   , COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
-   FROM
-     producer_readdocumentreference
-)*/
-/*, ps AS (
-   SELECT
-     time
-   , event_timestamp
-   , date
-   , host
-   , event_log_reference
-   , event_level
-   , event_location
-   , event_message
-   , event_service
-   , event_function_request_id
-   , event_correlation_id
-   , event_xray_trace_id
-   , event_pointer_types
-   , COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
-   FROM
-     producer_searchdocumentreference
-)*/
 , psp AS (
    SELECT
      time
@@ -90,30 +51,10 @@ WITH
    , event_function_request_id
    , event_correlation_id
    , event_xray_trace_id
-   --, event_pointer_types
    , COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
    FROM
      producer_searchpostdocumentreference
 )
-/*, pu AS (
-   SELECT
-     time
-   , event_timestamp
-   , date
-   , host
-   , event_log_reference
-   , event_level
-   , event_location
-   , event_message
-   , event_service
-   , event_function_request_id
-   , event_correlation_id
-   , event_xray_trace_id
-   , event_pointer_types
-   , COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
-   FROM
-     producer_updatedocumentreference
-)*/
 , pus AS (
    SELECT
      time
@@ -128,7 +69,6 @@ WITH
    , event_function_request_id
    , event_correlation_id
    , event_xray_trace_id
-   --, event_pointer_types
    , COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
    FROM
      producer_upsertdocumentreference
@@ -140,18 +80,9 @@ WITH
 UNION    SELECT *
    FROM
      pd
-/*UNION    SELECT *
-   FROM
-     pr
-UNION    SELECT *
-   FROM
-     ps*/
 UNION    SELECT *
    FROM
      psp
-/*UNION    SELECT *
-   FROM
-     pu*/
 UNION    SELECT *
    FROM
      pus
@@ -177,7 +108,6 @@ SELECT
 , event_function_request_id
 , b.event_correlation_id
 , b.event_xray_trace_id
---, event_pointer_types
 , oc.user_ods
 FROM
   (base b