Merge pull request #1181 from NHSDigital/DTOSS-124560-note-form

Appointment note page

Author: swebberuk

manage_breast_screening/mammograms/jinja2/mammograms/show/appointment_note_review.jinja

@@ -0,0 +1,33 @@
+{% extends "layout-form.jinja" %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/inset-text/macro.jinja' import insetText %}
+
+{% block form %}
+    {% set inset_html %}
+      <p>
+        If adjustments are required,
+        <a href="{{ presented_appointment.special_appointment_url }}?return_url={{ return_url }}" class="nhsuk-link nhsuk-link--no-visited-state">
+          provide special appointment details instead
+        </a>
+      </p>
+    {% endset %}
+    {{ insetText({
+      "html": inset_html
+    }) }}
+
+    <input type="hidden" name="return_url" value="{{ return_url }}">
+    {{ form.content.as_field_group() }}
+
+    <div class="nhsuk-button-group">
+      {{ button({
+        "text": "Save note"
+      }) }}
+      {% if form.instance_is_saved %}
+        <p>
+          <a href="{{ url('mammograms:delete_appointment_note', kwargs={'pk': presented_appointment.pk}) }}?return_url={{ return_url}}" class="nhsuk-link nhsuk-link--no-visited-state app-link--warning">
+            Delete appointment note
+          </a>
+        </p>
+      {% endif %}
+    </div>
+{% endblock %}

manage_breast_screening/mammograms/presenters/appointment_presenters.py

@@ -63,7 +63,7 @@ def special_appointment_url(self):
     def appointment_note_url(self, return_url):
         return (
             reverse(
-                "mammograms:appointment_note",
+                "mammograms:appointment_note_review",
                 kwargs={"pk": self._appointment.pk},
             )
             + f"?return_url={return_url}"

manage_breast_screening/mammograms/tests/jinja2/test_appointment_details_card.py

@@ -54,7 +54,7 @@ def test_appointment_details_empty(template, mock_appointment):
                             Appointment note
                         </dt>
                         <dd class="nhsuk-summary-list__value">
-                            <a href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note/?return_url=" class="nhsuk-link">
+                            <a href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note-review/?return_url=" class="nhsuk-link">
                                 Enter appointment note
                             </a>
                         </dd>
@@ -120,7 +120,7 @@ def test_appointment_details_is_special_appointmet(template, mock_appointment):
                             Appointment note
                         </dt>
                         <dd class="nhsuk-summary-list__value">
-                            <a href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note/?return_url=" class="nhsuk-link">
+                            <a href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note-review/?return_url=" class="nhsuk-link">
                                 Enter appointment note
                             </a>
                         </dd>
@@ -168,7 +168,7 @@ def test_appointment_details_has_appointment_note(template, mock_appointment):
                             a note about<br>the appointment
                         </dd>
                         <dd class="nhsuk-summary-list__actions">
-                            <a class="nhsuk-link nhsuk-link--no-visited-state" href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note/?return_url=">
+                            <a class="nhsuk-link nhsuk-link--no-visited-state" href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note-review/?return_url=">
                                 Change<span class="nhsuk-u-visually-hidden"> appointment note</span>
                             </a>
                         </dd>
@@ -228,7 +228,7 @@ def test_appointment_details_special_appointment_with_note(template, mock_appoin
                             Things to consider before &amp; during the appointment.
                         </dd>
                         <dd class="nhsuk-summary-list__actions">
-                            <a class="nhsuk-link nhsuk-link--no-visited-state" href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note/?return_url=">
+                            <a class="nhsuk-link nhsuk-link--no-visited-state" href="/mammograms/53ce8d3b-9e65-471a-b906-73809c0475d0/note-review/?return_url=">
                                 Change<span class="nhsuk-u-visually-hidden"> appointment note</span>
                             </a>
                         </dd>

manage_breast_screening/mammograms/tests/presenters/test_appointment_presenters.py

@@ -279,7 +279,7 @@ def test_appointment_note_action_with_note(self, mock_appointment):
         assert action["text"] == "Change"
         assert (
             action["href"]
-            == "/mammograms/68d758d0-792d-430f-9c52-1e7a0c2aa1dd/note/?return_url=/return/"
+            == "/mammograms/68d758d0-792d-430f-9c52-1e7a0c2aa1dd/note-review/?return_url=/return/"
         )
         assert action["visuallyHiddenText"] == "appointment note"
 

manage_breast_screening/mammograms/tests/views/test_appointment_note_views.py

@@ -2,7 +2,12 @@
 from django.urls import reverse
 from pytest_django.asserts import assertRedirects
 
+from manage_breast_screening.core.tests.factories import UserFactory
+from manage_breast_screening.manual_images.tests.factories import StudyFactory
 from manage_breast_screening.participants.models import AppointmentNote
+from manage_breast_screening.participants.models.appointment import (
+    AppointmentStatusNames,
+)
 from manage_breast_screening.participants.tests.factories import AppointmentFactory
 
 
@@ -101,6 +106,204 @@ def test_users_can_update_note(self, request, client_fixture):
         assert AppointmentNote.objects.count() == 1
 
 
+@pytest.mark.django_db
+class TestAppointmentNoteReviewView:
+    def test_delete_link_not_shown_when_note_does_not_exist(
+        self, clinical_user_client, clinical_user
+    ):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.IN_PROGRESS,
+                "created_by": clinical_user,
+            },
+        )
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:appointment_note_review",
+                kwargs={"pk": appointment.pk},
+            )
+        )
+        assert response.status_code == 200
+        assert "Appointment note" in response.content.decode()
+        assert "app-status-bar" in response.content.decode()
+        assert "Delete appointment note" not in response.content.decode()
+
+    def test_delete_link_shown_when_note_exists(self, clinical_user_client):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status=AppointmentStatusNames.SCHEDULED,
+        )
+        AppointmentNote.objects.create(appointment=appointment, content="Existing note")
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:appointment_note_review",
+                kwargs={"pk": appointment.pk},
+            )
+        )
+        assert response.status_code == 200
+        assert "Delete appointment note" in response.content.decode()
+
+    def test_users_can_save_note(self, clinical_user_client, clinical_user):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.IN_PROGRESS,
+                "created_by": clinical_user,
+            },
+        )
+        StudyFactory.create(appointment=appointment)
+
+        note_content = "Participant prefers left arm blood pressure readings."
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:appointment_note_review",
+                kwargs={"pk": appointment.pk},
+            ),
+            {"content": note_content},
+        )
+
+        assertRedirects(
+            response,
+            reverse("mammograms:check_information", kwargs={"pk": appointment.pk}),
+        )
+        saved_note = AppointmentNote.objects.get(appointment=appointment)
+        assert saved_note.content == note_content
+
+    def test_save_redirects_to_return_url(self, clinical_user_client, clinical_user):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.IN_PROGRESS,
+                "created_by": clinical_user,
+            },
+        )
+        check_info_url = reverse(
+            "mammograms:check_information", kwargs={"pk": appointment.pk}
+        )
+        response = clinical_user_client.http.post(
+            reverse("mammograms:appointment_note_review", kwargs={"pk": appointment.pk})
+            + f"?return_url={check_info_url}",
+            {"content": "Test note content"},
+        )
+        assertRedirects(response, check_info_url, fetch_redirect_response=False)
+
+    def test_users_can_update_note(self, clinical_user_client, clinical_user):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.IN_PROGRESS,
+                "created_by": clinical_user,
+            },
+        )
+        StudyFactory.create(appointment=appointment)
+        note = AppointmentNote.objects.create(
+            appointment=appointment, content="Original note"
+        )
+
+        updated_content = "Updated note content"
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:appointment_note_review", kwargs={"pk": appointment.pk}
+            ),
+            {"content": updated_content},
+        )
+
+        assertRedirects(
+            response,
+            reverse("mammograms:check_information", kwargs={"pk": appointment.pk}),
+        )
+        updated_note = AppointmentNote.objects.get(pk=note.pk)
+        assert updated_note.content == updated_content
+        assert AppointmentNote.objects.count() == 1
+
+    def test_access_denied_for_administrative_users(
+        self, administrative_user_client, clinical_user
+    ):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=administrative_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.IN_PROGRESS,
+                "created_by": clinical_user,
+            },
+        )
+        note = AppointmentNote.objects.create(
+            appointment=appointment, content="Original note"
+        )
+
+        response = administrative_user_client.http.post(
+            reverse(
+                "mammograms:appointment_note_review", kwargs={"pk": appointment.pk}
+            ),
+            {"content": "Updated note content"},
+        )
+
+        assert response.status_code == 403
+        updated_note = AppointmentNote.objects.get(pk=note.pk)
+        assert updated_note.content == "Original note"
+        assert AppointmentNote.objects.count() == 1
+
+    def test_access_denied_when_not_in_progress(
+        self, clinical_user_client, clinical_user
+    ):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.SCREENED,
+                "created_by": UserFactory.create(),
+            },
+        )
+        note = AppointmentNote.objects.create(
+            appointment=appointment, content="Original note"
+        )
+        StudyFactory.create(appointment=appointment)
+
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:appointment_note_review", kwargs={"pk": appointment.pk}
+            ),
+            {"content": "Updated note content"},
+        )
+        assertRedirects(
+            response,
+            reverse("mammograms:show_appointment", kwargs={"pk": appointment.pk}),
+        )
+
+        updated_note = AppointmentNote.objects.get(pk=note.pk)
+        assert updated_note.content == "Original note"
+        assert AppointmentNote.objects.count() == 1
+
+    def test_access_denied_when_in_progress_with_another_user(
+        self, clinical_user_client, clinical_user
+    ):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider,
+            current_status_params={
+                "name": AppointmentStatusNames.IN_PROGRESS,
+                "created_by": UserFactory.create(),
+            },
+        )
+        note = AppointmentNote.objects.create(
+            appointment=appointment, content="Original note"
+        )
+        StudyFactory.create(appointment=appointment)
+
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:appointment_note_review", kwargs={"pk": appointment.pk}
+            ),
+            {"content": "Updated note content"},
+        )
+        assertRedirects(
+            response,
+            reverse("mammograms:check_information", kwargs={"pk": appointment.pk}),
+        )
+
+        updated_note = AppointmentNote.objects.get(pk=note.pk)
+        assert updated_note.content == "Updated note content"
+        assert AppointmentNote.objects.count() == 1
+
+
 @pytest.mark.django_db
 class TestDeleteAppointmentNoteView:
     def test_get_redirects_when_note_does_not_exist(self, clinical_user_client):

manage_breast_screening/mammograms/urls.py

@@ -85,6 +85,11 @@ def not_implemented_view(request, pk):
         appointment_note_views.AppointmentNoteView.as_view(),
         name="appointment_note",
     ),
+    path(
+        "<uuid:pk>/note-review/",
+        appointment_note_views.AppointmentNoteReviewView.as_view(),
+        name="appointment_note_review",
+    ),
     path(
         "<uuid:pk>/note/delete/",
         appointment_note_views.DeleteAppointmentNoteView.as_view(),