PER-26: Rework querying. #31
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
Should reduce the number of joins when dealing with various multiple file and media fields in the same query, as it instead builds out a disjuction in the "join" condition against the LUT.
Track things as metadata on the query?
See: #6 (review) Some mixed up assertions, assuming that the ::setUp() method changed at some point mid-implementation, and wasn't carried through? And that it that the existing implementation was indeed bearing a bug.
... DRY-ing up in progress, with the trait.
adam-vessey
commented
Mar 7, 2024
Comment on lines
+13
to
+19
| with: | ||
| composer_patches: |- | ||
| { | ||
| "discoverygarden/islandora_hierarchical_access": { | ||
| "dependent work from dependency": "https://github.com/discoverygarden/islandora_hierarchical_access/pull/19.patch" | ||
| } | ||
| } |
There was a problem hiding this comment.
This can be dropped when discoverygarden/islandora_hierarchical_access#19 is merged (and released).
... could possibly bump our composer.json according to the new release of islandora_hierarchical_access?
Suggested change
| with: | |
| composer_patches: |- | |
| { | |
| "discoverygarden/islandora_hierarchical_access": { | |
| "dependent work from dependency": "https://github.com/discoverygarden/islandora_hierarchical_access/pull/19.patch" | |
| } | |
| } |
adam-vessey
commented
Mar 7, 2024
There was a problem hiding this comment.
The changes in discoverygarden/islandora_hierarchical_access#19 revealed some bad assertions in here, where we were expecting more files then should be available: #6 (review)
Better than being left thinking there's a bug where we have undocumentedly expected there to be a file to exist that we didn't explicitly create in our `::setUp()`.
Bit of formatting, and using constants.
Other embargoes block access (but exemptions from _any_ are let through).
adam-vessey
commented
Mar 11, 2024
Comment on lines
-58
to
-76
| /** | ||
| * Implements hook_query_TAG_alter() for `media_access` tagged queries. | ||
| */ | ||
| function embargo_query_media_access_alter(AlterableInterface $query) { | ||
| /** @var \Drupal\embargo\Access\QueryTagger $tagger */ | ||
| $tagger = \Drupal::service('embargo.query_tagger'); | ||
| $tagger->tagAccess($query, 'media'); | ||
| } | ||
|
|
||
| /** | ||
| * Implements hook_query_TAG_alter() for `file_access` tagged queries. | ||
| */ | ||
| function embargo_query_file_access_alter(AlterableInterface $query) { | ||
| /** @var \Drupal\embargo\Access\QueryTagger $tagger */ | ||
| $tagger = \Drupal::service('embargo.query_tagger'); | ||
| $tagger->tagAccess($query, 'file'); |
There was a problem hiding this comment.
media and file are now handled via the event.
PER-26: Merging in latest from main to resolve merge conflicts
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.
Dependent on discoverygarden/islandora_hierarchical_access#19