Skip to content

Feature: update case list filters #72

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

Merged
OsamaRagab520 merged 1 commit into from
Jun 5, 2022
Merged

Feature: update case list filters #72

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
1 change: 1 addition & 0 deletions api/cases/apis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class FilterSerializer(serializers.Serializer):
end_date = serializers.DateField(required=False)
gov = serializers.IntegerField(required=False)
name = serializers.CharField(required=False)
include_null = serializers.BooleanField(required=False)

class OutputSerializer(serializers.Serializer):
id = serializers.IntegerField()
Expand Down
13 changes: 10 additions & 3 deletions api/cases/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import django_filters
from django.db.models.query import Q

from .models import Case

Expand All @@ -8,9 +9,7 @@ class CaseFilter(django_filters.FilterSet):
type = django_filters.CharFilter(lookup_expr="iexact")

gov = django_filters.NumberFilter(field_name="location__gov")
name = django_filters.CharFilter(
field_name="details__name", lookup_expr="icontains"
)
name = django_filters.CharFilter(field_name="details__name", method="filter_name")

start_age = django_filters.NumberFilter(
field_name="details__age", lookup_expr="gte"
Expand All @@ -24,6 +23,14 @@ class CaseFilter(django_filters.FilterSet):
field_name="details__last_seen", lookup_expr="lte"
)

def filter_name(self, queryset, name, value):
if self.data.get("include_null"):
return queryset.filter(
Q(details__name__icontains=value) | Q(details__name__isnull=True)
)

return queryset.filter(details__name__icontains=value)

class Meta:
model = Case
fields = [
Expand Down