Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

48 add missing comparators #76

Merged
merged 2 commits into from
May 6, 2024
Merged

48 add missing comparators #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d8686
Add special cases for the search name comparators
projkov May 6, 2024
2adca4c
Add comments reated to the comparator expectation
projkov May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions lib/au_core_test_kit/generator/search_definition_metadata_extractor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,20 @@ def comparator_expectation(extension)
end

def comparators
# NOTE: Hard-coded values are used because the comparator expectation
# does not exist in the machine-readable files, but it does exist in the narrative.
# NOTE: https://github.com/hl7au/au-fhir-core-inferno/issues/48
special_cases_resources = %w[Observation Condition Encounter Immunization MedicationRequest]
special_cases_comparators = %w[gt lt ge le]
special_cases_param_ids = %w[clinical-date Condition-onset-date clinical-date MedicationRequest-authoredon]

{}.tap do |comparators|
param.comparator&.each_with_index do |comparator, index|
comparators[comparator.to_sym] = comparator_expectation(comparator_expectation_extensions[index])
comparators[comparator.to_sym] = if (special_cases_resources.include? group_metadata[:resource]) && (special_cases_comparators.include? comparator) && (special_cases_param_ids.include? param_hash['id'])
'SHALL'
else
comparator_expectation(comparator_expectation_extensions[index])
end
end
end
end
Expand Down Expand Up @@ -181,7 +192,7 @@ def multiple_or_expectation
return 'SHOULD' if param_hash['id'] == 'clinical-code'
when 'Observation'
return 'SHALL' if param_hash['id'] == 'Observation-status'
return "SHOULD" if param_hash['id'] == 'clinical-code'
return 'SHOULD' if param_hash['id'] == 'clinical-code'
when 'MedicationRequest'
return 'SHALL' if param_hash['id'] == 'medications-status'
return 'SHOULD' if param_hash['id'] == 'MedicationRequest-intent'
Expand All @@ -191,13 +202,11 @@ def multiple_or_expectation

return unless param_hash['_multipleOr']

result = param_hash['_multipleOr']['extension'].first['valueCode']

result
param_hash['_multipleOr']['extension'].first['valueCode']
end

def multiple_and_expectation
# NOTE: Hard-coded values are used because the multipleAnd attributes
# NOTE: Hard-coded values are used because the multipleAnd attributes
# do not exist in the machine-readable files, but they do exist in the narrative.
# NOTE: https://github.com/hl7au/au-fhir-core-inferno/issues/62
case group_metadata[:resource]
Expand All @@ -218,7 +227,7 @@ def multiple_and_expectation
end

def values
fixed_date_value = ['1950-01-01', '2050-01-01']
fixed_date_value = %w[1950-01-01 2050-01-01]
# NOTE: In the current step we don't need to check the correct content of the response.
# We should care about the correct structure of the request. In this current case we use dates just
# to check that server can make a response for the request.
Expand All @@ -234,7 +243,7 @@ def values
when 'MedicationRequest'
return fixed_date_value if param_hash['id'] == 'MedicationRequest-authoredon'
end

values_from_fixed_codes = value_extractor.values_from_fixed_codes(profile_element, type).presence
values_from_pattern_coding = value_extractor.values_from_pattern_coding(profile_element, type).presence
merged_values = Array(values_from_fixed_codes) + Array(values_from_pattern_coding)
Expand Down
Loading