Merge pull request #941 from NHSDigital/DTOSS-12063-complete-screening

Add submit button to check information page

Author: swebberuk

manage_breast_screening/mammograms/jinja2/mammograms/check_information.jinja

@@ -3,5 +3,15 @@
 {% set active_workflow_step = 'CHECK_INFORMATION' %}
 
 {% block step_content %}
+  <p>Before concluding this appointment, confirm that the information recorded is correct.</p>
+{% endblock %}
 
+{% block wizard_form %}
+  <form action="{{ url('mammograms:complete_screening', kwargs={'pk': presented_appointment.pk}) }}" method="post" novalidate>
+    {{ csrf_input }}
+    {{ button({
+      "text": "Complete screening and return to clinic",
+      "classes": "nhsuk-u-margin-bottom-4"
+    }) }}
+  </form>
 {% endblock %}

manage_breast_screening/mammograms/tests/views/test_participant_reported_mammogram_views.py

@@ -4,15 +4,22 @@
 from dateutil.relativedelta import relativedelta
 from django.contrib import messages
 from django.urls import reverse
-from pytest_django.asserts import assertInHTML, assertMessages, assertRedirects
+from pytest_django.asserts import (
+    assertInHTML,
+    assertMessages,
+    assertQuerySetEqual,
+    assertRedirects,
+)
 
 from manage_breast_screening.participants.forms import ParticipantReportedMammogramForm
 from manage_breast_screening.participants.models import ParticipantReportedMammogram
 from manage_breast_screening.participants.models.appointment import (
     AppointmentStatusNames,
+    AppointmentWorkflowStepCompletion,
 )
 from manage_breast_screening.participants.tests.factories import (
     AppointmentFactory,
+    ParticipantFactory,
     ParticipantReportedMammogramFactory,
 )
 
@@ -471,3 +478,70 @@ def test_valid_post_redirects_to_appointment(
             ),
         )
         assert_success_message(response, "Updated a previous mammogram")
+
+
+@pytest.mark.django_db
+class TestCompleteScreening:
+    def test_renders_response(self, clinical_user_client, appointment):
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:check_information",
+                kwargs={
+                    "pk": appointment.pk,
+                },
+            )
+        )
+        assert response.status_code == 200
+
+    def test_valid_transition(self, clinical_user_client):
+        participant = ParticipantFactory.create(
+            first_name="<b>J</b>ane", last_name="S<i>m</>i&th"
+        )
+        appointment = AppointmentFactory.create(
+            screening_episode__participant=participant,
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status=AppointmentStatusNames.IN_PROGRESS,
+        )
+
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:complete_screening",
+                kwargs={
+                    "pk": appointment.pk,
+                },
+            ),
+        )
+        assertRedirects(
+            response,
+            reverse(
+                "clinics:show",
+                kwargs={"pk": appointment.clinic_slot.clinic.pk},
+            ),
+        )
+        view_appointment_url = reverse(
+            "mammograms:show_appointment",
+            kwargs={
+                "pk": appointment.pk,
+            },
+        )
+        assert_success_message(
+            response,
+            f"""
+            <p class=\"nhsuk-notification-banner__heading\">
+                &lt;b&gt;J&lt;/b&gt;ane S&lt;i&gt;m&lt;/&gt;i&amp;th has been screened.
+                <a href=\"{view_appointment_url}\" class=\"app-u-nowrap\">
+                    View their appointment
+                </a>
+            </p>
+            """,
+        )
+
+        assert appointment.current_status.name == AppointmentStatusNames.SCREENED
+        assertQuerySetEqual(
+            appointment.completed_workflow_steps.filter(
+                created_by=clinical_user_client.user
+            )
+            .values_list("step_name", flat=True)
+            .distinct(),
+            [AppointmentWorkflowStepCompletion.StepNames.CHECK_INFORMATION],
+        )

manage_breast_screening/mammograms/urls.py

