Fix code after merge from main (DomainRequest)

src/registrar/admin.py

@@ -442,9 +442,9 @@ def analytics(request):
 
     thirty_days_ago = datetime.datetime.today() - datetime.timedelta(days=30)
 
-    last_30_days_applications = models.DomainApplication.objects.filter(created_at__gt=thirty_days_ago)
+    last_30_days_applications = models.DomainRequest.objects.filter(created_at__gt=thirty_days_ago)
-    last_30_days_approved_applications = models.DomainApplication.objects.filter(
+    last_30_days_approved_applications = models.DomainRequest.objects.filter(
-        created_at__gt=thirty_days_ago, status=DomainApplication.ApplicationStatus.APPROVED
+        created_at__gt=thirty_days_ago, status=DomainRequest.DomainRequestStatus.APPROVED
     )
     avg_approval_time = last_30_days_approved_applications.annotate(
         approval_time=F("approved_domain__created_at") - F("submission_date")
@@ -516,11 +516,11 @@ def analytics(request):
     requests_sliced_at_end_date = csv_export.get_sliced_requests(filter_requests_end_date)
 
     filter_submitted_requests_start_date = {
-        "status": DomainApplication.ApplicationStatus.SUBMITTED,
+        "status": DomainRequest.DomainRequestStatus.SUBMITTED,
         "submission_date__lte": start_date_formatted,
     }
     filter_submitted_requests_end_date = {
-        "status": DomainApplication.ApplicationStatus.SUBMITTED,
+        "status": DomainRequest.DomainRequestStatus.SUBMITTED,
         "submission_date__lte": end_date_formatted,
     }
     submitted_requests_sliced_at_start_date = csv_export.get_sliced_requests(filter_submitted_requests_start_date)

src/registrar/tests/common.py

@@ -623,19 +623,19 @@ class MockDb(TestCase):
 
         with less_console_noise():
             self.domain_request_1 = completed_application(
-                status=DomainApplication.ApplicationStatus.STARTED, name="city1.gov"
+                status=DomainRequest.DomainRequestStatus.STARTED, name="city1.gov"
             )
             self.domain_request_2 = completed_application(
-                status=DomainApplication.ApplicationStatus.IN_REVIEW, name="city2.gov"
+                status=DomainRequest.DomainRequestStatus.IN_REVIEW, name="city2.gov"
             )
             self.domain_request_3 = completed_application(
-                status=DomainApplication.ApplicationStatus.STARTED, name="city3.gov"
+                status=DomainRequest.DomainRequestStatus.STARTED, name="city3.gov"
             )
             self.domain_request_4 = completed_application(
-                status=DomainApplication.ApplicationStatus.STARTED, name="city4.gov"
+                status=DomainRequest.DomainRequestStatus.STARTED, name="city4.gov"
             )
             self.domain_request_5 = completed_application(
-                status=DomainApplication.ApplicationStatus.APPROVED, name="city5.gov"
+                status=DomainRequest.DomainRequestStatus.APPROVED, name="city5.gov"
             )
             self.domain_request_3.submit()
             self.domain_request_3.save()
@@ -647,7 +647,7 @@ class MockDb(TestCase):
         PublicContact.objects.all().delete()
         Domain.objects.all().delete()
         DomainInformation.objects.all().delete()
-        DomainApplication.objects.all().delete()
+        DomainRequest.objects.all().delete()
         User.objects.all().delete()
         UserDomainRole.objects.all().delete()
 

src/registrar/tests/test_reports.py

@@ -2,7 +2,7 @@ import csv
 import io
 from django.test import Client, RequestFactory
 from io import StringIO
-from registrar.models.domain_application import DomainApplication
+from registrar.models.domain_request import DomainRequest
 from registrar.models.domain import Domain
 from registrar.utility.csv_export import (
     get_sliced_domains,
@@ -738,7 +738,7 @@ class ExportDataTest(MockDb, MockEppLib):
                 "requested_domain__name",
             ]
             filter_condition = {
-                "status": DomainApplication.ApplicationStatus.SUBMITTED,
+                "status": DomainRequest.RequestStatus.SUBMITTED,
                 "submission_date__lte": self.end_date,
                 "submission_date__gte": self.start_date,
             }
@@ -794,7 +794,7 @@ class HelperFunctions(MockDb):
 
         with less_console_noise():
             filter_condition = {
-                "status": DomainApplication.ApplicationStatus.SUBMITTED,
+                "status": DomainRequest.RequestStatus.SUBMITTED,
                 "submission_date__lte": self.end_date,
             }
             submitted_requests_sliced_at_end_date = get_sliced_requests(filter_condition)

src/registrar/utility/csv_export.py

@@ -2,7 +2,7 @@ import csv
 import logging
 from datetime import datetime
 from registrar.models.domain import Domain
-from registrar.models.domain_application import DomainApplication
+from registrar.models.domain_request import DomainRequest
 from registrar.models.domain_information import DomainInformation
 from django.utils import timezone
 from django.core.paginator import Paginator
@@ -190,11 +190,11 @@ def write_domains_csv(
 
 
 def get_requests(filter_condition, sort_fields):
-    requests = DomainApplication.objects.all().filter(**filter_condition).order_by(*sort_fields).distinct()
+    requests = DomainRequest.objects.all().filter(**filter_condition).order_by(*sort_fields).distinct()
     return requests
 
 
-def parse_request_row(columns, request: DomainApplication):
+def parse_request_row(columns, request: DomainRequest):
     """Given a set of columns, generate a new row from cleaned column data"""
 
     requested_domain_name = "No requested domain"
@@ -448,19 +448,19 @@ def get_sliced_domains(filter_condition):
 
     domains = DomainInformation.objects.all().filter(**filter_condition).distinct()
     domains_count = domains.count()
-    federal = domains.filter(organization_type=DomainApplication.OrganizationChoices.FEDERAL).distinct().count()
+    federal = domains.filter(organization_type=DomainRequest.OrganizationChoices.FEDERAL).distinct().count()
-    interstate = domains.filter(organization_type=DomainApplication.OrganizationChoices.INTERSTATE).count()
+    interstate = domains.filter(organization_type=DomainRequest.OrganizationChoices.INTERSTATE).count()
     state_or_territory = (
-        domains.filter(organization_type=DomainApplication.OrganizationChoices.STATE_OR_TERRITORY).distinct().count()
+        domains.filter(organization_type=DomainRequest.OrganizationChoices.STATE_OR_TERRITORY).distinct().count()
     )
-    tribal = domains.filter(organization_type=DomainApplication.OrganizationChoices.TRIBAL).distinct().count()
+    tribal = domains.filter(organization_type=DomainRequest.OrganizationChoices.TRIBAL).distinct().count()
-    county = domains.filter(organization_type=DomainApplication.OrganizationChoices.COUNTY).distinct().count()
+    county = domains.filter(organization_type=DomainRequest.OrganizationChoices.COUNTY).distinct().count()
-    city = domains.filter(organization_type=DomainApplication.OrganizationChoices.CITY).distinct().count()
+    city = domains.filter(organization_type=DomainRequest.OrganizationChoices.CITY).distinct().count()
     special_district = (
-        domains.filter(organization_type=DomainApplication.OrganizationChoices.SPECIAL_DISTRICT).distinct().count()
+        domains.filter(organization_type=DomainRequest.OrganizationChoices.SPECIAL_DISTRICT).distinct().count()
     )
     school_district = (
-        domains.filter(organization_type=DomainApplication.OrganizationChoices.SCHOOL_DISTRICT).distinct().count()
+        domains.filter(organization_type=DomainRequest.OrganizationChoices.SCHOOL_DISTRICT).distinct().count()
     )
     election_board = domains.filter(is_election_board=True).distinct().count()
 
@@ -481,21 +481,21 @@ def get_sliced_domains(filter_condition):
 def get_sliced_requests(filter_condition):
     """Get fitered requests counts sliced by org type and election office."""
 
-    requests = DomainApplication.objects.all().filter(**filter_condition).distinct()
+    requests = DomainRequest.objects.all().filter(**filter_condition).distinct()
     requests_count = requests.count()
-    federal = requests.filter(organization_type=DomainApplication.OrganizationChoices.FEDERAL).distinct().count()
+    federal = requests.filter(organization_type=DomainRequest.OrganizationChoices.FEDERAL).distinct().count()
-    interstate = requests.filter(organization_type=DomainApplication.OrganizationChoices.INTERSTATE).distinct().count()
+    interstate = requests.filter(organization_type=DomainRequest.OrganizationChoices.INTERSTATE).distinct().count()
     state_or_territory = (
-        requests.filter(organization_type=DomainApplication.OrganizationChoices.STATE_OR_TERRITORY).distinct().count()
+        requests.filter(organization_type=DomainRequest.OrganizationChoices.STATE_OR_TERRITORY).distinct().count()
     )
-    tribal = requests.filter(organization_type=DomainApplication.OrganizationChoices.TRIBAL).distinct().count()
+    tribal = requests.filter(organization_type=DomainRequest.OrganizationChoices.TRIBAL).distinct().count()
-    county = requests.filter(organization_type=DomainApplication.OrganizationChoices.COUNTY).distinct().count()
+    county = requests.filter(organization_type=DomainRequest.OrganizationChoices.COUNTY).distinct().count()
-    city = requests.filter(organization_type=DomainApplication.OrganizationChoices.CITY).distinct().count()
+    city = requests.filter(organization_type=DomainRequest.OrganizationChoices.CITY).distinct().count()
     special_district = (
-        requests.filter(organization_type=DomainApplication.OrganizationChoices.SPECIAL_DISTRICT).distinct().count()
+        requests.filter(organization_type=DomainRequest.OrganizationChoices.SPECIAL_DISTRICT).distinct().count()
     )
     school_district = (
-        requests.filter(organization_type=DomainApplication.OrganizationChoices.SCHOOL_DISTRICT).distinct().count()
+        requests.filter(organization_type=DomainRequest.OrganizationChoices.SCHOOL_DISTRICT).distinct().count()
     )
     election_board = requests.filter(is_election_board=True).distinct().count()
 
@@ -679,7 +679,7 @@ def export_data_requests_growth_to_csv(csv_file, start_date, end_date):
         "requested_domain__name",
     ]
     filter_condition = {
-        "status": DomainApplication.ApplicationStatus.SUBMITTED,
+        "status": DomainRequest.DomainRequestStatus.SUBMITTED,
         "submission_date__lte": end_date_formatted,
         "submission_date__gte": start_date_formatted,
     }