| Domain name |
- Date created |
+ Date submitted |
Status |
Action |
@@ -110,7 +112,13 @@
{{ application.requested_domain.name|default:"New domain request" }}
|
- {{ application.created_at|date }} |
+
+ {% if application.submission_date %}
+ {{ application.submission_date|date }}
+ {% else %}
+ Not submitted
+ {% endif %}
+ |
{{ application.get_status_display }} |
{% if application.status == "started" or application.status == "action needed" or application.status == "withdrawn" %}
diff --git a/src/registrar/templates/includes/domain_dates.html b/src/registrar/templates/includes/domain_dates.html
new file mode 100644
index 000000000..c05e202e1
--- /dev/null
+++ b/src/registrar/templates/includes/domain_dates.html
@@ -0,0 +1,12 @@
+{% if domain.expiration_date or domain.created_at %}
+
+ {% if domain.expiration_date %}
+ Expires:
+ {{ domain.expiration_date|date }}
+ {% if domain.is_expired %} (expired){% endif %}
+
+ {% endif %}
+ {% if domain.created_at %}
+ Date created: {{ domain.created_at|date }}{% endif %}
+
+{% endif %}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 9d6add249..097d4eeee 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -623,6 +623,7 @@ class TestDomainApplicationAdmin(MockEppLib):
"no_other_contacts_rationale",
"anything_else",
"is_policy_acknowledged",
+ "submission_date",
"current_websites",
"other_contacts",
"alternative_domains",
diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py
index 39f63c942..2f54d7794 100644
--- a/src/registrar/tests/test_models_domain.py
+++ b/src/registrar/tests/test_models_domain.py
@@ -1962,6 +1962,9 @@ class TestExpirationDate(MockEppLib):
"""
super().setUp()
# for the tests, need a domain in the ready state
+ # mock data for self.domain includes the following dates:
+ # cr_date=datetime.datetime(2023, 5, 25, 19, 45, 35)
+ # ex_date=datetime.date(2023, 5, 25)
self.domain, _ = Domain.objects.get_or_create(name="fake.gov", state=Domain.State.READY)
# for the test, need a domain that will raise an exception
self.domain_w_error, _ = Domain.objects.get_or_create(name="fake-error.gov", state=Domain.State.READY)
@@ -1987,6 +1990,23 @@ class TestExpirationDate(MockEppLib):
with self.assertRaises(RegistryError):
self.domain_w_error.renew_domain()
+ def test_is_expired(self):
+ """assert that is_expired returns true for expiration_date in past"""
+ # force fetch_cache to be called
+ self.domain.statuses
+ self.assertTrue(self.domain.is_expired)
+
+ def test_is_not_expired(self):
+ """assert that is_expired returns false for expiration in future"""
+ # to do this, need to mock value returned from timezone.now
+ # set now to 2023-01-01
+ mocked_datetime = datetime.datetime(2023, 1, 1, 12, 0, 0)
+ # force fetch_cache which sets the expiration date to 2023-05-25
+ self.domain.statuses
+
+ with patch("registrar.models.domain.timezone.now", return_value=mocked_datetime):
+ self.assertFalse(self.domain.is_expired())
+
def test_expiration_date_updated_on_info_domain_call(self):
"""assert that expiration date in db is updated on info domain call"""
# force fetch_cache to be called
@@ -1995,6 +2015,36 @@ class TestExpirationDate(MockEppLib):
self.assertEquals(self.domain.expiration_date, test_date)
+class TestCreationDate(MockEppLib):
+ """Created_at in domain model is updated from EPP"""
+
+ def setUp(self):
+ """
+ Domain exists in registry
+ """
+ super().setUp()
+ # for the tests, need a domain with a creation date
+ self.domain, _ = Domain.objects.get_or_create(name="fake.gov", state=Domain.State.READY)
+ # creation_date returned from mockDataInfoDomain with creation date:
+ # cr_date=datetime.datetime(2023, 5, 25, 19, 45, 35)
+ self.creation_date = datetime.datetime(2023, 5, 25, 19, 45, 35)
+
+ def tearDown(self):
+ Domain.objects.all().delete()
+ super().tearDown()
+
+ def test_creation_date_setter_not_implemented(self):
+ """assert that the setter for creation date is not implemented and will raise error"""
+ with self.assertRaises(NotImplementedError):
+ self.domain.creation_date = datetime.date.today()
+
+ def test_creation_date_updated_on_info_domain_call(self):
+ """assert that creation date in db is updated on info domain call"""
+ # force fetch_cache to be called
+ self.domain.statuses
+ self.assertEquals(self.domain.created_at, self.creation_date)
+
+
class TestAnalystClientHold(MockEppLib):
"""Rule: Analysts may suspend or restore a domain by using client hold"""
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 57fa03f52..e40e6196a 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -100,7 +100,7 @@ class LoggedInTests(TestWithUser):
response = self.client.get("/")
# count = 2 because it is also in screenreader content
self.assertContains(response, "igorville.gov", count=2)
- self.assertContains(response, "DNS needed")
+ self.assertContains(response, "Expired")
# clean up
role.delete()
diff --git a/src/registrar/views/index.py b/src/registrar/views/index.py
index b203694ff..9605c723d 100644
--- a/src/registrar/views/index.py
+++ b/src/registrar/views/index.py
@@ -1,7 +1,6 @@
-from django.db.models import F
from django.shortcuts import render
-from registrar.models import DomainApplication
+from registrar.models import DomainApplication, Domain, UserDomainRole
def index(request):
@@ -14,12 +13,9 @@ def index(request):
# the active applications table
context["domain_applications"] = applications.exclude(status="approved")
- domains = request.user.permissions.values(
- "role",
- pk=F("domain__id"),
- name=F("domain__name"),
- created_time=F("domain__created_at"),
- state=F("domain__state"),
- )
+ user_domain_roles = UserDomainRole.objects.filter(user=request.user)
+ domain_ids = user_domain_roles.values_list("domain_id", flat=True)
+ domains = Domain.objects.filter(id__in=domain_ids)
+
context["domains"] = domains
return render(request, "home.html", context)
|