fix tests and lint

This commit is contained in:
zandercymatics 2025-03-24 08:20:55 -06:00
parent 1ccaea5028
commit 3cefc4c24a
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 22 additions and 18 deletions

View file

@ -257,7 +257,7 @@ class Command(BaseCommand):
def print_final_run_summary(self, parse_domains, parse_requests, parse_managers, debug):
self.portfolio_changes.print_script_run_summary(
no_changes_message="\n||============= No portfolios changed. =============||",
no_changes_message="||============= No portfolios changed. =============||",
debug=debug,
log_header="============= PORTFOLIOS =============",
skipped_header="----- SOME PORTFOLIOS WERENT CREATED (BUT OTHER RECORDS ARE STILL PROCESSED) -----",
@ -265,7 +265,7 @@ class Command(BaseCommand):
display_as_str=True,
)
self.suborganization_changes.print_script_run_summary(
no_changes_message="\n||============= No suborganizations changed. =============||",
no_changes_message="||============= No suborganizations changed. =============||",
debug=debug,
log_header="============= SUBORGANIZATIONS =============",
skipped_header="----- SUBORGANIZATIONS SKIPPED (SAME NAME AS PORTFOLIO NAME) -----",
@ -507,7 +507,7 @@ class Command(BaseCommand):
# Clear the federal agency for started domain requests
agency_name = normalize_string(domain_request.federal_agency.agency)
portfolio_name = normalize_string(portfolio.organization_name)
if not domain_request.portfolio and agency_name == portfolio_name:
if agency_name == portfolio_name:
domain_request.federal_agency = None
logger.info(f"Set federal agency on started domain request '{domain_request}' to None.")
updated_domain_requests.add(domain_request)

View file

@ -1473,7 +1473,7 @@ class TestCreateFederalPortfolio(TestCase):
generic_org_type=DomainRequest.OrganizationChoices.CITY,
federal_agency=self.federal_agency,
user=self.user,
organization_name="Testorg"
organization_name="Testorg",
)
self.domain_request.approve()
self.domain_info = DomainInformation.objects.filter(domain_request=self.domain_request).get()
@ -1875,7 +1875,9 @@ class TestCreateFederalPortfolio(TestCase):
UserDomainRole.objects.create(user=manager2, domain=self.domain, role=UserDomainRole.Roles.MANAGER)
# Run the management command
self.run_create_federal_portfolio(agency_name=self.federal_agency.agency, parse_domains=True, parse_managers=True)
self.run_create_federal_portfolio(
agency_name=self.federal_agency.agency, parse_domains=True, parse_managers=True
)
# Check that the portfolio was created
self.portfolio = Portfolio.objects.get(federal_agency=self.federal_agency)
@ -1898,7 +1900,9 @@ class TestCreateFederalPortfolio(TestCase):
)
# Run the management command
self.run_create_federal_portfolio(agency_name=self.federal_agency.agency, parse_domains=True, parse_managers=True)
self.run_create_federal_portfolio(
agency_name=self.federal_agency.agency, parse_domains=True, parse_managers=True
)
# Check that the portfolio was created
self.portfolio = Portfolio.objects.get(federal_agency=self.federal_agency)
@ -1995,9 +1999,9 @@ class TestCreateFederalPortfolio(TestCase):
skip_existing_portfolios=True,
)
# Check that managers were added to the portfolio
# Check that managers weren't added to the portfolio
permissions = UserPortfolioPermission.objects.filter(portfolio=self.portfolio, user__in=[manager1, manager2])
self.assertEqual(permissions.count(), 2)
self.assertEqual(permissions.count(), 0)
for perm in permissions:
self.assertIn(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, perm.roles)