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

Lint

Browse source
This commit is contained in:
Jon Roberts 2023-05-08 15:41:20 -04:00
parent 8982d8d293
commit 4498ae7847
No known key found for this signature in database
GPG key ID: EED093582198B041
2 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/registrar/models/domain_application.py
View file

@ -516,18 +516,6 @@ class DomainApplication(TimeStampedModel):
application into an admin on that domain. application into an admin on that domain.
""" """
# create the domain if it doesn't exist
Domain = apps.get_model("registrar.Domain")
created_domain, _ = Domain.objects.get_or_create(name=self.requested_domain)
# copy the information from domainapplication into domaininformation
DomainInformation = apps.get_model("registrar.DomainInformation")
domain_info = self.to_dict()
# remove PK from domainapplication as it use different PK
# for domain/domaininformation
domain_info = DomainInformation.create_from_da(self)
# create the permission for the user # create the permission for the user
UserDomainRole = apps.get_model("registrar.UserDomainRole") UserDomainRole = apps.get_model("registrar.UserDomainRole")
UserDomainRole.objects.get_or_create( UserDomainRole.objects.get_or_create(
@ -587,7 +575,8 @@ class DomainApplication(TimeStampedModel):
return False return False
def to_dict(instance): def to_dict(instance):
"""This is to process to_dict for Domain Information, making it friendly to "copy" it""" """This is to process to_dict for Domain Information, making it friendly
to "copy" it"""
opts = instance._meta opts = instance._meta
data = {} data = {}
for field in chain(opts.concrete_fields, opts.private_fields): for field in chain(opts.concrete_fields, opts.private_fields):

14
src/registrar/models/domain_information.py
View file

@ -1,11 +1,9 @@
from __future__ import annotations from __future__ import annotations
from typing import Union
from .domain_application import DomainApplication from .domain_application import DomainApplication
from .utility.time_stamped_model import TimeStampedModel from .utility.time_stamped_model import TimeStampedModel
import logging import logging
from django.apps import apps
from django.db import models from django.db import models
@ -14,7 +12,8 @@ logger = logging.getLogger(__name__)
class DomainInformation(TimeStampedModel): class DomainInformation(TimeStampedModel):
"""A registrant's domain information for that domain, exported from DomainApplication.""" """A registrant's domain information for that domain, exported from
DomainApplication."""
StateTerritoryChoices = DomainApplication.StateTerritoryChoices StateTerritoryChoices = DomainApplication.StateTerritoryChoices
@ -160,7 +159,8 @@ class DomainInformation(TimeStampedModel):
on_delete=models.PROTECT, on_delete=models.PROTECT,
blank=True, blank=True,
null=True, null=True,
related_name="domain_info", # Access this information via Domain as "domain.info" # Access this information via Domain as "domain.info"
related_name="domain_info",
help_text="Domain to which this information belongs", help_text="Domain to which this information belongs",
) )
alternative_domains = models.ManyToManyField( alternative_domains = models.ManyToManyField(
@ -230,7 +230,8 @@ class DomainInformation(TimeStampedModel):
da_dict = domain_application.to_dict() da_dict = domain_application.to_dict()
# remove the id so one can be assinged on creation # remove the id so one can be assinged on creation
da_id = da_dict.pop("id") da_id = da_dict.pop("id")
# check if we have a record that corresponds with the domain application, if so short circuit the create # check if we have a record that corresponds with the domain
# application, if so short circuit the create
domain_info = cls.objects.filter(domain_application__id=da_id).first() domain_info = cls.objects.filter(domain_application__id=da_id).first()
if domain_info: if domain_info:
return domain_info return domain_info
@ -243,7 +244,8 @@ class DomainInformation(TimeStampedModel):
alternative_domains = da_dict.pop("alternative_domains") # just in case alternative_domains = da_dict.pop("alternative_domains") # just in case
domain_info = cls(**da_dict) domain_info = cls(**da_dict)
domain_info.domain_application = domain_application domain_info.domain_application = domain_application
# Save so the object now have PK (needed to process the manytomany below before first) # Save so the object now have PK
# (needed to process the manytomany below before, first)
domain_info.save() domain_info.save()
# Process the remaining "many to many" stuff # Process the remaining "many to many" stuff