replace ActiveFedora where with Valkyrized where #4910
Merged
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
no-reply
previously approved these changes
May 4, 2021
| end | ||
|
|
||
| def collection_type_gids_that_disallow_multiple_membership | ||
| Hyrax::CollectionType.gids_that_do_not_allow_multiple_membership | ||
| Hyrax::CollectionType.gids_that_do_not_allow_multiple_membership.map(&:to_s) |
There was a problem hiding this comment.
Tests initially failed when refactoring for the new approach which required this change. But the final refactor really doesn't need this. So I set it back to what it was.
| results = solr_service.query(query) | ||
| ids = results.map(&:id) | ||
| return query_service.find_many_by_ids(ids: ids) if use_valkyrie | ||
| ids.map { |id| query_service.find_by_alternate_identifier(alternate_identifier: id.to_str, use_valkyrie: false) } |
There was a problem hiding this comment.
what's the advantage of using the valkyrie query service?
would there be fewer risks if we stuck with the the existing ActiveFedora::Base#where implementation in the case where what we want is to query AF objects?
There was a problem hiding this comment.
I updated to use AF where unless use_valkyrie is true.
elrayle
force-pushed
the
fix/3820_AF_where
branch
2 times, most recently
from
7af0aa6
to
c7af5b2
Compare
jeremyf
reviewed
May 5, 2021
Results were expected to be an array, but before this commit, an enumeration was returned when using Valkyrie. This ensures that an array is returned whether working wtih AF or Valkyrie. Also removes need to convert to string per requested change during review.
jeremyf
approved these changes
May 6, 2021
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.
Partially addresses Issue #3820
Establishes the pattern for how to replace calls to ActiveFedora::Base #where method.
Establishes a new service class that searches solr to get object IDs and then uses Hyrax.query_service get the objects. The method name that is the equivalent of the ActiveFedora where method is
.find_for_model_by_field_pairs.This allows for other types of queries for solr to be constructed as needed at a later time.
@samvera/hyrax-code-reviewers