NRL-518 Revert contentType regex to simple version

Author: axelkrastek1-nhs

api/consumer/swagger.yaml

@@ -1101,7 +1101,7 @@ components:
           description: Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.
         contentType:
           type: string
-          pattern: "^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$"
+          pattern: "[^\\s]+(\\s[^\\s]+)*"
           description: Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate.
         language:
           type: string

api/producer/swagger.yaml

@@ -1666,7 +1666,7 @@ components:
           description: Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.
         contentType:
           type: string
-          pattern: "^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$"
+          pattern: "[^\\s]+(\\s[^\\s]+)*"
           description: Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate.
         language:
           type: string

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  swagger.yaml
-#   timestamp: 2024-11-26T15:05:35+00:00
+#   timestamp: 2024-12-05T16:54:49+00:00
 
 from __future__ import annotations
 
@@ -136,7 +136,7 @@ class Attachment(BaseModel):
         str,
         Field(
             description="Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate.",
-            pattern="^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$",
+            pattern="[^\\s]+(\\s[^\\s]+)*",
         ),
     ]
     language: Annotated[

layer/nrlf/core/tests/test_pydantic_errors.py

@@ -61,31 +61,3 @@ def test_validate_content_missing_content_type():
         "diagnostics": "Failed to parse DocumentReference resource (content.0.attachment.contentType: Field required)",
         "expression": ["content.0.attachment.contentType"],
     }
-
-
-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"
-
-    with pytest.raises(ParseError) as error:
-        validator.validate(document_ref_data)
-
-    exc = error.value
-    assert len(exc.issues) == 1
-    assert exc.issues[0].model_dump(exclude_none=True) == {
-        "severity": "error",
-        "code": "invalid",
-        "details": {
-            "coding": [
-                {
-                    "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
-                    "code": "INVALID_RESOURCE",
-                    "display": "Invalid validation of resource",
-                }
-            ]
-        },
-        "diagnostics": "Failed to parse DocumentReference resource (content.0.attachment.contentType: String should match pattern '^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$')",
-        "expression": ["content.0.attachment.contentType"],
-    }

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  swagger.yaml
-#   timestamp: 2024-11-26T15:05:33+00:00
+#   timestamp: 2024-12-05T16:54:46+00:00
 
 from __future__ import annotations
 
@@ -136,7 +136,7 @@ class Attachment(BaseModel):
         str,
         Field(
             description="Identifies the type of the data in the attachment and allows a method to be chosen to interpret or render the data. Includes mime type parameters such as charset where appropriate.",
-            pattern="^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$",
+            pattern="[^\\s]+(\\s[^\\s]+)*",
         ),
     ]
     language: Annotated[

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  swagger.yaml
-#   timestamp: 2024-11-26T15:05:34+00:00
+#   timestamp: 2024-12-05T16:54:48+00:00
 
 from __future__ import annotations
 

tests/features/producer/createDocumentReference-failure.feature

@@ -725,7 +725,7 @@ Feature: Producer - createDocumentReference - Failure Scenarios
             }
             ]
         },
-        "diagnostics": "Request body could not be parsed (content.0.attachment.contentType: String should match pattern '^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$')",
+        "diagnostics": "Request body could not be parsed (content.0.attachment.contentType: String should match pattern '[^\\s]+(\\s[^\\s]+)*')",
         "expression": [
             "content.0.attachment.contentType"
         ]

tests/features/producer/updateDocumentReference-failure.feature

@@ -144,7 +144,7 @@ Feature: Producer - updateDocumentReference - Failure Scenarios
             }
             ]
         },
-        "diagnostics": "Request body could not be parsed (content.0.attachment.contentType: String should match pattern '^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$')",
+        "diagnostics": "Request body could not be parsed (content.0.attachment.contentType: String should match pattern '[^\\s]+(\\s[^\\s]+)*')",
         "expression": [
             "content.0.attachment.contentType"
         ]

tests/features/producer/upsertDocumentReference-failure.feature

@@ -306,7 +306,7 @@ Feature: Producer - upsertDocumentReference - Failure Scenarios
             }
             ]
         },
-        "diagnostics": "Request body could not be parsed (content.0.attachment.contentType: String should match pattern '^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$')",
+        "diagnostics": "Request body could not be parsed (content.0.attachment.contentType: String should match pattern '[^\\s]+(\\s[^\\s]+)*')",
         "expression": [
             "content.0.attachment.contentType"
         ]