mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-06 01:35:22 +02:00
Merge branch 'ms/2451-additional-domain-request-dates' of https://github.com/cisagov/manage.get.gov into ms/2451-additional-domain-request-dates
This commit is contained in:
commit
8bb3f0080b
3 changed files with 14 additions and 8 deletions
|
@ -22,14 +22,14 @@ class Command(BaseCommand, PopulateScriptTemplate):
|
|||
audit_log_entries = LogEntry.objects.filter(object_pk=record.pk).order_by("-timestamp")
|
||||
# Loop through logs in descending order to find most recent status change
|
||||
for log_entry in audit_log_entries:
|
||||
if 'status' in log_entry.changes_dict:
|
||||
if "status" in log_entry.changes_dict:
|
||||
record.last_status_update = log_entry.timestamp.date()
|
||||
break
|
||||
|
||||
# Loop through logs in ascending order to find first submission
|
||||
for log_entry in audit_log_entries.reverse():
|
||||
status = log_entry.changes_dict.get('status')
|
||||
if status and status[1] == 'submitted':
|
||||
status = log_entry.changes_dict.get("status")
|
||||
if status and status[1] == "submitted":
|
||||
record.first_submitted_date = log_entry.timestamp.date()
|
||||
break
|
||||
|
||||
|
|
|
@ -26,7 +26,11 @@ class Migration(migrations.Migration):
|
|||
model_name="domainrequest",
|
||||
name="first_submitted_date",
|
||||
field=models.DateField(
|
||||
blank=True, default=None, help_text="Date initially submitted", null=True, verbose_name="first submitted on"
|
||||
blank=True,
|
||||
default=None,
|
||||
help_text="Date initially submitted",
|
||||
null=True,
|
||||
verbose_name="first submitted on",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
|
|
|
@ -287,8 +287,9 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
|
|||
|
||||
def test_sorting(self):
|
||||
"""test that sorting works properly on the result set"""
|
||||
response = self.app.get(reverse("get_domain_requests_json"),
|
||||
{"sort_by": "last_submitted_date", "order": "desc"})
|
||||
response = self.app.get(
|
||||
reverse("get_domain_requests_json"), {"sort_by": "last_submitted_date", "order": "desc"}
|
||||
)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
data = response.json
|
||||
|
||||
|
@ -307,8 +308,9 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
|
|||
def test_filter_approved_excluded(self):
|
||||
"""test that approved requests are excluded from result set."""
|
||||
# sort in reverse chronological order of submission date, since most recent request is approved
|
||||
response = self.app.get(reverse("get_domain_requests_json"),
|
||||
{"sort_by": "last_submitted_date", "order": "desc"})
|
||||
response = self.app.get(
|
||||
reverse("get_domain_requests_json"), {"sort_by": "last_submitted_date", "order": "desc"}
|
||||
)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
data = response.json
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue