Load models first and organize inheritance

fhir-crucible · Oct 16, 2024 · 46c1055 · 46c1055
1 parent 6c584e4
commit 46c1055
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/lib/fhir_client.rb b/lib/fhir_client.rb
@@ -12,6 +12,7 @@
 Dir.glob(File.join(root, 'fhir_client', 'sections', '**', '*.rb')).each do |file|
   require file
 end
+require_relative 'fhir_client/ext/model' #require first so reference and bundle can inherit
 Dir.glob(File.join(root, 'fhir_client', 'ext', '**', '*.rb')).each do |file|
   require file
 end

diff --git a/lib/fhir_client/ext/bundle.rb b/lib/fhir_client/ext/bundle.rb
@@ -71,15 +71,15 @@ class Bundle
 
 module FHIR
   module R4B
-    class Bundle
+    class Bundle < FHIR::R4B::Model
       include FHIR::BundleExtras
     end
   end
 end
 
 module FHIR
   module R5
-    class Bundle
+    class Bundle < FHIR::R5::Model
       include FHIR::BundleExtras
     end
   end

diff --git a/lib/fhir_client/ext/model.rb b/lib/fhir_client/ext/model.rb
@@ -144,3 +144,19 @@ class Model
     end
   end
 end
+
+module FHIR
+  module R4B
+    class Model < FHIR::Model
+      include FHIR::ModelExtras
+    end
+  end
+end
+
+module FHIR
+  module R5
+    class Model < FHIR::Model
+      include FHIR::ModelExtras
+    end
+  end
+end
diff --git a/lib/fhir_client/ext/reference.rb b/lib/fhir_client/ext/reference.rb
@@ -101,7 +101,7 @@ def resource_class
 
 module FHIR
   module STU3
-    class Reference
+    class Reference 
       include FHIR::ReferenceExtras
 
       def resource_class
@@ -113,7 +113,7 @@ def resource_class
 
 module FHIR
   module R4B
-    class Reference
+    class Reference < FHIR::R4B::Model
       include FHIR::ReferenceExtras
 
       def resource_class
@@ -125,7 +125,7 @@ def resource_class
 
 module FHIR
   module R5
-    class Reference
+    class Reference < FHIR::R5::Model
       include FHIR::ReferenceExtras
 
       def resource_class