Merge pull request #660 from NHSDigital/feature/eema1-NRL-759-removeA…

…ppIDDependency NRL-759 switch to using new app ID header
NHSDigital · Jul 1, 2024 · 58eca28 · 58eca28
2 parents 4192db9 + 58c171f
commit 58eca28
Show file tree

Hide file tree

Showing 33 changed files with 256 additions and 323 deletions.
diff --git a/api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py b/api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py
@@ -3,7 +3,6 @@
 from moto import mock_aws
 
 from api.consumer.readDocumentReference.read_document_reference import handler
-from nrlf.core.constants import PointerTypes
 from nrlf.core.dynamodb.repository import DocumentPointer, DocumentPointerRepository
 from nrlf.tests.data import load_document_reference
 from nrlf.tests.dynamodb import mock_repository
@@ -105,14 +104,12 @@ def test_read_document_reference_missing_id():
 def test_read_document_reference_unauthorised_for_type(
     repository: DocumentPointerRepository,
 ):
-    doc_ref = load_document_reference("Y05868-736253002-Valid")
+    doc_ref = load_document_reference("RQI-736253002-Valid")
     doc_pointer = DocumentPointer.from_document_reference(doc_ref)
     repository.create(doc_pointer)
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            app_id="12356", pointer_types=[PointerTypes.EMERGENCY_HEALTHCARE_PLAN.value]
-        ),
+        headers=create_headers(app_id="12356", ods_code="RQI"),
         path_parameters={"id": doc_pointer.id},
     )
 
@@ -157,7 +154,7 @@ def test_document_reference_invalid_json(repository: DocumentPointerRepository):
     repository.create(doc_pointer)
 
     event = create_test_api_gateway_event(
-        headers=create_headers(pointer_types=[PointerTypes.MENTAL_HEALTH_PLAN.value]),
+        headers=create_headers(),
         path_parameters={"id": doc_pointer.id},
     )
 

diff --git a/api/producer/createDocumentReference/tests/test_create_document_reference.py b/api/producer/createDocumentReference/tests/test_create_document_reference.py
@@ -9,7 +9,6 @@
     _set_create_time_fields,
     handler,
 )
