merge

src/registrar/tests/test_views_domains_json.py

@@ -76,7 +76,7 @@ class GetDomainsJsonTest(TestWithUser, WebTest):
             self.assertEqual(expected_domain.state_display(), state_displays[i])
             self.assertEqual(expected_domain.get_state_help_text(), get_state_help_texts[i])
 
-            self.assertEqual(f"/domain/{expected_domain.id}", action_urls[i])
+            self.assertEqual(reverse("domain", kwargs={"pk": expected_domain.id}), action_urls[i])
 
             # Check action_label
             action_label_expected = (

src/registrar/tests/test_views_requests_json.py

@@ -3,7 +3,6 @@ from django.urls import reverse
 from .test_views import TestWithUser
 from django_webtest import WebTest  # type: ignore
 from django.utils.dateparse import parse_datetime
-from django.urls import reverse
 
 
 class GetRequestsJsonTest(TestWithUser, WebTest):
@@ -159,14 +158,14 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
 
             # Check action_url
             action_url_expected = (
-                reverse('domain-request/<id>/edit/', kwargs={'pk': self.domain_requests[i].id})
+                reverse("edit-domain-request", kwargs={"id": self.domain_requests[i].id})
                 if self.domain_requests[i].status
                 in [
                     DomainRequest.DomainRequestStatus.STARTED,
                     DomainRequest.DomainRequestStatus.ACTION_NEEDED,
                     DomainRequest.DomainRequestStatus.WITHDRAWN,
                 ]
-                else reverse('domain-request', kwargs={'pk': self.domain_requests[i].id})
+                else reverse("domain-request-status", kwargs={"pk": self.domain_requests[i].id})
             )
             self.assertEqual(action_url_expected, action_urls[i])
 

src/registrar/views/domain_requests_json.py

@@ -3,6 +3,7 @@ from django.core.paginator import Paginator
 from registrar.models import DomainRequest
 from django.utils.dateformat import format
 from django.contrib.auth.decorators import login_required
+from django.urls import reverse
 
 
 @login_required
@@ -33,14 +34,14 @@ def get_domain_requests_json(request):
             "is_deletable": domain_request.status
             in [DomainRequest.DomainRequestStatus.STARTED, DomainRequest.DomainRequestStatus.WITHDRAWN],
             "action_url": (
-                f"/domain-request/{domain_request.id}/edit"
+                reverse("edit-domain-request", kwargs={"id": domain_request.id})
                 if domain_request.status
                 in [
                     DomainRequest.DomainRequestStatus.STARTED,
                     DomainRequest.DomainRequestStatus.ACTION_NEEDED,
                     DomainRequest.DomainRequestStatus.WITHDRAWN,
                 ]
-                else f"/domain-request/{domain_request.id}"
+                else reverse("domain-request-status", kwargs={"pk": domain_request.id})
             ),
             "action_label": (
                 "Edit"

src/registrar/views/domains_json.py

@@ -41,7 +41,7 @@ def get_domains_json(request):
             "state": domain.state,
             "state_display": domain.state_display(),
             "get_state_help_text": domain.get_state_help_text(),
-            "action_url": reverse('domain', kwargs={'pk': domain.id}),
+            "action_url": reverse("domain", kwargs={"pk": domain.id}),
             "action_label": ("View" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "Manage"),
             "svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"),
         }