Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change search to match every sub part #1054

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change search to match every sub part #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions django/thunderstore/api/cyberstorm/views/package_listing_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,10 +457,12 @@ def filter_by_query(
parts = [x for x in query.split(" ") if x]

for part in parts:
part_query = Q()
for field in search_fields:
icontains_query &= ~Q(**{f"{field}__icontains": part})
part_query |= Q(**{f"{field}__icontains": part})
icontains_query &= part_query

return queryset.exclude(icontains_query).distinct()
return queryset.filter(icontains_query).distinct()


def filter_by_review_status(
Expand Down
6 changes: 4 additions & 2 deletions django/thunderstore/frontend/api/experimental/views/community_package_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@ def filter_by_query(
parts = [x for x in query.split(" ") if x]

for part in parts:
part_query = Q()
for field in search_fields:
icontains_query &= ~Q(**{f"{field}__icontains": part})
part_query |= Q(**{f"{field}__icontains": part})
icontains_query &= part_query

return queryset.exclude(icontains_query).distinct()
return queryset.filter(icontains_query).distinct()

def order_queryset(
self, ordering: str, queryset: QuerySet[Package]
Expand Down
7 changes: 5 additions & 2 deletions django/thunderstore/repository/views/package/list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,14 @@ def perform_search(self, queryset, search_query):

icontains_query = Q()
parts = [x for x in search_query.split(" ") if x]

for part in parts:
part_query = Q()
for field in search_fields:
icontains_query &= ~Q(**{f"{field}__icontains": part})
part_query |= Q(**{f"{field}__icontains": part})
icontains_query &= part_query

return queryset.exclude(icontains_query).distinct()
return queryset.filter(icontains_query).distinct()

def filter_approval_status(
self, queryset: QuerySet[PackageListing]
Expand Down