Skip to content

Commit 95cd496

Browse files
mattdean3-nhsmattdean3-nhs
committed
[NRL-1922] Use python language features where possible
1 parent 3d14fa7 commit 95cd496

File tree

4 files changed

+7
-82
lines changed

4 files changed

+7
-82
lines changed

‎layer/nrlf/core/dynamodb/repository.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
import sys
2-
from abc import ABC
3-
from typing import Generic, Iterator, List, Optional, Type, TypeVar
2+
from typing import Iterator, List, Optional, Type
43

54
from botocore.exceptions import ClientError
65
from pydantic import ValidationError
76

87
from nrlf.core.boto import get_dynamodb_resource, get_dynamodb_table
98
from nrlf.core.codes import SpineErrorConcept
109
from nrlf.core.constants import SYSTEM_SHORT_IDS, TYPE_CATEGORIES
11-
from nrlf.core.dynamodb.model import DocumentPointer, DynamoDBModel
10+
from nrlf.core.dynamodb.model import DocumentPointer, DynamoDBModel # noqa: F401
1211
from nrlf.core.errors import OperationOutcomeError
1312
from nrlf.core.logger import LogReference, logger
1413

15-
RepositoryModel = TypeVar("RepositoryModel", bound=DynamoDBModel)
16-
1714

1815
def _get_sk_ids_for_type(pointer_type: str) -> tuple:
1916
if pointer_type not in TYPE_CATEGORIES:
@@ -33,8 +30,8 @@ def _get_sk_ids_for_type(pointer_type: str) -> tuple:
3330
return category_id, type_id
3431

3532

36-
class Repository(ABC, Generic[RepositoryModel]):
37-
ITEM_TYPE: Type[RepositoryModel]
33+
class Repository[T: DynamoDBModel]:
34+
ITEM_TYPE: Type[T]
3835

3936
def __init__(self, table_name: str):
4037
self.dynamodb = get_dynamodb_resource()

‎layer/nrlf/core/model.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Union
2-
31
from nhs_number import is_valid as is_valid_nhs_number
42
from pydantic import BaseModel, Field, StrictStr
53

@@ -9,7 +7,7 @@
97

108
class _NhsNumberMixin:
119
@property
12-
def nhs_number(self) -> Union[str, None]:
10+
def nhs_number(self) -> str | None:
1311
if self.subject_identifier is None:
1412
return None
1513

‎layer/nrlf/core/validators.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ def _validate_category(self, model: DocumentReference):
395395
issue_code="business-rule",
396396
error_code="UNPROCESSABLE_ENTITY",
397397
diagnostics=f"Invalid category length: {len(model.category)} Category must only contain a single value",
398-
field=f"category",
398+
field="category",
399399
)
400400
return
401401

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

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

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -33,49 +33,10 @@ WITH
3333
, event_function_request_id
3434
, event_correlation_id
3535
, event_xray_trace_id
36-
--, event_pointer_types
3736
, COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
3837
FROM
3938
producer_deletedocumentreference
4039
)
41-
/*, pr AS (
42-
SELECT
43-
time
44-
, event_timestamp
45-
, date
46-
, host
47-
, event_log_reference
48-
, event_level
49-
, event_location
50-
, event_message
51-
, event_service
52-
, event_function_request_id
53-
, event_correlation_id
54-
, event_xray_trace_id
55-
, event_pointer_types
56-
, COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
57-
FROM
58-
producer_readdocumentreference
59-
)*/
60-
/*, ps AS (
61-
SELECT
62-
time
63-
, event_timestamp
64-
, date
65-
, host
66-
, event_log_reference
67-
, event_level
68-
, event_location
69-
, event_message
70-
, event_service
71-
, event_function_request_id
72-
, event_correlation_id
73-
, event_xray_trace_id
74-
, event_pointer_types
75-
, COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
76-
FROM
77-
producer_searchdocumentreference
78-
)*/
7940
, psp AS (
8041
SELECT
8142
time
@@ -90,30 +51,10 @@ WITH
9051
, event_function_request_id
9152
, event_correlation_id
9253
, event_xray_trace_id
93-
--, event_pointer_types
9454
, COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
9555
FROM
9656
producer_searchpostdocumentreference
9757
)
98-
/*, pu AS (
99-
SELECT
100-
time
101-
, event_timestamp
102-
, date
103-
, host
104-
, event_log_reference
105-
, event_level
106-
, event_location
107-
, event_message
108-
, event_service
109-
, event_function_request_id
110-
, event_correlation_id
111-
, event_xray_trace_id
112-
, event_pointer_types
113-
, COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
114-
FROM
115-
producer_updatedocumentreference
116-
)*/
11758
, pus AS (
11859
SELECT
11960
time
@@ -128,7 +69,6 @@ WITH
12869
, event_function_request_id
12970
, event_correlation_id
13071
, event_xray_trace_id
131-
--, event_pointer_types
13272
, COALESCE("event_headers_nhsd-end-user-organisation-ods", event_metadata_ods_code) user_ods
13373
FROM
13474
producer_upsertdocumentreference
@@ -140,18 +80,9 @@ WITH
14080
UNION SELECT *
14181
FROM
14282
pd
143-
/*UNION SELECT *
144-
FROM
145-
pr
146-
UNION SELECT *
147-
FROM
148-
ps*/
14983
UNION SELECT *
15084
FROM
15185
psp
152-
/*UNION SELECT *
153-
FROM
154-
pu*/
15586
UNION SELECT *
15687
FROM
15788
pus
@@ -177,7 +108,6 @@ SELECT
177108
, event_function_request_id
178109
, b.event_correlation_id
179110
, b.event_xray_trace_id
180-
--, event_pointer_types
181111
, oc.user_ods
182112
FROM
183113
(base b

0 commit comments

Comments
 (0)