Skip to content

Commit ccf9104

Browse files
committed
OKRS24-198 Removed GeographyUnitListView.
1 parent 2686718 commit ccf9104

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

src/signals/urls.py

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
SignalsDetailView,
66
SignalsListApiView,
77
SignalsListView,
8-
GeographyUnitListApiView
98
)
109

1110
urlpatterns: list[URLPattern] = [
@@ -15,5 +14,4 @@
1514

1615
# REST API
1716
path('api/v1/signals/', SignalsListApiView.as_view(), name='signals_api'),
18-
path('api/v1/geography_units/', GeographyUnitListApiView.as_view(), name='geography_units_api')
1917
]

src/signals/views.py

+2-32
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
from django.conf import settings
44
from django.views.generic import DetailView, ListView
5-
from django.db.models import Q
65
from django_filters.rest_framework import DjangoFilterBackend
76
from rest_framework.filters import SearchFilter
87
from rest_framework.generics import ListAPIView
98

109
from signals.filters import SignalFilter
1110
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
1413

1514

1615
class SignalsListView(ListView):
@@ -127,32 +126,3 @@ class SignalsListApiView(ListAPIView):
127126
"source__name",
128127
"time_label",
129128
)
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

Comments
 (0)