Merge pull request #785 from NHSDigital/DTOSS-11532-delete-breast-cancer-history

Medical information - delete breast cancer history

Author: MatMoore

manage_breast_screening/core/jinja2/layout-confirmation.jinja

@@ -1,5 +1,7 @@
 {% extends "layout-app.jinja" %}
 {% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/inset-text/macro.jinja' import insetText %}
+
 
 {% block header %}
   {{ header({
@@ -21,6 +23,13 @@
     </h1>
 
     {% block details %}
+      {% set insetTextHtml %}
+        <p>This action is final and cannot be undone.</p>
+      {% endset %}
+
+      {{ insetText({
+        "html": insetTextHtml
+      }) }}
     {% endblock %}
 
     <form method="post" action="{{ confirm_action.href | default(request.path) }}">

manage_breast_screening/core/views/__init__.py

@@ -0,0 +1,55 @@
+from django.contrib import messages
+from django.shortcuts import redirect
+from django.views.generic import DeleteView
+
+from ..services.auditor import Auditor
+
+
+class DeleteWithAuditView(DeleteView):
+    """
+    A generic delete view with a confirmation page, success message,
+    and some default context variables.
+
+    The object is hard deleted but the record is audited first.
+    """
+
+    template_name = "layout-confirmation.jinja"
+
+    def get_thing_name(self, object):
+        return object._meta.verbose_name
+
+    def get_success_message_content(self, object):
+        return f"Deleted {self.get_thing_name(object)}"
+
+    def get_cancel_url(self):
+        return self.get_success_url()
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        thing_name = self.get_thing_name(self.object)
+        context.update(
+            {
+                "page_title": f"Are you sure you want to delete this {thing_name}?",
+                "heading": f"Are you sure you want to delete this {thing_name}?",
+                "confirm_action": {
+                    "text": f"Delete {thing_name}",
+                    "href": self.request.get_full_path(),
+                },
+                "cancel_action": {"href": self.get_cancel_url()},
+            }
+        )
+        return context
+
+    def post(self, request, *args, **kwargs):
+        object = self.get_object()
+        auditor = Auditor.from_request(request)
+        auditor.audit_delete(object)
+        object.delete()
+
+        messages.add_message(
+            self.request,
+            messages.SUCCESS,
+            self.get_success_message_content(object),
+        )
+
+        return redirect(self.get_success_url())

manage_breast_screening/core/views/generic.py

@@ -218,7 +218,7 @@ def create(self, appointment, request):
         auditor = Auditor.from_request(request)
         field_values = self.model_values()
 
-        symptom = appointment.symptom_set.create(
+        symptom = appointment.symptoms.create(
             appointment=appointment,
             symptom_type_id=self.symptom_type,
             reported_at=date.today(),

manage_breast_screening/mammograms/forms/symptom_forms.py

@@ -62,4 +62,12 @@
     }) }}
   </div>
 
+  {% if delete_link %}
+    <p class="nhsuk-u-margin-top-4">
+      <a href="{{ delete_link.href }}" class="{{ delete_link.class }}">
+        {{ delete_link.text }}
+      </a>
+    </p>
+  {% endif %}
+
 {% endblock %}

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/medical_history/forms/breast_cancer_history_item_form.jinja

@@ -32,7 +32,7 @@
 class MedicalInformationPresenter:
     def __init__(self, appointment):
         self.appointment = AppointmentPresenter(appointment)
-        symptoms = appointment.symptom_set.select_related("symptom_type").order_by(
+        symptoms = appointment.symptoms.select_related("symptom_type").order_by(
             "symptom_type__name", "reported_at"
         )
         self.symptoms = [SymptomPresenter(symptom) for symptom in symptoms]

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -3,12 +3,27 @@
 from django.urls import reverse
 from pytest_django.asserts import assertInHTML, assertMessages, assertRedirects
 
+from manage_breast_screening.participants.models.breast_cancer_history_item import (
+    BreastCancerHistoryItem,
+)
 from manage_breast_screening.participants.tests.factories import (
     AppointmentFactory,
     BreastCancerHistoryItemFactory,
 )
 
 
+@pytest.fixture
+def appointment(clinical_user_client):
+    return AppointmentFactory.create(
+        clinic_slot__clinic__setting__provider=clinical_user_client.current_provider
+    )
+
+
+@pytest.fixture
+def history_item(appointment):
+    return BreastCancerHistoryItemFactory.create(appointment=appointment)
+
+
 @pytest.mark.django_db
 class TestBreastCancerHistoryView:
     def test_renders_response(self, clinical_user_client):
@@ -97,16 +112,6 @@ def test_invalid_post_renders_response_with_errors(self, clinical_user_client):
 
 @pytest.mark.django_db
 class TestBreastCancerHistoryUpdateView:
-    @pytest.fixture
-    def appointment(self, clinical_user_client):
-        return AppointmentFactory.create(
-            clinic_slot__clinic__setting__provider=clinical_user_client.current_provider
-        )
-
-    @pytest.fixture
-    def history_item(self, appointment):
-        return BreastCancerHistoryItemFactory.create(appointment=appointment)
-
     def test_renders_response(self, clinical_user_client, history_item):
         response = clinical_user_client.http.get(
             reverse(
@@ -160,3 +165,60 @@ def test_valid_post_redirects_to_appointment(
                 )
             ],
         )
+
+
+@pytest.mark.django_db
+class TestDeleteSymptomView:
+    def test_get_renders_response(self, clinical_user_client, history_item):
+        response = clinical_user_client.http.get(
+            reverse(
+                "mammograms:delete_breast_cancer_history_item",
+                kwargs={
+                    "pk": history_item.appointment.pk,
+                    "history_item_pk": history_item.pk,
+                },
+            )
+        )
+        assert response.status_code == 200
+
+    def test_post_redirects_to_record_medical_information(
+        self, clinical_user_client, history_item
+    ):
+        response = clinical_user_client.http.post(
+            reverse(
+                "mammograms:delete_breast_cancer_history_item",
+                kwargs={
+                    "pk": history_item.appointment.pk,
+                    "history_item_pk": history_item.pk,
+                },
+            )
+        )
+        assertRedirects(
+            response,
+            reverse(
+                "mammograms:record_medical_information",
+                kwargs={"pk": history_item.appointment.pk},
+            ),
+        )
+        assertMessages(
+            response,
+            [
+                messages.Message(
+                    level=messages.SUCCESS,
+                    message="Deleted breast cancer",
+                )
+            ],
+        )
+
+    def test_the_symptom_is_deleted(self, clinical_user_client, history_item):
+        clinical_user_client.http.post(
+            reverse(
+                "mammograms:delete_breast_cancer_history_item",
+                kwargs={
+                    "pk": history_item.appointment.pk,
+                    "history_item_pk": history_item.pk,
+                },
+            )
+        )
+
+        assert not BreastCancerHistoryItem.objects.filter(pk=history_item.pk).exists()

manage_breast_screening/mammograms/tests/views/test_breast_cancer_history_views.py

@@ -135,6 +135,11 @@
         breast_cancer_history_views.ChangeBreastCancerHistoryView.as_view(),
         name="change_breast_cancer_history_item",
     ),
+    path(
+        "<uuid:pk>/record-medical-information/breast-cancer-history/<uuid:history_item_pk>/delete",
+        breast_cancer_history_views.DeleteBreastCancerHistoryView.as_view(),
+        name="delete_breast_cancer_history_item",
+    ),
     path(
         "<uuid:pk>/record-medical-information/implanted-medical-device-history/",
         implanted_medical_device_history_view.AddImplantedMedicalDeviceHistoryView.as_view(),

manage_breast_screening/mammograms/urls.py

@@ -7,6 +7,7 @@
 from django.urls import reverse
 from django.views.generic import FormView
 
+from manage_breast_screening.core.views.generic import DeleteWithAuditView
 from manage_breast_screening.mammograms.forms.breast_cancer_history_form import (
     BreastCancerHistoryForm,
     BreastCancerHistoryUpdateForm,
@@ -84,7 +85,7 @@ class ChangeBreastCancerHistoryView(BaseBreastCancerHistoryView):
 
     def get_instance(self):
         try:
-            return BreastCancerHistoryItem.objects.get(
+            return self.appointment.breast_cancer_history_items.get(
                 pk=self.kwargs["history_item_pk"],
                 appointment_id=self.kwargs["pk"],
             )
@@ -134,7 +135,39 @@ def get_context_data(self, **kwargs):
             {
                 "heading": "Edit details of breast cancer",
                 "page_title": "Edit details of breast cancer",
+                "delete_link": {
+                    "text": "Delete this item",
+                    "class": "nhsuk-link app-link--warning",
+                    "href": reverse(
+                        "mammograms:delete_breast_cancer_history_item",
+                        kwargs={
+                            "pk": self.kwargs["pk"],
+                            "history_item_pk": self.kwargs["history_item_pk"],
+                        },
+                    ),
+                },
             },
         )
 
         return context
+
+
+class DeleteBreastCancerHistoryView(DeleteWithAuditView):
+    def get_thing_name(self, object):
+        return "item"
+
+    def get_success_message_content(self, object):
+        return "Deleted breast cancer"
+
+    def get_object(self):
+        provider = self.request.user.current_provider
+        appointment = provider.appointments.get(pk=self.kwargs["pk"])
+        return appointment.breast_cancer_history_items.get(
+            pk=self.kwargs["history_item_pk"]
+        )
+
+    def get_success_url(self) -> str:
+        return reverse(
+            "mammograms:record_medical_information",
+            kwargs={"pk": self.kwargs["pk"]},
+        )

manage_breast_screening/mammograms/views/breast_cancer_history_views.py

@@ -1,11 +1,9 @@
 from django.contrib import messages
 from django.http import Http404
-from django.shortcuts import redirect, render
 from django.urls import reverse
-from django.views import View
 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.mammograms.presenters.symptom_presenter import (
     SymptomPresenter,
 )
@@ -85,7 +83,7 @@ def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
 
         try:
-            instance = Symptom.objects.get(
+            instance = self.appointment.symptoms.get(
                 pk=self.kwargs["symptom_pk"],
                 appointment_id=self.kwargs["pk"],
                 **self.extra_filters(),
@@ -248,59 +246,29 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class DeleteSymptomView(View):
-    def get(self, request, *args, **kwargs):
-        try:
-            symptom = Symptom.objects.get(pk=kwargs["symptom_pk"])
-        except Symptom.DoesNotExist:
-            raise Http404("Symptom not found")
+class DeleteSymptomView(DeleteWithAuditView):
+    template_name = "mammograms/medical_information/symptoms/confirm_delete_lump.jinja"
 
-        context = {
-            "page_title": "Are you sure you want to delete this symptom?",
-            "heading": "Are you sure you want to delete this symptom?",
-            "confirm_action": {
-                "text": "Delete symptom",
-                "href": reverse(
-                    "mammograms:delete_symptom",
-                    kwargs={
-                        "pk": kwargs["pk"],
-                        "symptom_pk": kwargs["symptom_pk"],
-                    },
-                ),
-            },
-            "cancel_action": {
-                "href": reverse(
-                    "mammograms:record_medical_information",
-                    kwargs={"pk": kwargs["pk"]},
-                )
-            },
-            "summary_list_row": SymptomPresenter(symptom).build_summary_list_row(
-                include_actions=False
-            ),
-        }
-
-        return render(
-            request,
-            "mammograms/medical_information/symptoms/confirm_delete_lump.jinja",
-            context=context,
+    def get_success_url(self):
+        return reverse(
+            "mammograms:record_medical_information",
+            kwargs={"pk": self.kwargs["pk"]},
         )
 
-    def post(self, request, *args, **kwargs):
-        try:
-            symptom = Symptom.objects.get(pk=kwargs["symptom_pk"])
-        except Symptom.DoesNotExist:
-            raise Http404("Symptom not found")
-        auditor = Auditor.from_request(request)
-
-        presenter = SymptomPresenter(symptom)
+    def get_object(self):
+        provider = self.request.user.current_provider
+        appointment = provider.appointments.get(pk=self.kwargs["pk"])
+        return appointment.symptoms.get(pk=self.kwargs["symptom_pk"])
 
-        auditor.audit_delete(symptom)
-        symptom.delete()
+    def get_context_data(self, **kwargs):
+        symptom = self.object
 
-        messages.add_message(
-            self.request,
-            messages.SUCCESS,
-            presenter.delete_message_html,
+        context = super().get_context_data(**kwargs)
+        context["summary_list_row"] = SymptomPresenter(symptom).build_summary_list_row(
+            include_actions=False
         )
+        return context
 
-        return redirect("mammograms:record_medical_information", pk=kwargs["pk"])
+    def get_success_message_content(self, symptom):
+        presenter = SymptomPresenter(symptom)
+        return presenter.delete_message_html