@@ -282,4 +282,9 @@
         mammogram_views.check_information,
         name="check_information",
     ),
+    path(
+        "<uuid:pk>/complete-screening/",
+        mammogram_views.complete_screening,
+        name="complete_screening",
+    ),
 ]

manage_breast_screening/mammograms/views/mammogram_views.py

@@ -1,9 +1,12 @@
 import logging
 
+from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 from django.http import Http404
 from django.shortcuts import redirect, render
 from django.urls import reverse
+from django.utils.html import escape
+from django.utils.safestring import mark_safe
 from django.views.decorators.http import require_http_methods
 from rules.contrib.views import PermissionRequiredMixin
 
@@ -18,11 +21,16 @@
 )
 from manage_breast_screening.mammograms.views.mixins import AppointmentMixin
 from manage_breast_screening.participants.models import ParticipantReportedMammogram
-from manage_breast_screening.participants.models.appointment import Appointment
+from manage_breast_screening.participants.models.appointment import (
+    Appointment,
+    AppointmentWorkflowStepCompletion,
+)
 from manage_breast_screening.participants.views import parse_return_url
 
 from ..forms.appointment_proceed_anyway_form import AppointmentProceedAnywayForm
 
+APPOINTMENT_NOT_FOUND = "Appointment not found"
+
 logger = logging.getLogger(__name__)
 
 
@@ -38,7 +46,7 @@ def appointment_should_not_proceed(
             "screening_episode__participant__address",
         ).get(pk=appointment_pk)
     except Appointment.DoesNotExist:
