Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion backend/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
def main():
"""Run administrative tasks."""
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "siarnaq.settings")
os.environ.setdefault("DJANGO_CONFIGURATION", "Local")
os.environ.setdefault("DJANGO_CONFIGURATION", "Staging")
try:
from configurations.management import execute_from_command_line
except ImportError as exc:
Expand Down
25 changes: 19 additions & 6 deletions backend/siarnaq/api/teams/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,31 @@ def filter_queryset(self, request, queryset, view):

class TeamEligibilityFilter(filters.BaseFilterBackend):
def filter_queryset(self, request, queryset, view):
if "eligible_for" not in request.query_params:
if (
"eligible_for" not in request.query_params
and "not_eligible_for" not in request.query_params
):
return queryset

eligible_for_list = request.query_params.getlist("eligible_for")
not_eligible_for_list = request.query_params.getlist("not_eligible_for")

# Filter teams that have all the specified eligible_for values
# tricky query, this results in a join becasue eligible_for is a many to many
filtered_teams = (
queryset.filter(profile__eligible_for__in=eligible_for_list)
.annotate(eligible_count=Count("profile__eligible_for"))
.filter(eligible_count=len(eligible_for_list))
)
filtered_teams = queryset

if eligible_for_list:
filtered_teams = (
filtered_teams.filter(profile__eligible_for__in=eligible_for_list)
.annotate(eligible_count=Count("profile__eligible_for", distinct=True))
.filter(eligible_count=len(eligible_for_list))
)

if not_eligible_for_list:
filtered_teams = filtered_teams.exclude(
profile__eligible_for__in=not_eligible_for_list
)

logger.info(
"TeamEligibilityFilter",
message="TeamEligibilityFilter Query Plan:",
Expand Down
14 changes: 13 additions & 1 deletion backend/siarnaq/api/teams/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,19 @@
name="eligible_for",
type=int,
many=True,
description="Filter teams by a set of eligibility criteria ID",
description=(
"Filter teams by a set of eligibility criteria ID "
"that all team members must have"
),
),
OpenApiParameter(
name="not_eligible_for",
type=int,
many=True,
description=(
"Filter teams by a set of eligibility criteria ID "
"that no team member should have"
),
),
]
)
Expand Down
9 changes: 5 additions & 4 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"tailwindcss": "^3.4.15",
"typescript": "^4.9.5",
"typescript-eslint": "^8.14.0",
"vite": "^5.4.11",
"vite": "^5.4.20",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-svgr": "^4.3.0",
"vite-tsconfig-paths": "^5.1.2"
Expand Down
Loading