NRL-820 validate the type has the correct category code

Author: eesa456

layer/nrlf/core/tests/test_validators.py

@@ -485,6 +485,42 @@ def test_validate_category_coding_display_mismatch_observations():
     }
 
 
+def test_validate_category_coding_and_type_mismatch():
+    validator = DocumentReferenceValidator()
+    document_ref_data = load_document_reference_json("Y05868-736253002-Valid")
+
+    document_ref_data["category"][0] = {
+        "coding": [
+            {
+                "system": "http://snomed.info/sct",
+                "code": "1102421000000108",
+                "display": "Observations",
+            }
+        ]
+    }
+
+    result = validator.validate(document_ref_data)
+
+    assert result.is_valid is False
+    assert result.resource.id == "Y05868-99999-99999-999999"
+    assert len(result.issues) == 1
+    assert result.issues[0].dict(exclude_none=True) == {
+        "severity": "error",
+        "code": "value",
+        "details": {
+            "coding": [
+                {
+                    "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
+                    "code": "INVALID_RESOURCE",
+                    "display": "Invalid validation of resource",
+                }
+            ]
+        },
+        "diagnostics": "category code '1102421000000108' must match the allowed category for pointer type 736253002 with a category value of '734163000'",
+        "expression": ["category[0].coding[0].code"],
+    }
+
+
 def test_validate_category_coding_invalid_code():
     validator = DocumentReferenceValidator()
     document_ref_data = load_document_reference_json("Y05868-736253002-Valid")

layer/nrlf/core/validators.py

@@ -5,7 +5,7 @@
 from pydantic import ValidationError
 
 from nrlf.core.codes import SpineErrorConcept
-from nrlf.core.constants import CATEGORIES, REQUIRED_CREATE_FIELDS
+from nrlf.core.constants import CATEGORIES, REQUIRED_CREATE_FIELDS, TYPE_CATEGORIES
 from nrlf.core.errors import ParseError
 from nrlf.core.logger import LogReference, logger
 from nrlf.core.types import DocumentReference, OperationOutcomeIssue, RequestQueryType
@@ -390,6 +390,19 @@ def _validate_category(self, model: DocumentReference):
                 diagnostics=f"category code '{coding.code}' must have a display value of '{CATEGORIES.get(coding.code)}'",
                 field=f"category[0].coding[{0}].display",
             )
+            return
+
+        pointer_type = model.type.coding[0].code
+        type_category = TYPE_CATEGORIES[f"http://snomed.info/sct|{pointer_type}"].split(
+            "|"
+        )[1]
+        if type_category != coding.code:
+            self.result.add_error(
+                issue_code="value",
+                error_code="INVALID_RESOURCE",
+                diagnostics=f"category code '{coding.code}' must match the allowed category for pointer type {pointer_type} with a category value of '{type_category}'",
+                field=f"category[0].coding[{0}].code",
+            )
 
     def _validate_content_extension(self, model: DocumentReference):
         """