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

Small changes

Browse source
This commit is contained in:
zandercymatics 2023-09-13 09:41:31 -06:00
parent 80d37777c0
commit 7abc9bdf7d
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 14 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/registrar/models/domain.py
View file

@ -114,12 +114,6 @@ class Domain(TimeStampedModel, DomainHelper):
# the state is indeterminate # the state is indeterminate
UNKNOWN = "unknown" UNKNOWN = "unknown"
# the ready state for a domain object
READY = "ready"
# when a domain is on hold
ONHOLD = "onhold"
class Cache(property): class Cache(property):
""" """
Python descriptor to turn class methods into properties. Python descriptor to turn class methods into properties.
@ -317,17 +311,13 @@ class Domain(TimeStampedModel, DomainHelper):
"""Time to renew. Not implemented.""" """Time to renew. Not implemented."""
raise NotImplementedError() raise NotImplementedError()
@transition(field="state", source=[State.READY], target=State.ONHOLD)
def place_client_hold(self): def place_client_hold(self):
"""This domain should not be active.""" """This domain should not be active."""
# This method is changing the state of the domain in registrar raise NotImplementedError("This is not implemented yet.")
# TODO: implement EPP call
@transition(field="state", source=[State.ONHOLD], target=State.READY)
def remove_client_hold(self): def remove_client_hold(self):
"""This domain is okay to be active.""" """This domain is okay to be active."""
# This method is changing the state of the domain in registrar raise NotImplementedError()
# TODO: implement EPP call
def __str__(self) -> str: def __str__(self) -> str:
return self.name return self.name
@ -482,10 +472,6 @@ class Domain(TimeStampedModel, DomainHelper):
""" Gets the default security contact. """ """ Gets the default security contact. """
contact = PublicContact.get_default_security() contact = PublicContact.get_default_security()
contact.domain = self contact.domain = self
# if you invert the logic in get_contact_default
# such that the match statement calls from PublicContact,
# you can reduce these to one liners:
# self.get_contact_default(PublicContact.ContactTypeChoices.SECURITY)
return contact return contact
def get_default_administrative_contact(self): def get_default_administrative_contact(self):
@ -506,30 +492,6 @@ class Domain(TimeStampedModel, DomainHelper):
contact.domain = self contact.domain = self
return contact return contact
def get_contact_default(self, contact_type_choice: PublicContact.ContactTypeChoices) -> PublicContact:
""" Returns a default contact based off the contact_type_choice.
Used
contact_type_choice is a literal in PublicContact.ContactTypeChoices,
for instance: PublicContact.ContactTypeChoices.SECURITY.
If you wanted to get the default contact for Security, you would call:
get_contact_default(PublicContact.ContactTypeChoices.SECURITY),
or get_contact_default("security")
"""
choices = PublicContact.ContactTypeChoices
contact: PublicContact
match(contact_type_choice):
case choices.ADMINISTRATIVE:
contact = self.get_default_administrative_contact()
case choices.SECURITY:
contact = self.get_default_security_contact()
case choices.TECHNICAL:
contact = self.get_default_technical_contact()
case choices.REGISTRANT:
contact = self.get_default_registrant_contact()
return contact
def grab_contact_in_keys(self, contacts, check_type, get_from_registry=True): def grab_contact_in_keys(self, contacts, check_type, get_from_registry=True):
""" Grabs a contact object. """ Grabs a contact object.
Returns None if nothing is found. Returns None if nothing is found.

12
src/registrar/views/domain.py
View file

@ -20,6 +20,7 @@ from registrar.models import (
User, User,
UserDomainRole, UserDomainRole,
) )
from registrar.models.public_contact import PublicContact
from ..forms import ( from ..forms import (
ContactForm, ContactForm,
@ -246,7 +247,10 @@ class DomainSecurityEmailView(DomainPermissionView, FormMixin):
"""The initial value for the form.""" """The initial value for the form."""
domain = self.get_object() domain = self.get_object()
initial = super().get_initial() initial = super().get_initial()
initial["security_email"] = domain.security_contact.email security_email = ""
if(domain.security_contact.email is not None):
security_email = domain.security_contact.email
initial["security_email"] = security_email
return initial return initial
def get_success_url(self): def get_success_url(self):
@ -269,7 +273,13 @@ class DomainSecurityEmailView(DomainPermissionView, FormMixin):
# Set the security email from the form # Set the security email from the form
new_email = form.cleaned_data.get("security_email", "") new_email = form.cleaned_data.get("security_email", "")
domain = self.get_object() domain = self.get_object()
contact: PublicContact
if domain.security_contact is not None:
contact = domain.security_contact contact = domain.security_contact
else:
contact = domain.get_default_security_contact()
contact.email = new_email contact.email = new_email
contact.save() contact.save()