Merge pull request #823 from NHSDigital/11725-delete-note

Add link to delete appointment notes

Author: malcolmbaig

manage_breast_screening/mammograms/forms/appointment_note_form.py

@@ -27,3 +27,7 @@ def save(self):
         self.instance.content = self.cleaned_data["content"]
         self.instance.save()
         return self.instance
+
+    @property
+    def instance_is_saved(self):
+        return self.instance and not self.instance._state.adding

manage_breast_screening/mammograms/jinja2/mammograms/show/appointment_note.jinja

@@ -77,8 +77,16 @@
         {{ button({
           "text": "Save note"
         }) }}
+        {% if form.instance_is_saved %}
+          <p>
+            <a href="{{ url('mammograms:delete_appointment_note', kwargs={'pk': presented_appointment.pk}) }}" class="nhsuk-link app-link--warning">
+              Delete appointment note
+            </a>
+          </p>
+        {% endif %}
       </div>
     </form>
+
   </div>
 </div>
 {% endblock %}

manage_breast_screening/mammograms/tests/views/test_appointment_note_views.py

@@ -0,0 +1,120 @@
+import pytest
+from django.urls import reverse
+from pytest_django.asserts import assertRedirects
+
+from manage_breast_screening.participants.models import AppointmentNote
+from manage_breast_screening.participants.tests.factories import AppointmentFactory
+
+
+@pytest.mark.django_db
+class TestAppointmentNoteView:
+    def test_delete_link_not_shown_when_note_does_not_exist(self, clinical_user_client):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider
+        )
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:appointment_note",
+                kwargs={"pk": appointment.pk},
+            )
+        )
+        assert response.status_code == 200
+        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
+        )
+        AppointmentNote.objects.create(appointment=appointment, content="Existing note")
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:appointment_note",
+                kwargs={"pk": appointment.pk},
+            )
+        )
+        assert response.status_code == 200
+        assert "Delete appointment note" in response.content.decode()
+
+    @pytest.mark.parametrize(
+        "client_fixture", ["clinical_user_client", "administrative_user_client"]
+    )
+    def test_users_can_save_note(self, request, client_fixture):
+        client = request.getfixturevalue(client_fixture)
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=client.current_provider
+        )
+
+        note_content = "Participant prefers left arm blood pressure readings."
+        response = client.http.post(
+            reverse(
+                "mammograms:appointment_note",
+                kwargs={"pk": appointment.pk},
+            ),
+            {"content": note_content},
+        )
+
+        assertRedirects(
+            response,
+            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
+        )
+        saved_note = AppointmentNote.objects.get(appointment=appointment)
+        assert saved_note.content == note_content
+
+    @pytest.mark.parametrize(
+        "client_fixture", ["clinical_user_client", "administrative_user_client"]
+    )
+    def test_users_can_update_note(self, request, client_fixture):
+        client = request.getfixturevalue(client_fixture)
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=client.current_provider
+        )
+        note = AppointmentNote.objects.create(
+            appointment=appointment, content="Original note"
+        )
+
+        updated_content = "Updated note content"
+        response = client.http.post(
+            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
+            {"content": updated_content},
+        )
+
+        assertRedirects(
+            response,
+            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
+        )
+        updated_note = AppointmentNote.objects.get(pk=note.pk)
+        assert updated_note.content == updated_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):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider
+        )
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:delete_appointment_note",
+                kwargs={"pk": appointment.pk},
+            )
+        )
+        assertRedirects(
+            response,
+            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
+        )
+
+    def test_post_redirects_when_note_does_not_exist(self, clinical_user_client):
+        appointment = AppointmentFactory.create(
+            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider
+        )
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:delete_appointment_note",
+                kwargs={"pk": appointment.pk},
+            )
+        )
+        assertRedirects(
+            response,
+            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
+        )

manage_breast_screening/mammograms/tests/views/test_appointment_views.py

@@ -3,7 +3,6 @@
 from pytest_django.asserts import assertContains, assertRedirects
 
 from manage_breast_screening.core.models import AuditLog
-from manage_breast_screening.participants.models import AppointmentNote
 from manage_breast_screening.participants.tests.factories import AppointmentFactory
 
 
@@ -22,60 +21,6 @@ def test_renders_response(self, clinical_user_client):
         assert response.status_code == 200
 
 
