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

Fix org_type and fed_type

Browse source
This commit is contained in:
zandercymatics 2023-11-03 08:51:16 -06:00
parent 87696d9b92
commit 0a313af71a
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/registrar/management/commands/transfer_transition_domains_to_domains.py
View file

@ -367,12 +367,29 @@ class Command(BaseCommand):
def create_new_domain_info(self, def create_new_domain_info(self,
transition_domain: TransitionDomain, transition_domain: TransitionDomain,
domain: Domain) -> DomainInformation: domain: Domain) -> DomainInformation:
org_type = transition_domain.organization_type org_type = transition_domain.organization_type
fed_type = transition_domain.federal_type fed_type = transition_domain.federal_type
fed_agency = transition_domain.federal_agency fed_agency = transition_domain.federal_agency
valid_org_type = org_type in [choice_value for choice_value, _ in DomainApplication.OrganizationChoices.choices] match org_type:
valid_fed_type = fed_type in [choice_value for choice_value, _ in DomainApplication.BranchChoices.choices] case "Federal":
org_type = ("federal", "Federal")
case "Interstate":
org_type = ("interstate", "Interstate")
case "State":
org_type = ("state_or_territory", "State or territory")
case "Tribal":
org_type = ("tribal", "Tribal")
case "County":
org_type = ("county", "County")
case "City":
org_type = ("city", "City")
case "Independent Intrastate":
org_type = ("special_district", "Special district")
valid_org_type = org_type in [(name, value) for name, value in DomainApplication.OrganizationChoices.choices]
valid_fed_type = fed_type in [value for name, value in DomainApplication.BranchChoices.choices]
valid_fed_agency = fed_agency in DomainApplication.AGENCIES valid_fed_agency = fed_agency in DomainApplication.AGENCIES
default_creator, _ = User.objects.get_or_create(username="System") default_creator, _ = User.objects.get_or_create(username="System")
@ -383,22 +400,14 @@ class Command(BaseCommand):
"creator": default_creator, "creator": default_creator,
} }
new_domain_info_data['federal_type'] = None
for item in DomainApplication.BranchChoices.choices:
print(f"it is this: {item}")
name, _ = item
if fed_type is not None and fed_type.lower() == name:
new_domain_info_data['federal_type'] = item
new_domain_info_data['organization_type'] = org_type
new_domain_info_data['federal_agency'] = fed_agency
if valid_org_type: if valid_org_type:
new_domain_info_data['organization_type'] = org_type new_domain_info_data['organization_type'] = org_type[0]
else: else:
logger.debug(f"No org type found on {domain.name}") logger.debug(f"No org type found on {domain.name}")
if valid_fed_type: if valid_fed_type:
new_domain_info_data['federal_type'] = fed_type new_domain_info_data['federal_type'] = fed_type.lower()
pass
else: else:
logger.debug(f"No federal type found on {domain.name}") logger.debug(f"No federal type found on {domain.name}")
@ -413,7 +422,7 @@ class Command(BaseCommand):
TerminalHelper.print_conditional( TerminalHelper.print_conditional(
True, True,
(f"{TerminalColors.MAGENTA}" (f"{TerminalColors.MAGENTA}"
f"Created template: {new_domain_info}" f"Created Domain Information template for: {new_domain_info}"
f"{TerminalColors.ENDC}"), # noqa f"{TerminalColors.ENDC}"), # noqa
) )
return new_domain_info return new_domain_info
@ -585,8 +594,6 @@ class Command(BaseCommand):
Duplicate Detected: {transition_domain_name}. Duplicate Detected: {transition_domain_name}.
Cannot add duplicate entry for another username. Cannot add duplicate entry for another username.
Violates Unique Key constraint. Violates Unique Key constraint.
Checking for unique user e-mail for Domain Invitations...
{TerminalColors.ENDC}""" {TerminalColors.ENDC}"""
else: else:
# ---------------- CREATED ---------------- # ---------------- CREATED ----------------