From 2840ebc63dd94fff25966c723f0500092d46e44a Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Fri, 29 Sep 2023 14:39:18 -0400
Subject: [PATCH] lint, change permissions tests in permissions classes

---
 src/registrar/migrations/0036_create_groups.py  | 1 +
 src/registrar/views/utility/mixins.py           | 6 +++---
 src/registrar/views/utility/permission_views.py | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/registrar/migrations/0036_create_groups.py b/src/registrar/migrations/0036_create_groups.py
index 4cf65bfbd..2975b6bf8 100644
--- a/src/registrar/migrations/0036_create_groups.py
+++ b/src/registrar/migrations/0036_create_groups.py
@@ -12,6 +12,7 @@ from django.db import migrations
 from registrar.models import UserGroup
 from typing import Any
 
+
 # For linting: RunPython expects a function reference,
 # so let's give it one
 def create_groups(apps, schema_editor) -> Any:
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index fd58b3475..97db65505 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -63,9 +63,9 @@ class DomainPermission(PermissionsLoginMixin):
         """
 
         # Check if the user is permissioned...
-        user_is_analyst_or_superuser = (
-            self.request.user.is_staff or self.request.user.is_superuser
-        )
+        user_is_analyst_or_superuser = self.request.user.has_perm(
+            "registrar.analyst_access_permission"
+        ) or self.request.user.has_perm("registrar.full_access_permission")
 
         if not user_is_analyst_or_superuser:
             return False
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index 417ee8417..aeeaadc2d 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -33,7 +33,9 @@ class DomainPermissionView(DomainPermission, DetailView, abc.ABC):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         user = self.request.user
-        context["is_analyst_or_superuser"] = user.is_staff or user.is_superuser
+        context["is_analyst_or_superuser"] = user.has_perm(
+            "registrar.analyst_access_permission"
+        ) or user.has_perm("registrar.full_access_permission")
         # Stored in a variable for the linter
         action = "analyst_action"
         action_location = "analyst_action_location"