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

Merge pull request #2112 from cisagov/rjm/2038-capture-cisa-region

Browse source 
Issue #2038 / #2095: Add CISA region on domain and domain requests change form - (RJM)
This commit is contained in:
zandercymatics 2024-05-06 09:35:59 -06:00 • committed by GitHub
commit 2467e09bcc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 138 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/registrar/templates/django/admin/includes/detail_table_fieldset.html
View file

@ -1,4 +1,5 @@
{% extends "admin/fieldset.html" %}
{% load custom_filters %}
{% load static url_helpers %}
{% comment %}
@ -162,5 +163,16 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
</details>
{% endif %}
{% endwith %}
{% elif field.field.name == "state_territory" %}
<div class="flex-container margin-top-2">
<span>
CISA region:
{% if original_object.generic_org_type and original_object.generic_org_type != original_object.OrganizationChoices.FEDERAL %}
{{ original_object.state_territory|get_region }}
{% else %}
N/A
{% endif %}
</span>
</div>
{% endif %}
{% endblock after_help_text %}

66
src/registrar/templatetags/custom_filters.py
View file

@ -67,3 +67,69 @@ def get_organization_long_name(generic_org_type):
@register.filter(name="has_permission")
def has_permission(user, permission):
return user.has_perm(permission)
@register.filter
def get_region(state):
if state and isinstance(state, str):
regions = {
"CT": 1,
"ME": 1,
"MA": 1,
"NH": 1,
"RI": 1,
"VT": 1,
"NJ": 2,
"NY": 2,
"PR": 2,
"VI": 2,
"DE": 3,
"DC": 3,
"MD": 3,
"PA": 3,
"VA": 3,
"WV": 3,
"AL": 4,
"FL": 4,
"GA": 4,
"KY": 4,
"MS": 4,
"NC": 4,
"SC": 4,
"TN": 4,
"IL": 5,
"IN": 5,
"MI": 5,
"MN": 5,
"OH": 5,
"WI": 5,
"AR": 6,
"LA": 6,
"NM": 6,
"OK": 6,
"TX": 6,
"IA": 7,
"KS": 7,
"MO": 7,
"NE": 7,
"CO": 8,
"MT": 8,
"ND": 8,
"SD": 8,
"UT": 8,
"WY": 8,
"AZ": 9,
"CA": 9,
"HI": 9,
"NV": 9,
"GU": 9,
"AS": 9,
"MP": 9,
"AK": 10,
"ID": 10,
"OR": 10,
"WA": 10,
}
return regions.get(state.upper(), "N/A")
else:
return None

60
src/registrar/tests/test_admin.py
View file

@ -2524,6 +2524,66 @@ class TestDomainRequestAdmin(MockEppLib):
self.assertEqual(expected_list, actual_list)
@less_console_noise_decorator
def test_staff_can_see_cisa_region_federal(self):
"""Tests if staff can see CISA Region: N/A"""
# Create a fake domain request
_domain_request = completed_domain_request(status=DomainRequest.DomainRequestStatus.IN_REVIEW)
p = "userpass"
self.client.login(username="staffuser", password=p)
response = self.client.get(
"/admin/registrar/domainrequest/{}/change/".format(_domain_request.pk),
follow=True,
)
# Make sure the page loaded, and that we're on the right page
self.assertEqual(response.status_code, 200)
self.assertContains(response, _domain_request.requested_domain.name)
# Test if the page has the right CISA region
expected_html = '<div class="flex-container margin-top-2"><span>CISA region: N/A</span></div>'
# Remove whitespace from expected_html
expected_html = "".join(expected_html.split())
# Remove whitespace from response content
response_content = "".join(response.content.decode().split())
# Check if response contains expected_html
self.assertIn(expected_html, response_content)
@less_console_noise_decorator
def test_staff_can_see_cisa_region_non_federal(self):
"""Tests if staff can see the correct CISA region"""
# Create a fake domain request. State will be NY (2).
_domain_request = completed_domain_request(
status=DomainRequest.DomainRequestStatus.IN_REVIEW, generic_org_type="interstate"
)
p = "userpass"
self.client.login(username="staffuser", password=p)
response = self.client.get(
"/admin/registrar/domainrequest/{}/change/".format(_domain_request.pk),
follow=True,
)
# Make sure the page loaded, and that we're on the right page
self.assertEqual(response.status_code, 200)
self.assertContains(response, _domain_request.requested_domain.name)
# Test if the page has the right CISA region
expected_html = '<div class="flex-container margin-top-2"><span>CISA region: 2</span></div>'
# Remove whitespace from expected_html
expected_html = "".join(expected_html.split())
# Remove whitespace from response content
response_content = "".join(response.content.decode().split())
# Check if response contains expected_html
self.assertIn(expected_html, response_content)
def tearDown(self):
super().tearDown()
Domain.objects.all().delete()