use the new generic views for medical history

Author: MatMoore

manage_breast_screening/mammograms/forms/medical_history/benign_lump_history_item_form.py

@@ -1,6 +1,5 @@
 from django.forms import Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields.char_field import CharField
 from manage_breast_screening.nhsuk_forms.fields.choice_fields import (
     ChoiceField,
@@ -132,9 +131,7 @@ def initial_values(self, instance):
 
         return initial
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
-
+    def create(self, appointment):
         benign_lump_history_item = BenignLumpHistoryItem.objects.create(
             appointment=appointment,
             left_breast_procedures=self.cleaned_data.get("left_breast_procedures", []),
@@ -147,16 +144,12 @@ def create(self, appointment, request):
             additional_details=self.cleaned_data.get("additional_details", ""),
         )
 
-        auditor.audit_create(benign_lump_history_item)
-
         return benign_lump_history_item
 
-    def update(self, request):
+    def update(self):
         if self.instance is None:
             raise ValueError("Form has no instance")
 
-        auditor = Auditor.from_request(request)
-
         self.instance.left_breast_procedures = self.cleaned_data.get(
             "left_breast_procedures", []
         )
@@ -171,7 +164,6 @@ def update(self, request):
         )
 
         self.instance.save()
-        auditor.audit_update(self.instance)
 
         return self.instance
 

manage_breast_screening/mammograms/forms/medical_history/breast_augmentation_history_item_form.py

@@ -2,7 +2,6 @@
 from django.forms import Form
 from django.forms.widgets import Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields import (
     BooleanField,
     CharField,
@@ -122,20 +121,18 @@ def clean(self):
 
         return cleaned_data
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
+    def create(self, appointment):
         field_values = self.model_values()
         breast_augmentation_history = (
             appointment.breast_augmentation_history_items.create(
                 appointment=appointment,
                 **field_values,
             )
         )
-        auditor.audit_create(breast_augmentation_history)
 
         return breast_augmentation_history
 
-    def update(self, request):
+    def update(self):
         if self.instance is None:
             raise ValueError("Form has no instance")
 
@@ -150,6 +147,4 @@ def update(self, request):
 
         self.instance.save()
 
-        Auditor.from_request(request).audit_update(self.instance)
-
         return self.instance

manage_breast_screening/mammograms/forms/medical_history/breast_cancer_history_item_form.py

@@ -1,7 +1,6 @@
 from django.db.models import TextChoices
 from django.forms import Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields.char_field import CharField
 from manage_breast_screening.nhsuk_forms.fields.choice_fields import (
     ChoiceField,
@@ -225,30 +224,24 @@ def model_values(self):
             additional_details=self.cleaned_data.get("additional_details"),
         )
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
+    def create(self, appointment):
         field_values = self.model_values()
 
         instance = appointment.breast_cancer_history_items.create(
             **field_values,
         )
 
-        auditor.audit_create(instance)
-
         return instance
 
-    def update(self, request):
+    def update(self):
         if self.instance is None:
             raise ValueError("Form has no instance")
 
-        auditor = Auditor.from_request(request)
         field_values = self.model_values()
 
         for k, v in field_values.items():
             setattr(self.instance, k, v)
 
         self.instance.save()
 
-        auditor.audit_update(self.instance)
-
         return self.instance

manage_breast_screening/mammograms/forms/medical_history/cyst_history_item_form.py

@@ -1,7 +1,6 @@
 from django.forms import Form
 from django.forms.widgets import Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields import CharField, ChoiceField
 from manage_breast_screening.participants.models.medical_history.cyst_history_item import (
     CystHistoryItem,
@@ -43,27 +42,22 @@ def model_values(self):
             additional_details=self.cleaned_data.get("additional_details", ""),
         )
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
+    def create(self, appointment):
         field_values = self.model_values()
 
         cyst_history = appointment.cyst_history_items.create(
             appointment=appointment,
             **field_values,
         )
 
-        auditor.audit_create(cyst_history)
-
         return cyst_history
 
-    def update(self, request):
+    def update(self):
         if self.instance is None:
             raise ValueError("Form has no instance")
 
         self.instance.treatment = self.cleaned_data["treatment"]
         self.instance.additional_details = self.cleaned_data["additional_details"]
         self.instance.save()
 
-        Auditor.from_request(request).audit_update(self.instance)
-
         return self.instance

manage_breast_screening/mammograms/forms/medical_history/implanted_medical_device_history_item_form.py

@@ -1,7 +1,6 @@
 from django import forms
 from django.forms.widgets import Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields import (
     BooleanField,
     CharField,
@@ -112,8 +111,7 @@ def clean(self):
                 ),
             )
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
+    def create(self, appointment):
         field_values = self.model_values()
 
         implanted_medical_device_history = (
@@ -123,11 +121,9 @@ def create(self, appointment, request):
             )
         )
 
