NRL-518 Remove checks, pydantic validates that, add invalid contentType test

Author: axelkrastek1-nhs

layer/nrlf/core/tests/test_validators.py

@@ -1553,3 +1553,30 @@ def test_validate_content_extension_invalid_code_and_display_mismatch():
             "content[0].extension[0].valueCodeableConcept.coding[0].display"
         ],
     }
+
+
+def test_validate_content_invalid_content_type():
+    validator = DocumentReferenceValidator()
+    document_ref_data = load_document_reference_json("Y05868-736253002-Valid")
+
+    document_ref_data["content"][0]["attachment"]["contentType"] = "invalid/type"
+
+    result = validator.validate(document_ref_data)
+
+    assert result.is_valid is False
+    assert len(result.issues) == 1
+    assert result.issues[0].model_dump(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": "Invalid contentType: invalid/type. Must be 'application/pdf' or 'text/html'",
+        "expression": ["content[0].attachment.contentType"],
+    }

layer/nrlf/core/validators.py

@@ -612,24 +612,6 @@ def _validate_content(self, model: DocumentReference):
         logger.log(LogReference.VALIDATOR001, step="content")
 
         for i, content in enumerate(model.content):
-            if not content.attachment:
-                self.result.add_error(
-                    issue_code="required",
-                    error_code="INVALID_RESOURCE",
-                    diagnostics="Missing attachment in content",
-                    field=f"content[{i}].attachment",
-                )
-                continue
-
-            if not content.attachment.contentType:
-                self.result.add_error(
-                    issue_code="required",
-                    error_code="INVALID_RESOURCE",
-                    diagnostics="Missing contentType in content.attachment",
-                    field=f"content[{i}].attachment.contentType",
-                )
-                continue
-
             if content.attachment.contentType not in ["application/pdf", "text/html"]:
                 self.result.add_error(
                     issue_code="value",