NRL-1948 Clean up logs and mock file opens for prettier tests & code

anjalitrace2-nhs · anjalitrace2-nhs · commit 1e3af17f032c · 2026-03-02T15:46:05.000Z
diff --git a/layer/nrlf/core/authoriser.py b/layer/nrlf/core/authoriser.py
@@ -10,13 +10,10 @@
 from nrlf.core.logger import LogReference, logger
 from nrlf.core.model import ConnectionMetadata
 
-default_lookup_path = "/opt/python/nrlf_permissions"
-
 
 def get_pointer_permissions_v2(
     connection_metadata: ConnectionMetadata,
     request_path: str,
-    lookup_path=default_lookup_path,
 ):
     producer_or_consumer = (
         re.search("^/(producer|consumer)/", request_path).group().strip("/")
@@ -28,7 +25,7 @@ def get_pointer_permissions_v2(
     key = f"{producer_or_consumer}/{app_id}/{ods_code}.json"
     logger.log(LogReference.V2PERMISSIONS011, key=key)
 
-    file_path = f"{lookup_path}/{key}"
+    file_path = f"/opt/python/nrlf_permissions/{key}"
 
     pointer_permissions = {}
     try:
diff --git a/layer/nrlf/core/request.py b/layer/nrlf/core/request.py
@@ -19,14 +19,14 @@ def _fetch_ods_app_id_headers(headers: dict[str, str]):
 
     if not ods_code or len(ods_code.strip()) == 0:
         logger.log(
-            code=LogReference.HANDLER003a,
+            LogReference.HANDLER003a,
             headers_names=list(case_insensitive_headers.keys()),
         )
 
     nrl_app_id = case_insensitive_headers.get("nhsd-nrl-app-id")
     if not nrl_app_id or len(nrl_app_id.strip()) == 0:
         logger.log(
-            code=LogReference.HANDLER003b,
+            LogReference.HANDLER003b,
             headers_names=list(case_insensitive_headers.keys()),
         )
 
diff --git a/layer/nrlf/core/tests/test_authoriser.py b/layer/nrlf/core/tests/test_authoriser.py
@@ -1,3 +1,5 @@
+from unittest.mock import mock_open, patch
+
 from nrlf.core.authoriser import get_pointer_permissions_v2, parse_permissions_file
 from nrlf.core.logger import LogReference, logger
 from nrlf.core.request import parse_headers
@@ -20,10 +22,12 @@ def test_authoriser_parse_permission_file_with_permission_file():
     assert metadata_result == ["http://snomed.info/sct|736253001"]
 
 
-v2_test_lookup_path = "layer/test_permissions/v2"
-
-
-def test_authoriser_get_v2_permissions_with_pointer_types(mocker):
+@patch(
+    "builtins.open",
+    new_callable=mock_open,
+    read_data='{"types": ["http://snomed.info/sct|736253001"]}',
+)
+def test_authoriser_get_v2_permissions_with_pointer_types(mock_file, mocker):
     spy = mocker.spy(logger, "log")
 
     expected_lookup_key = "producer/ODS123-app-id/ODS123.json"
@@ -33,9 +37,11 @@ def test_authoriser_get_v2_permissions_with_pointer_types(mocker):
     result = get_pointer_permissions_v2(
         connection_metadata=connection_metadata,
         request_path="/producer/DocumentReference/_search",
-        lookup_path=v2_test_lookup_path,
     )
 
+    mock_file.assert_called_once_with(
+        f"/opt/python/nrlf_permissions/{expected_lookup_key}"
+    )
     assert result.get("types") == ["http://snomed.info/sct|736253001"]
 
     spy.assert_called_with(LogReference.V2PERMISSIONS011, key=expected_lookup_key)
@@ -50,7 +56,6 @@ def test_authoriser_parse_v2_permission_file_with_no_permission_file(mocker):
             create_headers(ods_code="NotFound", nrl_app_id="NotAnApp")
         ),
         request_path="/consumer/_status",
-        lookup_path=v2_test_lookup_path,
     )
 
     assert metadata_result == {}
diff --git a/layer/test_permissions/v2/producer/ODS123-app-id/ODS123.json b/layer/test_permissions/v2/producer/ODS123-app-id/ODS123.json

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ def _fetch_ods_app_id_headers(headers: dict[str, str]):`
`19`	`19`
`20`	`20`	`if not ods_code or len(ods_code.strip()) == 0:`
`21`	`21`	`logger.log(`
`22`		`- code=LogReference.HANDLER003a,`
	`22`	`+ LogReference.HANDLER003a,`
`23`	`23`	`headers_names=list(case_insensitive_headers.keys()),`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`nrl_app_id = case_insensitive_headers.get("nhsd-nrl-app-id")`
`27`	`27`	`if not nrl_app_id or len(nrl_app_id.strip()) == 0:`
`28`	`28`	`logger.log(`
`29`		`- code=LogReference.HANDLER003b,`
	`29`	`+ LogReference.HANDLER003b,`
`30`	`30`	`headers_names=list(case_insensitive_headers.keys()),`
`31`	`31`	`)`
`32`	`32`