-        auditor.audit_create(implanted_medical_device_history)
-
         return implanted_medical_device_history
 
-    def update(self, request):
+    def update(self):
         if self.instance is None:
             raise ValueError("Form has no instance")
 
@@ -143,6 +139,4 @@ def update(self, request):
         self.instance.additional_details = self.cleaned_data["additional_details"]
         self.instance.save()
 
-        Auditor.from_request(request).audit_update(self.instance)
-
         return self.instance

manage_breast_screening/mammograms/forms/medical_history/mastectomy_or_lumpectomy_history_item_form.py

@@ -1,7 +1,6 @@
 from django.forms import widgets
 from django.forms.widgets import RadioSelect, Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields import CharField, ChoiceField, YearField
 from manage_breast_screening.nhsuk_forms.fields.choice_fields import MultipleChoiceField
 from manage_breast_screening.nhsuk_forms.forms import FormWithConditionalFields
@@ -126,8 +125,7 @@ def model_values(self):
             additional_details=self.cleaned_data.get("additional_details", ""),
         )
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
+    def create(self, appointment):
         field_values = self.model_values()
 
         mastectomy_or_lumpectomy_history = (
@@ -137,11 +135,9 @@ def create(self, appointment, request):
             )
         )
 
-        auditor.audit_create(mastectomy_or_lumpectomy_history)
-
         return mastectomy_or_lumpectomy_history
 
-    def update(self, request):
+    def update(self):
         self.instance.left_breast_procedure = self.cleaned_data["left_breast_procedure"]
         self.instance.right_breast_procedure = self.cleaned_data[
             "right_breast_procedure"
@@ -160,6 +156,4 @@ def update(self, request):
         self.instance.additional_details = self.cleaned_data["additional_details"]
         self.instance.save()
 
-        Auditor.from_request(request).audit_update(self.instance)
-
         return self.instance

manage_breast_screening/mammograms/forms/medical_history/other_procedure_history_item_form.py

@@ -1,6 +1,5 @@
 from django.forms.widgets import Textarea
 
-from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields import CharField, ChoiceField
 from manage_breast_screening.nhsuk_forms.fields.integer_field import YearField
 from manage_breast_screening.nhsuk_forms.forms import FormWithConditionalFields
@@ -72,9 +71,7 @@ def initial_values(self, instance):
 
         return initial
 
-    def create(self, appointment, request):
-        auditor = Auditor.from_request(request)
-
+    def create(self, appointment):
         other_procedure_history_item = OtherProcedureHistoryItem.objects.create(
             appointment=appointment,
             procedure=self.cleaned_data["procedure"],
@@ -83,19 +80,15 @@ def create(self, appointment, request):
             additional_details=self.cleaned_data.get("additional_details", ""),
         )
 
-        auditor.audit_create(other_procedure_history_item)
-
         return other_procedure_history_item
 
-    def update(self, request):
+    def update(self):
         self.instance.procedure = self.cleaned_data["procedure"]
         self.instance.procedure_details = self._get_selected_procedure_details()
         self.instance.procedure_year = self.cleaned_data["procedure_year"]
         self.instance.additional_details = self.cleaned_data["additional_details"]
         self.instance.save()
 
-        Auditor.from_request(request).audit_update(self.instance)
-
         return self.instance
 
     @property

manage_breast_screening/mammograms/tests/forms/medical_history/test_benign_lump_history_item_form.py

@@ -89,8 +89,6 @@ def test_procedure_year_must_be_within_range(
 
     def test_create_persists_data(self, clinical_user):
         appointment = AppointmentFactory()
-        request = RequestFactory().post("/test-form")
-        request.user = clinical_user
 
         data = [
             (
@@ -112,7 +110,7 @@ def test_create_persists_data(self, clinical_user):
         form = BenignLumpHistoryItemForm(_form_data(data))
         assert form.is_valid()
 
-        obj = form.create(appointment=appointment, request=request)
+        obj = form.create(appointment=appointment)
 
         obj.refresh_from_db()
         assert obj.appointment == appointment
@@ -186,7 +184,7 @@ def test_update_persists_changes(self, clinical_user):
         ]
         form = BenignLumpHistoryItemForm(_form_data(data), instance=instance)
         assert form.is_valid()
-        updated_obj = form.update(request=request)
+        updated_obj = form.update()
         assert updated_obj.pk == instance.pk
         assert updated_obj.left_breast_procedures == [
             BenignLumpHistoryItem.Procedure.LUMP_REMOVED