-from nrlf.core.constants import PointerTypes
 from nrlf.core.dynamodb.repository import DocumentPointer, DocumentPointerRepository
 from nrlf.producer.fhir.r4.model import (
     DocumentReferenceRelatesTo,
@@ -659,10 +658,6 @@ def test_create_document_reference_invalid_relatesto_type(
     event = create_test_api_gateway_event(
         headers=create_headers(
             app_id="123456",
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ],
         ),
         body=doc_ref.json(exclude_none=True),
     )
@@ -710,12 +705,7 @@ def test_create_document_reference_with_no_context_related_for_ssp_url(
     del doc_ref.context.related
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -769,12 +759,7 @@ def test_create_document_reference_with_no_asid_in_for_ssp_url(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -828,12 +813,7 @@ def test_create_document_reference_with_invalid_asid_for_ssp_url(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -892,12 +872,7 @@ def test_create_document_reference_supersede_deletes_old_pointers_replace(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -957,13 +932,7 @@ def test_create_document_reference_supersede_succeeds_with_toggle(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ],
-            nrl_permissions=["supersede-ignore-delete-fail"],
-        ),
+        headers=create_headers(nrl_permissions=["supersede-ignore-delete-fail"]),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -1022,12 +991,7 @@ def test_create_document_reference_supersede_fails_without_toggle(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -1086,12 +1050,7 @@ def test_create_document_reference_create_relatesto_not_replaces(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 

diff --git a/api/producer/readDocumentReference/tests/test_read_document_reference_producer.py b/api/producer/readDocumentReference/tests/test_read_document_reference_producer.py
@@ -101,7 +101,7 @@ def test_read_document_reference_missing_id():
 
 def test_read_document_reference_incorrect_ods_code():
     event = create_test_api_gateway_event(
-        headers=create_headers(ods_code="X26"),
+        headers=create_headers(ods_code="RQI"),
         path_parameters={"id": "Y05868-99999-99999-999999"},
     )
 

diff --git a/api/producer/searchDocumentReference/tests/test_search_document_reference_producer.py b/api/producer/searchDocumentReference/tests/test_search_document_reference_producer.py
@@ -253,9 +253,7 @@ def test_search_document_reference_filters_by_pointer_types(
     repository.create(doc_pointer)
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            app_id="123445", pointer_types=[PointerTypes.EOL_COORDINATION_SUMMARY.value]
-        ),
+        headers=create_headers(app_id="123445", ods_code="X26"),
         query_string_parameters={
             "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|6700028191",
         },

diff --git a/...roducer/searchPostDocumentReference/tests/test_search_post_document_reference_producer.py b/...roducer/searchPostDocumentReference/tests/test_search_post_document_reference_producer.py
@@ -262,9 +262,7 @@ def test_search_document_reference_filters_by_pointer_types(
     repository.create(doc_pointer)
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            app_id="12356", pointer_types=[PointerTypes.EOL_COORDINATION_SUMMARY.value]
-        ),
+        headers=create_headers(app_id="12356", ods_code="X26"),
         body=json.dumps(
             {
                 "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|6700028191",

diff --git a/api/producer/updateDocumentReference/tests/test_update_document_reference.py b/api/producer/updateDocumentReference/tests/test_update_document_reference.py
@@ -355,7 +355,7 @@ def test_update_document_reference_invalid_resource():
 def test_update_document_reference_invalid_producer_id():
     doc_ref = load_document_reference("Y05868-736253002-Valid")
     event = create_test_api_gateway_event(
-        headers=create_headers(ods_code="X26"),
+        headers=create_headers(ods_code="RQI"),
         path_parameters={"id": "Y05868-99999-99999-999999"},
         body=doc_ref.json(exclude_none=True),
     )

diff --git a/api/producer/upsertDocumentReference/tests/test_upsert_document_reference.py b/api/producer/upsertDocumentReference/tests/test_upsert_document_reference.py
@@ -8,7 +8,7 @@
     _set_upsert_time_fields,
     handler,
 )
-from nrlf.core.constants import PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL, PointerTypes
+from nrlf.core.constants import PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL
 from nrlf.core.dynamodb.repository import DocumentPointer, DocumentPointerRepository
 from nrlf.producer.fhir.r4.model import (
     DocumentReferenceRelatesTo,
@@ -748,10 +748,6 @@ def test_create_document_reference_invalid_relatesto_type(
     event = create_test_api_gateway_event(
         headers=create_headers(
             app_id="12356",
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ],
         ),
         body=doc_ref.json(exclude_none=True),
     )
@@ -799,12 +795,7 @@ def test_create_document_reference_with_no_context_related_for_ssp_url(
     del doc_ref.context.related
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -858,12 +849,7 @@ def test_create_document_reference_with_no_asid_in_for_ssp_url(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -917,12 +903,7 @@ def test_create_document_reference_with_invalid_asid_for_ssp_url(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -980,12 +961,7 @@ def test_create_document_reference_supersede_deletes_old_pointers_replace(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -1044,13 +1020,7 @@ def test_create_document_reference_supersede_succeeds_with_toggle(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ],
-            nrl_permissions=["supersede-ignore-delete-fail"],
-        ),
+        headers=create_headers(nrl_permissions=["supersede-ignore-delete-fail"]),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -1109,12 +1079,7 @@ def test_create_document_reference_supersede_fails_without_toggle(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 
@@ -1172,12 +1137,7 @@ def test_create_document_reference_create_relatesto_not_replaces(
     ]
 
     event = create_test_api_gateway_event(
-        headers=create_headers(
-            pointer_types=[
-                PointerTypes.EOL_COORDINATION_SUMMARY.value,
-                PointerTypes.MENTAL_HEALTH_PLAN.value,
-            ]
-        ),
+        headers=create_headers(),
         body=doc_ref.json(exclude_none=True),
     )
 

diff --git a/layer/nrlf/core/authoriser.py b/layer/nrlf/core/authoriser.py
@@ -1,5 +1,6 @@
 import json
 import sys
+from os import path
 
 from botocore.exceptions import ClientError
 
@@ -14,7 +15,7 @@ def get_pointer_types(
 ) -> list[str]:
     ods_code = ".".join(connection_metadata.ods_code)
 
-    app_id = connection_metadata.client_rp_details.developer_app_id
+    app_id = connection_metadata.nrl_app_id
     ods_code = connection_metadata.ods_code
     ods_code_extension = connection_metadata.ods_code_extension
 
@@ -57,11 +58,10 @@ def get_pointer_types(
 
 def parse_permissions_file(
     connection_metadata: ConnectionMetadata,
-    path_to_search: str = "/opt/python/nrlf_permissions",
 ) -> list[str]:
     ods_code = ".".join(connection_metadata.ods_code)
 
-    app_id = connection_metadata.client_rp_details.developer_app_id
+    app_id = connection_metadata.nrl_app_id
     ods_code = connection_metadata.ods_code
     ods_code_extension = connection_metadata.ods_code_extension
 
@@ -70,7 +70,11 @@ def parse_permissions_file(
     else:
         key = f"{app_id}/{ods_code}.json"
 
-    file_path = f"{path_to_search}/{key}"
+    file_path = f"/opt/python/nrlf_permissions/{key}"
+
+    if connection_metadata.is_test_event:
+        file_path = path.abspath(f"layer/test_permissions/{key}")
+
     pointer_types = []
     try:
         with open(file_path) as file:

diff --git a/layer/nrlf/core/decorators.py b/layer/nrlf/core/decorators.py
@@ -74,12 +74,11 @@ def load_connection_metadata(headers: Dict[str, str], config: Config):
 
     logger.log(LogReference.HANDLER004b)
     pointer_types = parse_permissions_file(metadata)
-    if not pointer_types and metadata.enable_authorization_lookup:
+    if not pointer_types and not metadata.is_test_event:
         logger.log(LogReference.HANDLER004)
         pointer_types = get_pointer_types(metadata, config)
-        metadata.pointer_types = pointer_types
-    elif pointer_types:
-        metadata.pointer_types = pointer_types
+
+    metadata.pointer_types = pointer_types
 
     return metadata
 

diff --git a/layer/nrlf/core/model.py b/layer/nrlf/core/model.py
@@ -56,9 +56,8 @@ class ConnectionMetadata(BaseModel):
     ods_code: str = Field(alias="nrl.ods-code")
     ods_code_extension: str | None = Field(alias="nrl.ods-code-extension", default=None)
     nrl_permissions: list[str] = Field(alias="nrl.permissions", default_factory=list)
-    enable_authorization_lookup: bool = Field(
-        alias="nrl.enable-authorization-lookup", default=False
-    )
+    nrl_app_id: str = Field(alias="nrl.app-id")
+    is_test_event: bool = Field(alias="nrl.test-event", default=False)
     client_rp_details: ClientRpDetails
 
     @property