[NRL-829] Finish fixup of unit tests

Author: mattdean3-nhs

layer/nrlf/core/codes.py

@@ -1,34 +1,31 @@
-from typing import Dict
+from typing import ClassVar
 
 from nrlf.consumer.fhir.r4 import model as consumer_model
 from nrlf.producer.fhir.r4 import model as producer_model
 
 
-class _CodeableConcept(producer_model.CodeableConcept, consumer_model.CodeableConcept):
+class _CodeableConcept(producer_model.CodeableConcept, consumer_model.CodeableConcept):  # type: ignore
     """
     Represents a codeable concept with a mapping of codes to text values.
     """
 
-    _TEXT_MAP: Dict[str, str] = {}
-    _SYSTEM: str = ""
+    _TEXT_MAP: ClassVar[dict[str, str]] = {}
+    _SYSTEM: ClassVar[str] = ""
 
     @classmethod
     def from_code(cls, code: str) -> "_CodeableConcept":
         """
         Creates a CodeableConcept instance from a given code.
         """
-        text_map = cls._TEXT_MAP.get_default()
-        system = cls._SYSTEM.get_default()
-
-        if code not in text_map:
+        if code not in cls._TEXT_MAP:
             raise ValueError(f"Unknown code: {code}")
 
         return cls(
             coding=[
                 producer_model.Coding(
-                    system=system,
+                    system=cls._SYSTEM,
                     code=code,
-                    display=text_map[code],
+                    display=cls._TEXT_MAP[code],
                 )
             ]
         )

layer/nrlf/core/dynamodb/model.py

@@ -74,16 +74,22 @@ class DocumentPointer(DynamoDBModel):
     document_id: str = Field(exclude=True)
     schemas: list = Field(default_factory=list)
 
-    def dict(self, **kwargs) -> dict:
+    def model_dump(self, **kwargs) -> dict:
         """
-        Override dict() to include partition and sort keys
+        Override model_dump() to include partition and sort keys
         """
-        default_dict = super().dict(**kwargs)
+        default_dict = super().model_dump(**kwargs)
         return {
             **default_dict,
             **self.indexes,
         }
 
+    def dict(self, **kwargs: dict[str, Any]) -> dict[str, Any]:
+        """
+        Define dict() to do same as model_dump
+        """
+        return self.model_dump(**kwargs)
+
     @classmethod
     def from_document_reference(
         cls, resource: DocumentReference, created_on: Optional[str] = None

layer/nrlf/core/tests/test_codes.py

@@ -2,6 +2,8 @@
 
 from nrlf.core.codes import NRLResponseConcept, SpineErrorConcept, _CodeableConcept
 
+# TODO-NOW Fix up these codes impls to work better in test cases
+
 
 def test_from_code_known_code():
     # Arrange

layer/nrlf/core/tests/test_decorators.py

@@ -578,7 +578,7 @@ def decorated_function(event, context, config, metadata, body) -> Response:
                         }
                     ]
                 },
-                "diagnostics": "Request body could not be parsed (param1: str type expected)",
+                "diagnostics": "Request body could not be parsed (param1: Input should be a valid string)",
                 "expression": ["param1"],
             },
             {
@@ -593,7 +593,7 @@ def decorated_function(event, context, config, metadata, body) -> Response:
                         }
                     ],
                 },
-                "diagnostics": "Request body could not be parsed (param2: value is not a valid integer)",
+                "diagnostics": "Request body could not be parsed (param2: Input should be a valid integer, unable to parse string as an integer)",
                 "expression": ["param2"],
             },
         ],

layer/nrlf/core/tests/test_validators.py

@@ -174,7 +174,7 @@ def test_document_reference_validator_parse_invalid():
                 }
             ]
         },
-        "diagnostics": "Failed to parse DocumentReference resource (id: str type expected)",
+        "diagnostics": "Failed to parse DocumentReference resource (id: Input should be a valid string)",
         "expression": ["id"],
     }
     assert exc.issues[1].model_dump(exclude_none=True) == {
@@ -189,7 +189,7 @@ def test_document_reference_validator_parse_invalid():
                 }
             ]
         },
-        "diagnostics": "Failed to parse DocumentReference resource (type: value is not a valid dict)",
+        "diagnostics": "Failed to parse DocumentReference resource (type: Input should be a valid dictionary or instance of CodeableConcept)",
         "expression": ["type"],
     }