From 3bab02fda217f5a0f96b9c848c373e57e034df71 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Tue, 9 Sep 2025 22:35:54 +0200 Subject: [PATCH] API: Remove global Grouping routes grouping will return later as Issue.grouping_keys & Event.grouping_key i.e. with the relevant info directly resolved See #146 --- bugsink/urls.py | 3 +-- issues/api_views.py | 11 ++--------- issues/serializers.py | 12 +----------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/bugsink/urls.py b/bugsink/urls.py index b5434f4..976ea81 100644 --- a/bugsink/urls.py +++ b/bugsink/urls.py @@ -17,7 +17,7 @@ from files.views import chunk_upload, artifact_bundle_assemble, api_root, api_ca from bugsink.decorators import login_exempt from events.api_views import EventViewSet -from issues.api_views import IssueViewSet, GroupingViewSet +from issues.api_views import IssueViewSet from projects.api_views import ProjectViewSet from releases.api_views import ReleaseViewSet from teams.api_views import TeamViewSet @@ -34,7 +34,6 @@ admin.site.index_title = "Admin" # everyone calls this the "admin" anyway. Let' api_router = routers.DefaultRouter() api_router.register(r'events', EventViewSet) api_router.register(r'issues', IssueViewSet) -api_router.register(r'groupings', GroupingViewSet) api_router.register(r'projects', ProjectViewSet) api_router.register(r'releases', ReleaseViewSet) api_router.register(r'teams', TeamViewSet) diff --git a/issues/api_views.py b/issues/api_views.py index ca27d41..23ad92b 100644 --- a/issues/api_views.py +++ b/issues/api_views.py @@ -2,8 +2,8 @@ from django.shortcuts import get_object_or_404 from rest_framework import viewsets from rest_framework.exceptions import ValidationError -from .models import Issue, Grouping -from .serializers import IssueSerializer, GroupingSerializer +from .models import Issue +from .serializers import IssueSerializer class IssueViewSet(viewsets.ReadOnlyModelViewSet): @@ -55,10 +55,3 @@ class IssueViewSet(viewsets.ReadOnlyModelViewSet): obj = get_object_or_404(queryset, **filter_kwargs) self.check_object_permissions(self.request, obj) return obj - - -class GroupingViewSet(viewsets.ReadOnlyModelViewSet): - queryset = Grouping.objects.all().order_by('grouping_key') # TBD - serializer_class = GroupingSerializer - - # TODO: the idea of required filter-fields when listing. diff --git a/issues/serializers.py b/issues/serializers.py index 0e9d127..898e315 100644 --- a/issues/serializers.py +++ b/issues/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from .models import Issue, Grouping +from .models import Issue class IssueSerializer(serializers.ModelSerializer): @@ -33,13 +33,3 @@ class IssueSerializer(serializers.ModelSerializer): "is_muted", # "unmute_on_volume_based_conditions", too "raw"? i.e. too implementation-tied? ] - - -class GroupingSerializer(serializers.ModelSerializer): - class Meta: - model = Grouping - fields = [ - "project", - "grouping_key", - "issue", - ]