Fix last test and lint

src/registrar/models/user.py

@@ -397,8 +397,6 @@ class User(AbstractUser):
         """Returns either the domains ids associated with this user on UserDomainRole or Portfolio"""
         portfolio = request.session.get("portfolio")
         if self.is_org_user(request) and self.has_view_all_domains_permission(portfolio):
-            return DomainInformation.objects.filter(portfolio=portfolio).values_list(
+            return DomainInformation.objects.filter(portfolio=portfolio).values_list("domain_id", flat=True)
-                "domain_id", flat=True
-            )
         else:
             return UserDomainRole.objects.filter(user=self).values_list("domain_id", flat=True)

src/registrar/tests/test_admin.py

@@ -1209,7 +1209,6 @@ class TestMyUserAdmin(MockDbForSharedTests):
         domain_deleted.delete()
         role.delete()
 
-    # TODO - should refactor
     def test_analyst_cannot_see_selects_for_portfolio_role_and_permissions_in_user_form(self):
         """Can only test for the presence of a base element. The multiselects and the h2->h3 conversion are all
         dynamically generated."""

src/registrar/tests/test_models.py

@@ -30,7 +30,6 @@ from registrar.utility.constants import BranchChoices
 
 from .common import (
     MockSESClient,
-    get_wsgi_request_object,
     less_console_noise,
     completed_domain_request,
     set_domain_request_investigators,
@@ -1151,7 +1150,9 @@ class TestPortfolioInvitations(TestCase):
 
     @less_console_noise_decorator
     def test_retrieval(self):
-        portfolio_role_exists = UserPortfolioPermission.objects.filter(user=self.user, portfolio=self.portfolio).exists()
+        portfolio_role_exists = UserPortfolioPermission.objects.filter(
+            user=self.user, portfolio=self.portfolio
+        ).exists()
         self.assertFalse(portfolio_role_exists)
         self.invitation.retrieve()
         self.user.refresh_from_db()
@@ -1172,7 +1173,9 @@ class TestPortfolioInvitations(TestCase):
 
     @less_console_noise_decorator
     def test_retrieve_user_already_member_error(self):
-        portfolio_role_exists = UserPortfolioPermission.objects.filter(user=self.user, portfolio=self.portfolio).exists()
+        portfolio_role_exists = UserPortfolioPermission.objects.filter(
+            user=self.user, portfolio=self.portfolio
+        ).exists()
         self.assertFalse(portfolio_role_exists)
         portfolio_role, _ = UserPortfolioPermission.objects.get_or_create(user=self.user, portfolio=self.portfolio)
         self.assertEqual(portfolio_role.portfolio.organization_name, "Hotel California")
@@ -1380,7 +1383,11 @@ class TestUser(TestCase):
         self.assertFalse(user_can_view_all_domains)
         self.assertFalse(user_can_view_all_requests)
 
-        portfolio_permission, _ = UserPortfolioPermission.objects.get_or_create(portfolio=portfolio, user=self.user, additional_permissions = [UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS])
+        portfolio_permission, _ = UserPortfolioPermission.objects.get_or_create(
+            portfolio=portfolio,
+            user=self.user,
+            additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS],
+        )
 
         # TODO - uncomment this when we just pass request to these functions
         # request = get_wsgi_request_object(self.client, self.user)

src/registrar/tests/test_reports.py

@@ -34,7 +34,14 @@ import boto3_mocking
 from registrar.utility.s3_bucket import S3ClientError, S3ClientErrorCodes  # type: ignore
 from django.utils import timezone
 from api.tests.common import less_console_noise_decorator
-from .common import MockDbForSharedTests, MockDbForIndividualTests, MockEppLib, get_wsgi_request_object, less_console_noise, get_time_aware_date
+from .common import (
+    MockDbForSharedTests,
+    MockDbForIndividualTests,
+    MockEppLib,
+    get_wsgi_request_object,
+    less_console_noise,
+    get_time_aware_date,
+)
 from waffle.testutils import override_flag
 
 

src/registrar/tests/test_views_portfolio.py

@@ -285,7 +285,7 @@ class TestPortfolio(WebTest):
 
             # removing non-basic portfolio role, which should remove domains
             # and domain requests from nav
-            portfolio_permission.portfolio_roles = [UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
+            portfolio_permission.roles = [UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
             portfolio_permission.save()
             portfolio_permission.refresh_from_db()
 

src/registrar/views/portfolios.py

@@ -52,9 +52,7 @@ class PortfolioOrganizationView(PortfolioBasePermissionView, FormMixin):
         """Add additional context data to the template."""
         context = super().get_context_data(**kwargs)
         portfolio = self.request.session.get("portfolio")
-        context["has_edit_org_portfolio_permission"] = self.request.user.has_edit_org_portfolio_permission(
+        context["has_edit_org_portfolio_permission"] = self.request.user.has_edit_org_portfolio_permission(portfolio)
-            portfolio
-        )
         return context
 
     def get_object(self, queryset=None):

src/registrar/views/utility/mixins.py

@@ -434,7 +434,7 @@ class PortfolioDomainsPermission(PortfolioBasePermission):
 
         if not self.request.user.is_authenticated:
             return False
-        
+
         return self.request.user.is_org_user(self.request)
 
 
@@ -450,5 +450,5 @@ class PortfolioDomainRequestsPermission(PortfolioBasePermission):
 
         if not self.request.user.is_authenticated:
             return False
-        
+
         return self.request.user.is_org_user(self.request)