Merge pull request #1124 from NHSDigital/DTOSS-12142-standardise-routes-and-views-clinic-app

Standardise routes and views in the clinic app

Author: MatMoore

manage_breast_screening/auth/demo_views.py

@@ -33,7 +33,7 @@ def persona_login(request):
         now = timezone.now()
         request.session["login_time"] = now.isoformat()
 
-        redirect_url = reverse("clinics:select_provider")
+        redirect_url = reverse("select_provider")
         if next_path:
             redirect_url = f"{redirect_url}?{urlencode({'next': next_path})}"
 

manage_breast_screening/auth/tests/test_views.py

@@ -48,7 +48,7 @@ def test_post_persona_login(client):
         {"username": "anna_davies", "next": "/some-url"},
     )
     assert response.status_code == 302
-    assert response.headers["location"] == "/clinics/select-provider/?next=%2Fsome-url"
+    assert response.headers["location"] == "/current-provider/select/?next=%2Fsome-url"
 
 
 @pytest.mark.django_db
@@ -202,7 +202,7 @@ def test_accepts_valid_assurance_levels(
             response = client.get(reverse("auth:cis2_callback"))
 
             assert response.status_code == 302
-            assert "/clinics/select-provider" in response.headers["location"]
+            assert "/current-provider/select/" in response.headers["location"]
 
             mock_authenticate.assert_called_once_with(
                 ANY, cis2_sub="user-123", cis2_userinfo={"sub": "user-123"}

manage_breast_screening/auth/views.py

@@ -115,7 +115,7 @@ def cis2_callback(request):
     request.session["login_time"] = now.isoformat()
     request.session["last_activity"] = now.isoformat()
 
-    return redirect(reverse("clinics:select_provider"))
+    return redirect(reverse("select_provider"))
 
 
 @current_provider_exempt

manage_breast_screening/clinics/forms.py

@@ -3,7 +3,7 @@
 from .models import ProviderConfig
 
 
-class ProviderSettingsForm(forms.ModelForm):
+class UpdateProviderSettingsForm(forms.ModelForm):
     class Meta:
         model = ProviderConfig
         fields = ["manual_image_collection"]

…eening/clinics/jinja2/clinics/show.jinja …2/clinics/list_clinic_appointments.jinjamanage_breast_screening/clinics/jinja2/clinics/show.jinja renamed to manage_breast_screening/clinics/jinja2/clinics/list_clinic_appointments.jinja manage_breast_screening/clinics/jinja2/clinics/show.jinja renamed to manage_breast_screening/clinics/jinja2/clinics/list_clinic_appointments.jinja

@@ -12,7 +12,7 @@
 
 {% block beforeContent %}
 {{ backLink({
-  "href": url('clinics:index'),
+  "href": url('clinics:list_clinics'),
   "text": "Clinics"
 }) }}
 {% endblock beforeContent %}
@@ -87,7 +87,7 @@
       {{ app_check_in(
         presented_appointment,
         check_in_url=url(
-          'clinics:check_in',
+          'clinics:check_in_appointment',
            kwargs={
             'pk': presented_clinic.pk,
             'appointment_pk': presented_appointment.pk,

…ening/clinics/jinja2/clinics/index.jinja …linics/jinja2/clinics/list_clinics.jinjamanage_breast_screening/clinics/jinja2/clinics/index.jinja renamed to manage_breast_screening/clinics/jinja2/clinics/list_clinics.jinja manage_breast_screening/clinics/jinja2/clinics/index.jinja renamed to manage_breast_screening/clinics/jinja2/clinics/list_clinics.jinja

@@ -48,7 +48,7 @@
     {% for presented_clinic in presenter.clinics %}
     <tr>
       <td>
-        {% set clinic_url = url('clinics:show', kwargs={"pk": presented_clinic.pk}) %}
+        {% set clinic_url = url('clinics:show_clinic', kwargs={"pk": presented_clinic.pk}) %}
         <a href="{{ clinic_url }}" class="nhsuk-link">
           {{ presented_clinic.location_name }}
           <br>

…s/jinja2/clinics/provider_settings.jinja …2/clinics/update_provider_settings.jinjamanage_breast_screening/clinics/jinja2/clinics/provider_settings.jinja renamed to manage_breast_screening/clinics/jinja2/clinics/update_provider_settings.jinja manage_breast_screening/clinics/jinja2/clinics/provider_settings.jinja renamed to manage_breast_screening/clinics/jinja2/clinics/update_provider_settings.jinja

@@ -107,7 +107,7 @@ def secondary_nav_data(self):
                     "label": filter_label,
                     "count": count,
                     "href": reverse(
-                        "clinics:show_" + filter_identifier,
+                        "clinics:list_clinic_appointments_" + filter_identifier,
                         kwargs={"pk": self.clinic_pk},
                     ),
                     "current": filter_identifier == self.filter,

manage_breast_screening/clinics/presenters.py

@@ -66,23 +66,25 @@ def test_secondary_nav_data(self):
         assert nav_data[0]["label"] == "Remaining"
         assert nav_data[0]["count"] == 5
         expected_remaining_url = reverse(
-            "clinics:show_remaining", kwargs={"pk": clinic_pk, "filter": "remaining"}
+            "clinics:list_clinic_appointments_remaining",
+            kwargs={"pk": clinic_pk, "filter": "remaining"},
         )
         assert nav_data[0]["href"] == expected_remaining_url
         assert not nav_data[0]["current"]
 
         assert nav_data[1]["label"] == "Checked in"
         assert nav_data[1]["count"] == 3
         expected_checked_in_url = reverse(
-            "clinics:show_checked_in", kwargs={"pk": clinic_pk, "filter": "checked_in"}
+            "clinics:list_clinic_appointments_checked_in",
+            kwargs={"pk": clinic_pk, "filter": "checked_in"},
         )
         assert nav_data[1]["href"] == expected_checked_in_url
         assert nav_data[1]["current"]
 
         assert nav_data[2]["label"] == "In progress"
         assert nav_data[2]["count"] == 2
         expected_in_progress_url = reverse(
-            "clinics:show_in_progress",
+            "clinics:list_clinic_appointments_in_progress",
             kwargs={"pk": clinic_pk, "filter": "in_progress"},
         )
         assert nav_data[2]["href"] == expected_in_progress_url
@@ -91,15 +93,17 @@ def test_secondary_nav_data(self):
         assert nav_data[3]["label"] == "Complete"
         assert nav_data[3]["count"] == 2
         expected_complete_url = reverse(
-            "clinics:show_complete", kwargs={"pk": clinic_pk, "filter": "complete"}
+            "clinics:list_clinic_appointments_complete",
+            kwargs={"pk": clinic_pk, "filter": "complete"},
         )
         assert nav_data[3]["href"] == expected_complete_url
         assert not nav_data[3]["current"]
 
         assert nav_data[4]["label"] == "All"
         assert nav_data[4]["count"] == 10
         expected_all_url = reverse(
-            "clinics:show_all", kwargs={"pk": clinic_pk, "filter": "all"}
+            "clinics:list_clinic_appointments_all",
+            kwargs={"pk": clinic_pk, "filter": "all"},
         )
         assert nav_data[4]["href"] == expected_all_url
         assert not nav_data[4]["current"]

manage_breast_screening/clinics/tests/test_presenters.py

@@ -17,7 +17,7 @@ def test_single_assignment_redirects_to_next(self, client):
         force_mbs_login(client, user)
 
         response = client.get(
-            reverse("clinics:select_provider"), {"next": "/clinics/some-target/"}
+            reverse("select_provider"), {"next": "/clinics/some-target/"}
         )
 
         assert response.status_code == 302
@@ -35,7 +35,7 @@ def test_provider_select_post_redirects_to_next(self, client):
         force_mbs_login(client, user)
 
         response = client.post(
-            reverse("clinics:select_provider"),
+            reverse("select_provider"),
             {"provider": provider2.pk, "next": "/clinics/other-target/"},
         )
 
@@ -52,12 +52,12 @@ def test_safely_handles_bad_redirect(self, client):
         force_mbs_login(client, user)
 
         response = client.post(
-            reverse("clinics:select_provider"),
+            reverse("select_provider"),
             {"provider": provider.pk, "next": "http://evil.com"},
         )
 
         assert response.status_code == 302
-        assert response.headers["location"] == reverse("clinics:index")
+        assert response.headers["location"] == reverse("clinics:list_clinics")
 
     @pytest.mark.django_db
     def test_excludes_providers_with_no_roles(self, client):
@@ -67,7 +67,7 @@ def test_excludes_providers_with_no_roles(self, client):
 
         force_mbs_login(client, user)
 
-        response = client.get(reverse("clinics:select_provider"))
+        response = client.get(reverse("select_provider"))
 
         assert response.status_code == 200
         assert "Your account is not recognised" in response.text
@@ -89,7 +89,7 @@ def test_requires_sysadmin(self, client):
 
         login_with_provider(client, user, provider)
 
-        response = client.get(reverse("clinics:settings"))
+        response = client.get(reverse("update_provider_settings"))
 
         assert response.status_code == 403
         assert "You do not have permission" in response.text
@@ -102,7 +102,7 @@ def test_accessible_to_sysadmin(self, client):
 
         login_with_provider(client, user, provider)
 
-        response = client.get(reverse("clinics:settings"))
+        response = client.get(reverse("update_provider_settings"))
 
         assert response.status_code == 200
         assert "Settings" in response.text
@@ -115,7 +115,7 @@ def test_displays_provider_name(self, client):
 
         login_with_provider(client, user, provider)
 
-        response = client.get(reverse("clinics:settings"))
+        response = client.get(reverse("update_provider_settings"))
 
         assert "Test Hospital Trust" in response.text
 
@@ -130,7 +130,7 @@ def test_saves_settings(self, client):
         login_with_provider(client, user, provider)
 
         response = client.post(
-            reverse("clinics:settings"),
+            reverse("update_provider_settings"),
             {"manual_image_collection": ""},  # unchecked checkbox sends empty
         )
 
@@ -150,7 +150,7 @@ def test_enables_manual_image_collection(self, client):
         login_with_provider(client, user, provider)
 
         response = client.post(
-            reverse("clinics:settings"),
+            reverse("update_provider_settings"),
             {"manual_image_collection": "true"},
         )