Include appointment ID in record-a-mammogram URLs

Author: MatMoore

manage_breast_screening/record_a_mammogram/tests/test_views.py

@@ -22,6 +22,7 @@ def test_appointment_continued(self, client):
             response,
             reverse(
                 "record_a_mammogram:ask_for_medical_information",
+                kwargs={"id": self.appointment.pk},
             ),
         )
 
@@ -33,7 +34,11 @@ def test_appointment_stopped(self, client):
             {"decision": "dropout"},
         )
         assertRedirects(
-            response, reverse("record_a_mammogram:appointment_cannot_go_ahead", kwargs={"id": self.appointment.pk})
+            response,
+            reverse(
+                "record_a_mammogram:appointment_cannot_go_ahead",
+                kwargs={"id": self.appointment.pk},
+            ),
         )
 
     def test_renders_invalid_form(self, client):

manage_breast_screening/record_a_mammogram/urls.py

@@ -16,16 +16,20 @@
         name="start_screening",
     ),
     path(
-        "ask-for-medical-information/",
+        "appointments/<int:id>/ask-for-medical-information/",
         views.AskForMedicalInformation.as_view(),
         name="ask_for_medical_information",
     ),
     path(
-        "record-medical-information/",
+        "appointments/<int:id>/record-medical-information/",
         views.RecordMedicalInformation.as_view(),
         name="record_medical_information",
     ),
-    path("awaiting-images/", views.awaiting_images, name="awaiting_images"),
+    path(
+        "appointments/<int:id>/awaiting-images/",
+        views.awaiting_images,
+        name="awaiting_images",
+    ),
     path(
         "appointments/<int:id>/cannot-go-ahead/",
         views.appointment_cannot_go_ahead,

manage_breast_screening/record_a_mammogram/views.py

@@ -14,7 +14,6 @@
     RecordMedicalInformationForm,
     ScreeningAppointmentForm,
 )
-from manage_breast_screening.clinics.models import Appointment
 
 Status = Appointment.Status
 
@@ -88,56 +87,80 @@ def form_valid(self, form):
         form.save()
 
         if form.cleaned_data["decision"] == "continue":
-            return redirect("record_a_mammogram:ask_for_medical_information")
+            return redirect(
+                "record_a_mammogram:ask_for_medical_information",
+                id=self.get_appointment().pk,
+            )
         else:
-            return redirect("record_a_mammogram:appointment_cannot_go_ahead", id=self.get_appointment().pk)
+            return redirect(
+                "record_a_mammogram:appointment_cannot_go_ahead",
+                id=self.get_appointment().pk,
+            )
 
 
 class AskForMedicalInformation(FormView):
     template_name = "record_a_mammogram/ask_for_medical_information.jinja"
     form_class = AskForMedicalInformationForm
 
+    def get_appointment(self):
+        id = self.kwargs["id"]
+
+        return Appointment.objects.get(pk=id)
+
     def form_valid(self, form):
         form.save()
 
+        appointment = self.get_appointment()
+
         if form.cleaned_data["decision"] == "continue":
-            return redirect("record_a_mammogram:record_medical_information")
+            return redirect(
+                "record_a_mammogram:record_medical_information", id=appointment.pk
+            )
         else:
-            return redirect("record_a_mammogram:awaiting_images")
+            return redirect("record_a_mammogram:awaiting_images", id=appointment.pk)
 
 
 class RecordMedicalInformation(FormView):
     template_name = "record_a_mammogram/record_medical_information.jinja"
     form_class = RecordMedicalInformationForm
 
+    def get_appointment(self):
+        id = self.kwargs["id"]
+
+        return Appointment.objects.get(pk=id)
+
     def form_valid(self, form):
         form.save()
 
+        appointment = self.get_appointment()
+
         if form.cleaned_data["decision"] == "continue":
-            return redirect("record_a_mammogram:awaiting_images")
+            return redirect("record_a_mammogram:awaiting_images", id=appointment.pk)
         else:
-            return redirect("record_a_mammogram:appointment_cannot_go_ahead", id=self.appointment.pk)
+            return redirect(
+                "record_a_mammogram:appointment_cannot_go_ahead", id=appointment.pk
+            )
 
 
 def appointment_cannot_go_ahead(request, id):
     appointment = Appointment.objects.get(pk=id)
     participant = appointment.screening_episode.participant
-    if request.method == 'POST':
+    if request.method == "POST":
         form = AppointmentCannotGoAheadForm(request.POST, instance=appointment)
         if form.is_valid():
             form.save()
-            return redirect('clinics:index')
+            return redirect("clinics:index")
     else:
         form = AppointmentCannotGoAheadForm(instance=appointment)
 
     return render(
         request,
-        'record_a_mammogram/appointment_cannot_go_ahead.jinja',
-        {'form': form, 'participant': participant}
+        "record_a_mammogram/appointment_cannot_go_ahead.jinja",
+        {"form": form, "participant": participant},
     )
 
 
-def awaiting_images(request):
+def awaiting_images(request, id):
     return render(request, "record_a_mammogram/awaiting_images.jinja", {})