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

Code cleanup

Browse source
This commit is contained in:
zandercymatics 2023-11-20 10:38:53 -07:00
parent 0ce4a04b4b
commit 04c7bdd3b6
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/registrar/management/commands/utility/extra_transition_domain_helper.py
View file

@ -12,6 +12,7 @@ import sys
from typing import Dict from typing import Dict
from django.core.paginator import Paginator from django.core.paginator import Paginator
from registrar.models.transition_domain import TransitionDomain from registrar.models.transition_domain import TransitionDomain
from registrar.utility.errors import LoadOrganizationError, LoadOrganizationErrorCodes
from .epp_data_containers import ( from .epp_data_containers import (
AgencyAdhoc, AgencyAdhoc,
@ -756,9 +757,9 @@ class OrganizationDataLoader:
"""Saves organization data onto Transition Domains. Handles file parsing.""" """Saves organization data onto Transition Domains. Handles file parsing."""
def __init__(self, options: TransitionDomainArguments): def __init__(self, options: TransitionDomainArguments):
# Globally stores event logs and organizes them
self.debug = options.debug self.debug = options.debug
# We want to data from the domain_additional file and the organization_adhoc file
options.pattern_map_params = [ options.pattern_map_params = [
( (
EnumFilenames.DOMAIN_ADDITIONAL, EnumFilenames.DOMAIN_ADDITIONAL,
@ -773,17 +774,20 @@ class OrganizationDataLoader:
"orgid", "orgid",
), ),
] ]
# Reads and parses organization data # Reads and parses organization data
self.parsed_data = ExtraTransitionDomain(options) self.parsed_data = ExtraTransitionDomain(options)
# options.infer_filenames will always be false when not SETTING.DEBUG # options.infer_filenames will always be false when not SETTING.DEBUG
self.parsed_data.parse_all_files(options.infer_filenames) self.parsed_data.parse_all_files(options.infer_filenames)
self.tds_to_update = [] self.tds_to_update = []
def update_organization_data_for_all(self): def update_organization_data_for_all(self):
"""Updates org data for all TransitionDomains""" """Updates org data for all TransitionDomains"""
all_transition_domains = TransitionDomain.objects.all() all_transition_domains = TransitionDomain.objects.all()
if len(all_transition_domains) == 0: if len(all_transition_domains) == 0:
raise Exception(f"{TerminalColors.FAIL}No TransitionDomains exist. Cannot update.{TerminalColors.ENDC}") raise LoadOrganizationError(code=LoadOrganizationErrorCodes.EMPTY_TRANSITION_DOMAIN_TABLE)
self.prepare_transition_domains(all_transition_domains) self.prepare_transition_domains(all_transition_domains)
@ -887,24 +891,6 @@ class OrganizationDataLoader:
desired_id: str -> Which id you want to search on. desired_id: str -> Which id you want to search on.
An example would be `"12"` or `"igorville.gov"` An example would be `"12"` or `"igorville.gov"`
Explanation:
Each data file has an associated type (file_type) for tracking purposes.
Each file_type is a dictionary which
contains a dictionary of row[id_field]: object.
In practice, this would look like:
EnumFilenames.AUTHORITY_ADHOC: {
"1": AuthorityAdhoc(...),
"2": AuthorityAdhoc(...),
...
}
desired_id will then specify which id to grab. If we wanted "1",
then this function will return the value of id "1".
So, `AuthorityAdhoc(...)`
""" """
# Grabs a dict associated with the file_type. # Grabs a dict associated with the file_type.
# For example, EnumFilenames.DOMAIN_ADDITIONAL would map to # For example, EnumFilenames.DOMAIN_ADDITIONAL would map to

2
src/registrar/utility/errors.py
View file

@ -60,6 +60,7 @@ contact help@get.gov
class LoadOrganizationErrorCodes(IntEnum): class LoadOrganizationErrorCodes(IntEnum):
TRANSITION_DOMAINS_NOT_FOUND = 1 TRANSITION_DOMAINS_NOT_FOUND = 1
UPDATE_DOMAIN_INFO_FAILED = 2 UPDATE_DOMAIN_INFO_FAILED = 2
EMPTY_TRANSITION_DOMAIN_TABLE = 3
class LoadOrganizationError(Exception): class LoadOrganizationError(Exception):
@ -72,6 +73,7 @@ class LoadOrganizationError(Exception):
"Could not find all desired TransitionDomains. " "(Possible data corruption?)" "Could not find all desired TransitionDomains. " "(Possible data corruption?)"
), ),
LoadOrganizationErrorCodes.UPDATE_DOMAIN_INFO_FAILED: "Failed to update DomainInformation", LoadOrganizationErrorCodes.UPDATE_DOMAIN_INFO_FAILED: "Failed to update DomainInformation",
LoadOrganizationErrorCodes.EMPTY_TRANSITION_DOMAIN_TABLE: "No TransitionDomains exist. Cannot update."
} }
def __init__(self, *args, code=None, **kwargs): def __init__(self, *args, code=None, **kwargs):