NRL-518 Update models with mandatory fields

Author: axelkrastek1-nhs

api/consumer/swagger.yaml

@@ -1074,6 +1074,7 @@ components:
             description: Additional content defined by implementations.
       required:
         - attachment
+        - format
     DocumentReferenceRelatesTo:
       type: object
       properties:
@@ -1100,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: "[^\\s]+(\\s[^\\s]+)*"
+          pattern: "^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$"
           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
@@ -1130,6 +1131,9 @@ components:
           type: string
           pattern: ([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?
           description: The date that the attachment was first created.
+      required:
+        - contentType
+        - url
     CodeableConcept:
       type: object
       properties:

api/producer/swagger.yaml

@@ -1639,6 +1639,7 @@ components:
             description: Additional content defined by implementations.
       required:
         - attachment
+        - format
     DocumentReferenceRelatesTo:
       type: object
       properties:
@@ -1665,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: "[^\\s]+(\\s[^\\s]+)*"
+          pattern: "^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$"
           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
@@ -1695,6 +1696,9 @@ components:
           type: string
           pattern: ([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?
           description: The date that the attachment was first created.
+      required:
+        - contentType
+        - url
     CodeableConcept:
       type: object
       properties:

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  swagger.yaml
-#   timestamp: 2024-11-20T09:43:58+00:00
+#   timestamp: 2024-11-26T15:05:35+00:00
 
 from __future__ import annotations
 
@@ -133,12 +133,12 @@ class Attachment(BaseModel):
         ),
     ] = None
     contentType: Annotated[
-        Optional[str],
+        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="[^\\s]+(\\s[^\\s]+)*",
+            pattern="^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$",
         ),
-    ] = None
+    ]
     language: Annotated[
         Optional[str],
         Field(
@@ -154,9 +154,9 @@ class Attachment(BaseModel):
         ),
     ] = None
     url: Annotated[
-        Optional[str],
+        str,
         Field(description="A location where the data can be accessed.", pattern="\\S*"),
-    ] = None
+    ]
     size: Annotated[
         Optional[int],
         Field(
@@ -833,11 +833,11 @@ class DocumentReferenceContent(BaseModel):
         ),
     ]
     format: Annotated[
-        Optional[Coding],
+        Coding,
         Field(
             description="An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType."
         ),
-    ] = None
+    ]
     extension: Optional[List[Extension]] = None
 
 

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  swagger.yaml
-#   timestamp: 2024-11-20T10:10:52+00:00
+#   timestamp: 2024-11-26T15:05:33+00:00
 
 from __future__ import annotations
 
@@ -133,12 +133,12 @@ class Attachment(BaseModel):
         ),
     ] = None
     contentType: Annotated[
-        Optional[str],
+        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="[^\\s]+(\\s[^\\s]+)*",
+            pattern="^(application|audio|image|message|model|multipart|text|video)/[a-zA-Z0-9!#$&^_+.-]+(;[a-zA-Z0-9!#$&^_+.-]+=[a-zA-Z0-9!#$&^_+.-]+)*$",
         ),
-    ] = None
+    ]
     language: Annotated[
         Optional[str],
         Field(
@@ -154,9 +154,9 @@ class Attachment(BaseModel):
         ),
     ] = None
     url: Annotated[
-        Optional[str],
+        str,
         Field(description="A location where the data can be accessed.", pattern="\\S*"),
-    ] = None
+    ]
     size: Annotated[
         Optional[int],
         Field(
@@ -817,11 +817,11 @@ class DocumentReferenceContent(BaseModel):
         ),
     ]
     format: Annotated[
-        Optional[Coding],
+        Coding,
         Field(
             description="An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType."
         ),
-    ] = None
+    ]
     extension: Optional[List[Extension]] = None
 
 

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  swagger.yaml
-#   timestamp: 2024-11-20T10:10:54+00:00
+#   timestamp: 2024-11-26T15:05:34+00:00
 
 from __future__ import annotations
 
@@ -126,11 +126,11 @@ class Attachment(BaseModel):
         ),
     ] = None
     contentType: Annotated[
-        Optional[StrictStr],
+        StrictStr,
         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."
         ),
-    ] = None
+    ]
     language: Annotated[
         Optional[StrictStr],
         Field(
@@ -144,9 +144,8 @@ class Attachment(BaseModel):
         ),
     ] = None
     url: Annotated[
-        Optional[StrictStr],
-        Field(description="A location where the data can be accessed."),
-    ] = None
+        StrictStr, Field(description="A location where the data can be accessed.")
+    ]
     size: Annotated[
         Optional[StrictInt],
         Field(
@@ -721,11 +720,11 @@ class DocumentReferenceContent(BaseModel):
         ),
     ]
     format: Annotated[
-        Optional[Coding],
+        Coding,
         Field(
             description="An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType."
         ),
-    ] = None
+    ]
     extension: Optional[List[Extension]] = None