mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed search facets and sub recipe

Browse Source
This commit is contained in:
vabene1111
2021-09-04 19:26:42 +02:00
parent 738387ccf0
commit 16d125a243
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cookbook/helper/recipe_search.py
View File

@@ -51,7 +51,7 @@ def search_recipes(request, queryset, params):
if search_new == 'true':
queryset = (
queryset.annotate(new_recipe=Case(
When(created_at__gte=(datetime.now() - timedelta(days=7)), then=('pk')), default=Value(0),))
When(created_at__gte=(datetime.now() - timedelta(days=7)), then=('pk')), default=Value(0), ))
)
orderby += ['-new_recipe']
@@ -123,9 +123,9 @@ def search_recipes(request, queryset, params):
# TODO add order by user settings - only do search rank and annotation if rank order is configured
search_rank = (
SearchRank('name_search_vector', search_query, cover_density=True)
+ SearchRank('desc_search_vector', search_query, cover_density=True)
+ SearchRank('steps__search_vector', search_query, cover_density=True)
SearchRank('name_search_vector', search_query, cover_density=True)
+ SearchRank('desc_search_vector', search_query, cover_density=True)
+ SearchRank('steps__search_vector', search_query, cover_density=True)
)
queryset = queryset.filter(query_filter).annotate(rank=search_rank)
orderby += ['-rank']
@@ -174,7 +174,6 @@ def search_recipes(request, queryset, params):
return queryset
def get_facet(qs, request):
# NOTE facet counts for tree models include self AND descendants
facets = {}
@@ -210,9 +209,9 @@ def get_facet(qs, request):
# TODO add book facet
facets['Books'] = []
facets['Recent'] = ViewLog.objects.filter(
created_by=request.user, space=request.space,
created_at__gte=datetime.now() - timedelta(days=14) # TODO make days of recent recipe a setting
).values_list('recipe__pk', flat=True)
created_by=request.user, space=request.space,
created_at__gte=datetime.now() - timedelta(days=14) # TODO make days of recent recipe a setting
).values_list('recipe__pk', flat=True)
return facets