feat: simplify permissions

apps/feedback/views.py

@@ -5,14 +5,14 @@
 from rest_framework.views import APIView
 
 from apps.mailer.models import Email
-from zhu_core.permissions import IsGet, IsSeniorStaff
+from zhu_core.permissions import IsAdmin, IsGet
 
 from .models import Feedback
 from .serializers import BaseFeedbackSerializer, FeedbackSerializer
 
 
 class FeedbackListView(APIView):
-    permission_classes = [(IsGet & IsSeniorStaff) | (~IsGet & IsAuthenticated)]
+    permission_classes = [(IsGet & IsAdmin) | (~IsGet & IsAuthenticated)]
 
     def get(self, request):
         """
@@ -43,7 +43,7 @@ def post(self, request):
 
 
 class FeedbackInstanceView(APIView):
-    permission_classes = [IsSeniorStaff]
+    permission_classes = [IsAdmin]
 
     def put(self, request, feedback_id):
         """

apps/users/models.py

@@ -138,22 +138,10 @@ def is_staff(self):
             or self.is_superuser
         )
 
-    @property
-    def is_senior_staff(self):
-        return self.roles.filter(short__in=["ATM", "DATM", "TA", "FE"]).exists() or self.is_superuser
-
     @property
     def is_admin(self):
         return self.roles.filter(short__in=["ATM", "DATM"]).exists() or self.is_superuser
 
-    @property
-    def training_staff_role(self):
-        return self.roles.filter(short__in=["INS", "MTR"]).first()
-
-    @property
-    def staff_role(self):
-        return self.roles.filter(short__in=["ATM", "DATM", "TA", "ATA", "FE", "AFE", "EC", "AEC", "WM", "AWM"]).first()
-
     @property
     def visiting_eligibility(self):
         """Check if authenticated user is eligible to apply as a visiting controller."""
@@ -165,8 +153,6 @@ def visiting_eligibility(self):
             params={"apikey": os.getenv("VATUSA_API_TOKEN")},
         ).json()
 
-        print(vatusa_checklist)
-
         membership_check = not self.is_member
         pending_application_check = not VisitingApplication.objects.filter(user=self).exists()
 

apps/vatsim/serializers.py

@@ -62,6 +62,5 @@ def get_permissions(self, user):
             "is_member": user.is_member,
             "is_training_staff": user.is_training_staff,
             "is_staff": user.is_staff,
-            "is_senior_staff": user.is_senior_staff,
             "is_admin": user.is_admin,
         }

zhu_core/permissions.py

@@ -46,15 +46,6 @@ def has_permission(self, request, view):
         return request.user.is_authenticated and request.user.is_staff or request.user.is_superuser
 
 
-class IsSeniorStaff(BasePermission):
-    """
-    Allows access to the ATM, DATM, TA, and FE.
-    """
-
-    def has_permission(self, request, view):
-        return request.user.is_authenticated and request.user.is_senior_staff or request.user.is_superuser
-
-
 class IsAdmin(BasePermission):
     """
     Allows access to the ATM and DATM.