NRL-1986 Address PR comments

Author: sandyforresternhs

layer/nrlf/core/decorators.py

@@ -25,6 +25,7 @@
     PERMISSION_ALLOW_ALL_POINTER_TYPES,
     X_CORRELATION_ID_HEADER,
     X_REQUEST_ID_HEADER,
+    AccessControls,
     PointerTypes,
 )
 from nrlf.core.dynamodb.repository import DocumentPointerRepository
@@ -164,7 +165,10 @@ def _load_v2_connection_metadata(headers: Dict[str, str], path: str):
         pointer_permissions
     )
 
-    if "allow_all_types" in metadata.nrl_permissions_policy.access_controls:
+    if (
+        AccessControls.ALLOW_ALL_TYPES.value
+        in metadata.nrl_permissions_policy.access_controls
+    ):
         metadata.nrl_permissions_policy.types = PointerTypes.list()
 
     logger.log(

layer/nrlf/core/tests/test_decorators.py

@@ -12,6 +12,7 @@
 from nrlf.core.constants import (
     PERMISSION_ALLOW_ALL_POINTER_TYPES,
     X_REQUEST_ID_HEADER,
+    AccessControls,
     PointerTypes,
     V2Headers,
 )
@@ -851,7 +852,7 @@ def test_load_v2_connection_metadata_allow_all_types(mocker: MockerFixture):
     mocker.patch(
         "nrlf.core.decorators.get_pointer_permissions_v2",
         return_value={
-            "access_controls": ["allow_all_types"],
+            "access_controls": [AccessControls.ALLOW_ALL_TYPES.value],
             "types": [],
         },
     )

tests/utilities/api_clients.py

@@ -6,7 +6,12 @@
 from pydantic import BaseModel
 from requests import Response
 
-from nrlf.core.constants import Categories, PointerTypes, V2Headers
+from nrlf.core.constants import (
+    NHSD_CORRELATION_ID_HEADER,
+    Categories,
+    PointerTypes,
+    V2Headers,
+)
 from nrlf.core.model import ConnectionMetadata
 
 logger = logging.getLogger(__name__)
@@ -83,7 +88,7 @@ def __init__(self, config: ClientConfig, use_v2: bool = False):
                     {
                         V2Headers.NHSD_END_USER_ORGANISATION_ODS: self.config.connection_metadata.ods_code,
                         V2Headers.NHSD_NRL_APP_ID: self.config.connection_metadata.nrl_app_id,
-                        "NHSD-Correlation-Id": "test-correlation-id",
+                        NHSD_CORRELATION_ID_HEADER: "test-correlation-id",
                     }
                 )
             else:
@@ -232,9 +237,9 @@ def __init__(self, config: ClientConfig, use_v2: bool = False):
             if use_v2:
                 self.request_headers.update(
                     {
-                        "NHSD-End-User-Organisation-ODS": self.config.connection_metadata.ods_code,
-                        "NHSD-NRL-App-Id": self.config.connection_metadata.nrl_app_id,
-                        "NHSD-Correlation-Id": "test-correlation-id",
+                        V2Headers.NHSD_END_USER_ORGANISATION_ODS: self.config.connection_metadata.ods_code,
+                        V2Headers.NHSD_NRL_APP_ID: self.config.connection_metadata.nrl_app_id,
+                        NHSD_CORRELATION_ID_HEADER: "test-correlation-id",
                     }
                 )
             else: