zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-17 18:09:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Model corrections

Browse source
This commit is contained in:
CocoByte 2024-06-12 14:49:06 -06:00
parent 7178832d74
commit 85f3234fcd
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
4 changed files with 183 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,17 @@ class DomainInformation(TimeStampedModel):
help_text="Person who submitted the domain request",
)
# portfolio
portfolio = models.OneToOneField(
"registrar.Portfolio",
on_delete=models.PROTECT,
null=True,
blank=True,
related_name="DomainRequest_portfolio",
help_text="Portfolio associated with this domain",
)
domain_request = models.OneToOneField(
"registrar.DomainRequest",
on_delete=models.PROTECT,

10
src/registrar/models/domain_request.py
View file

@ -286,6 +286,16 @@ class DomainRequest(TimeStampedModel):
null=True,
)
# portfolio
portfolio = models.OneToOneField(
"registrar.Portfolio",
on_delete=models.PROTECT,
null=True,
blank=True,
related_name="DomainInformation_portfolio",
help_text="Portfolio associated with this domain",
)
# This is the domain request user who created this domain request. The contact
# information that they gave is in the `submitter` field
creator = models.ForeignKey(

145
src/registrar/models/organization.py
View file

@ -1,145 +0,0 @@
from django.db import models
from django_fsm import FSMField # type: ignore
from registrar.models.domain_request import DomainRequest
from registrar.models.federal_agency import FederalAgency
from registrar.models.domain import State
from .utility.time_stamped_model import TimeStampedModel
class Organization(TimeStampedModel):
"""
TODO:
"""
class Meta:
"""Contains meta information about this class"""
indexes = [
models.Index(fields=["user"]),
models.Index(fields=["email"]),
]
# federal agency - FK to fed agency table (Not nullable, should default to the Non-federal agency value in the fed agency table)
federal_agency = models.ForeignKey(
"registrar.FederalAgency",
on_delete=models.PROTECT,
help_text="Associated federal agency",
unique=False,
default=FederalAgency.objects.filter(agency="Non-Federal Agency").first()
)
# creator- user foreign key- stores who created this model
# should get the user who is adding it via django admin if there
# is a user (aka not done via commandline/ manual means)
# TODO: auto-populate
creator = models.ForeignKey(
"registrar.User",
on_delete=models.PROTECT,
help_text="Associated user",
unique=False
)
# organization type- should match organization types allowed on domain info
organization_type = models.CharField(
max_length=255,
choices=DomainRequest.OrgChoicesElectionOffice.choices,
null=True,
blank=True,
help_text='"Election" appears after the org type if it\'s an election office.',
)
# organization name
# TODO: org name will be the same as federal agency, if it is federal,
# otherwise it will be the actual org name. If nothing is entered for
# org name and it is a federal organization, have this field fill with
# the federal agency text name.
organization_name = models.CharField(
null=True,
blank=True,
)
# address_line1
address_line1 = models.CharField(
null=True,
blank=True,
verbose_name="address line 1",
)
# address_line2
address_line2 = models.CharField(
null=True,
blank=True,
verbose_name="address line 2",
)
# city
city = models.CharField(
null=True,
blank=True,
)
# state (copied from domain.py -- imports enums from domain.py)
state = FSMField(
max_length=21,
choices=State.choices,
default=State.UNKNOWN,
# cannot change state directly, particularly in Django admin
protected=True,
# This must be defined for custom state help messages,
# as otherwise the view will purge the help field as it does not exist.
help_text=" ",
verbose_name="domain state",
)
# zipcode
zipcode = models.CharField(
max_length=10,
null=True,
blank=True,
verbose_name="zip code",
)
# urbanization
urbanization = models.CharField(
null=True,
blank=True,
help_text="Required for Puerto Rico only",
verbose_name="urbanization",
)
# security_contact_email
security_contact_email = models.EmailField(
null=True,
blank=True,
verbose_name="security contact e-mail",
max_length=320,
)
# def save(self, *args, **kwargs):
# # Call the parent class's save method to perform the actual save
# super().save(*args, **kwargs)
# if self.user:
# updated = False
# # Update first name and last name if necessary
# if not self.user.first_name or not self.user.last_name:
# self.user.first_name = self.first_name
# self.user.last_name = self.last_name
# updated = True
# # Update phone if necessary
# if not self.user.phone:
# self.user.phone = self.phone
# updated = True
# # Save user if any updates were made
# if updated:
# self.user.save()
# def __str__(self):
# if self.first_name or self.last_name:
# return self.get_formatted_name()
# elif self.email:
# return self.email
# elif self.pk:
# return str(self.pk)
# else:
# return ""

207
src/registrar/models/portfolio.py
View file

@ -1,4 +1,9 @@
from django.db import models
from django_fsm import FSMField # type: ignore
from registrar.models.domain_request import DomainRequest
from registrar.models.federal_agency import FederalAgency
from registrar.models.domain import State
from .utility.time_stamped_model import TimeStampedModel
@ -15,6 +20,10 @@ class Portfolio(TimeStampedModel):
models.Index(fields=["user"]),
models.Index(fields=["email"]),
]
# use the short names in Django admin
OrganizationChoices = DomainRequest.OrganizationChoices
# NOTE: This will be specified in a future ticket
# class PortfolioTypes(models.TextChoices):
@ -23,6 +32,12 @@ class Portfolio(TimeStampedModel):
# TYPE3 = "foo", "foo"
# TYPE4 = "foo", "foo"
# NOTE: This will be specified in a future ticket
# portfolio_type = models.TextField(
# choices=PortfolioTypes.choices,
# null=True,
# blank=True,
# )
# creator- user foreign key- stores who created this model should get the user who is adding
# it via django admin if there is a user (aka not done via commandline/ manual means)"""
@ -34,69 +49,171 @@ class Portfolio(TimeStampedModel):
unique=False
)
# NOTE: This will be specified in a future ticket
# portfolio_type = models.TextField(
# choices=PortfolioTypes.choices,
# null=True,
# blank=True,
# )
# notes- text field (copy what is done on requests/domains)
notes = models.TextField(
null=True,
blank=True,
)
# domains- many to many to Domain field (nullable)
domains = models.ManyToManyField(
"registrar.Domain",
null=True,
blank=True,
related_name="portfolio domains",
verbose_name="portfolio domains",
# on_delete=models.PROTECT, # TODO: protect this?
# # domains- many to many to Domain field (nullable)
# domains = models.ManyToManyField(
# "registrar.Domain",
# null=True,
# blank=True,
# related_name="portfolio domains",
# verbose_name="portfolio domains",
# # on_delete=models.PROTECT, # TODO: protect this?
# )
# # domain_requests- Many to many to Domain Request field (nullable)
# domain_requests = models.ManyToManyField(
# "registrar.DomainRequest",
# null=True,
# blank=True,
# related_name="portfolio domain requests",
# verbose_name="portfolio domain requests",
# # on_delete=models.PROTECT, # TODO: protect this?
# )
# # organization
# organization = models.OneToOneField(
# "registrar.Organization",
# null=True,
# blank=True,
# )
# federal agency - FK to fed agency table (Not nullable, should default to the Non-federal agency value in the fed agency table)
federal_agency = models.ForeignKey(
"registrar.FederalAgency",
on_delete=models.PROTECT,
help_text="Associated federal agency",
unique=False,
default=FederalAgency.objects.filter(agency="Non-Federal Agency").first()
)
# domain_requests- Many to many to Domain Request field (nullable)
domain_requests = models.ManyToManyField(
"registrar.DomainRequest",
null=True,
blank=True,
related_name="portfolio domain requests",
verbose_name="portfolio domain requests",
# on_delete=models.PROTECT, # TODO: protect this?
# creator- user foreign key- stores who created this model
# should get the user who is adding it via django admin if there
# is a user (aka not done via commandline/ manual means)
# TODO: auto-populate
creator = models.ForeignKey(
"registrar.User",
on_delete=models.PROTECT,
help_text="Associated user",
unique=False
)
# organization
organization = models.OneToOneField(
"registrar.Organization",
# organization type- should match organization types allowed on domain info
organization_type = models.CharField(
max_length=255,
choices=OrganizationChoices.choices,
null=True,
blank=True,
# on_delete=models.PROTECT, # TODO: protect this?
help_text="Type of organization",
)
# def save(self, *args, **kwargs):
# # Call the parent class's save method to perform the actual save
# super().save(*args, **kwargs)
# organization name
# TODO: org name will be the same as federal agency, if it is federal,
# otherwise it will be the actual org name. If nothing is entered for
# org name and it is a federal organization, have this field fill with
# the federal agency text name.
organization_name = models.CharField(
null=True,
blank=True,
)
# if self.user:
# updated = False
# address_line1
address_line1 = models.CharField(
null=True,
blank=True,
verbose_name="address line 1",
)
# address_line2
address_line2 = models.CharField(
null=True,
blank=True,
verbose_name="address line 2",
)
# city
city = models.CharField(
null=True,
blank=True,
)
# state (copied from domain.py -- imports enums from domain.py)
state = FSMField(
max_length=21,
choices=State.choices,
default=State.UNKNOWN,
# cannot change state directly, particularly in Django admin
protected=True,
# This must be defined for custom state help messages,
# as otherwise the view will purge the help field as it does not exist.
help_text=" ",
verbose_name="domain state",
)
# zipcode
zipcode = models.CharField(
max_length=10,
null=True,
blank=True,
verbose_name="zip code",
)
# urbanization
urbanization = models.CharField(
null=True,
blank=True,
help_text="Required for Puerto Rico only",
verbose_name="urbanization",
)
# # Update first name and last name if necessary
# if not self.user.first_name or not self.user.last_name:
# self.user.first_name = self.first_name
# self.user.last_name = self.last_name
# updated = True
# security_contact_email
security_contact_email = models.EmailField(
null=True,
blank=True,
verbose_name="security contact e-mail",
max_length=320,
)
# # Update phone if necessary
# if not self.user.phone:
# self.user.phone = self.phone
# updated = True
def save(self, *args, **kwargs):
# Call the parent class's save method to perform the actual save
super().save(*args, **kwargs)
# # Save user if any updates were made
# if updated:
# self.user.save()
# TODO:
# ---- auto-populate creator ----
# creator- user foreign key- stores who created this model
# should get the user who is adding it via django admin if there
# is a user (aka not done via commandline/ manual means)
# ---- update organization name ----
# org name will be the same as federal agency, if it is federal,
# otherwise it will be the actual org name. If nothing is entered for
# org name and it is a federal organization, have this field fill with
# the federal agency text name.
is_federal = self.organization_type == self.OrganizationChoices.FEDERAL
if is_federal:
self.organization_name = DomainRequest.OrganizationChoicesVerbose(self.organization_type)
#NOTE: Is this what is meant by "federal agency text name?"
# -----------------------------------
# if self.user:
# updated = False
# # Update first name and last name if necessary
# if not self.user.first_name or not self.user.last_name:
# self.user.first_name = self.first_name
# self.user.last_name = self.last_name
# updated = True
# # Update phone if necessary
# if not self.user.phone:
# self.user.phone = self.phone
# updated = True
# # Save user if any updates were made
# if updated:
# self.user.save()
# -----------------------------------
# def __str__(self):
# if self.first_name or self.last_name: