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

fixed migration conflicts

Browse source 
Signed-off-by: CocoByte <nicolle.leclair@gmail.com>
This commit is contained in:
CocoByte 2023-10-10 13:56:36 -06:00
parent 87d4fa8f78
commit 3ea0811239
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,6 @@ class termColors:
BackgroundLightYellow = "\033[103m" BackgroundLightYellow = "\033[103m"
class Command(BaseCommand): class Command(BaseCommand):
help = """Load data from transition domain tables help = """Load data from transition domain tables
into main domain tables. Also create domain invitation into main domain tables. Also create domain invitation
@ -71,7 +70,6 @@ class Command(BaseCommand):
""" """
) )
def handle( # noqa: C901 def handle( # noqa: C901
self, self,
**options, **options,
@ -137,7 +135,10 @@ class Command(BaseCommand):
{termColors.ENDC}""" # noqa {termColors.ENDC}""" # noqa
) )
if transition_domain_status != current_state: if transition_domain_status != current_state:
if transition_domain_status == TransitionDomain.StatusChoices.ON_HOLD: if (
transition_domain_status
== TransitionDomain.StatusChoices.ON_HOLD
):
existingEntry.place_client_hold(ignoreEPP=True) existingEntry.place_client_hold(ignoreEPP=True)
else: else:
existingEntry.revert_client_hold(ignoreEPP=True) existingEntry.revert_client_hold(ignoreEPP=True)
@ -153,7 +154,6 @@ class Command(BaseCommand):
{termColors.ENDC}""" {termColors.ENDC}"""
) )
except Domain.DoesNotExist: except Domain.DoesNotExist:
already_in_to_create = next( already_in_to_create = next(
(x for x in domains_to_create if x.name == transition_domain_name), (x for x in domains_to_create if x.name == transition_domain_name),
None, None,
@ -177,8 +177,7 @@ class Command(BaseCommand):
if transition_domain_email: if transition_domain_email:
new_domain_invitation = DomainInvitation( new_domain_invitation = DomainInvitation(
email=transition_domain_email.lower(), email=transition_domain_email.lower(), domain=new_entry
domain=new_entry
) )
domain_invitations_to_create.append(new_domain_invitation) domain_invitations_to_create.append(new_domain_invitation)
else: else:
@ -262,7 +261,6 @@ class Command(BaseCommand):
""" """
) )
# DEBUG: # DEBUG:
if debug_on: if debug_on:
logger.info( logger.info(

4
src/registrar/migrations/0033_alter_transitiondomain_status.py → src/registrar/migrations/0038_alter_transitiondomain_status.py
View file

@ -1,11 +1,11 @@
# Generated by Django 4.2.1 on 2023-10-03 05:43 # Generated by Django 4.2.1 on 2023-10-10 17:38
from django.db import migrations, models from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("registrar", "0032_alter_transitiondomain_status"), ("registrar", "0037_create_groups_v01"),
] ]
operations = [ operations = [