From 61c47e4c792e173b4d0363c5dffdc25a5f4d1ba1 Mon Sep 17 00:00:00 2001
From: alex <birukov.system@gmail.com>
Date: Tue, 21 Jan 2020 08:17:03 +0300
Subject: [PATCH] establishment employee position delete view

---
 apps/establishment/urls/back.py  |  3 +--
 apps/establishment/views/back.py | 25 +++++--------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/apps/establishment/urls/back.py b/apps/establishment/urls/back.py
index 10351fe5..013ada1c 100644
--- a/apps/establishment/urls/back.py
+++ b/apps/establishment/urls/back.py
@@ -50,8 +50,7 @@ urlpatterns = [
     path('<int:establishment_id>/employee/<int:employee_id>/position/<int:position_id>',
          views.EstablishmentEmployeeCreateView.as_view(),
          name='employees-establishment-create'),
-    path('<int:establishment_id>/employee/<int:employee_id>',
-         views.EstablishmentEmployeeDeleteView.as_view(),
+    path('employee/position/<int:pk>/delete/', views.EstablishmentEmployeeDeleteView.as_view(),
          name='employees-establishment-delete'),
     path('types/', views.EstablishmentTypeListCreateView.as_view(), name='type-list'),
     path('types/<int:pk>/', views.EstablishmentTypeRUDView.as_view(), name='type-rud'),
diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py
index 8b446ac6..4449599b 100644
--- a/apps/establishment/views/back.py
+++ b/apps/establishment/views/back.py
@@ -1,17 +1,15 @@
 """Establishment app views."""
-from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework import generics, permissions, status, filters as rest_filters
+from rest_framework import generics, permissions
 
 from account.models import User
 from establishment import filters, models, serializers
+from establishment.models import EstablishmentEmployee
+from timetable.models import Timetable
 from timetable.serialziers import ScheduleRUDSerializer, ScheduleCreateSerializer
 from utils.permissions import IsCountryAdmin, IsEstablishmentManager, IsWineryReviewer
 from utils.views import CreateDestroyGalleryViewMixin
-from timetable.models import Timetable
-from rest_framework import status
-from rest_framework.response import Response
 
 
 class EstablishmentMixinViews:
@@ -371,21 +369,8 @@ class EstablishmentEmployeeCreateView(generics.CreateAPIView):
 
 
 class EstablishmentEmployeeDeleteView(generics.DestroyAPIView):
-
-    def _get_object_to_delete(self, establishment_id, employee_id):
-        result_qs = models.EstablishmentEmployee \
-            .objects \
-            .filter(establishment_id=establishment_id, employee_id=employee_id)
-        if not result_qs.exists():
-            raise Http404
-        return result_qs.first()
-
-    def delete(self, request, *args, **kwargs):
-        establishment_id = self.kwargs["establishment_id"]
-        employee_id = self.kwargs["employee_id"]
-        object_to_delete = self._get_object_to_delete(establishment_id, employee_id)
-        object_to_delete.delete()
-        return HttpResponse(status=status.HTTP_204_NO_CONTENT)
+    queryset = EstablishmentEmployee.objects.all()
+    permission_classes = [IsEstablishmentManager | permissions.IsAdminUser]
 
 
 class EstablishmentPositionListView(generics.ListAPIView):