From b43ba2af6f5a267343b15d1a603dbbaaa48797f6 Mon Sep 17 00:00:00 2001 From: CocoByte Date: Thu, 26 Dec 2024 17:08:46 -0700 Subject: [PATCH 1/5] Fixed Request Growth report according to ticket recommendations --- src/registrar/utility/csv_export.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 66809777b..10175569e 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -1980,7 +1980,7 @@ class DomainRequestGrowth(DomainRequestExport): "Domain request", "Domain type", "Federal type", - "Submitted at", + "First submitted date", ] @classmethod @@ -2004,7 +2004,6 @@ class DomainRequestGrowth(DomainRequestExport): start_date_formatted = format_start_date(start_date) end_date_formatted = format_end_date(end_date) return Q( - status=DomainRequest.DomainRequestStatus.SUBMITTED, last_submitted_date__lte=end_date_formatted, last_submitted_date__gte=start_date_formatted, ) From 88cca2dc84ea86a8efb0ba65b50848218a647159 Mon Sep 17 00:00:00 2001 From: CocoByte Date: Thu, 26 Dec 2024 18:02:56 -0700 Subject: [PATCH 2/5] update fixtures to include first_submitted_date data --- src/registrar/fixtures/fixtures_requests.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py index 93167ec61..5df3fd0b6 100644 --- a/src/registrar/fixtures/fixtures_requests.py +++ b/src/registrar/fixtures/fixtures_requests.py @@ -1,4 +1,4 @@ -from datetime import timedelta +from datetime import datetime, timedelta from django.utils import timezone import logging import random @@ -126,7 +126,21 @@ class DomainRequestFixture: # TODO for a future ticket: Allow for more than just "federal" here request.generic_org_type = request_dict["generic_org_type"] if "generic_org_type" in request_dict else "federal" if request.status != "started": - request.last_submitted_date = fake.date() + # Generate fake data for first_submitted_date and last_submitted_date + # First generate a random date set to be later than 2020 (or something) + # (if we just use fake.date() we might get years like 1970 or earlier) + earliest_date_allowed = datetime(2020, 1, 1).date() + end_date = datetime.today().date() # Today's date (latest allowed date) + days_range = (end_date - earliest_date_allowed).days + first_submitted_date = earliest_date_allowed + timedelta(days=random.randint(0, days_range)) + + # Generate a random positive offset to ensure last_submitted_date is later + offset_days = random.randint(1, 30) # Ensures at least 1 day difference + last_submitted_date = first_submitted_date + timedelta(days=offset_days) + + # Convert back to strings before assigning + request.first_submitted_date = first_submitted_date.strftime("%Y-%m-%d") + request.last_submitted_date = last_submitted_date.strftime("%Y-%m-%d") request.federal_type = ( request_dict["federal_type"] if "federal_type" in request_dict From 86e436171cfe68fbbddbd25f4807c6daba1e6858 Mon Sep 17 00:00:00 2001 From: CocoByte Date: Thu, 26 Dec 2024 18:29:33 -0700 Subject: [PATCH 3/5] linted --- src/registrar/fixtures/fixtures_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py index 5df3fd0b6..6ac52bd8b 100644 --- a/src/registrar/fixtures/fixtures_requests.py +++ b/src/registrar/fixtures/fixtures_requests.py @@ -129,7 +129,7 @@ class DomainRequestFixture: # Generate fake data for first_submitted_date and last_submitted_date # First generate a random date set to be later than 2020 (or something) # (if we just use fake.date() we might get years like 1970 or earlier) - earliest_date_allowed = datetime(2020, 1, 1).date() + earliest_date_allowed = datetime(2020, 1, 1).date() end_date = datetime.today().date() # Today's date (latest allowed date) days_range = (end_date - earliest_date_allowed).days first_submitted_date = earliest_date_allowed + timedelta(days=random.randint(0, days_range)) From 19bd9fdd3be5da3b5ef32f2883f5c50ce73d54dc Mon Sep 17 00:00:00 2001 From: CocoByte Date: Mon, 6 Jan 2025 13:49:32 -0700 Subject: [PATCH 4/5] Fix linter --- src/registrar/fixtures/fixtures_requests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py index 6ac52bd8b..ceeef3bfb 100644 --- a/src/registrar/fixtures/fixtures_requests.py +++ b/src/registrar/fixtures/fixtures_requests.py @@ -132,10 +132,11 @@ class DomainRequestFixture: earliest_date_allowed = datetime(2020, 1, 1).date() end_date = datetime.today().date() # Today's date (latest allowed date) days_range = (end_date - earliest_date_allowed).days - first_submitted_date = earliest_date_allowed + timedelta(days=random.randint(0, days_range)) + first_submitted_date = earliest_date_allowed + timedelta(days=random.randint(0, days_range)) # nosec - # Generate a random positive offset to ensure last_submitted_date is later - offset_days = random.randint(1, 30) # Ensures at least 1 day difference + # Generate a random positive offset to ensure last_submitted_date is later + # (Start with 1 to ensure at least 1 day difference) + offset_days = random.randint(1, 30) # nosec last_submitted_date = first_submitted_date + timedelta(days=offset_days) # Convert back to strings before assigning From 630854d8bd4a32697a186a3494b0944ec9244a59 Mon Sep 17 00:00:00 2001 From: CocoByte Date: Mon, 6 Jan 2025 13:55:38 -0700 Subject: [PATCH 5/5] linted --- src/registrar/fixtures/fixtures_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py index ceeef3bfb..bff49ff6b 100644 --- a/src/registrar/fixtures/fixtures_requests.py +++ b/src/registrar/fixtures/fixtures_requests.py @@ -134,7 +134,7 @@ class DomainRequestFixture: days_range = (end_date - earliest_date_allowed).days first_submitted_date = earliest_date_allowed + timedelta(days=random.randint(0, days_range)) # nosec - # Generate a random positive offset to ensure last_submitted_date is later + # Generate a random positive offset to ensure last_submitted_date is later # (Start with 1 to ensure at least 1 day difference) offset_days = random.randint(1, 30) # nosec last_submitted_date = first_submitted_date + timedelta(days=offset_days)