FI-2906 R4B and R5 support #169
Conversation
| @@ -1,4 +1,6 @@ | |||
| require 'fhir_models' | |||
| require 'fhir_models/r4b' | |||
There was a problem hiding this comment.
I think we should only require these when we're going to actually use them, otherwise this undoes the work we did to allow versions to be loaded separately.
There was a problem hiding this comment.
I'm sorry, Diego, I thought I removed this comment before I finished my review because I decided it was out of scope. Could you undo this part of the changes?
|
Tried my best to remove the multiversion wherever possible. It is still required in some of the unit test files, specifically |
lib/fhir_client.rb
Outdated
| @@ -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 | |||
There was a problem hiding this comment.
If we remove multiversion loading from the start, there is an issue with superclass matching for the versioned classes of bundle and reference defined in ext. This fixed it, I think it's because of the versioned model definitions occurring late in model.rb for fhir_client, and the versioned classes not being loaded from fhir_models.
If we load multiversion from the start, this is not an issue as we load the model.rb files in models that contain the versioned classes. I've removed the line with the other reverted changes.
| @@ -1,4 +1,6 @@ | |||
| require 'fhir_models' | |||
| require 'fhir_models/r4b' | |||
There was a problem hiding this comment.
I'm sorry, Diego, I thought I removed this comment before I finished my review because I decided it was out of scope. Could you undo this part of the changes?
lib/fhir_client/ext/reference.rb
Outdated
| include FHIR::ReferenceExtras | ||
|
|
||
| def resource_class | ||
| "FHIR::R4B::#{resource_type}".constantize unless contained? |
There was a problem hiding this comment.
FHIR::R4B.const_get(resource_type).
| @@ -7,6 +7,10 @@ def versioned_resource_class(klass = nil) | |||
| FHIR::STU3 | |||
| when :dstu2 | |||
| FHIR::DSTU2 | |||
| when :r4b | |||
| defined?(FHIR::R4B) ? FHIR::R4B : FHIR | |||
There was a problem hiding this comment.
These changes should be reverted, right?
Adds R4B and R5 to fhir_client. Also added some unit tests for both versions, autodetection based on
fhir_version, etc.This is dependent on another PR from fhir_models, here.
It is also dependent on the new features introduced in fhir_models, so may need to wait until the next fhir_models gem update.