linted

src/registrar/config/urls.py

@@ -76,7 +76,6 @@ urlpatterns = [
         views.PortfolioNoDomainsView.as_view(),
         name="no-portfolio-domains",
     ),
-
     path(
         "members/",
         views.PortfolioMembersView.as_view(),

src/registrar/management/commands/create_federal_portfolio.py

@@ -257,11 +257,9 @@ class Command(BaseCommand):
         message = f"Added portfolio '{portfolio}' to {len(domain_infos)} domains"
         TerminalHelper.colorful_logger(logger.info, TerminalColors.OKGREEN, message)
 
-
     def handle_portfolio_members(self, portfolio: Portfolio, federal_agency: FederalAgency):
         """
         Associate portfolio with members for a federal agency.
         Updates all relevant member records.
         """
         # TODO: future ticket?
-    

src/registrar/views/domains_json.py

@@ -6,10 +6,11 @@ from django.contrib.auth.decorators import login_required
 from django.urls import reverse
 from django.db.models import Q
 
-#---Logger
+# ---Logger
 import logging
 from venv import logger
 from registrar.management.commands.utility.terminal_helper import TerminalColors, TerminalHelper
+
 logger = logging.getLogger(__name__)
 
 
@@ -54,7 +55,7 @@ def get_domain_ids_from_request(request):
     """
     portfolio = request.GET.get("portfolio")
     # TODO: delete me
-    TerminalHelper.colorful_logger(logger.info, TerminalColors.OKGREEN, f'domain portfolio = {portfolio}')
+    TerminalHelper.colorful_logger(logger.info, TerminalColors.OKGREEN, f"domain portfolio = {portfolio}")
     if portfolio:
         current_user: User = request.user
         if current_user.is_org_user(request) and current_user.has_view_all_domains_portfolio_permission(portfolio):

src/registrar/views/portfolio_members_json.py

@@ -1,4 +1,3 @@
-
 from django.http import JsonResponse
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required
@@ -10,11 +9,12 @@ from registrar.models.portfolio_invitation import PortfolioInvitation
 from registrar.models.user import User
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 
-#---Logger
+# ---Logger
 import logging
 from venv import logger
 from registrar.management.commands.utility.terminal_helper import TerminalColors, TerminalHelper
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
+
 logger = logging.getLogger(__name__)
 
 
@@ -24,7 +24,7 @@ def get_portfolio_members_json(request):
     get all members that are associated with the given portfolio"""
 
     objects = get_member_objects_from_request(request)
-    if(objects is not None):
+    if objects is not None:
         member_ids = objects.values_list("id", flat=True)
 
         portfolio = request.session.get("portfolio")
@@ -34,8 +34,9 @@ def get_portfolio_members_json(request):
                 UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
             ],
         ).values_list("user__id", flat=True)
-        portfolio_invitation_emails = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list("email", flat=True)
+        portfolio_invitation_emails = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
-       
+            "email", flat=True
+        )
 
         unfiltered_total = member_ids.count()
 
@@ -47,7 +48,8 @@ def get_portfolio_members_json(request):
         page_number = request.GET.get("page", 1)
         page_obj = paginator.get_page(page_number)
         members = [
-            serialize_members(request, member, request.user, admin_ids, portfolio_invitation_emails) for member in page_obj.object_list
+            serialize_members(request, member, request.user, admin_ids, portfolio_invitation_emails)
+            for member in page_obj.object_list
         ]
 
         # DEVELOPER'S NOTE (9-24-24):
@@ -107,14 +109,16 @@ def get_member_objects_from_request(request):
         # else:
         #     filter_condition = Q(portfolio=portfolio, creator=request.user)
 
-        permissions = UserPortfolioPermission.objects.filter(
+        permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio)
-                portfolio=portfolio
+
+        portfolio_invitation_emails = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list(
+            "email", flat=True
         )
 
-        portfolio_invitation_emails = PortfolioInvitation.objects.filter(portfolio=portfolio).values_list("email", flat=True)
+        members = User.objects.filter(
-        
+            Q(portfolio_permissions__in=permissions) | Q(email__in=portfolio_invitation_emails)
-        members = User.objects.filter(Q(portfolio_permissions__in=permissions) | Q(email__in=portfolio_invitation_emails))
+        )
-        TerminalHelper.colorful_logger(logger.info, TerminalColors.OKCYAN, f'members {members}')  # TODO: delete me
+        TerminalHelper.colorful_logger(logger.info, TerminalColors.OKCYAN, f"members {members}")  # TODO: delete me
         return members
 
 
@@ -176,7 +180,7 @@ def serialize_members(request, member, user, admin_ids, portfolio_invitation_ema
         "email": member.email,
         "is_admin": is_admin,
         "last_active": last_active,
-        "action_url": '#', #reverse("members", kwargs={"pk": member.id}), # TODO: Future ticket?
+        "action_url": "#",  # reverse("members", kwargs={"pk": member.id}), # TODO: Future ticket?
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),
     }

src/registrar/views/portfolios.py

@@ -21,12 +21,14 @@ from django.views.generic.edit import FormMixin
 logger = logging.getLogger(__name__)
 
 
-#---Logger
+# ---Logger
 import logging
 from venv import logger
 from registrar.management.commands.utility.terminal_helper import TerminalColors, TerminalHelper
+
 logger = logging.getLogger(__name__)
 
+
 class PortfolioDomainsView(PortfolioDomainsPermissionView, View):
 
     template_name = "portfolio_domains.html"
@@ -61,7 +63,9 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
         # We can override the base class. This view only needs this item.
         context = {}
         portfolio = self.request.session.get("portfolio")
-        TerminalHelper.colorful_logger(logger.info, TerminalColors.OKGREEN, f'PortfolioMembersView portfolio = {portfolio}')
+        TerminalHelper.colorful_logger(
+            logger.info, TerminalColors.OKGREEN, f"PortfolioMembersView portfolio = {portfolio}"
+        )
         if portfolio:
 
             # # ------ Gets admin members
@@ -72,7 +76,6 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
             #     ],
             # ).values_list("user__id", flat=True)
 
-
             # # ------ Gets non-admin members
             # # Filter UserPortfolioPermission objects related to the portfolio that do NOT have the "Admin" role
             # non_admin_permissions = UserPortfolioPermission.objects.filter(portfolio=obj).exclude(
@@ -81,17 +84,15 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
             # # Get the user objects associated with these permissions
             # non_admin_users = User.objects.filter(portfolio_permissions__in=non_admin_permissions)
 
-
             # ------- Gets all members
-            member_ids = UserPortfolioPermission.objects.filter(
+            member_ids = UserPortfolioPermission.objects.filter(portfolio=portfolio).values_list("user__id", flat=True)
-                portfolio=portfolio
-            ).values_list("user__id", flat=True)
 
             all_members = User.objects.filter(id__in=member_ids)
             context["portfolio_members"] = all_members
             context["portfolio_members_count"] = all_members.count()
         return render(request, "portfolio_members.html", context)
 
+
 class PortfolioNoDomainsView(NoPortfolioDomainsPermissionView, View):
     """Some users have access to the underlying portfolio, but not any domains.
     This is a custom view which explains that to the user - and denotes who to contact.

src/registrar/views/utility/mixins.py

@@ -19,6 +19,7 @@ logger = logging.getLogger(__name__)
 import logging
 from venv import logger
 from registrar.management.commands.utility.terminal_helper import TerminalColors, TerminalHelper
+
 logger = logging.getLogger(__name__)