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

Merge pull request #3271 from cisagov/nl/3011-fix-request-growth-report-data

Browse source 
#3011 - The "Request growth" report is missing data - [backup]
This commit is contained in:
CuriousX 2025-01-08 11:06:52 -07:00 • committed by GitHub
commit f226b58435
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/registrar/fixtures/fixtures_requests.py
View file

@ -1,4 +1,4 @@
from datetime import timedelta from datetime import datetime, timedelta
from django.utils import timezone from django.utils import timezone
import logging import logging
import random import random
@ -126,7 +126,22 @@ class DomainRequestFixture:
# TODO for a future ticket: Allow for more than just "federal" here # 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" request.generic_org_type = request_dict["generic_org_type"] if "generic_org_type" in request_dict else "federal"
if request.status != "started": 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.federal_type = (
request_dict["federal_type"] request_dict["federal_type"]
if "federal_type" in request_dict if "federal_type" in request_dict

3
src/registrar/utility/csv_export.py
View file

@ -1952,7 +1952,7 @@ class DomainRequestGrowth(DomainRequestExport):
"Domain request", "Domain request",
"Domain type", "Domain type",
"Federal type", "Federal type",
"Submitted at", "First submitted date",
] ]
@classmethod @classmethod
@ -1976,7 +1976,6 @@ class DomainRequestGrowth(DomainRequestExport):
start_date_formatted = format_start_date(start_date) start_date_formatted = format_start_date(start_date)
end_date_formatted = format_end_date(end_date) end_date_formatted = format_end_date(end_date)
return Q( return Q(
status=DomainRequest.DomainRequestStatus.SUBMITTED,
last_submitted_date__lte=end_date_formatted, last_submitted_date__lte=end_date_formatted,
last_submitted_date__gte=start_date_formatted, last_submitted_date__gte=start_date_formatted,
) )