simplified code

This commit is contained in:
smilerz
2021-04-21 15:19:37 -05:00
parent d625e07bd7
commit 6a5dea080e

View File

@@ -1,14 +1,11 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from functools import reduce from functools import reduce
from cookbook.models import Recipe
from recipes import settings from recipes import settings
from django.contrib.postgres.aggregates import StringAgg from django.contrib.postgres.aggregates import StringAgg
from django.contrib.postgres.search import ( from django.contrib.postgres.search import (
SearchQuery, SearchRank, SearchVector, TrigramSimilarity, SearchQuery, SearchRank, SearchVector, TrigramSimilarity,
) )
from django.db import models
from django.db.models import Q
from django.utils import translation from django.utils import translation
@@ -59,7 +56,7 @@ def search_recipes(queryset, params):
queryset.annotate( queryset.annotate(
search=search_vectors, search=search_vectors,
rank=search_rank,) rank=search_rank,)
.filter(Q(search=search_query)) .filter(search=search_query)
.order_by('-rank')) .order_by('-rank'))
else: else:
queryset = queryset.filter(name__icontains=search_string) queryset = queryset.filter(name__icontains=search_string)