Merge pull request #273 from ZdruzenieSTROM/add_endpoint_for_react_admin

Add endpoint for react admin
ZdruzenieSTROM · Dec 8, 2023 · ef6ac62 · ef6ac62
2 parents 873a7c5 + 1a7912b
commit ef6ac62
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/competition/serializers.py b/competition/serializers.py
@@ -60,7 +60,7 @@ class Meta:
 
 @ts_interface(context='competition')
 class CompetitionSerializer(serializers.ModelSerializer):
-    competition_type = CompetitionTypeSerializer(many=False)
+    competition_type = CompetitionTypeSerializer(many=False, read_only=True)
     upcoming_or_current_event = serializers.SerializerMethodField(
         'get_upcoming_or_current')
     history_events = serializers.SerializerMethodField('get_history_events')

diff --git a/competition/tests.py b/competition/tests.py
@@ -316,11 +316,11 @@ def test_get_competition_list(self):
 
     def test_get_competition_detail(self):
         '''detail format OK'''
-        response = self.client.get(self.URL_PREFIX + '/strom', {}, 'json')
+        response = self.client.get(self.URL_PREFIX + '/slug/strom', {}, 'json')
         self.assertEqual(response.status_code, 200)
         self.competition_assert_format(response.json(), 0)
 
-        response = self.client.get(self.URL_PREFIX + '/matik', {}, 'json')
+        response = self.client.get(self.URL_PREFIX + '/slug/matik', {}, 'json')
         self.assertEqual(response.status_code, 200)
         self.competition_assert_format(response.json(), 1)
 
@@ -331,13 +331,25 @@ def test_permission_list(self):
 
     def test_permission_get(self):
         '''retrieve permission OK'''
-        self.check_permissions(self.URL_PREFIX + '/strom/',
+        self.check_permissions(self.URL_PREFIX + '/slug/strom/',
                                'GET', self.PUBLIC_OK_RESPONSES)
 
     def test_permission_update(self):
         ''' update permission OK'''
-        self.check_permissions(self.URL_PREFIX + '/strom/', 'PUT',
-                               self.ALL_FORBIDDEN, {'start_year': 2020})
+        self.check_permissions(self.URL_PREFIX + '/0/', 'PUT',
+                               self.ONLY_STROM_OK_RESPONSES,
+                               {
+                                   "id": 0,
+                                   "name": "STROM",
+                                   "slug": "strom",
+                                   "start_year": 1976,
+                                   "description": "popis",
+                                   "rules": "# Pravidlá",
+                                   "min_years_until_graduation": 0,
+                                   "sites": [
+                                       0
+                                   ]
+                               })
 
     def test_permission_create(self):
         ''' create permission OK'''

diff --git a/competition/views.py b/competition/views.py
@@ -12,6 +12,7 @@
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError
 from rest_framework.permissions import IsAdminUser, IsAuthenticated
+from rest_framework.request import Request
 from rest_framework.response import Response
 
 from base.utils import mime_type
@@ -100,13 +101,22 @@ def generate_result_row(
     }
 
 
-class CompetitionViewSet(viewsets.ReadOnlyModelViewSet):
+class CompetitionViewSet(mixins.RetrieveModelMixin,
+                         mixins.UpdateModelMixin,
+                         mixins.ListModelMixin,
+                         viewsets.GenericViewSet):
     """Naše aktivity"""
     queryset = Competition.objects.all()
     serializer_class = CompetitionSerializer
-    lookup_field = 'slug'
     permission_classes = (CompetitionRestrictedPermission,)
 
+    @action(detail=False, url_path=r'slug/(?P<slug>\w+)')
+    def slug(self, request: Request, slug: str = None) -> Response:
+        competition: Competition = self.get_queryset().get(slug=slug)
+        return Response(
+            CompetitionSerializer(competition, many=False).data
+        )
+
 
 class CommentViewSet(
     mixins.RetrieveModelMixin,

diff --git a/personal/views.py b/personal/views.py
@@ -1,5 +1,5 @@
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework import status, viewsets
+from rest_framework import exceptions, status, viewsets
 from rest_framework.decorators import action
 from rest_framework.filters import SearchFilter
 from rest_framework.permissions import IsAdminUser, IsAuthenticated
@@ -26,14 +26,23 @@ class DistrictViewSet(viewsets.ReadOnlyModelViewSet):
     filterset_fields = ['county', ]
 
 
-class SchoolViewSet(viewsets.ReadOnlyModelViewSet):
+class SchoolViewSet(viewsets.ModelViewSet):
     """Školy"""
     queryset = School.objects.all()
     serializer_class = SchoolSerializer
     filterset_fields = ['district', 'district__county']
     filter_backends = [DjangoFilterBackend, SearchFilter]
     search_fields = ['name', 'street']
 
+    def destroy(self, request, *args, **kwargs):
+        """Zmazanie školy"""
+        instance = self.get_object()
+        if Profile.objects.filter(school=instance).exists():
+            raise exceptions.ValidationError(
+                detail='Nie je možné zmazať školu, ktorá má priradených užívateľov.')
+        self.perform_destroy(instance)
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
 
 class ProfileViewSet(viewsets.ModelViewSet):
     """Užívateľské profily"""