Merge pull request #803 from NHSDigital/DTOSS-11572-delete-other-procedure

Allow deletion of other procedures

Author: swebberuk

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

@@ -14,5 +14,13 @@
       "text": "Save"
     }) }}
   </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/tests/views/test_other_procedure_history_view.py

@@ -12,6 +12,11 @@
 )
 
 
+@pytest.fixture
+def history_item(appointment):
+    return OtherProcedureHistoryItemFactory.create(appointment=appointment)
+
+
 @pytest.mark.django_db
 class TestAddOtherProcedureView:
     def test_renders_response(self, clinical_user_client):
@@ -107,7 +112,7 @@ def test_renders_response(self, clinical_user_client, history_item):
         )
         assert response.status_code == 200
 
-    def test_valid_post_redirects_to_appointment(
+    def test_valid_post_redirects_to_record_medical_information(
         self, clinical_user_client, appointment, history_item
     ):
         response = clinical_user_client.http.post(
@@ -136,3 +141,18 @@ def test_valid_post_redirects_to_appointment(
                 )
             ],
         )
+
+    def test_the_other_procedure_is_deleted(self, clinical_user_client, history_item):
+        assert OtherProcedureHistoryItem.objects.filter(pk=history_item.pk).exists()
+
+        clinical_user_client.http.post(
+            reverse(
+                "mammograms:delete_other_procedure_history_item",
+                kwargs={
+                    "pk": history_item.appointment.pk,
+                    "history_item_pk": history_item.pk,
+                },
+            )
+        )
+
+        assert not OtherProcedureHistoryItem.objects.filter(pk=history_item.pk).exists()

manage_breast_screening/mammograms/urls.py

@@ -201,4 +201,9 @@
         other_procedure_history_view.ChangeOtherProcedureHistoryView.as_view(),
         name="change_other_procedure_history_item",
     ),
+    path(
+        "<uuid:pk>/record-medical-information/other-procedure-history/<uuid:history_item_pk>/delete",
+        other_procedure_history_view.DeleteOtherProcedureHistoryView.as_view(),
+        name="delete_other_procedure_history_item",
+    ),
 ]

manage_breast_screening/mammograms/views/other_procedure_history_view.py

@@ -6,6 +6,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.participants.models.other_procedure_history_item import (
     OtherProcedureHistoryItem,
 )
@@ -133,7 +134,39 @@ def get_context_data(self, **kwargs):
             {
                 "heading": "Edit details of other procedure",
                 "page_title": "Details of the other procedure",
+                "delete_link": {
+                    "text": "Delete this item",
+                    "class": "nhsuk-link app-link--warning",
+                    "href": reverse(
+                        "mammograms:delete_other_procedure_history_item",
+                        kwargs={
+                            "pk": self.kwargs["pk"],
+                            "history_item_pk": self.kwargs["history_item_pk"],
+                        },
+                    ),
+                },
             },
         )
 
         return context
+
+
+class DeleteOtherProcedureHistoryView(DeleteWithAuditView):
+    def get_thing_name(self, object):
+        return "item"
+
+    def get_success_message_content(self, object):
+        return "Deleted other procedure"
+
+    def get_object(self):
+        provider = self.request.user.current_provider
+        appointment = provider.appointments.get(pk=self.kwargs["pk"])
+        return appointment.other_procedure_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/tests/system/clinical/test_other_procedure_history.py

@@ -37,6 +37,12 @@ def test_adding_and_changing_other_procedure(self):
         self.and_the_other_procedure_is_updated()
         self.and_the_message_says_other_procedure_updated()
 
+        self.when_i_click_change()
+        self.and_i_click_delete_this_item()
+        self.and_i_click_delete_item()
+        self.then_i_am_back_on_the_medical_information_page()
+        self.and_the_history_item_is_gone()
+
     def test_accessibility(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_there_is_an_appointment()
@@ -103,6 +109,7 @@ def and_the_other_procedure_is_listed(self):
             has=self.page.get_by_text("Other procedure history", exact=True),
         )
         row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
+        expect(row).to_contain_text("Procedure details")
         expect(row).to_contain_text("Breast reduction")
         expect(row).to_contain_text("Reason for breast reduction surgery")
         expect(row).to_contain_text("2000")
@@ -133,6 +140,7 @@ def and_the_other_procedure_is_updated(self):
             has=self.page.get_by_text("Other procedure history", exact=True),
         )
         row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
+        expect(row).to_contain_text("Procedure details")
         expect(row).to_contain_text("Nipple correction")
         expect(row).to_contain_text("Reason for nipple correction surgery")
         expect(row).to_contain_text("2000")
@@ -143,3 +151,19 @@ def and_the_message_says_other_procedure_updated(self):
 
         expect(alert).to_contain_text("Success")
         expect(alert).to_contain_text("Details of other procedure updated")
+
+    def and_i_click_delete_this_item(self):
+        self.page.get_by_text("Delete this item").click()
+
+    def and_i_click_delete_item(self):
+        self.page.get_by_text("Delete item").click()
+
+    def and_the_history_item_is_gone(self):
+        key = self.page.locator(
+            ".nhsuk-summary-list__key",
+            has=self.page.get_by_text("Other procedure history", exact=True),
+        )
+        row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
+        expect(row).not_to_contain_text("Procedure details")
+        expect(row.get_by_text("Change")).not_to_be_attached()
+        expect(row.get_by_text("Add other procedure history")).to_be_attached()