From 08583aea51eceb6de81f625280ab161a2dc64ea4 Mon Sep 17 00:00:00 2001 From: CocoByte Date: Wed, 25 Sep 2024 13:00:10 -0700 Subject: [PATCH] Cleanup logs / linted --- src/registrar/tests/test_views_portfolio.py | 18 ++++-------- src/registrar/views/domains_json.py | 7 ----- src/registrar/views/portfolio_members_json.py | 12 -------- src/registrar/views/portfolios.py | 28 ------------------- src/registrar/views/utility/mixins.py | 8 ------ 5 files changed, 5 insertions(+), 68 deletions(-) diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index a320c876c..960f698c6 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -667,7 +667,6 @@ class TestPortfolio(WebTest): self.assertContains(home, "Hotel California") self.assertContains(home, "Members") - @less_console_noise_decorator @override_flag("organization_feature", active=True) @override_flag("organization_members", active=True) @@ -685,14 +684,13 @@ class TestPortfolio(WebTest): # (1) - User is not admin and can view portfolio, but not the members table # (1) - User is admin and can view portfolio, but not the members table - # --- non-admin self.app.set_user(self.user.username) UserPortfolioPermission.objects.get_or_create( user=self.user, portfolio=self.portfolio, - role = UserPortfolioRoleChoices.ORGANIZATION_MEMBER, + role=UserPortfolioRoleChoices.ORGANIZATION_MEMBER, additional_permissions=[ UserPortfolioPermissionChoices.VIEW_PORTFOLIO, ], @@ -703,13 +701,9 @@ class TestPortfolio(WebTest): # Assert the response is a 403 Forbidden self.assertEqual(response.status_code, 403) - # --- admin - UserPortfolioPermission.objects.filter( - user=self.user, - portfolio=self.portfolio - ).update( - role=UserPortfolioRoleChoices.ORGANIZATION_ADMIN, + UserPortfolioPermission.objects.filter(user=self.user, portfolio=self.portfolio).update( + role=UserPortfolioRoleChoices.ORGANIZATION_ADMIN, ) # Verify that the user cannot access the members page @@ -771,8 +765,7 @@ class TestPortfolio(WebTest): self.assertEqual(response.status_code, 200) self.assertContains(response, '') - self.assertContains(response, 'Manage') - + self.assertContains(response, "Manage") @less_console_noise_decorator @override_flag("organization_feature", active=True) @@ -803,8 +796,7 @@ class TestPortfolio(WebTest): # Make sure the page loaded self.assertEqual(response.status_code, 200) - self.assertContains(response, 'View') - + self.assertContains(response, "View") @less_console_noise_decorator @override_flag("organization_feature", active=True) diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py index cef9631e5..f7c8b4637 100644 --- a/src/registrar/views/domains_json.py +++ b/src/registrar/views/domains_json.py @@ -6,11 +6,6 @@ from django.contrib.auth.decorators import login_required from django.urls import reverse from django.db.models import Q -# ---Logger -import logging -from venv import logger -from registrar.management.commands.utility.terminal_helper import TerminalColors, TerminalHelper - logger = logging.getLogger(__name__) @@ -54,8 +49,6 @@ def get_domain_ids_from_request(request): Otherwise, return domain ids associated with request.user. """ portfolio = request.GET.get("portfolio") - # TODO: delete me - 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): diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py index c62aaf6a0..7a06dd9fb 100644 --- a/src/registrar/views/portfolio_members_json.py +++ b/src/registrar/views/portfolio_members_json.py @@ -1,22 +1,13 @@ from django.http import JsonResponse from django.core.paginator import Paginator from django.contrib.auth.decorators import login_required -from django.urls import reverse -from django.utils import timezone from django.db.models import Q from registrar.models.portfolio_invitation import PortfolioInvitation from registrar.models.user import User from registrar.models.user_portfolio_permission import UserPortfolioPermission - -# ---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__) - @login_required def get_portfolio_members_json(request): @@ -173,9 +164,6 @@ def serialize_members(request, member, user, admin_ids, portfolio_invitation_ema user_can_edit_other_users = True index += 1 view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users - TerminalHelper.colorful_logger( - logger.info, TerminalColors.OKCYAN, f"user_can_edit_other_users {user_can_edit_other_users}" - ) # TODO: delete me # ------- USER STATUSES is_invited = member.email in portfolio_invitation_emails diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py index 4088a12cc..54438964a 100644 --- a/src/registrar/views/portfolios.py +++ b/src/registrar/views/portfolios.py @@ -21,14 +21,6 @@ from django.views.generic.edit import FormMixin logger = logging.getLogger(__name__) -# ---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" @@ -63,27 +55,7 @@ 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}" - ) if portfolio: - - # # ------ Gets admin members - # admin_ids = UserPortfolioPermission.objects.filter( - # portfolio=portfolio, - # roles__overlap=[ - # UserPortfolioRoleChoices.ORGANIZATION_ADMIN, - # ], - # ).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( - # roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN] - # ) - # # 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(portfolio=portfolio).values_list("user__id", flat=True) diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py index 32c5999b6..2cb2a599b 100644 --- a/src/registrar/views/utility/mixins.py +++ b/src/registrar/views/utility/mixins.py @@ -15,14 +15,6 @@ import logging logger = logging.getLogger(__name__) -# TODO: delete me -import logging -from venv import logger -from registrar.management.commands.utility.terminal_helper import TerminalColors, TerminalHelper - -logger = logging.getLogger(__name__) - - class OrderableFieldsMixin: """ Mixin to add multi-field ordering capabilities to a Django ModelAdmin on admin_order_field.