From 62b6bfe1ee2e3dec27664e42ba2045278dcb0847 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 26 Jun 2021 18:55:09 -0700 Subject: [PATCH] Annotation and filtering order --- bookwyrm/connectors/self_connector.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py index b5492b73..8d5a7614 100644 --- a/bookwyrm/connectors/self_connector.py +++ b/bookwyrm/connectors/self_connector.py @@ -143,8 +143,9 @@ def search_title_author(query, min_confidence, *filters): """searches for title and author""" query = SearchQuery(query, config="simple") | SearchQuery(query, config="english") results = ( - models.Edition.objects.annotate(rank=SearchRank(F("search_vector"), query)) - .filter(*filters, search_vector=query, rank__gt=min_confidence) + models.Edition.objects.filter(*filters, search_vector=query) + .annotate(rank=SearchRank(F("search_vector"), query)) + .filter(rank__gt=min_confidence) .order_by("-rank") )