-@pytest.mark.django_db
-class TestAppointmentNoteView:
-    @pytest.mark.parametrize(
-        "client_fixture", ["clinical_user_client", "administrative_user_client"]
-    )
-    def test_users_can_save_note(self, request, client_fixture):
-        client = request.getfixturevalue(client_fixture)
-        appointment = AppointmentFactory.create(
-            clinic_slot__clinic__setting__provider=client.current_provider
-        )
-
-        note_content = "Participant prefers left arm blood pressure readings."
-        response = client.http.post(
-            reverse(
-                "mammograms:appointment_note",
-                kwargs={"pk": appointment.pk},
-            ),
-            {"content": note_content},
-        )
-
-        assertRedirects(
-            response,
-            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
-        )
-        saved_note = AppointmentNote.objects.get(appointment=appointment)
-        assert saved_note.content == note_content
-
-    @pytest.mark.parametrize(
-        "client_fixture", ["clinical_user_client", "administrative_user_client"]
-    )
-    def test_users_can_update_note(self, request, client_fixture):
-        client = request.getfixturevalue(client_fixture)
-        appointment = AppointmentFactory.create(
-            clinic_slot__clinic__setting__provider=client.current_provider
-        )
-        note = AppointmentNote.objects.create(
-            appointment=appointment, content="Original note"
-        )
-
-        updated_content = "Updated note content"
-        response = client.http.post(
-            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
-            {"content": updated_content},
-        )
-
-        assertRedirects(
-            response,
-            reverse("mammograms:appointment_note", kwargs={"pk": appointment.pk}),
-        )
-        updated_note = AppointmentNote.objects.get(pk=note.pk)
-        assert updated_note.content == updated_content
-        assert AppointmentNote.objects.count() == 1
-
-
 @pytest.mark.django_db
 class TestConfirmIdentity:
     def test_renders_response(self, clinical_user_client):

manage_breast_screening/mammograms/urls.py

@@ -1,6 +1,11 @@
 from django.urls import path
 
-from .views import appointment_views, special_appointment_views, symptom_views
+from .views import (
+    appointment_note_views,
+    appointment_views,
+    special_appointment_views,
+    symptom_views,
+)
 from .views.medical_history import (
     benign_lump_history_item_views,
     breast_augmentation_history_item_views,
@@ -36,9 +41,14 @@
     ),
     path(
         "<uuid:pk>/note/",
-        appointment_views.AppointmentNoteView.as_view(),
+        appointment_note_views.AppointmentNoteView.as_view(),
         name="appointment_note",
     ),
+    path(
+        "<uuid:pk>/note/delete/",
+        appointment_note_views.DeleteAppointmentNoteView.as_view(),
+        name="delete_appointment_note",
+    ),
     path(
         "<uuid:pk>/confirm-identity/",
         appointment_views.ConfirmIdentity.as_view(),

manage_breast_screening/mammograms/views/appointment_note_views.py

@@ -0,0 +1,92 @@
+import logging
+
+from django.contrib import messages
+from django.shortcuts import redirect
+from django.urls import reverse
+from django.views.generic import FormView
+
+from manage_breast_screening.core.services.auditor import Auditor
+from manage_breast_screening.core.views.generic import DeleteWithAuditView
+from manage_breast_screening.participants.models import AppointmentNote
+
+from ..forms import AppointmentNoteForm
+from ..presenters import AppointmentPresenter, present_secondary_nav
+from .mixins import AppointmentMixin
+
+logger = logging.getLogger(__name__)
+
+
+class AppointmentNoteView(AppointmentMixin, FormView):
+    template_name = "mammograms/show/appointment_note.jinja"
+    form_class = AppointmentNoteForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        appointment = self.appointment
+        appointment_presenter = AppointmentPresenter(
+            appointment, tab_description="Note"
+        )
+
+        context.update(
+            {
+                "heading": appointment_presenter.participant.full_name,
+                "caption": appointment_presenter.caption,
+                "page_title": appointment_presenter.page_title,
+                "presented_appointment": appointment_presenter,
+                "secondary_nav_items": present_secondary_nav(
+                    appointment.pk, current_tab="note"
+                ),
+            }
+        )
+        return context
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        try:
+            kwargs["instance"] = self.appointment.note
+        except AppointmentNote.DoesNotExist:
+            kwargs["instance"] = AppointmentNote(appointment=self.appointment)
+        return kwargs
+
+    def form_valid(self, form):
+        is_new_note = form.instance._state.adding
+        note = form.save()
+        auditor = Auditor.from_request(self.request)
+        if is_new_note:
+            auditor.audit_create(note)
+        else:
+            auditor.audit_update(note)
+        messages.add_message(
+            self.request,
+            messages.SUCCESS,
+            "Appointment note saved",
+        )
+        return redirect("mammograms:appointment_note", pk=self.appointment.pk)
+
+
+class DeleteAppointmentNoteView(DeleteWithAuditView):
+    def get_thing_name(self, object):
+        return "appointment note"
+
+    def get_success_message_content(self, object):
+        return "Appointment note deleted"
+
+    def get_object(self):
+        provider = self.request.user.current_provider
+        appointment = provider.appointments.get(pk=self.kwargs["pk"])
+        return appointment.note
+
+    def get_success_url(self):
+        return reverse("mammograms:appointment_note", kwargs={"pk": self.kwargs["pk"]})
+
+    def get(self, request, *args, **kwargs):
+        try:
+            return super().get(request, *args, **kwargs)
+        except AppointmentNote.DoesNotExist:
+            return redirect(self.get_success_url())
+
+    def post(self, request, *args, **kwargs):
+        try:
+            return super().post(request, *args, **kwargs)
+        except AppointmentNote.DoesNotExist:
+            return redirect(self.get_success_url())