[NRL-829] Fixup unit tests for Pydantic v2 changes. Add Extension types to model.

Author: mattdean3-nhs

api/consumer/countDocumentReference/tests/test_count_document_reference.py

@@ -81,7 +81,7 @@ def test_count_document_reference_missing_nhs_number():
                         }
                     ]
                 },
-                "diagnostics": "Invalid query parameter (subject:identifier: field required)",
+                "diagnostics": "Invalid query parameter (subject:identifier: Field required)",
                 "expression": ["subject:identifier"],
             }
         ],

api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py

@@ -105,7 +105,7 @@ def test_read_document_reference_missing_id():
                         }
                     ]
                 },
-                "diagnostics": "Invalid path parameter (id: field required)",
+                "diagnostics": "Invalid path parameter (id: Field required)",
                 "expression": ["id"],
             }
         ],

api/consumer/searchDocumentReference/search_document_reference.py

@@ -59,16 +59,16 @@ def handler(
         )
 
     custodian_id = (
-        params.custodian_identifier.__root__.split("|", maxsplit=1)[1]
+        params.custodian_identifier.root.split("|", maxsplit=1)[1]
         if params.custodian_identifier
         else None
     )
     if custodian_id:
         self_link += f"&custodian:identifier=https://fhir.nhs.uk/Id/ods-organization-code|{custodian_id}"
 
-    pointer_types = [params.type.__root__] if params.type else metadata.pointer_types
+    pointer_types = [params.type.root] if params.type else metadata.pointer_types
     if params.type:
-        self_link += f"&type={params.type.__root__}"
+        self_link += f"&type={params.type.root}"
 
     bundle = {
         "resourceType": "Bundle",

api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py

@@ -248,7 +248,7 @@ def test_search_document_reference_missing_nhs_number(
                         }
                     ]
                 },
-                "diagnostics": "Invalid query parameter (subject:identifier: field required)",
+                "diagnostics": "Invalid query parameter (subject:identifier: Field required)",
                 "expression": ["subject:identifier"],
             }
         ],

api/consumer/searchPostDocumentReference/search_post_document_reference.py

@@ -62,16 +62,16 @@ def handler(
         )
 
     custodian_id = (
-        body.custodian_identifier.__root__.split("|", maxsplit=1)[1]
+        body.custodian_identifier.root.split("|", maxsplit=1)[1]
         if body.custodian_identifier
         else None
     )
     if custodian_id:
         self_link += f"&custodian:identifier=https://fhir.nhs.uk/Id/ods-organization-code|{custodian_id}"
 
-    pointer_types = [body.type.__root__] if body.type else metadata.pointer_types
+    pointer_types = [body.type.root] if body.type else metadata.pointer_types
     if body.type:
-        self_link += f"&type={body.type.__root__}"
+        self_link += f"&type={body.type.root}"
 
     bundle = {
         "resourceType": "Bundle",

api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py

@@ -212,7 +212,7 @@ def test_search_post_document_reference_missing_nhs_number(
                         }
                     ]
                 },
-                "diagnostics": "Request body could not be parsed (subject:identifier: field required)",
+                "diagnostics": "Request body could not be parsed (subject:identifier: Field required)",
                 "expression": ["subject:identifier"],
             }
         ],

api/consumer/swagger.yaml

@@ -1069,6 +1069,11 @@ components:
         format:
           $ref: "#/components/schemas/Coding"
           description: An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.
+        extension:
+          type: array
+          items:
+            $ref: "#/components/schemas/Extension"
+            description: Additional content defined by implementations.
       required:
         - attachment
     DocumentReferenceRelatesTo:
@@ -1143,6 +1148,11 @@ components:
           type: string
           pattern: "[ \\r\\n\\t\\S]+"
           description: A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user.
+        extension:
+          type: array
+          items:
+            $ref: "#/components/schemas/Extension"
+            description: Additional content defined by implementations.
     Coding:
       type: object
       properties:
@@ -1169,6 +1179,16 @@ components:
         userSelected:
           type: boolean
           description: Indicates that this coding was chosen by a user directly – e.g. off a pick list of available items (codes or displays).
+    Extension:
+      type: object
+      properties:
+        valueCodeableConcept:
+          $ref: "#/components/schemas/CodeableConcept"
+          description: A name which details the functional use for this link – see [http://www.iana.org/assignments/link–relations/link–relations.xhtml#link–relations–1](http://www.iana.org/assignments/link–relations/link–relations.xhtml#link–relations–1).
+        url:
+          type: string
+          pattern: \S*
+          description: The reference details for the link.
     Identifier:
       type: object
       properties:

api/producer/createDocumentReference/tests/test_create_document_reference.py

@@ -220,7 +220,7 @@ def test_create_document_reference_invalid_body():
                         }
                     ],
                 },
-                "diagnostics": "Request body could not be parsed (resourceType: field required)",
+                "diagnostics": "Request body could not be parsed (resourceType: Field required)",
                 "expression": ["resourceType"],
             },
             {
@@ -235,7 +235,7 @@ def test_create_document_reference_invalid_body():
                         }
                     ],
                 },
-                "diagnostics": "Request body could not be parsed (status: field required)",
+                "diagnostics": "Request body could not be parsed (status: Field required)",
                 "expression": ["status"],
             },
             {
@@ -250,7 +250,7 @@ def test_create_document_reference_invalid_body():
                         }
                     ],
                 },
-                "diagnostics": "Request body could not be parsed (content: field required)",
+                "diagnostics": "Request body could not be parsed (content: Field required)",
                 "expression": ["content"],
             },
         ],

api/producer/deleteDocumentReference/tests/test_delete_document_reference.py

@@ -86,7 +86,7 @@ def test_delete_document_reference_invalid_id_in_path():
                         }
                     ]
                 },
-                "diagnostics": "Invalid path parameter (id: field required)",
+                "diagnostics": "Invalid path parameter (id: Field required)",
                 "expression": ["id"],
             }
         ],

api/producer/readDocumentReference/tests/test_read_document_reference_producer.py

@@ -105,7 +105,7 @@ def test_read_document_reference_missing_id():
                         }
                     ]
                 },
-                "diagnostics": "Invalid path parameter (id: field required)",
+                "diagnostics": "Invalid path parameter (id: Field required)",
                 "expression": ["id"],
             }
         ],