|
2 | 2 |
|
3 | 3 | from django.conf import settings |
4 | 4 | from django.views.generic import DetailView, ListView |
5 | | -from django.db.models import Q |
6 | 5 | from django_filters.rest_framework import DjangoFilterBackend |
7 | 6 | from rest_framework.filters import SearchFilter |
8 | 7 | from rest_framework.generics import ListAPIView |
9 | 8 |
|
10 | 9 | from signals.filters import SignalFilter |
11 | 10 | from signals.forms import SignalFilterForm |
12 | | -from signals.models import Signal, GeographyUnit |
13 | | -from signals.serializers import SignalSerializer, GeographyUnitSerialializer |
| 11 | +from signals.models import Signal |
| 12 | +from signals.serializers import SignalSerializer |
14 | 13 |
|
15 | 14 |
|
16 | 15 | class SignalsListView(ListView): |
@@ -127,32 +126,3 @@ class SignalsListApiView(ListAPIView): |
127 | 126 | "source__name", |
128 | 127 | "time_label", |
129 | 128 | ) |
130 | | - |
131 | | - |
132 | | -class GeographyUnitListApiView(ListAPIView): |
133 | | - """ |
134 | | - ListAPIView for retrieving a list of Signal objects via API. |
135 | | - """ |
136 | | - |
137 | | - queryset = GeographyUnit.objects.all() |
138 | | - serializer_class = GeographyUnitSerialializer |
139 | | - search_fields = ("name") |
140 | | - filter_backends = [DjangoFilterBackend] |
141 | | - filterset_fields = ( |
142 | | - "name", |
143 | | - "display_name", |
144 | | - "geography__name" |
145 | | - ) |
146 | | - |
147 | | - def get_queryset(self): |
148 | | - search_term = self.request.GET.get('term') |
149 | | - if search_term: |
150 | | - queries: list[Q] = [] |
151 | | - for field in ['name', 'display_name']: |
152 | | - queries.append(Q(**{f'{field}__icontains': search_term})) |
153 | | - query = queries.pop() |
154 | | - |
155 | | - for item in queries: |
156 | | - query |= item |
157 | | - return GeographyUnit.objects.filter(query) |
158 | | - return super().get_queryset() |
0 commit comments