Fix bug with recursive references

beda-software · Nov 28, 2024 · 3ff835f · 3ff835f
1 parent 0eb2ba4
commit 3ff835f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.0.a1
+
+- Fix issues with resolving recursive references
+
 ## 1.0.0a0
 
 - Breaking changes in the API:

diff --git a/fhir_tbs/__init__.py b/fhir_tbs/__init__.py
@@ -2,7 +2,7 @@
 from .types import FilterBy, SubscriptionDefinitionWithHandler
 
 __title__ = "fhir-tbs-py"
-__version__ = "1.0.0a0"
+__version__ = "1.0.0a1"
 __author__ = "beda.software"
 __license__ = "MIT"
 __copyright__ = "Copyright 2024 beda.software"

diff --git a/fhir_tbs/r4b.py b/fhir_tbs/r4b.py
@@ -188,7 +188,8 @@ def _extract_relative_references_recursive(instance: BaseModel) -> BaseModel:
         field_value = getattr(instance, field_name)
         if isinstance(field_value, list):
             for sub_field in field_value:
-                _extract_relative_references_recursive(sub_field)
+                if isinstance(field_value, BaseModel):
+                    _extract_relative_references_recursive(sub_field)
         if isinstance(field_value, BaseModel):
             _extract_relative_references_recursive(field_value)
 

diff --git a/fhir_tbs/r5.py b/fhir_tbs/r5.py
@@ -144,7 +144,8 @@ def _extract_relative_references_recursive(instance: BaseModel) -> BaseModel:
         field_value = getattr(instance, field_name)
         if isinstance(field_value, list):
             for sub_field in field_value:
-                _extract_relative_references_recursive(sub_field)
+                if isinstance(field_value, BaseModel):
+                    _extract_relative_references_recursive(sub_field)
         if isinstance(field_value, BaseModel):
             _extract_relative_references_recursive(field_value)