mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-08 15:48:27 -05:00
simplified code
This commit is contained in:
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user