diff --git a/nix/overlay.nix b/nix/overlay.nix index 8d86c2685..06b3a1a99 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -47,10 +47,8 @@ in dj-database-url django-allauth django-debug-toolbar - django-filter django-types django - djangorestframework pytest-socket ipython psycopg2 diff --git a/src/project/settings.py b/src/project/settings.py index 21d0c1c0d..14bd67612 100644 --- a/src/project/settings.py +++ b/src/project/settings.py @@ -343,7 +343,6 @@ class AppSettings(BaseModel): "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "django_filters", "debug_toolbar", # AllAuth config "allauth", @@ -355,7 +354,6 @@ class AppSettings(BaseModel): "pgtrigger", "pghistory", "pghistory.admin", - "rest_framework", "shared", "webview", ] @@ -423,10 +421,6 @@ class AppSettings(BaseModel): ] -REST_FRAMEWORK = { - "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"] -} - SITE_ID = 1 # Disable regular signup but allow GitHub auth diff --git a/src/project/urls.py b/src/project/urls.py index a80f66f16..d128bca85 100644 --- a/src/project/urls.py +++ b/src/project/urls.py @@ -20,7 +20,6 @@ urlpatterns = [ path("", include("webview.urls")), - path("api/", include("shared.urls")), path("admin/", admin.site.urls), path("accounts/", include("allauth.urls")), path("debug/", include("debug_toolbar.urls")), diff --git a/src/shared/urls.py b/src/shared/urls.py deleted file mode 100644 index 7720ac1e0..000000000 --- a/src/shared/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.urls import include, path -from rest_framework import routers - -from shared.views import NixpkgsIssueViewSet - -v1_router = routers.DefaultRouter() -v1_router.register(r"issues", NixpkgsIssueViewSet) - -urlpatterns = [ - path("v1/", include(v1_router.urls)), -] diff --git a/src/shared/views.py b/src/shared/views.py deleted file mode 100644 index 9f2be6671..000000000 --- a/src/shared/views.py +++ /dev/null @@ -1,39 +0,0 @@ -from django_filters import rest_framework as filters -from rest_framework import serializers, viewsets -from rest_framework.permissions import AllowAny - -from shared.models import NixpkgsIssue - - -class StringInFilter(filters.BaseInFilter, filters.CharFilter): - pass - - -class NixpkgsIssueViewSet(viewsets.ReadOnlyModelViewSet): - class Filter(filters.FilterSet): - cve = StringInFilter( - label="Filter by CVEs referenced", - field_name="cve__cve_id", - lookup_expr="in", - ) - - class Meta: - model = NixpkgsIssue - fields = ["cve"] - - class Serializer(serializers.ModelSerializer): - status = serializers.CharField(source="get_status_display") - cve = serializers.SerializerMethodField() - - def get_cve(self, obj: NixpkgsIssue) -> list[str]: - return [cve.cve_id for cve in obj.cve.iterator()] - - class Meta: - model = NixpkgsIssue - fields = ["code", "cve", "status"] - - filterset_class = Filter - - permission_classes = [AllowAny] - queryset = NixpkgsIssue.objects.all() - serializer_class = Serializer