Fix relative reference resolution within bundles (#53)

Author: abjonnes

fhir-parser-resources/fhirabstractresource.py

@@ -58,13 +58,20 @@ def relativePath(self):
     # MARK: - Server Connection
 
     @property
-    def server(self):
+    def origin_server(self):
         """ Walks the owner hierarchy until it finds an owner with a server.
         """
-        if self._server is None:
-            owningRes = self.owningResource()
-            self._server = owningRes.server if owningRes is not None else None
-        return self._server
+        server = self._server
+        owner = self._owner
+        while server is None and owner is not None:
+            server = getattr(owner, '_server', None)
+            owner = owner._owner
+        return server
+
+    @origin_server.setter
+    def origin_server(self, server):
+        """ Sets the server on an element. """
+        self._server = server
 
     @classmethod
     def read(cls, rem_id, server):
@@ -101,7 +108,7 @@ def read_from(cls, path, server):
 
         ret = server.request_json(path)
         instance = cls(jsondict=ret)
-        instance._server = server
+        instance.origin_server = server
         return instance
 
     def create(self, server):
@@ -111,7 +118,7 @@ def create(self, server):
         :param FHIRServer server: The server to create the receiver on
         :returns: None or the response JSON on success
         """
-        srv = server or self.server
+        srv = server or self.origin_server
         if srv is None:
             raise Exception("Cannot create a resource without a server")
         if self.id:
@@ -130,7 +137,7 @@ def update(self, server=None):
             optional, will use the instance's `server` if needed.
         :returns: None or the response JSON on success
         """
-        srv = server or self.server
+        srv = server or self.origin_server
         if srv is None:
             raise Exception("Cannot update a resource that does not have a server")
         if not self.id:
@@ -148,7 +155,7 @@ def delete(self, server=None):
             optional, will use the instance's `server` if needed.
         :returns: None or the response JSON on success
         """
-        srv = server or self.server
+        srv = server or self.origin_server
         if srv is None:
             raise Exception("Cannot delete a resource that does not have a server")
         if not self.id:

fhir-parser-resources/fhirreference.py

@@ -57,7 +57,7 @@ def resolved(self, klass):
             if bundle.entry is not None:
                 fullUrl = self.reference
                 if ref_is_relative:
-                    base = bundle.server.base_uri if bundle.server else ''
+                    base = bundle.origin_server.base_uri if bundle.origin_server else ''
                     fullUrl = base + self.reference
 
                 for entry in bundle.entry:
@@ -72,7 +72,7 @@ def resolved(self, klass):
         # relative references, use the same server
         server = None
         if ref_is_relative:
-            server = owning_resource.server if owning_resource else None
+            server = owning_resource.origin_server if owning_resource else None
 
         # TODO: instantiate server for absolute resource
         if server is None:

fhir-parser-resources/fhirsearch.py

@@ -63,7 +63,7 @@ def perform(self, server):
         from . import bundle
         res = server.request_json(self.construct())
         bundle = bundle.Bundle(res)
-        bundle._server = server
+        bundle.origin_server = server
         return bundle
 
     def perform_resources(self, server):

fhirclient/models/fhirabstractresource.py

@@ -58,13 +58,20 @@ def relativePath(self):
     # MARK: - Server Connection
 
     @property
-    def server(self):
+    def origin_server(self):
         """ Walks the owner hierarchy until it finds an owner with a server.
         """
-        if self._server is None:
-            owningRes = self.owningResource()
-            self._server = owningRes.server if owningRes is not None else None
-        return self._server
+        server = self._server
+        owner = self._owner
+        while server is None and owner is not None:
+            server = getattr(owner, '_server', None)
+            owner = owner._owner
+        return server
+
+    @origin_server.setter
+    def origin_server(self, server):
+        """ Sets the server on an element. """
+        self._server = server
 
     @classmethod
     def read(cls, rem_id, server):
@@ -101,7 +108,7 @@ def read_from(cls, path, server):
 
         ret = server.request_json(path)
         instance = cls(jsondict=ret)
-        instance._server = server
+        instance.origin_server = server
         return instance
 
     def create(self, server):
@@ -111,7 +118,7 @@ def create(self, server):
         :param FHIRServer server: The server to create the receiver on
         :returns: None or the response JSON on success
         """
-        srv = server or self.server
+        srv = server or self.origin_server
         if srv is None:
             raise Exception("Cannot create a resource without a server")
         if self.id:
@@ -130,7 +137,7 @@ def update(self, server=None):
             optional, will use the instance's `server` if needed.
         :returns: None or the response JSON on success
         """
-        srv = server or self.server
+        srv = server or self.origin_server
         if srv is None:
             raise Exception("Cannot update a resource that does not have a server")
         if not self.id:
@@ -148,7 +155,7 @@ def delete(self, server=None):
             optional, will use the instance's `server` if needed.
         :returns: None or the response JSON on success
         """
-        srv = server or self.server
+        srv = server or self.origin_server
         if srv is None:
             raise Exception("Cannot delete a resource that does not have a server")
         if not self.id:

fhirclient/models/fhirreference.py

@@ -57,7 +57,7 @@ def resolved(self, klass):
             if bundle.entry is not None:
                 fullUrl = self.reference
                 if ref_is_relative:
-                    base = bundle.server.base_uri if bundle.server else ''
+                    base = bundle.origin_server.base_uri if bundle.origin_server else ''
                     fullUrl = base + self.reference
 
                 for entry in bundle.entry:
@@ -72,7 +72,7 @@ def resolved(self, klass):
         # relative references, use the same server
         server = None
         if ref_is_relative:
-            server = owning_resource.server if owning_resource else None
+            server = owning_resource.origin_server if owning_resource else None
 
         # TODO: instantiate server for absolute resource
         if server is None:

fhirclient/models/fhirsearch.py

@@ -63,7 +63,7 @@ def perform(self, server):
         from . import bundle
         res = server.request_json(self.construct())
         bundle = bundle.Bundle(res)
-        bundle._server = server
+        bundle.origin_server = server
         return bundle
 
     def perform_resources(self, server):