Allow multiple values in the resource-type-id parameter #1221
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jrhoads
approved these changes
Jul 26, 2024
app/models/doi.rb
Outdated
| @@ -962,7 +962,7 @@ def self.query(query, options = {}) | |||
| minimum_should_match = 0 | |||
|
|
|||
| filter << { terms: { doi: options[:ids].map(&:upcase) } } if options[:ids].present? | |||
| filter << { term: { resource_type_id: options[:resource_type_id].underscore.dasherize } } if options[:resource_type_id].present? | |||
| filter << { terms: { resource_type_id: options[:resource_type_id].split(",").map(&:underscore).map(&:dasherize) } } if options[:resource_type_id].present? | |||
There was a problem hiding this comment.
Code changes look perfect, can we format it like this,
if options[:resource_type_id].present?
resource_type_ids = options[:resource_type_id]
.split(",")
.map { |id| id.strip.underscore.dasherize }
filter << { terms: { resource_type_id: resource_type_ids } }
end
There was a problem hiding this comment.
I've done this, thanks for the suggestion :)
ashwinisukale
approved these changes
Jul 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
We allow querying against multiple values for
resourceType, but notresourceTypeGeneral. SinceresourceTypeGeneralis a controlled list, it seems useful to allow multiple queries in a single API call, as this uses the much more efficientfilterapproach in ES (vs doing?query=types.resourceTypeGeneral:x OR types.resourceTypeGeneral:y)This PR adds support for multiple values in the
resource_type_idparameter, which ultimately uses the value fromresourceTypeGeneralvia https://github.com/datacite/lupo/blob/master/app/models/doi.rb#L1232-L1237 and https://github.com/datacite/lupo/blob/master/app/models/doi.rb#L2489-L2495closes: Add github issue that originated this PR
Approach
Open Questions and Pre-Merge TODOs
Learning
Types of changes
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Reviewer, please remember our guidelines: