use MastectomyOrLumpectomyHistoryForm for both add and update

Author: swebberuk

manage_breast_screening/mammograms/forms/mastectomy_or_lumpectomy_history_form.py

@@ -16,7 +16,7 @@
 )
 
 
-class MastectomyOrLumpectomyHistoryBaseForm(FormWithConditionalFields):
+class MastectomyOrLumpectomyHistoryForm(FormWithConditionalFields):
     right_breast_procedure = ChoiceField(
         label="Right breast",
         visually_hidden_label_prefix="What procedure have they had in their ",
@@ -91,6 +91,20 @@ class MastectomyOrLumpectomyHistoryBaseForm(FormWithConditionalFields):
     )
 
     def __init__(self, *args, **kwargs):
+        self.instance = kwargs.pop("instance", None)
+
+        if self.instance:
+            kwargs["initial"] = {
+                "left_breast_procedure": self.instance.left_breast_procedure,
+                "right_breast_procedure": self.instance.right_breast_procedure,
+                "left_breast_other_surgery": self.instance.left_breast_other_surgery,
+                "right_breast_other_surgery": self.instance.right_breast_other_surgery,
+                "year_of_surgery": self.instance.year_of_surgery,
+                "surgery_reason": self.instance.surgery_reason,
+                "surgery_other_reason_details": self.instance.surgery_other_reason_details,
+                "additional_details": self.instance.additional_details,
+            }
+
         super().__init__(*args, **kwargs)
 
         self.given_field_value(
@@ -118,8 +132,6 @@ def model_values(self):
             additional_details=self.cleaned_data.get("additional_details", ""),
         )
 
-
-class MastectomyOrLumpectomyHistoryForm(MastectomyOrLumpectomyHistoryBaseForm):
     def create(self, appointment, request):
         auditor = Auditor.from_request(request)
         field_values = self.model_values()
@@ -135,24 +147,6 @@ def create(self, appointment, request):
 
         return mastectomy_or_lumpectomy_history
 
-
-class MastectomyOrLumpectomyHistoryUpdateForm(MastectomyOrLumpectomyHistoryBaseForm):
-    def __init__(self, instance, *args, **kwargs):
-        self.instance = instance
-
-        kwargs["initial"] = {
-            "left_breast_procedure": instance.left_breast_procedure,
-            "right_breast_procedure": instance.right_breast_procedure,
-            "left_breast_other_surgery": instance.left_breast_other_surgery,
-            "right_breast_other_surgery": instance.right_breast_other_surgery,
-            "year_of_surgery": instance.year_of_surgery,
-            "surgery_reason": instance.surgery_reason,
-            "surgery_other_reason_details": instance.surgery_other_reason_details,
-            "additional_details": instance.additional_details,
-        }
-
-        super().__init__(*args, **kwargs)
-
     def update(self, request):
         self.instance.left_breast_procedure = self.cleaned_data["left_breast_procedure"]
         self.instance.right_breast_procedure = self.cleaned_data[

manage_breast_screening/mammograms/tests/forms/test_mastectomy_or_lumpectomy_history_form.py

@@ -16,7 +16,6 @@
 
 from ...forms.mastectomy_or_lumpectomy_history_form import (
     MastectomyOrLumpectomyHistoryForm,
-    MastectomyOrLumpectomyHistoryUpdateForm,
 )
 
 
@@ -331,7 +330,7 @@ def create_year_outside_range_error_messsage(self, request_year):
 
 
 @pytest.mark.django_db
-class TestImplantedMedicalDeviceHistoryUpdateForm:
+class TestUpdateMastectomyOrLumpectomyHistoryForm:
     @pytest.fixture
     def instance(self):
         return MastectomyOrLumpectomyHistoryItemFactory(
@@ -349,7 +348,7 @@ def instance(self):
         )
 
     def test_no_data(self, instance):
-        form = MastectomyOrLumpectomyHistoryUpdateForm(instance, QueryDict())
+        form = MastectomyOrLumpectomyHistoryForm(QueryDict(), instance=instance)
 
         assert not form.is_valid()
         assert form.errors == {
@@ -388,9 +387,9 @@ def test_no_data(self, instance):
         ],
     )
     def test_success(self, instance, data, dummy_request):
-        form = MastectomyOrLumpectomyHistoryUpdateForm(
-            instance,
+        form = MastectomyOrLumpectomyHistoryForm(
             QueryDict(urlencode(data, doseq=True)),
+            instance=instance,
         )
 
         assert form.is_valid()

manage_breast_screening/mammograms/views/mastectomy_or_lumpectomy_history_view.py

@@ -16,7 +16,6 @@
 
 from ..forms.mastectomy_or_lumpectomy_history_form import (
     MastectomyOrLumpectomyHistoryForm,
-    MastectomyOrLumpectomyHistoryUpdateForm,
 )
 from .mixins import InProgressAppointmentMixin
 
@@ -89,7 +88,7 @@ def get_context_data(self, **kwargs):
 
 
 class UpdateMastectomyOrLumpectomyHistoryView(BaseMastectomyOrLumpectomyHistoryView):
-    form_class = MastectomyOrLumpectomyHistoryUpdateForm
+    form_class = MastectomyOrLumpectomyHistoryForm
 
     def get_instance(self):
         try: