diff --git a/src/registrar/management/commands/load_transition_domain.py b/src/registrar/management/commands/load_transition_domain.py index a38a7366e..3878a3366 100644 --- a/src/registrar/management/commands/load_transition_domain.py +++ b/src/registrar/management/commands/load_transition_domain.py @@ -339,7 +339,7 @@ class Command(BaseCommand): try: data = json.load(jsonFile) # Create an instance of TransitionDomainArguments - + has_desired_args = False # Iterate over the data from the JSON file for key, value in data.items(): # Check if the key exists in TransitionDomainArguments diff --git a/src/registrar/management/commands/master_domain_migrations.py b/src/registrar/management/commands/master_domain_migrations.py index c3f92a3a9..96bf0517b 100644 --- a/src/registrar/management/commands/master_domain_migrations.py +++ b/src/registrar/management/commands/master_domain_migrations.py @@ -269,7 +269,7 @@ class Command(BaseCommand): if file_directory and file_directory[-1] != "/": file_directory += "/" - json_filepath = file_directory+migration_json_filename + json_filepath = migration_json_filename """Runs the load_transition_domain script""" # Create the command string command_script = "load_transition_domain" @@ -285,6 +285,8 @@ class Command(BaseCommand): command_string += "--debug " if debug_max_entries_to_parse > 0: command_string += f"--limitParse {debug_max_entries_to_parse} " + if file_directory: + command_string += f"--directory {file_directory}" # Execute the command string proceed = False 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 06879c515..fd7752839 100644 --- a/src/registrar/management/commands/utility/extra_transition_domain_helper.py +++ b/src/registrar/management/commands/utility/extra_transition_domain_helper.py @@ -185,11 +185,8 @@ class LoadExtraTransitionDomain: ) # Check if the instance has changed before saving - #if updated_transition_domain.__dict__ != transition_domain.__dict__: - updated_transition_domain.save() updated_transition_domains.append(updated_transition_domain) - logger.info( f"{TerminalColors.OKCYAN}" f"Successfully updated {domain_name}" @@ -208,17 +205,16 @@ class LoadExtraTransitionDomain: ) failed_transition_domains.append(domain_name) - if self.debug: - # Display misc errors (not associated to a domain) - self.parse_logs.display_logs_by_domain_name(None) - failed_count = len(failed_transition_domains) if failed_count == 0: - TerminalHelper.print_conditional(self.debug, f"{TerminalHelper.array_as_string(updated_transition_domains)}") + if self.debug: + for domain in updated_transition_domains: + logger.debug(domain.display_transition_domain()) logger.info( f"""{TerminalColors.OKGREEN} ============= FINISHED =============== Updated {len(updated_transition_domains)} transition domain entries: + {[domain for domain in updated_transition_domains]} {TerminalColors.ENDC} """ ) @@ -228,18 +224,20 @@ class LoadExtraTransitionDomain: logger.error( f"""{TerminalColors.FAIL} ============= FINISHED WITH ERRORS =============== - Updated {len(updated_transition_domains)} transition domain entries, - Failed to update {failed_count} transition domain entries + Updated {len(updated_transition_domains)} transition domain entries: + {[domain for domain in updated_transition_domains]} + Failed to update {failed_count} transition domain entries: + {[domain for domain in failed_transition_domains]} {TerminalColors.ENDC} """ ) # DATA INTEGRITY CHECK # Make sure every Transition Domain got updated - total_transition_domains = TransitionDomain.objects.all().count() + total_transition_domains = len(updated_transition_domains) total_updates_made = TransitionDomain.objects.all().count() if total_transition_domains != total_updates_made: - logger.error(f"""{TerminalColors.Fail} + logger.error(f"""{TerminalColors.FAIL} WARNING: something went wrong processing domain information data. Total Transition Domains expecting a data update: {total_transition_domains} diff --git a/src/registrar/models/transition_domain.py b/src/registrar/models/transition_domain.py index a31b27e7e..7c4d2afe2 100644 --- a/src/registrar/models/transition_domain.py +++ b/src/registrar/models/transition_domain.py @@ -79,6 +79,10 @@ class TransitionDomain(TimeStampedModel): ) def __str__(self): + return f"{self.username}, {self.domain_name}" + + def display_transition_domain(self): + """Displays all information about a TransitionDomain in string format""" return ( f"\n-----TRANSITION DOMAIN------\n" f"domainName: {self.domain_name}, \n" diff --git a/src/registrar/tests/test_transition_domain_migrations.py b/src/registrar/tests/test_transition_domain_migrations.py index 3ac2fa2e5..f5ffb4600 100644 --- a/src/registrar/tests/test_transition_domain_migrations.py +++ b/src/registrar/tests/test_transition_domain_migrations.py @@ -159,8 +159,8 @@ class TestMigrations(TestCase): # STEP 2: (analyze the tables just like the # migration script does, but add assert statements) expected_total_transition_domains = 9 - expected_total_domains = 4 - expected_total_domain_informations = 4 + expected_total_domains = 5 + expected_total_domain_informations = 5 expected_total_domain_invitations = 7 expected_missing_domains = 0