zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-14 21:44:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup

Browse source
This commit is contained in:
zandercymatics 2025-01-07 13:01:15 -07:00
parent 2d163c1c1c
commit 2f5e0ec873
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/registrar/management/commands/create_federal_portfolio.py
View file

@ -184,7 +184,7 @@ class Command(BaseCommand):
return return
# Check for existing suborgs on the current portfolio # Check for existing suborgs on the current portfolio
existing_suborgs = Suborganization.objects.filter(name__in=org_names) existing_suborgs = Suborganization.objects.filter(name__in=org_names, name__isnull=False)
if existing_suborgs.exists(): if existing_suborgs.exists():
message = f"Some suborganizations already exist for portfolio '{portfolio}'." message = f"Some suborganizations already exist for portfolio '{portfolio}'."
TerminalHelper.colorful_logger(logger.info, TerminalColors.OKBLUE, message) TerminalHelper.colorful_logger(logger.info, TerminalColors.OKBLUE, message)
@ -192,9 +192,7 @@ class Command(BaseCommand):
# Create new suborgs, as long as they don't exist in the db already # Create new suborgs, as long as they don't exist in the db already
new_suborgs = [] new_suborgs = []
for name in org_names - set(existing_suborgs.values_list("name", flat=True)): for name in org_names - set(existing_suborgs.values_list("name", flat=True)):
# Stored in variables due to linter wanting type information here. if normalize_string(name) == normalize_string(portfolio.organization_name):
portfolio_name: str = portfolio.organization_name if portfolio.organization_name is not None else ""
if name is not None and normalize_string(name) == normalize_string(portfolio_name):
# You can use this to populate location information, when this occurs. # You can use this to populate location information, when this occurs.
# However, this isn't needed for now so we can skip it. # However, this isn't needed for now so we can skip it.
message = ( message = (
@ -249,9 +247,8 @@ class Command(BaseCommand):
domain_request.portfolio = portfolio domain_request.portfolio = portfolio
# Set suborg info # Set suborg info
if domain_request.organization_name in suborgs: domain_request.sub_organization = suborgs.get(domain_request.organization_name, None)
domain_request.sub_organization = suborgs.get(domain_request.organization_name) if domain_request.sub_organization is None:
else:
clean_organization_name = None clean_organization_name = None
if isinstance(domain_request.organization_name, str): if isinstance(domain_request.organization_name, str):
clean_organization_name = normalize_string(domain_request.organization_name, lowercase=False) clean_organization_name = normalize_string(domain_request.organization_name, lowercase=False)

2
src/registrar/tests/test_management_scripts.py
View file

@ -1773,7 +1773,7 @@ class TestCreateFederalPortfolio(TestCase):
with self.assertRaisesRegex( with self.assertRaisesRegex(
CommandError, "You must pass --parse_requests when using --include_started_requests" CommandError, "You must pass --parse_requests when using --include_started_requests"
): ):
self.run_create_federal_portfolio(agency_name="test", include_started_requests=True) self.run_create_federal_portfolio(agency_name="test", branch="executive", include_started_requests=True)
def test_command_error_agency_not_found(self): def test_command_error_agency_not_found(self):
"""Check error handling for non-existent agency.""" """Check error handling for non-existent agency."""