Fix actor relation type search, refs #13326 #1106
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
qubot
force-pushed
the
dev/issue-13326-actor-rel-type-search-fix
branch
from
88a7c56
to
b057ebd
Compare
sbreker
reviewed
Jun 1, 2020
|
|
||
| // Cache result | ||
| self::$converseTermIds[$typeId] = $converseTermId; | ||
| }; |
|
Thanks @sbreker ... I've updated the PR. |
jraddaoui
requested changes
Jun 2, 2020
| @@ -54,6 +54,7 @@ static function getEsDocsRelatedToTerm($relatedModelClass, $term, $options = []) | |||
|
|
|||
| // Allow for options to override default behavior | |||
| $search = !empty($options['search']) ? $options['search'] : new arElasticSearchPluginQuery(); | |||
| $search->query->setSize(10000); | |||
There was a problem hiding this comment.
Is this really needed only to get the count?
| @@ -352,6 +354,59 @@ public function serializeAltNames() | |||
| return $serialized; | |||
| } | |||
|
|
|||
| public static function serializeObjectDirectRelationTypes($actorId, $relationData) | |||
There was a problem hiding this comment.
Good point. Made it "protected".
Comment on lines
387
to
393
| $relationTerm = QubitTerm::getById($typeId); | ||
| $converseTerm = $relationTerm->getConverseActorRelationTerm(); | ||
|
|
||
| if ($converseTerm !== null) | ||
| { | ||
| $converseTermId = $converseTerm->id; | ||
| } |
There was a problem hiding this comment.
It's great that you cached them but I think we should use raw SQL in here, even if they are a few it should be a pretty easy query.
|
Thanks @mcantelon! Just a couple of questions and a suggestion, but feel free to disregard. PS. Somehow this wasn't included in the initial review. |
|
Thanks @Radda ! I've updated the PR. |
qubot
force-pushed
the
dev/issue-13326-actor-rel-type-search-fix
branch
from
dba4717
to
8516645
Compare
Changed how authority record search by relation type works so only the relation type directly related to an authority record is returned.
qubot
force-pushed
the
dev/issue-13326-actor-rel-type-search-fix
branch
from
8516645
to
9128ff8
Compare
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.
Changed how authority record search by relation type works so only the
relation type directly related to an authority record is returned.