-        raise Http404("Appointment not found")
+        raise Http404(APPOINTMENT_NOT_FOUND)
 
     try:
         mammogram = appointment.reported_mammograms.get(
@@ -95,7 +103,7 @@ def attended_not_screened(request, appointment_pk):
     try:
         appointment = provider.appointments.get(pk=appointment_pk)
     except Appointment.DoesNotExist:
-        raise Http404("Appointment not found")
+        raise Http404(APPOINTMENT_NOT_FOUND)
 
     AppointmentStatusUpdater(
         appointment, current_user=request.user
@@ -174,19 +182,67 @@ def get_context_data(self, **kwargs):
 
 
 @require_http_methods(["GET"])
+@permission_required(Permission.DO_MAMMOGRAM_APPOINTMENT)
 def check_information(request, pk):
     provider = request.user.current_provider
-    appointment = provider.appointments.select_related(
-        "screening_episode__participant",
-    ).get(pk=pk)
+    try:
+        appointment = provider.appointments.select_related(
+            "screening_episode__participant",
+        ).get(pk=pk)
+    except Appointment.DoesNotExist:
+        raise Http404(APPOINTMENT_NOT_FOUND)
 
     return render(
         request,
         "mammograms/check_information.jinja",
         context={
-            "caption": appointment.screening_episode.participant.full_name,
             "page_title": "Check information",
             "heading": "Check information",
             "presented_appointment": AppointmentPresenter(appointment),
         },
     )
+
+
+@require_http_methods(["POST"])
+@permission_required(Permission.DO_MAMMOGRAM_APPOINTMENT)
+def complete_screening(request, pk):
+    provider = request.user.current_provider
+    try:
+        appointment = provider.appointments.select_related(
+            "clinic_slot__clinic",
+            "screening_episode__participant",
+        ).get(pk=pk)
+    except Appointment.DoesNotExist:
+        raise Http404(APPOINTMENT_NOT_FOUND)
+
+    AppointmentStatusUpdater(
+        appointment=appointment, current_user=request.user
+    ).screen()
+    appointment.completed_workflow_steps.create(
+        step_name=AppointmentWorkflowStepCompletion.StepNames.CHECK_INFORMATION,
+        created_by=request.user,
+    )
+
+    view_appointment_url = reverse(
+        "mammograms:show_appointment",
+        kwargs={
+            "pk": appointment.pk,
+        },
+    )
+    escaped_full_name = escape(appointment.screening_episode.participant.full_name)
+    messages.add_message(
+        request,
+        messages.SUCCESS,
+        mark_safe(
+            f"""
+            <p class=\"nhsuk-notification-banner__heading\">
+                {escaped_full_name} has been screened.
+                <a href=\"{view_appointment_url}\" class=\"app-u-nowrap\">
+                    View their appointment
+                </a>
+            </p>
+            """
+        ),
+    )
+
+    return redirect("clinics:show", pk=appointment.clinic_slot.clinic.pk)

manage_breast_screening/tests/system/clinical/test_check_information.py

@@ -0,0 +1,83 @@
+import re
+from datetime import datetime, timezone
+
+import pytest
+from django.urls import reverse
+from playwright.sync_api import expect
+
+from manage_breast_screening.clinics.models import Clinic
+from manage_breast_screening.clinics.tests.factories import ClinicFactory
+from manage_breast_screening.participants.models.appointment import (
+    AppointmentStatusNames,
+)
+from manage_breast_screening.participants.tests.factories import AppointmentFactory
+
+from ..system_test_setup import SystemTestCase
+
+
+class TestCheckInformation(SystemTestCase):
+    @pytest.fixture(autouse=True)
+    def before(self):
+        today = datetime.now(timezone.utc).replace(hour=9, minute=0)
+        self.clinic_start_time = today
+
+    def test_check_information(self):
+        self.given_i_am_logged_in_as_a_clinical_user()
+        self.and_there_is_a_clinic_exists_that_is_run_by_my_provider()
+        self.and_there_is_an_appointment_for_the_clinic()
+        self.and_i_am_on_the_check_information_page()
+
+        self.and_i_click_on_complete_screening()
+        self.then_i_should_be_on_the_clinic_page()
+        self.and_the_message_says_image_details_added()
+
+    def test_accessibility(self):
+        self.given_i_am_logged_in_as_a_clinical_user()
+        self.and_there_is_a_clinic_exists_that_is_run_by_my_provider()
+        self.and_there_is_an_appointment_for_the_clinic()
+        self.and_i_am_on_the_check_information_page()
+        self.then_the_accessibility_baseline_is_met()
+
+    def and_there_is_a_clinic_exists_that_is_run_by_my_provider(self):
+        user_assignment = self.current_user.assignments.first()
+        self.clinic = ClinicFactory(
+            starts_at=self.clinic_start_time,
+            setting__name="West London BSS",
+            setting__provider=user_assignment.provider,
+            risk_type=Clinic.RiskType.ROUTINE_RISK,
+        )
+
+    def and_there_is_an_appointment_for_the_clinic(self):
+        self.appointment = AppointmentFactory(
+            clinic_slot__clinic=self.clinic,
+            clinic_slot__clinic__setting__provider=self.current_provider,
+            current_status=AppointmentStatusNames.IN_PROGRESS,
+        )
+
+    def and_i_am_on_the_check_information_page(self):
+        self.page.goto(
+            self.live_server_url
+            + reverse(
+                "mammograms:check_information",
+                kwargs={"pk": self.appointment.pk},
+            )
+        )
+        self.expect_url("mammograms:check_information", pk=self.appointment.pk)
+
+    def and_i_click_on_complete_screening(self):
+        self.page.get_by_text("Complete screening and return to clinic").click()
+
+    def then_i_should_be_on_the_clinic_page(self):
+        path = reverse(
+            "clinics:show",
+            kwargs={"pk": self.clinic.pk},
+        )
+        expect(self.page).to_have_url(re.compile(path))
+        self.assert_page_title_contains("Routine risk screening clinic")
+
+    def and_the_message_says_image_details_added(self):
+        alert = self.page.get_by_role("alert")
+        expect(alert).to_contain_text("Success")
+        expect(alert).to_contain_text(
+            f"{self.appointment.participant.full_name} has been screened"
+        )