Merge branch 'develop' of github.com:NHSDigital/NRLF into feature/eema1-NRL-478-validateContext

Author: eesa456

api/consumer/swagger.yaml

@@ -1052,8 +1052,6 @@ components:
           items:
             $ref: "#/components/schemas/Reference"
             description: Related identifiers or resources associated with the DocumentReference.
-      required:
-        - practiceSetting
     DocumentReferenceContent:
       type: object
       properties:

api/producer/swagger.yaml

@@ -1398,7 +1398,6 @@ components:
         - status
         - content
         - author
-        - context
     Bundle:
       type: object
       properties:
@@ -1608,8 +1607,6 @@ components:
           items:
             $ref: "#/components/schemas/Reference"
             description: Related identifiers or resources associated with the DocumentReference.
-      required:
-        - practiceSetting
     DocumentReferenceContent:
       type: object
       properties:

layer/nrlf/consumer/fhir/r4/model.py

@@ -804,11 +804,11 @@ class DocumentReferenceContext(BaseModel):
         Field(description="The kind of facility where the patient was seen."),
     ] = None
     practiceSetting: Annotated[
-        CodeableConcept,
+        Optional[CodeableConcept],
         Field(
             description="This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty."
         ),
-    ]
+    ] = None
     sourcePatientInfo: Annotated[
         Optional[Reference],
         Field(

layer/nrlf/core/tests/test_model.py

@@ -1,3 +1,6 @@
+import pytest
+from pydantic import ValidationError
+
 from nrlf.core.model import (
     ConnectionMetadata,
     ConsumerRequestParams,
@@ -91,6 +94,28 @@ def test_consumer_request_params():
     assert params.nhs_number == "9999999999"
 
 
+def test_producer_request_params_extra_fields():
+    with pytest.raises(ValidationError):
+        ProducerRequestParams.model_validate(
+            {
+                "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|9999999999",
+                "type": "test-type",
+                "extra_field": "extra_value",
+            }
+        )
+
+
+def test_consumer_request_params_extra_fields():
+    with pytest.raises(ValidationError):
+        ConsumerRequestParams.model_validate(
+            {
+                "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|9999999999",
+                "type": "test-type",
+                "extra_field": "extra_value",
+            }
+        )
+
+
 def test_count_request_params():
     params = CountRequestParams.model_validate(
         {

layer/nrlf/producer/fhir/r4/model.py

@@ -611,9 +611,9 @@ class DocumentReference(BaseModel):
     securityLabel: Optional[List[CodeableConcept]] = None
     content: Annotated[List[DocumentReferenceContent], Field(min_length=1)]
     context: Annotated[
-        DocumentReferenceContext,
+        Optional[DocumentReferenceContext],
         Field(description="The clinical context in which the document was prepared."),
-    ]
+    ] = None
 
 
 class Bundle(BaseModel):
@@ -788,11 +788,11 @@ class DocumentReferenceContext(BaseModel):
         Field(description="The kind of facility where the patient was seen."),
     ] = None
     practiceSetting: Annotated[
-        CodeableConcept,
+        Optional[CodeableConcept],
         Field(
             description="This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty."
         ),
-    ]
+    ] = None
     sourcePatientInfo: Annotated[
         Optional[Reference],
         Field(

layer/nrlf/producer/fhir/r4/strict_model.py

@@ -531,9 +531,9 @@ class DocumentReference(BaseModel):
     securityLabel: Optional[List[CodeableConcept]] = None
     content: Annotated[List[DocumentReferenceContent], Field(min_length=1)]
     context: Annotated[
-        DocumentReferenceContext,
+        Optional[DocumentReferenceContext],
         Field(description="The clinical context in which the document was prepared."),
-    ]
+    ] = None
 
 
 class Bundle(BaseModel):
@@ -693,11 +693,11 @@ class DocumentReferenceContext(BaseModel):
         Field(description="The kind of facility where the patient was seen."),
     ] = None
     practiceSetting: Annotated[
-        CodeableConcept,
+        Optional[CodeableConcept],
         Field(
             description="This property may convey specifics about the practice setting where the content was created, often reflecting the clinical specialty."
         ),
-    ]
+    ] = None
     sourcePatientInfo: Annotated[
         Optional[Reference],
         Field(

sonar-project.properties

@@ -10,4 +10,4 @@ sonar.exclusions=scripts/**, **/scripts/**, api/tests/**, tests/**, api/**/tests
 # Exclude snomed urls as being unsafe
 sonar.issue.ignore.multicriteria=exclude_snomed_urls
 sonar.issue.ignore.multicriteria.exclude_snomed_urls.ruleKey=python:S5332
-sonar.issue.ignore.multicriteria.exclude_snomed_urls.pattern=http://snomed\.info(/sct)?$
+sonar.issue.ignore.multicriteria.exclude_snomed_urls.pattern=**http://snomed\.info(/sct)?**