diff --git a/src/registrar/fixtures/fixtures_requests.py b/src/registrar/fixtures/fixtures_requests.py index 93167ec61..bff49ff6b 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,22 @@ 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)) # nosec + + # 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 + 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 diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 7addf041d..6e5773ebb 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -1952,7 +1952,7 @@ class DomainRequestGrowth(DomainRequestExport): "Domain request", "Domain type", "Federal type", - "Submitted at", + "First submitted date", ] @classmethod @@ -1976,7 +1976,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, )