Merge pull request #402 from onc-healthit/fi-1367-composite-or-fix

FI-1367 Ensure operation outcomes are allowed in composite or search result.
onc-healthit · Nov 18, 2021 · 458f3e8 · 458f3e8
2 parents 5c304fb + c7ebe69
commit 458f3e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/generator/uscore/uscore_generator.rb b/generator/uscore/uscore_generator.rb
@@ -938,12 +938,10 @@ def create_multiple_or_test(sequence)
 
               reply = get_resource_by_params(versioned_resource_class('#{sequence[:resource]}'), search_params)
               validate_search_reply(versioned_resource_class('#{sequence[:resource]}'), reply, search_params)
-              assert_response_ok(reply)
               resources_returned = fetch_all_bundled_resources(reply, check_for_data_absent_reasons)
-
-
+              applicable_resources_returned = resources_returned.reject { |entry| entry.class == FHIR::OperationOutcome }
               composite_or_parameters.each do |param|
-                missing_values[param.to_sym] = existing_values[param.to_sym] - resources_returned.map(&param.to_sym)
+                missing_values[param.to_sym] = existing_values[param.to_sym] - applicable_resources_returned.map(&param.to_sym)
               end
 
               missing_value_message = missing_values.reject { |_k, v| v.empty? }.map { |k, v| "\#{v.join(',')} values from \#{k}" }.join(' and ')

diff --git a/lib/modules/uscore_v3.1.1/us_core_careteam_sequence.rb b/lib/modules/uscore_v3.1.1/us_core_careteam_sequence.rb
diff --git a/lib/modules/uscore_v3.1.1/us_core_medicationrequest_sequence.rb b/lib/modules/uscore_v3.1.1/us_core_medicationrequest_sequence.rb