[NRL-1290] Allow both V4TOL and V4T0L as bars ods code. Add new proxy permission for create

Author: mattdean3-nhs

api/producer/createDocumentReference/create_document_reference.py

@@ -2,8 +2,10 @@
 
 from nrlf.core.codes import SpineErrorConcept
 from nrlf.core.constants import (
+    PERMISSION_ALLOW_PROXY_ODS_CODES,
     PERMISSION_AUDIT_DATES_FROM_PAYLOAD,
     PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL,
+    PointerTypes,
 )
 from nrlf.core.decorators import request_handler
 from nrlf.core.dynamodb.repository import DocumentPointer, DocumentPointerRepository
@@ -65,14 +67,29 @@ def _check_permissions(
     Check the requester has permissions to create the DocumentReference
     """
 
-    # Allow BARS proxy to create a document reference for any organisation
-    if metadata.ods_code == "V4TOL" and core_model.type in metadata.pointer_types:
+    # Allow BARS proxy to create an appointment document reference for any organisation
+    if (
+        metadata.ods_code in ["V4TOL", "V4T0L"]
+        and core_model.type.coding[0].code == PointerTypes.APPOINTMENT.coding_value()
+    ):
         return
 
+    allow_ods_code_proxying = False
+    if PERMISSION_ALLOW_PROXY_ODS_CODES in metadata.nrl_permissions:
+        if metadata.ods_code == metadata.nrl_proxy_ods_code:
+            allow_ods_code_proxying = True
+        else:
+            logger.log(
+                LogReference.PROCREATE003,
+                ods_code=metadata.ods_code,
+                proxy_ods_code=metadata.nrl_proxy_ods_code,
+                warning="Unable to allow ods code proxying as the ods code does not match the configured proxy ods code",
+            )
+
     custodian_parts = tuple(
         filter(None, (core_model.custodian, core_model.custodian_suffix))
     )
-    if metadata.ods_code_parts != custodian_parts:
+    if not allow_ods_code_proxying and metadata.ods_code_parts != custodian_parts:
         logger.log(
             LogReference.PROCREATE004,
             ods_code_parts=metadata.ods_code_parts,

api/producer/updateDocumentReference/update_document_reference.py

@@ -63,7 +63,7 @@ def handler(
     core_model = DocumentPointer.from_document_reference(document_reference)
 
     if (
-        metadata.ods_code == "V4TOL"
+        metadata.ods_code in ["V4TOL", "V4T0L"]
         and core_model.type.coding[0].code == PointerTypes.APPOINTMENT.coding_value()
     ):
         # If bars app - don't validate the ods code against the pointer

layer/nrlf/core/constants.py

@@ -35,12 +35,17 @@ class Source(Enum):
     "incorporates",
     "summarizes",
 }
+
 CLIENT_RP_DETAILS = "nhsd-client-rp-details"
 CONNECTION_METADATA = "nhsd-connection-metadata"
 PERMISSION_AUDIT_DATES_FROM_PAYLOAD = "audit-dates-from-payload"
 PERMISSION_SUPERSEDE_IGNORE_DELETE_FAIL = "supersede-ignore-delete-fail"
 PERMISSION_ALLOW_ALL_POINTER_TYPES = "allow-all-pointer-types"
 
+# Bars prototype - Allow a application to proxy as any organisation
+METADATA_PROXY_ODS_CODE = "nrl.proxy-ods-code"
+PERMISSION_ALLOW_PROXY_ODS_CODES = "allow-proxy-ods-codes"
+
 
 NHSD_REQUEST_ID_HEADER = "NHSD-Request-Id"
 NHSD_CORRELATION_ID_HEADER = "NHSD-Correlation-Id"

layer/nrlf/core/model.py

@@ -5,6 +5,7 @@
 
 import nrlf.consumer.fhir.r4.model as consumer_model
 import nrlf.producer.fhir.r4.model as producer_model
+from nrlf.core.constants import METADATA_PROXY_ODS_CODE
 
 
 class _NhsNumberMixin:
@@ -56,6 +57,7 @@ class ConnectionMetadata(BaseModel):
     ods_code_extension: str | None = Field(alias="nrl.ods-code-extension", default=None)
     nrl_permissions: list[str] = Field(alias="nrl.permissions", default_factory=list)
     nrl_app_id: str = Field(alias="nrl.app-id")
+    nrl_proxy_ods_code: str | None = Field(alias=METADATA_PROXY_ODS_CODE, default=None)
     is_test_event: bool = Field(alias="nrl.test-event", default=False)
     client_rp_details: ClientRpDetails