zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-29 05:56:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup bool logic to be more concise

Browse source
This commit is contained in:
zandercymatics 2024-10-30 14:33:30 -06:00
parent 4f1febf248
commit bb9cb527d2
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1137,13 +1137,10 @@ class DomainRequest(TimeStampedModel):
Checks if this record has a suborganization or not by checking if a suborganization exists, Checks if this record has a suborganization or not by checking if a suborganization exists,
and if it doesn't, determining if properties like requested_suborganization exist. and if it doesn't, determining if properties like requested_suborganization exist.
""" """
if self.portfolio and (self.sub_organization or self.is_requesting_new_suborganization()):
if self.portfolio: return True
if self.sub_organization: else:
return True return False
if self.is_requesting_new_suborganization():
return True
return False
def is_requesting_new_suborganization(self) -> bool: def is_requesting_new_suborganization(self) -> bool:
"""Used on the requesting entity form to determine if a user is trying to request """Used on the requesting entity form to determine if a user is trying to request
@ -1152,11 +1149,15 @@ class DomainRequest(TimeStampedModel):
This only occurs when no suborganization is selected, but they've filled out This only occurs when no suborganization is selected, but they've filled out
the requested_suborganization, suborganization_city, and suborganization_state_territory fields. the requested_suborganization, suborganization_city, and suborganization_state_territory fields.
""" """
# If a suborganization already exists, it can't possibly be a new one
if self.sub_organization:
return False
if self.requested_suborganization and self.suborganization_city and self.suborganization_state_territory: # If a suborganization already exists, it can't possibly be a new one.
# As well, we need all required fields to exist.
required_fields = [
self.requested_suborganization,
self.suborganization_city,
self.suborganization_state_territory
]
if not self.sub_organization and all(required_fields):
return True return True
else: else:
return False return False
@ -1167,9 +1168,7 @@ class DomainRequest(TimeStampedModel):
def unlock_requesting_entity(self) -> bool: def unlock_requesting_entity(self) -> bool:
"""Unlocks the requesting entity step""" """Unlocks the requesting entity step"""
if self.requesting_entity_is_suborganization(): if self.requesting_entity_is_suborganization() or self.requesting_entity_is_portfolio():
return True
elif self.requesting_entity_is_portfolio():
return True return True
else: else:
return False return False