Skip to content

Improved AppealViewset query #828

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
GergiH merged 1 commit into from
Jul 22, 2020
Merged

Improved AppealViewset query #828

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
12 changes: 10 additions & 2 deletions api/drf_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ class SituationReportViewset(ReadOnlyVisibilityViewset):
filter_class = SituationReportFilter
visibility_model_class = SituationReport


class AppealFilter(filters.FilterSet):
atype = filters.NumberFilter(field_name='atype', lookup_expr='exact')
dtype = filters.NumberFilter(field_name='dtype', lookup_expr='exact')
Expand All @@ -348,17 +349,20 @@ class AppealFilter(filters.FilterSet):
code = filters.CharFilter(field_name='code', lookup_expr='exact')
status = filters.NumberFilter(field_name='status', lookup_expr='exact')
id = filters.NumberFilter(field_name='id', lookup_expr='exact')

class Meta:
model = Appeal
fields = {
'start_date': ('exact', 'gt', 'gte', 'lt', 'lte'),
'end_date': ('exact', 'gt', 'gte', 'lt', 'lte'),
}


class AppealViewset(viewsets.ReadOnlyModelViewSet):
queryset = Appeal.objects.all()
queryset = Appeal.objects.select_related('dtype', 'country', 'region').all()
serializer_class = AppealSerializer
ordering_fields = ('start_date', 'end_date', 'name', 'aid', 'dtype', 'num_beneficiaries', 'amount_requested', 'amount_funded', 'status', 'atype', 'event',)
ordering_fields = ('start_date', 'end_date', 'name', 'aid', 'dtype', 'num_beneficiaries',
'amount_requested', 'amount_funded', 'status', 'atype', 'event',)
filter_class = AppealFilter

def remove_unconfirmed_event(self, obj):
Expand Down Expand Up @@ -386,22 +390,26 @@ def retrieve(self, request, *args, **kwargs):
serializer = self.get_serializer(instance)
return Response(self.remove_unconfirmed_event(serializer.data))


class AppealDocumentFilter(filters.FilterSet):
appeal = filters.NumberFilter(field_name='appeal', lookup_expr='exact')
appeal__in = ListFilter(field_name='appeal__id')

class Meta:
model = AppealDocument
fields = {
'name': ('exact',),
'created_at': ('exact', 'gt', 'gte', 'lt', 'lte'),
}


class AppealDocumentViewset(viewsets.ReadOnlyModelViewSet):
queryset = AppealDocument.objects.all()
serializer_class = AppealDocumentSerializer
ordering_fields = ('created_at', 'name',)
filter_class = AppealDocumentFilter


class ProfileViewset(viewsets.ModelViewSet):
serializer_class = ProfileSerializer
authentication_classes = (TokenAuthentication,)
Expand Down