From 4e22e26065204fa4c941fbe3a885c01a951fab07 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 6 Nov 2023 16:16:57 -0700 Subject: [PATCH] Bug fix --- .../commands/utility/extra_transition_domain_helper.py | 4 ++-- .../commands/utility/transition_domain_arguments.py | 8 +++++++- src/registrar/tests/test_transition_domain_migrations.py | 3 --- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/registrar/management/commands/utility/extra_transition_domain_helper.py b/src/registrar/management/commands/utility/extra_transition_domain_helper.py index e98954c60..496ed87f1 100644 --- a/src/registrar/management/commands/utility/extra_transition_domain_helper.py +++ b/src/registrar/management/commands/utility/extra_transition_domain_helper.py @@ -136,9 +136,9 @@ class LoadExtraTransitionDomain: def __init__(self, options: TransitionDomainArguments): # Globally stores event logs and organizes them self.parse_logs = FileTransitionLog() - arguments = options.args_extra_transition_domain() + print(f"options correct? {options.agency_adhoc_filename}") # Reads and parses migration files - self.parsed_data_container = ExtraTransitionDomain(**arguments) + self.parsed_data_container = ExtraTransitionDomain(options) self.parsed_data_container.parse_all_files(options.infer_filenames) def update_transition_domain_models(self): diff --git a/src/registrar/management/commands/utility/transition_domain_arguments.py b/src/registrar/management/commands/utility/transition_domain_arguments.py index e95425255..18bb99628 100644 --- a/src/registrar/management/commands/utility/transition_domain_arguments.py +++ b/src/registrar/management/commands/utility/transition_domain_arguments.py @@ -6,6 +6,11 @@ from registrar.management.commands.utility.epp_data_containers import EnumFilena @dataclass class TransitionDomainArguments: """Stores arguments for load_transition_domain""" + def __init__(self, **kwargs): + self.kwargs = kwargs + for k, v in kwargs.items(): + if hasattr(self, k): + setattr(self, k, v) # Settings # directory: Optional[str] = field(default="migrationdata", repr=True) @@ -20,7 +25,8 @@ class TransitionDomainArguments: authority_adhoc_filename: Optional[str] = field(default=EnumFilenames.AUTHORITY_ADHOC.value[1], repr=True) ## Data files ## - domain_additional_filename: Optional[str] = field(default=None, repr=True) + domain_escrow_filename: Optional[str] = field(default=EnumFilenames.DOMAIN_ESCROW.value[1], repr=True) + domain_additional_filename: Optional[str] = field(default=EnumFilenames.DOMAIN_ADDITIONAL.value[1], repr=True) domain_contacts_filename: Optional[str] = field(default=None, repr=True) domain_statuses_filename: Optional[str] = field(default=None, repr=True) diff --git a/src/registrar/tests/test_transition_domain_migrations.py b/src/registrar/tests/test_transition_domain_migrations.py index 7d6482db8..cdad79ed8 100644 --- a/src/registrar/tests/test_transition_domain_migrations.py +++ b/src/registrar/tests/test_transition_domain_migrations.py @@ -14,9 +14,6 @@ from django.core.management import call_command from unittest.mock import patch class TestMigrations(TestCase): - - """ """ - def setUp(self): """ """ # self.load_transition_domain_script = "load_transition_domain",