From 1b0ef4d19ed110778975130723cfd11ddf5591d4 Mon Sep 17 00:00:00 2001
From: Edie Pearce <edie.pearce@digital.trade.gov.uk>
Date: Fri, 20 Sep 2024 15:01:33 +0100
Subject: [PATCH 01/12] TP2000-1352: Add react origins form to quota create
 page (#1297)

* Add react origins form to quota create page to fix workbasket transaction error

* Update test

* Add extra errors to create form

* Pass initial data to origins form
---
 common/forms.py                               |  32 +++
 common/jinja2/layouts/create.jinja            |  10 +-
 .../js/components/QuotaOriginFormset/index.js |   5 +-
 .../tests/__snapshots__/index.test.js.snap    | 233 ++++++++++++++++++
 .../QuotaOriginFormset/tests/index.test.js    |   3 +-
 quotas/forms.py                               | 189 +++++++-------
 .../quotas/quota-create-origins.jinja         |  30 +++
 quotas/tests/test_forms.py                    | 140 ++++++++++-
 quotas/tests/test_views.py                    | 221 ++++++++++++++++-
 quotas/views.py                               |  65 +++++
 10 files changed, 819 insertions(+), 109 deletions(-)
 create mode 100644 quotas/jinja2/includes/quotas/quota-create-origins.jinja

diff --git a/common/forms.py b/common/forms.py
index 6c5de5117..af31c8386 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -14,6 +14,7 @@
 from crispy_forms_gds.layout import Submit
 from django import forms
 from django.contrib.postgres.forms.ranges import DateRangeField
+from django.core.exceptions import NON_FIELD_ERRORS
 from django.core.exceptions import ValidationError
 from django.forms.renderers import get_default_renderer
 from django.forms.utils import ErrorList
@@ -892,3 +893,34 @@ def deserialize_init_kwargs(cls, form_kwargs: Dict) -> Dict:
         representation.
         """
         return {}
+
+
+class ExtraErrorFormMixin:
+    def add_extra_error(self, field, error):
+        """
+        A modification of Django's add_error method that allows us to add data
+        to self._errors under custom keys that are not field names or
+        NON_FIELD_ERRORS.
+
+        Used to pass errors to the React form.
+        """
+        if not isinstance(error, ValidationError):
+            error = ValidationError(error)
+
+        if hasattr(error, "error_dict"):
+            if field is not None:
+                raise TypeError(
+                    "The argument `field` must be `None` when the `error` "
+                    "argument contains errors for multiple fields.",
+                )
+            else:
+                error = error.error_dict
+        else:
+            error = {field or NON_FIELD_ERRORS: error.error_list}
+
+        for field, error_list in error.items():
+            if field not in self.errors:
+                self._errors[field] = self.error_class()
+            self._errors[field].extend(error_list)
+            if field in self.cleaned_data:
+                del self.cleaned_data[field]
diff --git a/common/jinja2/layouts/create.jinja b/common/jinja2/layouts/create.jinja
index 725925119..7220f2739 100644
--- a/common/jinja2/layouts/create.jinja
+++ b/common/jinja2/layouts/create.jinja
@@ -1,11 +1,7 @@
 {% extends 'layouts/form.jinja' %}
 
 {% block form %}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-      {% call django_form() %}
-        {{ crispy(form) }}
-      {% endcall %}
-    </div>
-  </div>
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
 {% endblock %}
diff --git a/common/static/common/js/components/QuotaOriginFormset/index.js b/common/static/common/js/components/QuotaOriginFormset/index.js
index f08b771d3..d0c9ab28a 100644
--- a/common/static/common/js/components/QuotaOriginFormset/index.js
+++ b/common/static/common/js/components/QuotaOriginFormset/index.js
@@ -13,7 +13,6 @@ function QuotaOriginFormset({
   groupsWithMembers,
   errors,
 }) {
-  const [origins, setOrigins] = useState([...data]);
   const emptyOrigin = {
     id: "",
     pk: "",
@@ -26,6 +25,10 @@ function QuotaOriginFormset({
     end_date_1: "",
     end_date_2: "",
   };
+  if (data.length == 0) {
+    data.push(emptyOrigin);
+  }
+  const [origins, setOrigins] = useState([...data]);
 
   const addEmptyOrigin = (e) => {
     e.preventDefault();
diff --git a/common/static/common/js/components/QuotaOriginFormset/tests/__snapshots__/index.test.js.snap b/common/static/common/js/components/QuotaOriginFormset/tests/__snapshots__/index.test.js.snap
index 0c5c5abb3..3bb048dcf 100644
--- a/common/static/common/js/components/QuotaOriginFormset/tests/__snapshots__/index.test.js.snap
+++ b/common/static/common/js/components/QuotaOriginFormset/tests/__snapshots__/index.test.js.snap
@@ -4,6 +4,239 @@ exports[`QuotaOriginFormset renders empty formset when no initial data 1`] = `
 <div
   aria-live="polite"
 >
+  <div>
+    <h3
+      className="govuk-heading-m"
+    >
+      Origin 
+      1
+    </h3>
+    <input
+      name="origins-0-pk"
+      type="hidden"
+      value=""
+    />
+    <div
+      className="govuk-form-group"
+    >
+      <div
+        className="src__StyledContainer-sc-1l2t4xv-0 kSOVkC"
+      >
+        <span
+          className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+        >
+          <legend
+            className="legend__StyledLegend-sc-12rap65-0 deblVS"
+            size="S"
+          >
+            Start date
+          </legend>
+        </span>
+        <div
+          className="input__StyledList-sc-una33r-1 UBJjX"
+        >
+          <label
+            className="src__Label-sc-iqzvxn-0 input__StyledLabel-sc-una33r-0 eTSPOL bXvZdL"
+            error={false}
+            year={false}
+          >
+            <span
+              className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+            >
+              Day
+            </span>
+            <input
+              className="src__Input-sc-1ch9crp-0 esEbTY"
+              defaultValue=""
+              error={false}
+              name="origins-0-start_date_0"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              type="text"
+            />
+          </label>
+          <label
+            className="src__Label-sc-iqzvxn-0 input__StyledLabel-sc-una33r-0 eTSPOL bXvZdL"
+            error={false}
+            year={false}
+          >
+            <span
+              className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+            >
+              Month
+            </span>
+            <input
+              className="src__Input-sc-1ch9crp-0 esEbTY"
+              defaultValue=""
+              error={false}
+              name="origins-0-start_date_1"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              type="text"
+            />
+          </label>
+          <label
+            className="src__Label-sc-iqzvxn-0 input__StyledLabel-sc-una33r-0 eTSPOL kjRNx"
+            error={false}
+            year={true}
+          >
+            <span
+              className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+            >
+              Year
+            </span>
+            <input
+              className="src__Input-sc-1ch9crp-0 esEbTY"
+              defaultValue=""
+              error={false}
+              name="origins-0-start_date_2"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              type="text"
+            />
+          </label>
+        </div>
+      </div>
+    </div>
+    <div
+      className="govuk-form-group"
+    >
+      <div
+        className="src__StyledContainer-sc-1l2t4xv-0 kSOVkC"
+      >
+        <span
+          className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+        >
+          <legend
+            className="legend__StyledLegend-sc-12rap65-0 deblVS"
+            size="S"
+          >
+            End date
+          </legend>
+        </span>
+        <span
+          className="src__HintText-sc-tq1z5r-0 hIpBPn"
+        >
+          Leave empty if a quota order number origin is needed for an unlimited time
+        </span>
+        <div
+          className="input__StyledList-sc-una33r-1 UBJjX"
+        >
+          <label
+            className="src__Label-sc-iqzvxn-0 input__StyledLabel-sc-una33r-0 eTSPOL bXvZdL"
+            error={false}
+            year={false}
+          >
+            <span
+              className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+            >
+              Day
+            </span>
+            <input
+              className="src__Input-sc-1ch9crp-0 esEbTY"
+              defaultValue=""
+              error={false}
+              name="origins-0-end_date_0"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              type="text"
+            />
+          </label>
+          <label
+            className="src__Label-sc-iqzvxn-0 input__StyledLabel-sc-una33r-0 eTSPOL bXvZdL"
+            error={false}
+            year={false}
+          >
+            <span
+              className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+            >
+              Month
+            </span>
+            <input
+              className="src__Input-sc-1ch9crp-0 esEbTY"
+              defaultValue=""
+              error={false}
+              name="origins-0-end_date_1"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              type="text"
+            />
+          </label>
+          <label
+            className="src__Label-sc-iqzvxn-0 input__StyledLabel-sc-una33r-0 eTSPOL kjRNx"
+            error={false}
+            year={true}
+          >
+            <span
+              className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+            >
+              Year
+            </span>
+            <input
+              className="src__Input-sc-1ch9crp-0 esEbTY"
+              defaultValue=""
+              error={false}
+              name="origins-0-end_date_2"
+              onBlur={[Function]}
+              onChange={[Function]}
+              onFocus={[Function]}
+              type="text"
+            />
+          </label>
+        </div>
+      </div>
+    </div>
+    <div
+      className="govuk-form-group"
+    >
+      <legend
+        className="legend__StyledLegend-sc-12rap65-0 deblVS"
+        size="S"
+      >
+        Geographical area
+      </legend>
+      <label
+        className="src__Label-sc-iqzvxn-0 eTSPOL"
+        defaultValue=""
+        error={false}
+      >
+        <span
+          className="src__LabelText-sc-1lbxenh-0 jZJbVy"
+        />
+        <select
+          className="src__StyledSelect-sc-sgud4a-0 lmpfTQ"
+          defaultValue=""
+          error={false}
+          name="origins-0-geographical_area"
+          onChange={[Function]}
+        >
+          <option
+            value={1}
+          />
+          <option
+            value={2}
+          />
+          <option
+            value={3}
+          />
+          <option
+            value={4}
+          />
+          <option
+            value={5}
+          />
+        </select>
+      </label>
+    </div>
+    <hr
+      className="govuk-!-margin-top-3"
+    />
+  </div>
   <button
     className="govuk-button govuk-button--secondary"
     onClick={[Function]}
diff --git a/common/static/common/js/components/QuotaOriginFormset/tests/index.test.js b/common/static/common/js/components/QuotaOriginFormset/tests/index.test.js
index bf1dd61a8..58d1573cf 100644
--- a/common/static/common/js/components/QuotaOriginFormset/tests/index.test.js
+++ b/common/static/common/js/components/QuotaOriginFormset/tests/index.test.js
@@ -150,7 +150,8 @@ describe("QuotaOriginFormset", () => {
     // add an empty origin
     fireEvent.click(screen.getByText("Add another origin"));
     expect(screen.getByText("Origin 1")).toBeInTheDocument();
-    expect(screen.queryByText("Origin 2")).not.toBeInTheDocument();
+    expect(screen.queryByText("Origin 2")).toBeInTheDocument();
+    expect(screen.queryByText("Origin 3")).not.toBeInTheDocument();
   });
 
   it("should remove origin form when delete button is clicked", () => {
diff --git a/quotas/forms.py b/quotas/forms.py
index 74295f484..384e3f3d7 100644
--- a/quotas/forms.py
+++ b/quotas/forms.py
@@ -9,7 +9,6 @@
 from crispy_forms_gds.layout import Size
 from crispy_forms_gds.layout import Submit
 from django import forms
-from django.core.exceptions import NON_FIELD_ERRORS
 from django.core.exceptions import ValidationError
 from django.db.models import TextChoices
 from django.template.loader import render_to_string
@@ -17,6 +16,7 @@
 
 from common.fields import AutoCompleteField
 from common.forms import BindNestedFormMixin
+from common.forms import ExtraErrorFormMixin
 from common.forms import FormSet
 from common.forms import FormSetField
 from common.forms import FormSetSubmitMixin
@@ -51,6 +51,65 @@
 ORDER_NUMBER_HELP_TEXT = "The order number must begin with 05 and be 6 digits long. Licensed quotas must begin 054 and safeguards must begin 058"
 
 
+class QuotaOriginsReactMixin(ExtraErrorFormMixin):
+    """Custom cleaning and validation for QuotaUpdateForm and
+    QuotaOrderNumberCreateForm."""
+
+    def clean_quota_origins(self):
+        # unprefix origins formset
+        submitted_data = unprefix_formset_data(
+            QUOTA_ORIGINS_FORMSET_PREFIX,
+            self.data.copy(),
+        )
+        # for each origin, unprefix exclusions formset
+        for i, origin_data in enumerate(submitted_data):
+            exclusions = unprefix_formset_data(
+                QUOTA_EXCLUSIONS_FORMSET_PREFIX,
+                origin_data.copy(),
+            )
+            submitted_data[i]["exclusions"] = exclusions
+
+        self.cleaned_data["origins"] = []
+
+        for i, origin_data in enumerate(submitted_data):
+            # instantiate a form per origin data to do validation
+            origin_form = QuotaOrderNumberOriginUpdateReactForm(
+                data=origin_data,
+                initial=origin_data,
+                instance=(
+                    models.QuotaOrderNumberOrigin.objects.get(pk=origin_data["pk"])
+                    if origin_data.get("pk")
+                    else None
+                ),
+            )
+
+            cleaned_exclusions = []
+
+            for exclusion in origin_data["exclusions"]:
+                exclusion_form = QuotaOriginExclusionsReactForm(
+                    data=exclusion,
+                    initial=exclusion,
+                )
+                if not exclusion_form.is_valid():
+                    for j, item in enumerate(exclusion_form.errors.as_data().items()):
+                        self.add_extra_error(
+                            f"{QUOTA_ORIGINS_FORMSET_PREFIX}-{i}-exclusions-{j}-{item[0]}",
+                            item[1],
+                        )
+                else:
+                    cleaned_exclusions.append(exclusion_form.cleaned_data)
+
+            if not origin_form.is_valid():
+                for field, e in origin_form.errors.as_data().items():
+                    self.add_extra_error(
+                        f"{QUOTA_ORIGINS_FORMSET_PREFIX}-{i}-{field}",
+                        e,
+                    )
+            else:
+                origin_form.cleaned_data["exclusions"] = cleaned_exclusions
+                self.cleaned_data["origins"].append(origin_form.cleaned_data)
+
+
 class QuotaFilterForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -107,6 +166,7 @@ def __init__(self, *args, **kwargs):
 
 
 class QuotaUpdateForm(
+    QuotaOriginsReactMixin,
     ValidityPeriodForm,
     forms.ModelForm,
 ):
@@ -204,89 +264,8 @@ def get_origins_initial(self):
 
         return initial
 
-    def add_extra_error(self, field, error):
-        """
-        A modification of Django's add_error method that allows us to add data
-        to self._errors under custom keys that are not field names or
-        NON_FIELD_ERRORS.
-
-        Used to pass errors to the React form.
-        """
-        if not isinstance(error, ValidationError):
-            error = ValidationError(error)
-
-        if hasattr(error, "error_dict"):
-            if field is not None:
-                raise TypeError(
-                    "The argument `field` must be `None` when the `error` "
-                    "argument contains errors for multiple fields.",
-                )
-            else:
-                error = error.error_dict
-        else:
-            error = {field or NON_FIELD_ERRORS: error.error_list}
-
-        for field, error_list in error.items():
-            if field not in self.errors:
-                self._errors[field] = self.error_class()
-            self._errors[field].extend(error_list)
-            if field in self.cleaned_data:
-                del self.cleaned_data[field]
-
     def clean(self):
-        # unprefix origins formset
-        submitted_data = unprefix_formset_data(
-            QUOTA_ORIGINS_FORMSET_PREFIX,
-            self.data.copy(),
-        )
-        # for each origin, unprefix exclusions formset
-        for i, origin_data in enumerate(submitted_data):
-            exclusions = unprefix_formset_data(
-                QUOTA_EXCLUSIONS_FORMSET_PREFIX,
-                origin_data.copy(),
-            )
-            submitted_data[i]["exclusions"] = exclusions
-
-        self.cleaned_data["origins"] = []
-
-        for i, origin_data in enumerate(submitted_data):
-            # instantiate a form per origin data to do validation
-            origin_form = QuotaOrderNumberOriginUpdateReactForm(
-                data=origin_data,
-                initial=origin_data,
-                instance=(
-                    models.QuotaOrderNumberOrigin.objects.get(pk=origin_data["pk"])
-                    if origin_data.get("pk")
-                    else None
-                ),
-            )
-
-            cleaned_exclusions = []
-
-            for exclusion in origin_data["exclusions"]:
-                exclusion_form = QuotaOriginExclusionsReactForm(
-                    data=exclusion,
-                    initial=exclusion,
-                )
-                if not exclusion_form.is_valid():
-                    for field, e in exclusion_form.errors.as_data().items():
-                        self.add_extra_error(
-                            f"{QUOTA_ORIGINS_FORMSET_PREFIX}-{i}-{field}",
-                            e,
-                        )
-                else:
-                    cleaned_exclusions.append(exclusion_form.cleaned_data)
-
-            if not origin_form.is_valid():
-                for field, e in origin_form.errors.as_data().items():
-                    self.add_extra_error(
-                        f"{QUOTA_ORIGINS_FORMSET_PREFIX}-{i}-{field}",
-                        e,
-                    )
-            else:
-                origin_form.cleaned_data["exclusions"] = cleaned_exclusions
-                self.cleaned_data["origins"].append(origin_form.cleaned_data)
-
+        self.clean_quota_origins()
         return super().clean()
 
     def init_layout(self, request):
@@ -326,7 +305,6 @@ def init_layout(self, request):
                         ),
                     ),
                 ),
-                css_class="govuk-width-!-two-thirds",
             ),
             Submit(
                 "submit",
@@ -338,6 +316,7 @@ def init_layout(self, request):
 
 
 class QuotaOrderNumberCreateForm(
+    QuotaOriginsReactMixin,
     ValidityPeriodForm,
     forms.ModelForm,
 ):
@@ -375,23 +354,51 @@ class Meta:
     )
 
     def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request")
+        self.exclusions_options = kwargs.pop("exclusions_options")
+        self.geo_area_options = kwargs.pop("geo_area_options")
+        self.groups_with_members = kwargs.pop("groups_with_members")
         super().__init__(*args, **kwargs)
         self.init_fields()
-        self.init_layout()
+        self.init_layout(self.request)
 
     def init_fields(self):
         self.fields["start_date"].help_text = START_DATE_HELP_TEXT
 
-    def init_layout(self):
+    def get_origins_initial(self):
+        # if we just submitted the form, overwrite initial with submitted data
+        # this prevents newly added origin data being cleared if the form does not pass validation
+        initial = []
+        if self.data.get("submit"):
+            initial = unprefix_formset_data(
+                QUOTA_ORIGINS_FORMSET_PREFIX,
+                self.data.copy(),
+            )
+        return initial
+
+    def init_layout(self, request):
         self.helper = FormHelper(self)
         self.helper.label_size = Size.SMALL
         self.helper.legend_size = Size.SMALL
 
+        origins_html = render_to_string(
+            "includes/quotas/quota-create-origins.jinja",
+            {
+                "object": self.instance,
+                "request": request,
+                "geo_area_options": self.geo_area_options,
+                "groups_with_members": self.groups_with_members,
+                "exclusions_options": self.exclusions_options,
+                "origins_initial": self.get_origins_initial(),
+                "errors": self.errors,
+            },
+        )
+
         self.helper.layout = Layout(
             Accordion(
                 AccordionSection(
                     "Order number",
-                    "order_number",
+                    Field("order_number", css_class="govuk-input--width-20"),
                 ),
                 AccordionSection(
                     "Validity",
@@ -403,6 +410,12 @@ def init_layout(self):
                     "category",
                     "mechanism",
                 ),
+                AccordionSection(
+                    "Quota origins",
+                    Div(
+                        HTML(origins_html),
+                    ),
+                ),
                 css_class="govuk-width-!-two-thirds",
             ),
             Submit(
@@ -443,6 +456,8 @@ def clean(self):
                 "The order number for safeguard quotas must begin with 058",
             )
 
+        self.clean_quota_origins()
+
         return super().clean()
 
 
diff --git a/quotas/jinja2/includes/quotas/quota-create-origins.jinja b/quotas/jinja2/includes/quotas/quota-create-origins.jinja
new file mode 100644
index 000000000..5c8303c66
--- /dev/null
+++ b/quotas/jinja2/includes/quotas/quota-create-origins.jinja
@@ -0,0 +1,30 @@
+<div id="quota_origins"></div>
+
+<script nonce="{{ request.csp_nonce }}">
+  {# data used by react form component: common/static/common/js/components/QuotaOriginFormset/index.js #}
+  const originsData = {{origins_initial|safe}};
+  const originsErrors = {
+    {% for k, errorlist in errors.as_data().items() %}
+      "{{ k }}": "{% for errors in errorlist %}{% for error in errors %}{{ error|safe }}{% if not loop.last %}\n{% endif %}{% endfor %}{% endfor %}",
+    {% endfor %}
+  };
+  const groupsWithMembers = {{groups_with_members|safe}};
+  const geoAreasOptions = [
+    {"label": "", "value": ""},
+    {% for geo_area in geo_area_options %}
+    {
+      "label": "{{ geo_area.area_id  ~ " - " ~ geo_area.description }}",
+      "value": {{ geo_area.pk }},
+    },
+    {% endfor %}
+  ]
+  const exclusionsOptions = [
+    {"label": "", "value": ""},
+    {% for geo_area in exclusions_options %}
+    {
+      "label": "{{ geo_area.area_id  ~ " - " ~ geo_area.description }}",
+      "value": {{ geo_area.pk }},
+    },
+    {% endfor %}
+  ]
+</script>
diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index 3258e84e8..0211992a6 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -12,10 +12,11 @@
 from common.validators import UpdateType
 from geo_areas.models import GeographicalArea
 from geo_areas.validators import AreaCode
-from quotas import models
 from quotas import forms
+from quotas import models
 from quotas import validators
-from quotas.models import QuotaBlocking, QuotaDefinition
+from quotas.models import QuotaBlocking
+from quotas.models import QuotaDefinition
 from quotas.models import QuotaSuspension
 from quotas.serializers import serialize_duplicate_data
 
@@ -243,6 +244,69 @@ def test_quota_update_react_form_cleaned_data(session_request_with_workbasket):
         assert len(form.cleaned_data["origins"][0]["exclusions"]) == 2
 
 
+def test_quota_update_exclusions_origins_errors(session_request_with_workbasket):
+    quota = factories.QuotaOrderNumberFactory.create()
+    geo_group = factories.GeoGroupFactory.create()
+    area_1 = factories.GeographicalMembershipFactory.create(geo_group=geo_group).member
+    area_2 = factories.GeographicalMembershipFactory.create(geo_group=geo_group).member
+    area_3 = factories.GeographicalMembershipFactory.create(geo_group=geo_group).member
+    factories.GeographicalAreaFactory.create()
+    # create geo area group with members to be excluded
+    data = {
+        "category": quota.category,
+        "start_date_0": 1,
+        "start_date_1": 1,
+        "start_date_2": 2000,
+        "end_date_0": 1,
+        "end_date_1": 1,
+        "end_date_2": 2010,
+        "origins-0-geographical_area": quota.quotaordernumberorigin_set.first().geographical_area.pk,
+        "origins-0-start_date_0": 1,
+        "origins-0-start_date_1": 1,
+        "origins-0-start_date_2": 2000,
+        "origins-0-end_date_0": 1,
+        "origins-0-end_date_1": 1,
+        # invalid end date
+        "origins-0-end_date_2": 1999,
+        "origins-0-exclusions-0-geographical_area": area_1.pk,
+        # invalid exclusion
+        "origins-0-exclusions-1-geographical_area": "foo",
+        "submit": "Save",
+    }
+
+    tx = Transaction.objects.last()
+
+    with override_current_transaction(tx):
+        geo_area_options = (
+            GeographicalArea.objects.all()
+            .prefetch_related("descriptions")
+            .with_latest_description()
+            .as_at_today_and_beyond()
+            .order_by("description")
+        )
+        existing_origins = (
+            quota.quotaordernumberorigin_set.current().with_latest_geo_area_description()
+        )
+        form = forms.QuotaUpdateForm(
+            data=data,
+            instance=quota,
+            initial={},
+            request=session_request_with_workbasket,
+            geo_area_options=geo_area_options,
+            existing_origins=existing_origins,
+            exclusions_options=geo_area_options.exclude(area_code=AreaCode.GROUP),
+            groups_with_members=[],
+        )
+        assert not form.is_valid()
+
+        assert form.errors["origins-0-exclusions-0-geographical_area"] == [
+            "Select a valid choice. That choice is not one of the available choices.",
+        ]
+        assert form.errors["origins-0-end_date"] == [
+            "The end date must be the same as or after the start date.",
+        ]
+
+
 @pytest.mark.parametrize(
     "field_name, error",
     [
@@ -290,6 +354,52 @@ def test_quota_update_add_extra_error(
         assert "There is a problem" in form.errors["some_field"]
 
 
+def test_quota_create_form_extra_errors(session_request_with_workbasket):
+    geo_group = factories.GeoGroupFactory.create()
+    area_1 = factories.GeographicalMembershipFactory.create(geo_group=geo_group).member
+    area_2 = factories.GeographicalMembershipFactory.create(geo_group=geo_group).member
+    area_3 = factories.GeographicalMembershipFactory.create(geo_group=geo_group).member
+    non_member = factories.GeographicalAreaFactory.create()
+
+    data = {
+        "order_number": "054000",
+        "mechanism": validators.AdministrationMechanism.LICENSED.value,
+        "category": validators.QuotaCategory.WTO.value,
+        "start_date_0": 1,
+        "start_date_1": 1,
+        "start_date_2": 2000,
+        "origins-0-geographical_area": geo_group.pk,
+        "origins-0-start_date_0": 1,
+        "origins-0-start_date_1": 1,
+        "origins-0-start_date_2": 2000,
+        "origins-0-end_date_0": 1,
+        "origins-0-end_date_1": 1,
+        # invalid end date
+        "origins-0-end_date_2": 1999,
+        "origins-0-exclusions-0-geographical_area": area_1.pk,
+        # invalid exclusion
+        "origins-0-exclusions-1-geographical_area": "foo",
+        "submit": "Save",
+    }
+
+    with override_current_transaction(non_member.transaction):
+        form = forms.QuotaOrderNumberCreateForm(
+            data=data,
+            request=session_request_with_workbasket,
+            initial={},
+            geo_area_options=[],
+            exclusions_options=[],
+            groups_with_members=[],
+        )
+        assert not form.is_valid()
+        assert form.errors["origins-0-exclusions-0-geographical_area"] == [
+            "Select a valid choice. That choice is not one of the available choices.",
+        ]
+        assert form.errors["origins-0-end_date"] == [
+            "The end date must be the same as or after the start date.",
+        ]
+
+
 def test_quota_update_add_extra_error_type_error(session_request_with_workbasket):
     quota = factories.QuotaOrderNumberFactory.create()
     data = {
@@ -432,13 +542,15 @@ def test_quota_suspension_or_blockling_create_form_save(
 
 @pytest.fixture
 def main_quota_order_number() -> models.QuotaOrderNumber:
-    """Provides a main quota order number for use across the fixtures and following tests"""
+    """Provides a main quota order number for use across the fixtures and
+    following tests."""
     return factories.QuotaOrderNumberFactory()
 
 
 @pytest.fixture
 def quota_definition_1(main_quota_order_number, date_ranges) -> QuotaDefinition:
-    """Provides a definition, linked to the main_quota_order_number to be used across the following tests"""
+    """Provides a definition, linked to the main_quota_order_number to be used
+    across the following tests."""
     return factories.QuotaDefinitionFactory.create(
         order_number=main_quota_order_number,
         valid_between=date_ranges.normal,
@@ -450,11 +562,13 @@ def quota_definition_1(main_quota_order_number, date_ranges) -> QuotaDefinition:
 
 
 def test_select_sub_quota_form_set_staged_definition_data(
-    quota_definition_1, session_request
+    quota_definition_1,
+    session_request,
 ):
     session_request.path = ""
     form = forms.SelectSubQuotaDefinitionsForm(
-        request=session_request, prefix="select_definition_periods"
+        request=session_request,
+        prefix="select_definition_periods",
     )
     quotas = models.QuotaDefinition.objects.all()
     with override_current_transaction(Transaction.objects.last()):
@@ -473,13 +587,15 @@ def test_select_sub_quota_form_set_staged_definition_data(
 
 
 def test_quota_duplicator_form_clean_QA2(
-    date_ranges, session_request, quota_definition_1
+    date_ranges,
+    session_request,
+    quota_definition_1,
 ):
     staged_definition_data = [
         {
             "main_definition": quota_definition_1.pk,
             "sub_definition_staged_data": serialize_duplicate_data(quota_definition_1),
-        }
+        },
     ]
     session_request.session["staged_definition_data"] = staged_definition_data
 
@@ -510,7 +626,7 @@ def test_quota_duplicator_form_clean_QA3(session_request, quota_definition_1):
         {
             "main_definition": quota_definition_1.pk,
             "sub_definition_staged_data": serialize_duplicate_data(quota_definition_1),
-        }
+        },
     ]
 
     data = {
@@ -544,7 +660,7 @@ def test_quota_duplicator_form_clean_QA4(session_request, quota_definition_1):
         {
             "main_definition": quota_definition_1.pk,
             "sub_definition_staged_data": serialize_duplicate_data(quota_definition_1),
-        }
+        },
     ]
 
     data = {
@@ -579,7 +695,7 @@ def test_quota_duplicator_form_clean_QA5_nm(session_request, quota_definition_1)
         {
             "main_definition": quota_definition_1.pk,
             "sub_definition_staged_data": serialize_duplicate_data(quota_definition_1),
-        }
+        },
     ]
 
     data = {
@@ -615,7 +731,7 @@ def test_quota_duplicator_form_clean_QA5_eq(session_request, quota_definition_1)
         {
             "main_definition": quota_definition_1.pk,
             "sub_definition_staged_data": serialize_duplicate_data(quota_definition_1),
-        }
+        },
     ]
 
     data = {
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index 6a6d718f8..875c953bc 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -956,6 +956,76 @@ def test_delete_quota_definition(client_with_current_workbasket, date_ranges):
     )
 
 
+def test_quota_create_with_origins(
+    client_with_current_workbasket,
+    date_ranges,
+):
+    # make a geo group with 3 member countries
+    country1 = factories.CountryFactory.create()
+    country2 = factories.CountryFactory.create()
+    country3 = factories.CountryFactory.create()
+    geo_group = factories.GeoGroupFactory.create()
+    membership1 = factories.GeographicalMembershipFactory.create(
+        member=country1,
+        geo_group=geo_group,
+    )
+    membership2 = factories.GeographicalMembershipFactory.create(
+        member=country2,
+        geo_group=geo_group,
+    )
+    membership3 = factories.GeographicalMembershipFactory.create(
+        member=country3,
+        geo_group=geo_group,
+    )
+
+    data = {
+        "order_number": "054000",
+        "mechanism": validators.AdministrationMechanism.LICENSED.value,
+        "category": validators.QuotaCategory.WTO.value,
+        "start_date_0": date_ranges.big_no_end.lower.day,
+        "start_date_1": date_ranges.big_no_end.lower.month,
+        "start_date_2": date_ranges.big_no_end.lower.year,
+        "end_date_0": "",
+        "end_date_1": "",
+        "end_date_2": "",
+        "origins-0-pk": "",
+        "origins-0-start_date_0": date_ranges.big_no_end.lower.day,
+        "origins-0-start_date_1": date_ranges.big_no_end.lower.month,
+        "origins-0-start_date_2": date_ranges.big_no_end.lower.year,
+        "origins-0-end_date_0": "",
+        "origins-0-end_date_1": "",
+        "origins-0-end_date_2": "",
+        "origins-0-geographical_area": geo_group.pk,
+        "origins-0-exclusions-0-pk": "",
+        "origins-0-exclusions-0-geographical_area": membership1.member.pk,
+        "submit": "Save",
+    }
+    url = reverse("quota-ui-create")
+    response = client_with_current_workbasket.post(url, data)
+
+    tx = Transaction.objects.last()
+    new_quota = models.QuotaOrderNumber.objects.approved_up_to_transaction(tx).last()
+
+    assert response.status_code == 302
+    assert response.url == reverse(
+        "quota-ui-confirm-create",
+        kwargs={"sid": new_quota.sid},
+    )
+
+    assert new_quota.origins.approved_up_to_transaction(tx).count() == 1
+    new_origin = new_quota.quotaordernumberorigin_set.approved_up_to_transaction(
+        tx,
+    ).first()
+    assert {
+        e.excluded_geographical_area.sid
+        for e in new_origin.quotaordernumberoriginexclusion_set.approved_up_to_transaction(
+            tx,
+        )
+    } == {
+        membership1.member.sid,
+    }
+
+
 def test_quota_create_origin(
     client_with_current_workbasket,
     approved_transaction,
@@ -1243,17 +1313,39 @@ def test_create_new_quota_definition_business_rule_violation(
 
 
 @pytest.mark.django_db
-def test_quota_order_number_create_200(
+def test_get_200_quota_order_number_create(
     client_with_current_workbasket,
+    geo_group1,
+    geo_group2,
 ):
     response = client_with_current_workbasket.get(reverse("quota-ui-create"))
+    assert response.status_code == 200
+
 
+def test_get_200_quota_edit(client_with_current_workbasket):
+    quota = factories.QuotaOrderNumberFactory.create()
+    response = client_with_current_workbasket.get(
+        reverse("quota-ui-edit", kwargs={"sid": quota.sid}),
+    )
+    assert response.status_code == 200
+
+
+def test_get_200_quota_origins_edit(client_with_current_workbasket):
+    quota = factories.QuotaOrderNumberFactory.create()
+    origin = quota.quotaordernumberorigin_set.approved_up_to_transaction(
+        quota.transaction,
+    ).first()
+    response = client_with_current_workbasket.get(
+        reverse("quota_order_number_origin-ui-edit", kwargs={"sid": origin.sid}),
+    )
     assert response.status_code == 200
 
 
 @pytest.mark.django_db
 def test_quota_order_number_create_errors_required(
     client_with_current_workbasket,
+    geo_group1,
+    geo_group2,
 ):
     form_data = {
         "submit": "Save",
@@ -1308,6 +1400,8 @@ def test_quota_order_number_create_validation(
     exp_error,
     client_with_current_workbasket,
     date_ranges,
+    geo_group1,
+    geo_group2,
 ):
     form_data = {
         "start_date_0": date_ranges.normal.lower.day,
@@ -1336,6 +1430,8 @@ def test_quota_order_number_create_validation(
 def test_quota_order_number_create_success(
     client_with_current_workbasket,
     date_ranges,
+    geo_group1,
+    geo_group2,
 ):
     form_data = {
         "start_date_0": date_ranges.normal.lower.day,
@@ -1364,6 +1460,59 @@ def test_quota_order_number_create_success(
     assert soup.find("h1").text.strip() == f"Quota: {quota.order_number}"
 
 
+def test_quota_update_existing_origins_no_submitted_origins(
+    client_with_current_workbasket,
+    date_ranges,
+):
+    quota = factories.QuotaOrderNumberFactory.create(
+        category=0,
+        valid_between=date_ranges.big_no_end,
+    )
+    factories.QuotaOrderNumberOriginFactory.create(order_number=quota)
+    new_origin = factories.QuotaOrderNumberOriginFactory.create(order_number=quota)
+    tx = new_origin.transaction
+    (
+        origin1,
+        origin2,
+        origin3,
+    ) = quota.quotaordernumberorigin_set.approved_up_to_transaction(tx)
+
+    # sanity check
+    assert quota.quotaordernumberorigin_set.count() == 3
+
+    data = {
+        "start_date_0": quota.valid_between.lower.day,
+        "start_date_1": quota.valid_between.lower.month,
+        "start_date_2": quota.valid_between.lower.year,
+        "end_date_0": "",
+        "end_date_1": "",
+        "end_date_2": "",
+        "category": "1",  # update category
+        "submit": "Save",
+    }
+    url = reverse("quota-ui-edit", kwargs={"sid": quota.sid})
+    response = client_with_current_workbasket.post(url, data)
+
+    assert response.status_code == 302
+    assert response.url == reverse("quota-ui-confirm-update", kwargs={"sid": quota.sid})
+
+    tx = Transaction.objects.last()
+    updated_quota = (
+        models.QuotaOrderNumber.objects.approved_up_to_transaction(tx)
+        .filter(sid=quota.sid)
+        .first()
+    )
+    assert updated_quota.category == 1
+    assert updated_quota.valid_between == quota.valid_between
+
+    assert updated_quota.origins.approved_up_to_transaction(tx).count() == 3
+    assert {o.sid for o in updated_quota.origins.approved_up_to_transaction(tx)} == {
+        origin1.geographical_area.sid,
+        origin2.geographical_area.sid,
+        origin3.geographical_area.sid,
+    }
+
+
 def test_quota_update_existing_origins(client_with_current_workbasket, date_ranges):
     quota = factories.QuotaOrderNumberFactory.create(
         category=0,
@@ -1444,6 +1593,76 @@ def test_quota_update_existing_origins(client_with_current_workbasket, date_rang
     }
 
 
+def test_quota_update_existing_origin_exclusion_new_version(
+    client_with_current_workbasket,
+    date_ranges,
+):
+    # make a geo group with a member country
+    country1 = factories.CountryFactory.create()
+    geo_group = factories.GeoGroupFactory.create()
+    membership1 = factories.GeographicalMembershipFactory.create(
+        member=country1,
+        geo_group=geo_group,
+    )
+
+    exclusion = factories.QuotaOrderNumberOriginExclusionFactory.create(
+        excluded_geographical_area=membership1.member,
+    )
+    origin = exclusion.origin
+    quota = origin.order_number
+
+    # sanity check
+    assert quota.quotaordernumberorigin_set.count() == 1
+
+    data = {
+        "start_date_0": date_ranges.big_no_end.lower.day,
+        "start_date_1": date_ranges.big_no_end.lower.month,
+        "start_date_2": date_ranges.big_no_end.lower.year,
+        "end_date_0": "",
+        "end_date_1": "",
+        "end_date_2": "",
+        "category": "1",  # update category
+        # leave origin and exclusion data the same
+        "origins-0-pk": origin.pk,
+        "origins-0-start_date_0": date_ranges.big_no_end.lower.day,
+        "origins-0-start_date_1": date_ranges.big_no_end.lower.month,
+        "origins-0-start_date_2": date_ranges.big_no_end.lower.year,
+        "origins-0-end_date_0": "",
+        "origins-0-end_date_1": "",
+        "origins-0-end_date_2": "",
+        "origins-0-geographical_area": geo_group.pk,
+        "origins-0-exclusions-0-pk": exclusion.pk,
+        "origins-0-exclusions-0-geographical_area": membership1.member.pk,
+        "submit": "Save",
+    }
+    url = reverse("quota-ui-edit", kwargs={"sid": quota.sid})
+    response = client_with_current_workbasket.post(url, data)
+
+    assert response.status_code == 302
+    assert response.url == reverse("quota-ui-confirm-update", kwargs={"sid": quota.sid})
+
+    tx = Transaction.objects.last()
+
+    updated_quota = (
+        models.QuotaOrderNumber.objects.approved_up_to_transaction(tx)
+        .filter(sid=quota.sid)
+        .first()
+    )
+
+    assert updated_quota.origins.approved_up_to_transaction(tx).count() == 1
+    updated_origin = (
+        updated_quota.quotaordernumberorigin_set.approved_up_to_transaction(tx).first()
+    )
+    assert {
+        e.excluded_geographical_area.sid
+        for e in updated_origin.quotaordernumberoriginexclusion_set.approved_up_to_transaction(
+            tx,
+        )
+    } == {
+        membership1.member.sid,
+    }
+
+
 def test_quota_update_existing_origin_exclusions(
     client_with_current_workbasket,
     date_ranges,
diff --git a/quotas/views.py b/quotas/views.py
index 98ec7a2dc..bb39106d4 100644
--- a/quotas/views.py
+++ b/quotas/views.py
@@ -134,12 +134,77 @@ class QuotaCreate(QuotaOrderNumberMixin, CreateTaricCreateView):
         UpdateValidity,
     )
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["request"] = self.request
+        geo_area_options = (
+            GeographicalArea.objects.current()
+            .with_latest_description()
+            .as_at_today_and_beyond()
+            .prefetch_related("descriptions")
+            .order_by("description")
+        )
+        groups_options = geo_area_options.filter(area_code=AreaCode.GROUP)
+        geo_group_pks = [group.pk for group in groups_options]
+        memberships = GeographicalMembership.objects.filter(
+            geo_group__pk__in=geo_group_pks,
+        ).prefetch_related("geo_group", "member")
+
+        groups_with_members = {}
+        for group_pk in geo_group_pks:
+            members = memberships.filter(geo_group__pk=group_pk)
+            groups_with_members[group_pk] = [m.member.pk for m in members]
+
+        kwargs["geo_area_options"] = geo_area_options
+        kwargs["exclusions_options"] = geo_area_options.exclude(
+            area_code=AreaCode.GROUP,
+        )
+        kwargs["groups_with_members"] = groups_with_members
+        return kwargs
+
     def get_context_data(self, **kwargs):
         return super().get_context_data(
             page_title="Create a new quota order number",
             **kwargs,
         )
 
+    def create_origins(self, instance, form_origins):
+        for origin in form_origins:
+            new_origin = models.QuotaOrderNumberOrigin.objects.create(
+                order_number=instance,
+                valid_between=origin["valid_between"],
+                geographical_area=origin["geographical_area"],
+                update_type=UpdateType.CREATE,
+                transaction=instance.transaction,
+            )
+
+            self.create_exclusions(
+                instance,
+                new_origin,
+                origin.get("exclusions"),
+            )
+
+    def create_exclusions(self, quota, created_origin, exclusions):
+        for exclusion in exclusions:
+            geo_area = GeographicalArea.objects.get(pk=exclusion["geographical_area"])
+            models.QuotaOrderNumberOriginExclusion.objects.create(
+                origin=created_origin,
+                excluded_geographical_area=geo_area,
+                update_type=UpdateType.CREATE,
+                transaction=quota.transaction,
+            )
+
+    @transaction.atomic
+    def get_result_object(self, form):
+        instance = super().get_result_object(form)
+
+        # if JS is enabled we get data from the React form which includes origins and exclusions
+        form_origins = form.cleaned_data.get("origins")
+
+        self.create_origins(instance, form_origins)
+
+        return instance
+
 
 class QuotaConfirmCreate(QuotaOrderNumberMixin, TrackedModelDetailView):
     template_name = "quotas/confirm-create.jinja"

From 387dfd5e52ff3ffad09885f1940c36759279a302 Mon Sep 17 00:00:00 2001
From: Lauren Mullally <46787754+LaurenMullally@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:49:11 +0100
Subject: [PATCH 02/12] TP2000-1387 Async Bulk Edit - Python 3.12  (#1286)

* Make MeasuresBulkEditor model

* Export the MeasuresBulkEditor model

* Add flag for Measures async edit

* Split done function into sync and async done

* Add Mixin and kwarg functions to Start date form

* Add Mixin and kwarg functions to End date form

* Add mixin and kwarg functions to Regulations form

* Add Mixin and kwarg functions to Duties form

* Add Mixin to Geographical Areas formset

* WIP - Move serializable functions into a wizard mixin

* Create SerializableWizardMixin for wizards that use async bulk functionality

* Add MeasureSerializableWizardMixin to Create Measures

* Add serializable wizard mixin and split the form lists

* Set up Celery route for Async bulk edit

* WIP - Flesh out editing functionality - need to consider update functions

* WIP - Move Update functions into measures/util - will probs give circular import issues

* Move update functions into measures/util file

* WIP - Update functions in util

* Fix circular import errors

* Delete unnecessary if statement and comment

* Clean up ready for testing

* Change back order of kwargs to fix test

* WIP - Mock won't work

* Fix mock file path

* Fix measure/test_views.py tests

* Modify edit tests to be sync tests

* Refactor editing measures into a editor class so that both done routes can use it

* Hook the async route up to the new editor class

* Change name of mock and fix circular imports

* Test bulk processing

* Take out log

* Test for Paul to look at

* Add test to check form serialize and deserialize functionality

* Add Geo Areas serialize deserialise test

* Run linter

* Run linter

* Add test to check errors are logged in a detailed manor

* linter
---
 measures/editors.py                           | 118 +++++++
 measures/forms/wizard.py                      | 114 ++++++-
 .../migrations/0017_measuresbulkeditor.py     |  84 +++++
 measures/models/__init__.py                   |   2 +
 measures/models/bulk_processing.py            | 166 ++++++++++
 measures/tasks.py                             |  34 +++
 measures/tests/conftest.py                    |  55 +++-
 measures/tests/factories.py                   |  12 +
 measures/tests/test_bulk_processing.py        | 210 ++++++++++++-
 measures/tests/test_forms.py                  | 115 +++++++
 measures/tests/test_views.py                  |  11 +-
 measures/util.py                              | 123 +++++++-
 measures/views/mixins.py                      |  71 +++++
 measures/views/wizard.py                      | 288 ++++--------------
 settings/common.py                            |   4 +
 15 files changed, 1164 insertions(+), 243 deletions(-)
 create mode 100644 measures/editors.py
 create mode 100644 measures/migrations/0017_measuresbulkeditor.py

diff --git a/measures/editors.py b/measures/editors.py
new file mode 100644
index 000000000..0a55451f2
--- /dev/null
+++ b/measures/editors.py
@@ -0,0 +1,118 @@
+from typing import Dict
+from typing import List
+from typing import Type
+
+from django.db.transaction import atomic
+
+from workbaskets import models as workbasket_models
+from measures import models as measure_models
+from common.util import TaricDateRange
+from common.validators import UpdateType
+from common.models.utils import override_current_transaction
+from measures.util import update_measure_components
+from measures.util import update_measure_condition_components
+from measures.util import update_measure_excluded_geographical_areas
+from measures.util import update_measure_footnote_associations
+
+
+class MeasuresEditor:
+    """Utility class used to edit measures from measures wizard accumulated
+    data."""
+
+    workbasket: Type["workbasket_models.WorkBasket"]
+    """The workbasket with which created measures will be associated."""
+
+    selected_measures: List
+    """ The measures in which the edits will apply to."""
+
+    data: Dict
+    """Validated, cleaned and accumulated data created by the Form instances of
+    `MeasureEditWizard`."""
+
+    def __init__(
+        self,
+        workbasket: Type["workbasket_models.WorkBasket"],
+        selected_measures: List,
+        data: Dict,
+    ):
+        self.workbasket = workbasket
+        self.selected_measures = selected_measures
+        self.data = data
+
+    @atomic
+    def edit_measures(self) -> List["measure_models.Measure"]:
+        """
+        Returns a list of the edited measures.
+
+        `data` must be a dictionary
+        of the accumulated cleaned / validated data created from the
+        `MeasureEditWizard`.
+        """
+
+        with override_current_transaction(
+            transaction=self.workbasket.current_transaction,
+        ):
+            new_start_date = self.data.get("start_date", None)
+            new_end_date = self.data.get("end_date", False)
+            new_quota_order_number = self.data.get("order_number", None)
+            new_generating_regulation = self.data.get("generating_regulation", None)
+            new_duties = self.data.get("duties", None)
+            new_exclusions = [
+                e["excluded_area"]
+                for e in self.data.get("formset-geographical_area_exclusions", [])
+            ]
+
+            edited_measures = []
+
+            if self.selected_measures:
+                for measure in self.selected_measures:
+                    new_measure = measure.new_version(
+                        workbasket=self.workbasket,
+                        update_type=UpdateType.UPDATE,
+                        valid_between=TaricDateRange(
+                            lower=(
+                                new_start_date
+                                if new_start_date
+                                else measure.valid_between.lower
+                            ),
+                            upper=(
+                                new_end_date
+                                if new_end_date
+                                else measure.valid_between.upper
+                            ),
+                        ),
+                        order_number=(
+                            new_quota_order_number
+                            if new_quota_order_number
+                            else measure.order_number
+                        ),
+                        generating_regulation=(
+                            new_generating_regulation
+                            if new_generating_regulation
+                            else measure.generating_regulation
+                        ),
+                    )
+                    update_measure_components(
+                        measure=new_measure,
+                        duties=new_duties,
+                        workbasket=self.workbasket,
+                    )
+                    update_measure_condition_components(
+                        measure=new_measure,
+                        workbasket=self.workbasket,
+                    )
+                    update_measure_excluded_geographical_areas(
+                        edited="geographical_area_exclusions"
+                        in self.data.get("fields_to_edit", []),
+                        measure=new_measure,
+                        exclusions=new_exclusions,
+                        workbasket=self.workbasket,
+                    )
+                    update_measure_footnote_associations(
+                        measure=new_measure,
+                        workbasket=self.workbasket,
+                    )
+
+                    edited_measures.append(new_measure.id)
+
+            return edited_measures
diff --git a/measures/forms/wizard.py b/measures/forms/wizard.py
index 2e68915ec..d83142df3 100644
--- a/measures/forms/wizard.py
+++ b/measures/forms/wizard.py
@@ -781,7 +781,7 @@ def __init__(self, *args, **kwargs):
         )
 
 
-class MeasureStartDateForm(forms.Form):
+class MeasureStartDateForm(forms.Form, SerializableFormMixin):
     start_date = DateInputFieldFixed(
         label="Start date",
         help_text="For example, 27 3 2008",
@@ -819,8 +819,34 @@ def clean(self):
 
         return cleaned_data
 
+    @classmethod
+    def serializable_init_kwargs(cls, kwargs: Dict) -> Dict:
+        selected_measures = kwargs.get("selected_measures")
+        selected_measures_pks = []
+        for measure in selected_measures:
+            selected_measures_pks.append(measure.id)
+
+        serializable_kwargs = {
+            "selected_measures": selected_measures_pks,
+        }
+
+        return serializable_kwargs
+
+    @classmethod
+    def deserialize_init_kwargs(cls, form_kwargs: Dict) -> Dict:
+        serialized_selected_measures_pks = form_kwargs.get("selected_measures")
+        deserialized_selected_measures = models.Measure.objects.filter(
+            pk__in=serialized_selected_measures_pks
+        )
+
+        kwargs = {
+            "selected_measures": deserialized_selected_measures,
+        }
+
+        return kwargs
+
 
-class MeasureEndDateForm(forms.Form):
+class MeasureEndDateForm(forms.Form, SerializableFormMixin):
     end_date = DateInputFieldFixed(
         label="End date",
         help_text="For example, 27 3 2008",
@@ -861,8 +887,34 @@ def clean(self):
 
         return cleaned_data
 
+    @classmethod
+    def serializable_init_kwargs(cls, kwargs: Dict) -> Dict:
+        selected_measures = kwargs.get("selected_measures")
+        selected_measures_pks = []
+        for measure in selected_measures:
+            selected_measures_pks.append(measure.id)
+
+        serializable_kwargs = {
+            "selected_measures": selected_measures_pks,
+        }
+
+        return serializable_kwargs
+
+    @classmethod
+    def deserialize_init_kwargs(cls, form_kwargs: Dict) -> Dict:
+        serialized_selected_measures_pks = form_kwargs.get("selected_measures")
+        deserialized_selected_measures = models.Measure.objects.filter(
+            pk__in=serialized_selected_measures_pks
+        )
+
+        kwargs = {
+            "selected_measures": deserialized_selected_measures,
+        }
+
+        return kwargs
+
 
-class MeasureRegulationForm(forms.Form):
+class MeasureRegulationForm(forms.Form, SerializableFormMixin):
     generating_regulation = AutoCompleteField(
         label="Regulation ID",
         help_text="Select the regulation which provides the legal basis for the measures.",
@@ -888,8 +940,34 @@ def __init__(self, *args, **kwargs):
             ),
         )
 
+    @classmethod
+    def serializable_init_kwargs(cls, kwargs: Dict) -> Dict:
+        selected_measures = kwargs.get("selected_measures")
+        selected_measures_pks = []
+        for measure in selected_measures:
+            selected_measures_pks.append(measure.id)
+
+        serializable_kwargs = {
+            "selected_measures": selected_measures_pks,
+        }
+
+        return serializable_kwargs
+
+    @classmethod
+    def deserialize_init_kwargs(cls, form_kwargs: Dict) -> Dict:
+        serialized_selected_measures_pks = form_kwargs.get("selected_measures")
+        deserialized_selected_measures = models.Measure.objects.filter(
+            pk__in=serialized_selected_measures_pks
+        )
+
+        kwargs = {
+            "selected_measures": deserialized_selected_measures,
+        }
+
+        return kwargs
+
 
-class MeasureDutiesForm(forms.Form):
+class MeasureDutiesForm(forms.Form, SerializableFormMixin):
     duties = forms.CharField(
         label="Duties",
         help_text="Enter the duty that applies to the measures.",
@@ -932,6 +1010,32 @@ def clean(self):
 
         return cleaned_data
 
+    @classmethod
+    def serializable_init_kwargs(cls, kwargs: Dict) -> Dict:
+        selected_measures = kwargs.get("selected_measures")
+        selected_measures_pks = []
+        for measure in selected_measures:
+            selected_measures_pks.append(measure.id)
+
+        serializable_kwargs = {
+            "selected_measures": selected_measures_pks,
+        }
+
+        return serializable_kwargs
+
+    @classmethod
+    def deserialize_init_kwargs(cls, form_kwargs: Dict) -> Dict:
+        serialized_selected_measures_pks = form_kwargs.get("selected_measures")
+        deserialized_selected_measures = models.Measure.objects.filter(
+            pk__in=serialized_selected_measures_pks
+        )
+
+        kwargs = {
+            "selected_measures": deserialized_selected_measures,
+        }
+
+        return kwargs
+
 
 class MeasureGeographicalAreaExclusionsForm(forms.Form):
     excluded_area = forms.ModelChoiceField(
@@ -965,7 +1069,7 @@ def __init__(self, *args, **kwargs):
         )
 
 
-class MeasureGeographicalAreaExclusionsFormSet(FormSet):
+class MeasureGeographicalAreaExclusionsFormSet(FormSet, SerializableFormMixin):
     """Allows editing the geographical area exclusions of multiple measures in
     `MeasureEditWizard`."""
 
diff --git a/measures/migrations/0017_measuresbulkeditor.py b/measures/migrations/0017_measuresbulkeditor.py
new file mode 100644
index 000000000..9ea8940c4
--- /dev/null
+++ b/measures/migrations/0017_measuresbulkeditor.py
@@ -0,0 +1,84 @@
+# Generated by Django 4.2.15 on 2024-09-02 16:06
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django_fsm
+import measures.models.bulk_processing
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("workbaskets", "0008_datarow_dataupload"),
+        ("measures", "0016_measuresbulkcreator"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="MeasuresBulkEditor",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "task_id",
+                    models.CharField(blank=True, max_length=50, null=True, unique=True),
+                ),
+                (
+                    "processing_state",
+                    django_fsm.FSMField(
+                        choices=[
+                            ("AWAITING_PROCESSING", "Awaiting processing"),
+                            ("CURRENTLY_PROCESSING", "Currently processing"),
+                            ("SUCCESSFULLY_PROCESSED", "Successfully processed"),
+                            ("FAILED_PROCESSING", "Failed processing"),
+                            ("CANCELLED", "Cancelled"),
+                        ],
+                        db_index=True,
+                        default="AWAITING_PROCESSING",
+                        editable=False,
+                        max_length=50,
+                        protected=True,
+                    ),
+                ),
+                (
+                    "successfully_processed_count",
+                    models.PositiveIntegerField(default=0),
+                ),
+                ("form_data", models.JSONField()),
+                ("form_kwargs", models.JSONField()),
+                ("selected_measures", models.JSONField()),
+                (
+                    "user",
+                    models.ForeignKey(
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "workbasket",
+                    models.ForeignKey(
+                        editable=False,
+                        null=True,
+                        on_delete=measures.models.bulk_processing.REVOKE_TASKS_AND_SET_NULL,
+                        to="workbaskets.workbasket",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/measures/models/__init__.py b/measures/models/__init__.py
index a4c641802..f49a0d12e 100644
--- a/measures/models/__init__.py
+++ b/measures/models/__init__.py
@@ -1,5 +1,6 @@
 from measures.models.bulk_processing import BulkProcessor
 from measures.models.bulk_processing import MeasuresBulkCreator
+from measures.models.bulk_processing import MeasuresBulkEditor
 from measures.models.bulk_processing import ProcessingState
 from measures.models.tracked_models import AdditionalCodeTypeMeasureType
 from measures.models.tracked_models import DutyExpression
@@ -23,6 +24,7 @@
     # - Classes exported from bulk_processing.py.
     "BulkProcessor",
     "MeasuresBulkCreator",
+    "MeasuresBulkEditor",
     "ProcessingState",
     # - Classes exported from tracked_model.py.
     "AdditionalCodeTypeMeasureType",
diff --git a/measures/models/bulk_processing.py b/measures/models/bulk_processing.py
index aef1d8763..908e90d98 100644
--- a/measures/models/bulk_processing.py
+++ b/measures/models/bulk_processing.py
@@ -18,6 +18,7 @@
 from common.models.mixins import TimestampedMixin
 from common.models.utils import override_current_transaction
 from measures.models.tracked_models import Measure
+from measures.editors import MeasuresEditor
 
 logger = logging.getLogger(__name__)
 
@@ -414,3 +415,168 @@ def _log_form_errors(self, form_class, form_or_formset) -> None:
         for form_errors in errors:
             for error_key, error_values in form_errors.items():
                 logger.error(f"{error_key}: {error_values}")
+
+
+class MeasuresBulkEditorManager(models.Manager):
+    """Model Manager for MeasuresBulkEditor models."""
+
+    def create(
+        self,
+        form_data: Dict,
+        form_kwargs: Dict,
+        workbasket,
+        user,
+        selected_measures,
+        **kwargs,
+    ) -> "MeasuresBulkCreator":
+        """Create and save an instance of MeasuresBulkEditor."""
+
+        return super().create(
+            form_data=form_data,
+            form_kwargs=form_kwargs,
+            workbasket=workbasket,
+            user=user,
+            selected_measures=selected_measures,
+            **kwargs,
+        )
+
+
+class MeasuresBulkEditor(BulkProcessor):
+    """
+    Model class used to bulk edit Measures instances from serialized form
+    data.
+    The stored form data is serialized and deserialized by Forms that subclass
+    SerializableFormMixin.
+    """
+
+    objects = MeasuresBulkEditorManager()
+
+    form_data = models.JSONField()
+    """Dictionary of all Form.data, used to reconstruct bound Form instances as
+    if the form data had been sumbitted by the user within the measure wizard
+    process."""
+
+    form_kwargs = models.JSONField()
+    """Dictionary of all form init data, excluding a form's `data` param (which
+    is preserved via this class's `form_data` attribute)."""
+
+    selected_measures = models.JSONField()
+    """List of all measures that have been selected for bulk editing."""
+
+    workbasket = models.ForeignKey(
+        "workbaskets.WorkBasket",
+        on_delete=REVOKE_TASKS_AND_SET_NULL,
+        null=True,
+        editable=False,
+    )
+    """The workbasket with which created measures are associated."""
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=SET_NULL,
+        null=True,
+        editable=False,
+    )
+    """The user who submitted the task to create measures."""
+
+    def schedule_task(self) -> AsyncResult:
+        """Implementation of base class method."""
+
+        from measures.tasks import bulk_edit_measures
+
+        async_result = bulk_edit_measures.apply_async(
+            kwargs={
+                "measures_bulk_editor_pk": self.pk,
+            },
+            countdown=1,
+        )
+        self.task_id = async_result.id
+        self.save()
+
+        logger.info(
+            f"Measure bulk edit scheduled on task with ID {async_result.id}"
+            f"using MeasuresBulkEditor.pk={self.pk}.",
+        )
+
+        return async_result
+
+    @atomic
+    def edit_measures(self) -> Iterable[Measure]:
+        logger.info("INSIDE EDIT MEASURES - BULK PROCESSING")
+
+        with override_current_transaction(
+            transaction=self.workbasket.current_transaction,
+        ):
+            cleaned_data = self.get_forms_cleaned_data()
+            deserialized_selected_measures = Measure.objects.filter(
+                pk__in=self.selected_measures
+            )
+
+            measures_editor = MeasuresEditor(
+                self.workbasket, deserialized_selected_measures, cleaned_data
+            )
+            return measures_editor.edit_measures()
+
+    def get_forms_cleaned_data(self) -> Dict:
+        """
+        Returns a merged dictionary of all Form cleaned_data.
+
+        If a Form's data contains a `FormSet`, the key will be prefixed with
+        "formset-" and contain a list of the formset cleaned_data dictionaries.
+
+        If form validation errors are encountered when constructing cleaned
+        data, then this function raises Django's `ValidationError` exception.
+        """
+        all_cleaned_data = {}
+
+        from measures.views import MeasureEditWizard
+
+        for form_key, form_class in MeasureEditWizard.data_form_list:
+
+            if form_key not in self.form_data:
+                # Forms are conditionally included during step processing - see
+                # `MeasureEditWizard.show_step()` for details.
+                continue
+
+            data = self.form_data[form_key]
+            kwargs = form_class.deserialize_init_kwargs(self.form_kwargs[form_key])
+
+            form = form_class(data=data, **kwargs)
+
+            if not form.is_valid():
+                self._log_form_errors(form_class=form_class, form_or_formset=form)
+                raise ValidationError(
+                    f"{form_class.__name__} has {len(form.errors)} errors.",
+                )
+
+            if isinstance(form.cleaned_data, (tuple, list)):
+                all_cleaned_data[f"formset-{form_key}"] = form.cleaned_data
+            else:
+                all_cleaned_data.update(form.cleaned_data)
+
+        return all_cleaned_data
+
+    def _log_form_errors(self, form_class, form_or_formset) -> None:
+        """Output errors associated with a Form or Formset instance, handling
+        output for each instance type in a uniform manner."""
+
+        logger.error(
+            f"MeasuresBulkEditor.edit_measures() - "
+            f"{form_class.__name__} has {len(form_or_formset.errors)} errors.",
+        )
+
+        # Form.errors is a dictionary of errors, but FormSet.errors is a
+        # list of dictionaries of Form.errors. Access their errors in
+        # a uniform manner.
+        errors = []
+
+        if isinstance(form_or_formset, BaseFormSet):
+            errors = [
+                {"formset_errors": form_or_formset.non_form_errors()},
+            ] + form_or_formset.errors
+        else:
+            errors = [form_or_formset.errors]
+
+        for form_errors in errors:
+            for error_key, error_values in form_errors.items():
+                logger.error(f"{error_key}: {error_values}")
diff --git a/measures/tasks.py b/measures/tasks.py
index ed61c3f6d..755e64fc8 100644
--- a/measures/tasks.py
+++ b/measures/tasks.py
@@ -2,6 +2,7 @@
 
 from common.celery import app
 from measures.models import MeasuresBulkCreator
+from measures.models import MeasuresBulkEditor
 
 logger = logging.getLogger(__name__)
 
@@ -43,3 +44,36 @@ def bulk_create_measures(measures_bulk_creator_pk: int) -> None:
             f"succeeded but created no measures in "
             f"WorkBasket({measures_bulk_creator.workbasket.pk}).",
         )
+
+
+@app.task
+def bulk_edit_measures(measures_bulk_editor_pk: int) -> None:
+    """Bulk edit measures from serialized measures form data saved within an
+    instance of MeasuresBulkEditor."""
+
+    measures_bulk_editor = MeasuresBulkEditor.objects.get(pk=measures_bulk_editor_pk)
+    measures_bulk_editor.begin_processing()
+    measures_bulk_editor.save()
+
+    try:
+        measures = measures_bulk_editor.edit_measures()
+    except Exception as e:
+        measures_bulk_editor.processing_failed()
+        measures_bulk_editor.save()
+        logger.error(
+            f"MeasuresBulkCreator({measures_bulk_editor.pk}) task failed "
+            f"attempting to edit measures in "
+            f"WorkBasket({measures_bulk_editor.workbasket.pk}).",
+        )
+        raise e
+
+    measures_bulk_editor.processing_succeeded()
+    measures_bulk_editor.successfully_processed_count = len(measures)
+    measures_bulk_editor.save()
+
+    if measures:
+        logger.info(
+            f"MeasuresBulkEditor({measures_bulk_editor.pk}) task "
+            f"succeeded in editing {len(measures)} Measures in "
+            f"WorkBasket({measures_bulk_editor.workbasket.pk}).",
+        )
diff --git a/measures/tests/conftest.py b/measures/tests/conftest.py
index 474d0bf16..df5d8e12c 100644
--- a/measures/tests/conftest.py
+++ b/measures/tests/conftest.py
@@ -325,11 +325,34 @@ def mock_request(rf, valid_user, valid_user_client):
     return request
 
 
+@pytest.fixture()
+def measure_edit_start_date_form_data():
+    return {
+        "start_date_0": 1,
+        "start_date_1": 1,
+        "start_date_2": 2023,
+    }
+
+
+@pytest.fixture()
+def measure_edit_end_date_form_data():
+    return {
+        "end_date_0": 2,
+        "end_date_1": 2,
+        "end_date_2": 2026,
+    }
+
+
 @pytest.fixture()
 def measure_regulation_id_form_data():
     return {"generating_regulation": factories.RegulationFactory.create().pk}
 
 
+@pytest.fixture()
+def measure_edit_regulation_form_data():
+    return {"generating_regulation": factories.RegulationFactory.create()}
+
+
 @pytest.fixture()
 def measure_details_form_data(date_ranges):
     return {
@@ -487,6 +510,11 @@ def measure_geo_area_geo_group_exclusions_form_data(erga_omnes):
     }
 
 
+@pytest.fixture()
+def measure_edit_duties_form_data():
+    return {"duties": "4%"}
+
+
 @pytest.fixture()
 def simple_measures_bulk_creator(
     user_empty_workbasket,
@@ -503,9 +531,34 @@ def simple_measures_bulk_creator(
 
 
 @pytest.fixture()
-def mocked_schedule_apply_async():
+def mocked_create_schedule_apply_async():
     with patch(
         "measures.tasks.bulk_create_measures.apply_async",
         return_value=MagicMock(id=faker.Faker().uuid4()),
     ) as apply_async_mock:
         yield apply_async_mock
+
+
+@pytest.fixture()
+def simple_measures_bulk_editor(
+    user_empty_workbasket,
+    approved_transaction,
+):
+    from measures.tests.factories import MeasuresBulkEditorFactory
+
+    return MeasuresBulkEditorFactory.create(
+        form_data={},
+        form_kwargs={},
+        workbasket=user_empty_workbasket,
+        selected_measures=[],
+        user=None,
+    )
+
+
+@pytest.fixture()
+def mocked_edit_schedule_apply_async():
+    with patch(
+        "measures.tasks.bulk_edit_measures.apply_async",
+        return_value=MagicMock(id=faker.Faker().uuid4()),
+    ) as apply_async_mock:
+        yield apply_async_mock
diff --git a/measures/tests/factories.py b/measures/tests/factories.py
index 082d9b814..6b8301fad 100644
--- a/measures/tests/factories.py
+++ b/measures/tests/factories.py
@@ -106,3 +106,15 @@ class Meta:
     workbasket = factory.SubFactory(factories.WorkBasketFactory)
     form_data = {}
     form_kwargs = {}
+
+
+class MeasuresBulkEditorFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = "measures.MeasuresBulkEditor"
+
+    user = factory.SubFactory(factories.UserFactory)
+    created_at = factory.Faker("date_object")
+    workbasket = factory.SubFactory(factories.WorkBasketFactory)
+    form_data = {}
+    form_kwargs = {}
+    selected_measures = []
diff --git a/measures/tests/test_bulk_processing.py b/measures/tests/test_bulk_processing.py
index 189cca0ac..0b29330df 100644
--- a/measures/tests/test_bulk_processing.py
+++ b/measures/tests/test_bulk_processing.py
@@ -9,9 +9,12 @@
 from common.tests import factories
 from common.util import TaricDateRange
 from common.validators import ApplicabilityCode
+from measures import forms
 from measures.models import MeasuresBulkCreator
+from measures.models import MeasuresBulkEditor
 from measures.models import ProcessingState
 from measures.tests.factories import MeasuresBulkCreatorFactory
+from measures.tests.factories import MeasuresBulkEditorFactory
 from measures.validators import MeasureExplosionLevel
 
 pytestmark = pytest.mark.django_db
@@ -19,14 +22,14 @@
 
 def test_schedule_task_bulk_measures_create(
     simple_measures_bulk_creator,
-    mocked_schedule_apply_async,
+    mocked_create_schedule_apply_async,
 ):
-    """Test that calling MeasuresBulkCreator.shedule() correctly schedules a
+    """Test that calling MeasuresBulkCreator.schedule() correctly schedules a
     Celery task."""
 
     simple_measures_bulk_creator.schedule_task()
 
-    mocked_schedule_apply_async.assert_called_once_with(
+    mocked_create_schedule_apply_async.assert_called_once_with(
         kwargs={
             "measures_bulk_creator_pk": simple_measures_bulk_creator.pk,
         },
@@ -34,9 +37,26 @@ def test_schedule_task_bulk_measures_create(
     )
 
 
+def test_schedule_task_bulk_measures_edit(
+    simple_measures_bulk_editor,
+    mocked_edit_schedule_apply_async,
+):
+    """Test that calling MeasuresBulkCreator.schedule() correctly schedules a
+    Celery task."""
+
+    simple_measures_bulk_editor.schedule_task()
+
+    mocked_edit_schedule_apply_async.assert_called_once_with(
+        kwargs={
+            "measures_bulk_editor_pk": simple_measures_bulk_editor.pk,
+        },
+        countdown=ANY,
+    )
+
+
 def test_REVOKE_TASKS_AND_SET_NULL(
     simple_measures_bulk_creator,
-    mocked_schedule_apply_async,
+    mocked_create_schedule_apply_async,
 ):
     """Test that deleting an object, referenced by a ForeignKey field that has
     `on_delete=BulkProcessor.REVOKE_TASKS_AND_SET_NULL`, correctly revokes any
@@ -57,7 +77,7 @@ def test_REVOKE_TASKS_AND_SET_NULL(
 
 def test_cancel_task(
     simple_measures_bulk_creator,
-    mocked_schedule_apply_async,
+    mocked_create_schedule_apply_async,
 ):
     """Test BulkProcessor.cancel_task() behaviours correctly apply."""
 
@@ -167,6 +187,77 @@ def test_bulk_creator_get_forms_cleaned_data(
         }
 
 
+# Run the form and get the form data from the sync done
+@patch("measures.parsers.DutySentenceParser")
+def test_bulk_editor_get_forms_cleaned_data(
+    mock_duty_sentence_parser,
+    user_empty_workbasket,
+    duty_sentence_parser,
+):
+
+    mock_duty_sentence_parser.return_value = duty_sentence_parser
+
+    geo_area1 = factories.GeographicalAreaFactory.create()
+    geo_area2 = factories.GeographicalAreaFactory.create()
+    measure_1 = factories.MeasureFactory.create()
+    measure_2 = factories.MeasureFactory.create()
+    measure_3 = factories.MeasureFactory.create()
+    regulation = factories.RegulationFactory()
+    order_number = factories.QuotaOrderNumberFactory.create()
+
+    selected_measures = [measure_1.pk, measure_2.pk, measure_3.pk]
+
+    form_data = {
+        "start_date": {
+            "start_date_0": 1,
+            "start_date_1": 1,
+            "start_date_2": 2023,
+        },
+        "end_date": {
+            "end_date_0": 2,
+            "end_date_1": 2,
+            "end_date_2": 2026,
+        },
+        "quota_order_number": {"order_number": order_number.pk},
+        "regulation": {"generating_regulation": regulation.pk},
+        "duties": {"duties": "4%"},
+        "geographical_area_exclusions": {
+            "form-0-excluded_area": geo_area1.pk,
+            "form-1-excluded_area": geo_area2.pk,
+        },
+    }
+
+    form_kwargs = {
+        "start_date": {"selected_measures": selected_measures},
+        "end_date": {"selected_measures": selected_measures},
+        "quota_order_number": {},
+        "regulation": {"selected_measures": selected_measures},
+        "duties": {"selected_measures": selected_measures},
+        "geographical_area_exclusions": {},
+    }
+
+    mock_bulk_editor = MeasuresBulkEditorFactory.create(
+        form_data=form_data,
+        form_kwargs=form_kwargs,
+        workbasket=user_empty_workbasket,
+        selected_measures=selected_measures,
+        user=None,
+    )
+    with override_current_transaction(user_empty_workbasket.current_transaction):
+        data = mock_bulk_editor.get_forms_cleaned_data()
+        assert data == {
+            "start_date": datetime.date(2023, 1, 1),
+            "end_date": datetime.date(2026, 2, 2),
+            "generating_regulation": regulation,
+            "order_number": order_number,
+            "duties": "4%",
+            "formset-geographical_area_exclusions": [
+                {"excluded_area": geo_area1, "DELETE": False},
+                {"excluded_area": geo_area2, "DELETE": False},
+            ],
+        }
+
+
 @patch("measures.parsers.DutySentenceParser")
 @patch("measures.forms.wizard.LarkDutySentenceParser")
 def test_bulk_creator_get_forms_cleaned_data_errors(
@@ -225,3 +316,112 @@ def test_bulk_creator_get_forms_cleaned_data_errors(
     with override_current_transaction(user_empty_workbasket.current_transaction):
         with pytest.raises(ValidationError):
             mock_bulk_creator.get_forms_cleaned_data()
+
+
+@patch("measures.parsers.DutySentenceParser")
+def test_bulk_editor_get_forms_cleaned_data_errors(
+    mock_duty_sentence_parser,
+    user_empty_workbasket,
+    duty_sentence_parser,
+):
+    mock_duty_sentence_parser.return_value = duty_sentence_parser
+
+    measure_1 = factories.MeasureFactory.create()
+    measure_2 = factories.MeasureFactory.create()
+    measure_3 = factories.MeasureFactory.create()
+
+    selected_measures = [measure_1.pk, measure_2.pk, measure_3.pk]
+
+    form_data = {
+        "start_date": {
+            "start_date_0": "",
+            "start_date_1": "",
+            "start_date_2": "",
+        },
+        "end_date": {
+            "end_date_0": "",
+            "end_date_1": "",
+            "end_date_2": "",
+        },
+        "quota_order_number": {"order_number": ""},
+        "regulation": {"generating_regulation": ""},
+        "duties": {"duties": ""},
+        "geographical_area_exclusions": {
+            "form-0-excluded_area": "",
+            "form-1-excluded_area": "",
+        },
+    }
+
+    form_kwargs = {
+        "start_date": {"selected_measures": selected_measures},
+        "end_date": {"selected_measures": selected_measures},
+        "quota_order_number": {},
+        "regulation": {"selected_measures": selected_measures},
+        "duties": {"selected_measures": selected_measures},
+        "geographical_area_exclusions": {},
+    }
+
+    mock_bulk_editor = MeasuresBulkEditorFactory.create(
+        form_data=form_data,
+        form_kwargs=form_kwargs,
+        workbasket=user_empty_workbasket,
+        selected_measures=selected_measures,
+        user=None,
+    )
+
+    with override_current_transaction(user_empty_workbasket.current_transaction):
+        with pytest.raises(ValidationError):
+            mock_bulk_editor.get_forms_cleaned_data()
+
+
+@pytest.mark.parametrize(
+    "form_class, form_data, expected_error",
+    [
+        (
+            forms.MeasureStartDateForm,
+            {
+                "start_date": {
+                    "start_date_0": "",
+                    "start_date_1": "",
+                    "start_date_2": "",
+                }
+            },
+            "Enter the day, month and year",
+        ),
+        (
+            forms.MeasureRegulationForm,
+            {"regulation": {"generating_regulation": ""}},
+            "This field is required",
+        ),
+    ],
+    ids=[
+        "measure_edit_start_date_form",
+        "measure_edit_regulation_form",
+    ],
+)
+def test_bulk_editor_log_form_errors_displays_detailed_error(
+    form_class,
+    form_data,
+    expected_error,
+    caplog,
+):
+
+    # Create measures for the form kwargs
+    measure_1 = factories.MeasureFactory.create()
+    measure_2 = factories.MeasureFactory.create()
+    measure_3 = factories.MeasureFactory.create()
+
+    form_kwargs = {"selected_measures": [measure_1, measure_2, measure_3]}
+    form = form_class(data=form_data, **form_kwargs)
+
+    mock_bulk_editor = MeasuresBulkEditorFactory.create()
+
+    import logging
+
+    # Ensure logging propagation is enabled else log messages won't
+    # reach this module.
+    logger = logging.getLogger("measures")
+    logger.propagate = True
+
+    mock_bulk_editor._log_form_errors(form_class=form_class, form_or_formset=form)
+    assert expected_error in caplog.text
diff --git a/measures/tests/test_forms.py b/measures/tests/test_forms.py
index ac6123392..294fe9ea5 100644
--- a/measures/tests/test_forms.py
+++ b/measures/tests/test_forms.py
@@ -1923,3 +1923,118 @@ def test_measure_forms_geo_area_serialize_deserialize(form_data, request):
         assert deserialized_form.is_valid()
         assert type(deserialized_form) == forms.MeasureGeographicalAreaForm
         assert deserialized_form.data == form.data
+
+
+@pytest.mark.parametrize(
+    "form_class, form_data_fixture, has_form_kwargs",
+    [
+        (
+            forms.MeasureStartDateForm,
+            "measure_edit_start_date_form_data",
+            True,
+        ),
+        (
+            forms.MeasureEndDateForm,
+            "measure_edit_end_date_form_data",
+            True,
+        ),
+        (
+            forms.MeasureQuotaOrderNumberForm,
+            "measure_quota_order_number_form_data",
+            False,
+        ),
+        (
+            forms.MeasureRegulationForm,
+            "measure_edit_regulation_form_data",
+            True,
+        ),
+        (
+            forms.MeasureDutiesForm,
+            "measure_edit_duties_form_data",
+            True,
+        ),
+    ],
+    ids=[
+        "measure_edit_start_date_form",
+        "measure_edit_end_date_form",
+        "measure_edit_quota_order_number_form",
+        "measure_edit_regulation_form",
+        "measure_edit_duties_form",
+    ],
+)
+def test_simple_measure_edit_forms_serialize_deserialize(
+    form_class,
+    form_data_fixture,
+    has_form_kwargs,
+    date_ranges,
+    request,
+    duty_sentence_parser,
+):
+    """Test that the EditMeasure simple forms that use the
+    SerializableFormMixin behave correctly and as expected."""
+
+    # Create some measures to apply this data to, for the kwargs
+    quota_order_number = factories.QuotaOrderNumberFactory()
+    regulation = factories.RegulationFactory.create()
+    selected_measures = factories.MeasureFactory.create_batch(
+        4,
+        valid_between=date_ranges.normal,
+        order_number=quota_order_number,
+        generating_regulation=regulation,
+    )
+
+    # Check the forms are valid on data submission
+    form_data = request.getfixturevalue(form_data_fixture)
+    form_kwarg_data = {}
+
+    if has_form_kwargs:
+        form_kwarg_data = {
+            "selected_measures": selected_measures,
+        }
+
+    form = form_class(form_data, **form_kwarg_data)
+    assert form.is_valid()
+
+    # Create the serialized data
+    serialized_data = form.serializable_data()
+    serialized_data_kwargs = {}
+
+    if has_form_kwargs:
+        serialized_data_kwargs = form.serializable_init_kwargs(form_kwarg_data)
+
+    # Deserialize the kwargs
+    deserialized_form_kwargs = form.deserialize_init_kwargs(
+        serialized_data_kwargs,
+    )
+
+    # Make a form from serialized data.Check the form is the right type, valid, and the data that went in is the same that comes out
+    deserialized_form = form_class(
+        data=serialized_data,
+        **deserialized_form_kwargs,
+    )
+
+    # Check the form is the right type, valid, and the data that went in is the same that comes out
+    assert type(deserialized_form) == form_class
+    assert deserialized_form.is_valid()
+    assert deserialized_form.data == form_data
+
+
+def test_measure_edit_forms_geo_area_exclusions_serialize_deserialize():
+    geo_area1 = factories.GeographicalAreaFactory.create()
+    geo_area2 = factories.GeographicalAreaFactory.create()
+
+    form_data = {"form-0-excluded_area": geo_area1, "form-1-excluded_area": geo_area2}
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.MeasureGeographicalAreaExclusionsFormSet(
+            form_data,
+        )
+        assert form.is_valid()
+
+        serializable_form_data = form.serializable_data()
+
+        deserialized_form = forms.MeasureGeographicalAreaExclusionsFormSet(
+            data=serializable_form_data,
+        )
+        assert deserialized_form.is_valid()
+        assert type(deserialized_form) == forms.MeasureGeographicalAreaExclusionsFormSet
+        assert deserialized_form.data == form.data
diff --git a/measures/tests/test_views.py b/measures/tests/test_views.py
index 28dfda8cb..f6faf38b6 100644
--- a/measures/tests/test_views.py
+++ b/measures/tests/test_views.py
@@ -58,11 +58,11 @@
 
 @pytest.fixture()
 def mocked_diff_components():
-    """Mocks `diff_components()` inside `update_measure_components()` in
+    """Mocks `diff_components()` inside `update_measure_components()` that is called in
     `MeasureEditWizard` to prevent parsing errors where test measures lack a
     duty sentence."""
     with patch(
-        "measures.views.MeasureEditWizard.update_measure_components",
+        "measures.editors.update_measure_components",
     ) as update_measure_components:
         yield update_measure_components
 
@@ -1834,6 +1834,7 @@ def test_measuretype_api_list_view(valid_user_client):
     )
 
 
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_start_and_end_date_edit_functionality(
     valid_user_client,
     user_workbasket,
@@ -1966,6 +1967,7 @@ def test_multiple_measure_start_and_end_date_edit_functionality(
         ),
     ],
 )
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_edit_single_form_functionality(
     step,
     form_data,
@@ -2039,6 +2041,7 @@ def test_multiple_measure_edit_single_form_functionality(
         assert reduce(getattr, updated_attribute.split("."), measure) == expected_data
 
 
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_edit_only_regulation(
     valid_user_client,
     user_workbasket,
@@ -2264,6 +2267,7 @@ def test_measure_list_selected_measures_list(valid_user_client):
     assert not measure_ids_in_table.difference(selected_measures_ids)
 
 
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_edit_only_quota_order_number(
     valid_user_client,
     user_workbasket,
@@ -2335,6 +2339,7 @@ def test_multiple_measure_edit_only_quota_order_number(
         assert measure.order_number == quota_order_number
 
 
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_edit_only_duties(
     valid_user_client,
     user_workbasket,
@@ -2406,6 +2411,7 @@ def test_multiple_measure_edit_only_duties(
         assert measure.duty_sentence == duties
 
 
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_edit_preserves_footnote_associations(
     valid_user_client,
     user_workbasket,
@@ -2482,6 +2488,7 @@ def test_multiple_measure_edit_preserves_footnote_associations(
             assert footnote in expected_footnotes
 
 
+@override_settings(MEASURES_ASYNC_EDIT=False)
 def test_multiple_measure_edit_geographical_area_exclusions(
     valid_user_client,
     user_workbasket,
diff --git a/measures/util.py b/measures/util.py
index bf00efd6a..80849bde4 100644
--- a/measures/util.py
+++ b/measures/util.py
@@ -1,13 +1,21 @@
 import decimal
 from datetime import date
 from math import floor
-from typing import Type
 
 from common.models import TrackedModel
 from common.models.transactions import Transaction
 from common.validators import UpdateType
-from measures.models import MeasureComponent
-from workbaskets.models import WorkBasket
+
+from geo_areas.models import GeographicalArea
+from geo_areas.utils import get_all_members_of_geo_groups
+from measures import models as measure_models
+from typing import List
+from typing import Type
+from workbaskets import models as workbasket_models
+
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 def convert_eur_to_gbp(amount: str, eur_gbp_conversion_rate: float) -> str:
@@ -29,9 +37,9 @@ def diff_components(
     instance,
     duty_sentence: str,
     start_date: date,
-    workbasket: WorkBasket,
+    workbasket: "workbasket_models.WorkBasket",
     transaction: Type[Transaction],
-    component_output: Type[TrackedModel] = MeasureComponent,
+    component_output: type = None,
     reverse_attribute: str = "component_measure",
 ):
     """
@@ -49,6 +57,11 @@ def diff_components(
     """
     from measures.parsers import DutySentenceParser
 
+    # We add in the component output type here as otherwise we run into circular import issues.
+    component_output = (
+        measure_models.MeasureComponent if not component_output else component_output
+    )
+
     parser = DutySentenceParser.create(
         start_date,
         component_output=component_output,
@@ -91,3 +104,103 @@ def diff_components(
                 update_type=UpdateType.DELETE,
                 transaction=workbasket.new_transaction(),
             )
+
+
+def update_measure_components(
+    duties: str,
+    workbasket: "workbasket_models.WorkBasket",
+    measure: "measure_models.Measure",
+):
+    """Updates the measure components associated to the measure."""
+    diff_components(
+        instance=measure,
+        duty_sentence=duties if duties else measure.duty_sentence,
+        start_date=measure.valid_between.lower,
+        workbasket=workbasket,
+        transaction=workbasket.current_transaction,
+    )
+
+
+def update_measure_condition_components(
+    measure: "measure_models.Measure",
+    workbasket: "workbasket_models.WorkBasket",
+):
+    """Updates the measure condition components associated to the
+    measure."""
+    conditions = measure.conditions.current()
+    for condition in conditions:
+        condition.new_version(
+            dependent_measure=measure,
+            workbasket=workbasket,
+        )
+
+
+def update_measure_excluded_geographical_areas(
+    edited: bool,
+    measure: "measure_models.Measure",
+    exclusions: List[GeographicalArea],
+    workbasket: "workbasket_models.WorkBasket",
+):
+    """Updates the excluded geographical areas associated to the measure."""
+    existing_exclusions = measure.exclusions.current()
+
+    # Update any exclusions to new measure version
+    if not edited:
+        for exclusion in existing_exclusions:
+            exclusion.new_version(
+                modified_measure=measure,
+                workbasket=workbasket,
+            )
+        return
+
+    new_excluded_areas = get_all_members_of_geo_groups(
+        validity=measure.valid_between,
+        geo_areas=exclusions,
+    )
+
+    for geo_area in new_excluded_areas:
+        existing_exclusion = existing_exclusions.filter(
+            excluded_geographical_area=geo_area,
+        ).first()
+        if existing_exclusion:
+            existing_exclusion.new_version(
+                modified_measure=measure,
+                workbasket=workbasket,
+            )
+        else:
+            measure_models.MeasureExcludedGeographicalArea.objects.create(
+                modified_measure=measure,
+                excluded_geographical_area=geo_area,
+                update_type=UpdateType.CREATE,
+                transaction=workbasket.new_transaction(),
+            )
+
+    removed_excluded_areas = {
+        e.excluded_geographical_area for e in existing_exclusions
+    }.difference(set(exclusions))
+
+    exclusions_to_remove = [
+        existing_exclusions.get(excluded_geographical_area__id=geo_area.id)
+        for geo_area in removed_excluded_areas
+    ]
+
+    for exclusion in exclusions_to_remove:
+        exclusion.new_version(
+            update_type=UpdateType.DELETE,
+            modified_measure=measure,
+            workbasket=workbasket,
+        )
+
+
+def update_measure_footnote_associations(measure, workbasket):
+    """Updates the footnotes associated to the measure."""
+    footnote_associations = (
+        measure_models.FootnoteAssociationMeasure.objects.current().filter(
+            footnoted_measure__sid=measure.sid,
+        )
+    )
+    for fa in footnote_associations:
+        fa.new_version(
+            footnoted_measure=measure,
+            workbasket=workbasket,
+        )
diff --git a/measures/views/mixins.py b/measures/views/mixins.py
index bab973754..feb0d21ac 100644
--- a/measures/views/mixins.py
+++ b/measures/views/mixins.py
@@ -1,4 +1,5 @@
 from typing import Type
+from typing import Dict
 
 from common.models import TrackedModel
 from measures import models
@@ -50,3 +51,73 @@ def get_queryset(self):
         """Get the queryset for measures that are candidates for
         editing/deletion."""
         return models.Measure.objects.filter(pk__in=self.measure_selections)
+
+
+class MeasureSerializableWizardMixin:
+    """A Mixin for the wizard forms that utilise asynchronous bulk processing. This mixin provides the functionality to go through each form
+    and serialize the data ready for storing in the database."""
+
+    def get_data_form_list(self) -> dict:
+        """
+        Returns a form list based on form_list, conditionally including only
+        those items as per condition_list and also appearing in data_form_list.
+        The list is generated dynamically because conditions in condition_list
+        may be dynamic.
+        Essentially, version of `WizardView.get_form_list()` filtering in only
+        those list items appearing in `data_form_list`.
+        """
+        data_form_keys = [key for key, form in self.data_form_list]
+        return {
+            form_key: form_class
+            for form_key, form_class in self.get_form_list().items()
+            if form_key in data_form_keys
+        }
+
+    def all_serializable_form_data(self) -> Dict:
+        """
+        Returns serializable data for all wizard steps.
+        This is a re-implementation of
+        MeasureCreateWizard.get_all_cleaned_data(), but using self.data after
+        is_valid() has been successfully run.
+        """
+
+        all_data = {}
+
+        for form_key in self.get_data_form_list().keys():
+            all_data[form_key] = self.serializable_form_data_for_step(form_key)
+
+        return all_data
+
+    def serializable_form_data_for_step(self, step) -> Dict:
+        """
+        Returns serializable data for a wizard step.
+        This is a re-implementation of WizardView.get_cleaned_data_for_step(),
+        returning the serializable version of data in place of the form's
+        regular cleaned_data.
+        """
+
+        form_obj = self.get_form(
+            step=step,
+            data=self.storage.get_step_data(step),
+            files=self.storage.get_step_files(step),
+        )
+
+        return form_obj.serializable_data(remove_key_prefix=step)
+
+    def all_serializable_form_kwargs(self) -> Dict:
+        """Returns serializable kwargs for all wizard steps."""
+
+        all_kwargs = {}
+
+        for form_key in self.get_data_form_list().keys():
+            all_kwargs[form_key] = self.serializable_form_kwargs_for_step(form_key)
+
+        return all_kwargs
+
+    def serializable_form_kwargs_for_step(self, step) -> Dict:
+        """Returns serializable kwargs for a wizard step."""
+
+        form_kwargs = self.get_form_kwargs(step)
+        form_class = self.form_list[step]
+
+        return form_class.serializable_init_kwargs(form_kwargs)
diff --git a/measures/views/wizard.py b/measures/views/wizard.py
index af82e1af0..b69b6d1b9 100644
--- a/measures/views/wizard.py
+++ b/measures/views/wizard.py
@@ -13,12 +13,9 @@
 from django.views.generic import TemplateView
 from formtools.wizard.views import NamedUrlSessionWizardView
 
-from common.util import TaricDateRange
-from common.validators import UpdateType
 from geo_areas import constants
 from geo_areas.models import GeographicalArea
 from geo_areas.models import GeographicalMembership
-from geo_areas.utils import get_all_members_of_geo_groups
 from geo_areas.validators import AreaCode
 from measures import forms
 from measures import models
@@ -27,7 +24,8 @@
 from measures.constants import START
 from measures.constants import MeasureEditSteps
 from measures.creators import MeasuresCreator
-from measures.util import diff_components
+from measures.editors import MeasuresEditor
+from measures.views.mixins import MeasureSerializableWizardMixin
 from workbaskets.models import WorkBasket
 from workbaskets.views.decorators import require_current_workbasket
 
@@ -41,6 +39,7 @@ class MeasureEditWizard(
     PermissionRequiredMixin,
     MeasureSelectionQuerysetMixin,
     NamedUrlSessionWizardView,
+    MeasureSerializableWizardMixin,
 ):
     """
     Multipart form wizard for editing multiple measures.
@@ -51,8 +50,7 @@ class MeasureEditWizard(
     storage_name = "measures.wizard.MeasureEditSessionStorage"
     permission_required = ["common.change_trackedmodel"]
 
-    form_list = [
-        (START, forms.MeasuresEditFieldsForm),
+    data_form_list = [
         (MeasureEditSteps.START_DATE, forms.MeasureStartDateForm),
         (MeasureEditSteps.END_DATE, forms.MeasureEndDateForm),
         (MeasureEditSteps.QUOTA_ORDER_NUMBER, forms.MeasureQuotaOrderNumberForm),
@@ -63,6 +61,14 @@ class MeasureEditWizard(
             forms.MeasureGeographicalAreaExclusionsFormSet,
         ),
     ]
+    """Forms in this wizard's steps that collect user data."""
+
+    form_list = [
+        (START, forms.MeasuresEditFieldsForm),
+        *data_form_list,
+    ]
+    """All Forms in this wizard's steps, including both those that collect user
+    data and those that don't."""
 
     templates = {
         START: "measures/edit-multiple-start.jinja",
@@ -100,6 +106,10 @@ def get_template_names(self):
             "measures/edit-wizard-step.jinja",
         )
 
+    @property
+    def workbasket(self) -> WorkBasket:
+        return WorkBasket.current(self.request)
+
     def get_context_data(self, form, **kwargs):
         context = super().get_context_data(form=form, **kwargs)
         context["step_metadata"] = self.step_metadata
@@ -131,179 +141,76 @@ def get_form_kwargs(self, step):
 
         return kwargs
 
-    def update_measure_components(
-        self,
-        measure: models.Measure,
-        duties: str,
-        workbasket: WorkBasket,
-    ):
-        """Updates the measure components associated to the measure."""
-        diff_components(
-            instance=measure,
-            duty_sentence=duties if duties else measure.duty_sentence,
-            start_date=measure.valid_between.lower,
-            workbasket=workbasket,
-            transaction=workbasket.current_transaction,
-        )
+    def done(self, form_list, **kwargs):
+        if settings.MEASURES_ASYNC_EDIT:
+            return self.async_done(form_list, **kwargs)
+        else:
+            return self.sync_done(form_list, **kwargs)
 
-    def update_measure_condition_components(
-        self,
-        measure: models.Measure,
-        workbasket: WorkBasket,
-    ):
-        """Updates the measure condition components associated to the
-        measure."""
-        conditions = measure.conditions.current()
-        for condition in conditions:
-            condition.new_version(
-                dependent_measure=measure,
-                workbasket=workbasket,
-            )
+    def async_done(self, form_list, **kwargs):
+        logger.info("Editing measures asynchronously.")
+        serializable_data = self.all_serializable_form_data()
+        serializable_form_kwargs = self.all_serializable_form_kwargs()
 
-    def update_measure_excluded_geographical_areas(
-        self,
-        edited: bool,
-        measure: models.Measure,
-        exclusions: List[GeographicalArea],
-        workbasket: WorkBasket,
-    ):
-        """Updates the excluded geographical areas associated to the measure."""
-        existing_exclusions = measure.exclusions.current()
-
-        # Update any exclusions to new measure version
-        if not edited:
-            for exclusion in existing_exclusions:
-                exclusion.new_version(
-                    modified_measure=measure,
-                    workbasket=workbasket,
-                )
-            return
+        db_selected_measures = []
+        for measure in self.get_queryset():
+            db_selected_measures.append(measure.id)
 
-        new_excluded_areas = get_all_members_of_geo_groups(
-            validity=measure.valid_between,
-            geo_areas=exclusions,
+        measures_bulk_editor = models.MeasuresBulkEditor.objects.create(
+            form_data=serializable_data,
+            form_kwargs=serializable_form_kwargs,
+            workbasket=self.workbasket,
+            user=self.request.user,
+            selected_measures=db_selected_measures,
         )
+        self.session_store.clear()
+        measures_bulk_editor.schedule_task()
 
-        for geo_area in new_excluded_areas:
-            existing_exclusion = existing_exclusions.filter(
-                excluded_geographical_area=geo_area,
-            ).first()
-            if existing_exclusion:
-                existing_exclusion.new_version(
-                    modified_measure=measure,
-                    workbasket=workbasket,
-                )
-            else:
-                models.MeasureExcludedGeographicalArea.objects.create(
-                    modified_measure=measure,
-                    excluded_geographical_area=geo_area,
-                    update_type=UpdateType.CREATE,
-                    transaction=workbasket.new_transaction(),
-                )
+        return redirect(
+            reverse(
+                "workbaskets:workbasket-ui-review-measures",
+                kwargs={"pk": self.workbasket.pk},
+            ),
+        )
 
-        removed_excluded_areas = {
-            e.excluded_geographical_area for e in existing_exclusions
-        }.difference(set(exclusions))
+    def edit_measures(self, selected_measures, cleaned_data):
+        """Synchronously edit measures within the context of the view / web
+        worker using accumulated data, `cleaned_data`, from all the necessary
+        wizard forms."""
 
-        exclusions_to_remove = [
-            existing_exclusions.get(excluded_geographical_area__id=geo_area.id)
-            for geo_area in removed_excluded_areas
-        ]
+        measures_editor = MeasuresEditor(
+            self.workbasket, selected_measures, cleaned_data
+        )
+        return measures_editor.edit_measures()
 
-        for exclusion in exclusions_to_remove:
-            exclusion.new_version(
-                update_type=UpdateType.DELETE,
-                modified_measure=measure,
-                workbasket=workbasket,
-            )
+    def sync_done(self, form_list, **kwargs):
+        """
+        Handles this wizard's done step to edit measures within the context of
+        the web worker process.
 
-    def update_measure_footnote_associations(self, measure, workbasket):
-        """Updates the footnotes associated to the measure."""
-        footnote_associations = (
-            models.FootnoteAssociationMeasure.objects.current().filter(
-                footnoted_measure__sid=measure.sid,
-            )
-        )
-        for fa in footnote_associations:
-            fa.new_version(
-                footnoted_measure=measure,
-                workbasket=workbasket,
-            )
+        Because bulk editing measures can be computationally expensive, this can
+        take an excessive amount of time within the context of HTTP request
+        processing.
+        """
+        logger.info("Editing measures synchronously.")
 
-    def done(self, form_list, **kwargs):
         cleaned_data = self.get_all_cleaned_data()
         selected_measures = self.get_queryset()
-        workbasket = WorkBasket.current(self.request)
-        new_start_date = cleaned_data.get("start_date", None)
-        new_end_date = cleaned_data.get("end_date", False)
-        new_quota_order_number = cleaned_data.get("order_number", None)
-        new_generating_regulation = cleaned_data.get("generating_regulation", None)
-        new_duties = cleaned_data.get("duties", None)
-        new_exclusions = [
-            e["excluded_area"]
-            for e in cleaned_data.get("formset-geographical_area_exclusions", [])
-        ]
-        for measure in selected_measures:
-            new_measure = measure.new_version(
-                workbasket=workbasket,
-                update_type=UpdateType.UPDATE,
-                valid_between=TaricDateRange(
-                    lower=(
-                        new_start_date
-                        if new_start_date
-                        else measure.valid_between.lower
-                    ),
-                    upper=(
-                        new_end_date
-                        if new_end_date is not False
-                        else measure.valid_between.upper
-                    ),
-                ),
-                order_number=(
-                    new_quota_order_number
-                    if new_quota_order_number
-                    else measure.order_number
-                ),
-                generating_regulation=(
-                    new_generating_regulation
-                    if new_generating_regulation
-                    else measure.generating_regulation
-                ),
-            )
-            self.update_measure_components(
-                measure=new_measure,
-                duties=new_duties,
-                workbasket=workbasket,
-            )
-            self.update_measure_condition_components(
-                measure=new_measure,
-                workbasket=workbasket,
-            )
-            self.update_measure_excluded_geographical_areas(
-                edited="geographical_area_exclusions"
-                in cleaned_data.get("fields_to_edit", []),
-                measure=new_measure,
-                exclusions=new_exclusions,
-                workbasket=workbasket,
-            )
-            self.update_measure_footnote_associations(
-                measure=new_measure,
-                workbasket=workbasket,
-            )
+
+        self.edit_measures(selected_measures, cleaned_data)
         self.session_store.clear()
 
         return redirect(
             reverse(
                 "workbaskets:workbasket-ui-review-measures",
-                kwargs={"pk": workbasket.pk},
+                kwargs={"pk": self.workbasket.pk},
             ),
         )
 
 
 @method_decorator(require_current_workbasket, name="dispatch")
 class MeasureCreateWizard(
-    PermissionRequiredMixin,
-    NamedUrlSessionWizardView,
+    PermissionRequiredMixin, NamedUrlSessionWizardView, MeasureSerializableWizardMixin
 ):
     """
     Multipart form wizard for creating a single measure.
@@ -426,24 +333,6 @@ class MeasureCreateWizard(
     boolean or boolean values that indicate whether a wizard step should be
     shown."""
 
-    def get_data_form_list(self) -> dict:
-        """
-        Returns a form list based on form_list, conditionally including only
-        those items as per condition_list and also appearing in data_form_list.
-
-        The list is generated dynamically because conditions in condition_list
-        may be dynamic.
-
-        Essentially, version of `WizardView.get_form_list()` filtering in only
-        those list items appearing in `data_form_list`.
-        """
-        data_form_keys = [key for key, form in self.data_form_list]
-        return {
-            form_key: form_class
-            for form_key, form_class in self.get_form_list().items()
-            if form_key in data_form_keys
-        }
-
     @property
     def workbasket(self) -> WorkBasket:
         return WorkBasket.current(self.request)
@@ -507,57 +396,6 @@ def async_done(self, form_list, **kwargs):
             expected_measures_count=measures_bulk_creator.expected_measures_count,
         )
 
-    def all_serializable_form_data(self) -> Dict:
-        """
-        Returns serializable data for all wizard steps.
-
-        This is a re-implementation of
-        MeasureCreateWizard.get_all_cleaned_data(), but using self.data after
-        is_valid() has been successfully run.
-        """
-
-        all_data = {}
-
-        for form_key in self.get_data_form_list().keys():
-            all_data[form_key] = self.serializable_form_data_for_step(form_key)
-
-        return all_data
-
-    def serializable_form_data_for_step(self, step) -> Dict:
-        """
-        Returns serializable data for a wizard step.
-
-        This is a re-implementation of WizardView.get_cleaned_data_for_step(),
-        returning the serializable version of data in place of the form's
-        regular cleaned_data.
-        """
-
-        form_obj = self.get_form(
-            step=step,
-            data=self.storage.get_step_data(step),
-            files=self.storage.get_step_files(step),
-        )
-
-        return form_obj.serializable_data(remove_key_prefix=step)
-
-    def all_serializable_form_kwargs(self) -> Dict:
-        """Returns serializable kwargs for all wizard steps."""
-
-        all_kwargs = {}
-
-        for form_key in self.get_data_form_list().keys():
-            all_kwargs[form_key] = self.serializable_form_kwargs_for_step(form_key)
-
-        return all_kwargs
-
-    def serializable_form_kwargs_for_step(self, step) -> Dict:
-        """Returns serializable kwargs for a wizard step."""
-
-        form_kwargs = self.get_form_kwargs(step)
-        form_class = self.form_list[step]
-
-        return form_class.serializable_init_kwargs(form_kwargs)
-
     def get_all_cleaned_data(self):
         """
         Returns a merged dictionary of all step cleaned_data. If a step contains
diff --git a/settings/common.py b/settings/common.py
index da592d65a..a4c235f55 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -667,6 +667,9 @@
     "measures.tasks.bulk_create_measures": {
         "queue": "bulk-create",
     },
+    "measures.tasks.bulk_edit_measures": {
+        "queue": "bulk-create",
+    },
 }
 
 SQLITE_EXCLUDED_APPS = [
@@ -923,3 +926,4 @@
 
 # Asynchronous / background (bulk) object creation and editing config.
 MEASURES_ASYNC_CREATION = is_truthy(os.environ.get("MEASURES_ASYNC_CREATION", "true"))
+MEASURES_ASYNC_EDIT = is_truthy(os.environ.get("MEASURES_ASYNC_EDIT", "true"))

From dc84c0326cc29e4dc8640215a0b76043fc12bb16 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:12:57 +0100
Subject: [PATCH 03/12] TP2000-1475-Edit-sub-quotas (#1287)

* duplicating definitions form wizard

* temp conflict resolution - check

* initial journey working; todo: debug sub-quotas view page; todo: big refactor/tidy; todo: confirm styling matches design

* adding validity checks to Quota Association edit form; some tidying up

* conforming main/sub-quota language; removing comments; adding measurement_unit_code to dict; refactoring de/serializers to serializers.py

* alinging styles

* adding form reset button

* pause

* tests: get_cleaned_data_for_step, get_form_kwargs, edit view renders

* refactored business rule validations to business_rules.py; tests; notes

* correcting parent_definition to main_definition; squashing migrations

* correcting parent_definition to main_definition; squashing migrations

* adding check for definition data status; tidying up

* formatting

* adding tests for business rules; TODO: re-check QA5 requirements

* fixing test

* - fixes linting

* updates to QA5 checks - in progress

* fixing and testing QA5

* test for QA6

* tests

* removing comments

* date formatter

* adding initial volume; adding breadcrumbs

* responding to PR comments

* adding button group; cleaning up set_duplicate_definitions

* PR comments pt 2

* responding to PR comments 3

* corrected title

* Replace radio buttons for tabs

* Add test and match figma design

* response to Pauls CR pt 1

* factoring out of business rules checks to avoid duplication

* removing model, using session

* wizard file

* tests for forms using session

* black formatting

* adding tests for session use; correcting sid to pk

* removing model & migration

* fixing test params

* Basic functioning sub quota edit form

* Add helper for latest version of object

* adding validation to require at least one definition to be selected

* copy changes from chat with Ash; removed storage_name from update form

* Swapped main_quota for get_main_definition for consistency

* Content updates

* Make sub-quotas heading consistent

* black

* Undo some for compatibility with create journey

* Tidy up to match master

* Ensure correct association selection

* Use latest version up to transaction

* Tidy up

* Form tests not working

* Form tests done

* View tests

* Test sub-quota edit url

* Add test for get_association_edit_url

* Edie PR comments

* Hyphen sub-quotas

* Change to current, fix association bug

---------

Co-authored-by: Charles Prichard <charles.prichard@digital.trade.gov.uk>
Co-authored-by: Charlie Prichard <46421052+CPrich905@users.noreply.github.com>
Co-authored-by: tommacca <tom.mcdonagh@trade.gov.uk>
---
 quotas/business_rules.py                      |   2 +-
 quotas/forms.py                               |  60 ++++-
 ...sub-quota-definitions-confirm-update.jinja |  42 ++++
 .../sub-quota-definitions-updates.jinja       |   4 +
 quotas/jinja2/quotas/tables/sub_quotas.jinja  |  13 +-
 quotas/models.py                              |  20 ++
 quotas/tests/test_forms.py                    | 209 +++++++++++++++++-
 quotas/tests/test_models.py                   |  21 ++
 quotas/tests/test_views.py                    | 195 +++++++++++++---
 quotas/urls.py                                |  15 ++
 quotas/views.py                               | 164 +++++++++++++-
 workbaskets/views/generic.py                  |   5 +-
 12 files changed, 714 insertions(+), 36 deletions(-)
 create mode 100644 quotas/jinja2/quota-definitions/sub-quota-definitions-confirm-update.jinja

diff --git a/quotas/business_rules.py b/quotas/business_rules.py
index 0092ecd5e..92f5c718f 100644
--- a/quotas/business_rules.py
+++ b/quotas/business_rules.py
@@ -293,7 +293,7 @@ def validate(self, quota_definition):
 class QuotaAssociationMustReferToANonDeletedSubQuota(
     PreventDeletingLinkedQuotaDefinitions,
 ):
-    """A Quota Association must refer to a non-deleted sub quota."""
+    """A Quota Association must refer to a non-deleted sub-quota."""
 
     sid_prefix = "sub_quota__"
 
diff --git a/quotas/forms.py b/quotas/forms.py
index 384e3f3d7..8ebc4ddc5 100644
--- a/quotas/forms.py
+++ b/quotas/forms.py
@@ -1,3 +1,5 @@
+from datetime import date
+
 from crispy_forms_gds.helper import FormHelper
 from crispy_forms_gds.layout import HTML
 from crispy_forms_gds.layout import Accordion
@@ -1110,6 +1112,9 @@ def clean(self):
 class SubQuotaDefinitionsUpdatesForm(
     ValidityPeriodForm,
 ):
+    """Form used to edit duplicated sub-quota definitions and associations as
+    part of the sub-quota create journey."""
+
     class Meta:
         model = models.QuotaDefinition
         fields = [
@@ -1162,6 +1167,7 @@ class Meta:
     )
 
     measurement_unit = forms.ModelChoiceField(
+        label="Measurement unit",
         queryset=MeasurementUnit.objects.current().order_by("code"),
         error_messages={"required": "Select the measurement unit"},
     )
@@ -1223,7 +1229,7 @@ def clean(self):
             main_definition_valid_between=original_definition.valid_between,
         ):
             raise ValidationError(
-                "QA2: Validity period for sub quota must be within the "
+                "QA2: Validity period for sub-quota must be within the "
                 "validity period of the main quota",
             )
 
@@ -1337,3 +1343,55 @@ def init_layout(self, request):
                 ),
             ),
         )
+
+
+class SubQuotaDefinitionAssociationUpdateForm(SubQuotaDefinitionsUpdatesForm):
+    """Form used to update sub-quota definitions and associations as part of the
+    edit sub-quotas journey."""
+
+    def __init__(self, *args, **kwargs):
+        self.request = kwargs.pop("request", None)
+        self.workbasket = self.request.user.current_workbasket
+        sub_quota_definition_sid = kwargs.pop("sid")
+        ValidityPeriodForm.__init__(self, *args, **kwargs)
+        self.sub_quota = models.QuotaDefinition.objects.current().get(
+            sid=sub_quota_definition_sid,
+        )
+        self.init_fields()
+        self.set_initial_data()
+        self.init_layout(self.request)
+
+    def set_initial_data(self):
+        association = models.QuotaAssociation.objects.current().get(
+            sub_quota__sid=self.sub_quota.sid,
+        )
+        self.original_definition = association.main_quota
+        fields = self.fields
+        fields["relationship_type"].initial = association.sub_quota_relation_type
+        fields["coefficient"].initial = association.coefficient
+        fields["measurement_unit"].initial = self.sub_quota.measurement_unit
+        fields["initial_volume"].initial = self.sub_quota.initial_volume
+        fields["volume"].initial = self.sub_quota.volume
+        fields["start_date"].initial = self.sub_quota.valid_between.lower
+        fields["end_date"].initial = self.sub_quota.valid_between.upper
+
+    def init_fields(self):
+        super().init_fields()
+        if self.sub_quota.valid_between.lower <= date.today():
+            self.fields["coefficient"].disabled = True
+            self.fields["relationship_type"].disabled = True
+            self.fields["start_date"].disabled = True
+            self.fields["initial_volume"].disabled = True
+            self.fields["volume"].disabled = True
+            self.fields["measurement_unit"].disabled = True
+
+
+class QuotaAssociationEdit(forms.ModelForm):
+    class Meta:
+        model = models.QuotaAssociation
+        fields = [
+            "sub_quota_relation_type",
+            "coefficient",
+            "main_quota",
+            "sub_quota",
+        ]
diff --git a/quotas/jinja2/quota-definitions/sub-quota-definitions-confirm-update.jinja b/quotas/jinja2/quota-definitions/sub-quota-definitions-confirm-update.jinja
new file mode 100644
index 000000000..1bb6ad04d
--- /dev/null
+++ b/quotas/jinja2/quota-definitions/sub-quota-definitions-confirm-update.jinja
@@ -0,0 +1,42 @@
+{% extends "common/confirm_update.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+
+{% set page_title = "Sub-quota definition and association updated" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and edit quotas", "href": url("quota-ui-list")},
+      {"text": "Quota " ~ association.main_quota.order_number, "href": association.main_quota.order_number.get_url()},
+      {"text": "Quota " ~ association.main_quota.order_number ~ " - Data", "href": url("quota_definition-ui-list", kwargs={"sid":association.main_quota.order_number.sid})},
+      {"text": page_title},
+    ])
+  }}
+{% endblock %}
+
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Sub-" ~ object._meta.verbose_name ~ ": " ~ object|string,
+    "text": "Sub-" ~ object._meta.verbose_name ~ ": " ~ object|string ~ " and association have been updated in workbasket " ~ request.user.current_workbasket.pk,
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+        {% block button_group %}
+          {{ govukButton({
+            "text": "View workbasket summary",
+            "href": url("workbaskets:current-workbasket"),
+            "classes": "govuk-button"
+          }) }}
+          {{ govukButton({
+            "text": "Return to main quota",
+            "href": association.main_quota.order_number.get_url(),
+            "classes": "govuk-button--secondary"
+          }) }}
+        {% endblock %}
+
+{% block actions %}
+<li><a class="govuk-link" href="{{ object.order_number.get_url() }}">View this sub-quota definition's quota order number</a></li>
+<li><a href="{{ object.order_number.get_url('list') }}">Find and edit quotas</a></li>
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja b/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja
index 63eab5722..8d6974575 100644
--- a/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja
+++ b/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja
@@ -1,6 +1,10 @@
 {% extends "layouts/form.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
 {% from "components/table/macro.njk" import govukTable %}
 
+{% set page_title = "Update sub-quota definition and association" %}
+
 {% block content %}
     <h2 class="govuk-heading">Main quota definition details</h2>
     {% set main_definition = view.get_main_definition() %}
diff --git a/quotas/jinja2/quotas/tables/sub_quotas.jinja b/quotas/jinja2/quotas/tables/sub_quotas.jinja
index eae119037..947746eeb 100644
--- a/quotas/jinja2/quotas/tables/sub_quotas.jinja
+++ b/quotas/jinja2/quotas/tables/sub_quotas.jinja
@@ -11,27 +11,32 @@
     {% set sub_quota_link -%}
       <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.sub_quota.order_number.sid]) }}">{{ object.sub_quota.order_number.order_number }}</a>
     {% endset %}
+    {% set edit_link -%}
+      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit</a>
+    {% endset %}
     {{ table_rows.append([
       {"text": definition_link },
       {"text": sub_quota_link },
-      {"text": "{:%d %b %Y}".format(object.sub_quota.valid_between.lower) },
-      {"text": "{:%d %b %Y}".format(object.sub_quota.valid_between.upper) if object.sub_quota.valid_between.upper else "-"},
+      {"text": "{:%d %b %Y}".format(object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).valid_between.lower) },
+      {"text": "{:%d %b %Y}".format(object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).valid_between.upper) if object.sub_quota.valid_between.upper else "-"},
       {"text": object.get_sub_quota_relation_type_display() },
       {"text": object.coefficient },
+      {"text": edit_link },
     ]) or "" }}
   {% endfor %}
 
   {{ govukTable({
     "head": [
       {"text": "Quota definition sid"},
-      {"text": "Sub quota order number"},
+      {"text": "Sub-quota order number"},
       {"text": "Start date"},
       {"text": "End date"},
       {"text": "Relation type"},
       {"text": "Coefficient"},
+      {"text": "Actions"},
     ],
     "rows": table_rows
   }) }}
 {% else %}
-  <p class="govuk-body">There are no sub quotas for this quota order number.</p>
+  <p class="govuk-body">There are no sub-quotas for this quota order number.</p>
 {% endif %}
\ No newline at end of file
diff --git a/quotas/models.py b/quotas/models.py
index f89807801..402a6654a 100644
--- a/quotas/models.py
+++ b/quotas/models.py
@@ -404,6 +404,26 @@ def get_url(self, action: str = "detail") -> Optional[str]:
     def slugify_model_name(cls):
         return cls._meta.verbose_name.replace(" ", "_")
 
+    def get_association_edit_url(self):
+        """Get the edit url for the sub-quota definition and association edit
+        journey by checking if it has been updated in an 'EDITING' status
+        workbasket."""
+        url = "sub_quota_definition-edit"
+        try:
+            if self.transaction.workbasket.status == WorkflowStatus.EDITING:
+                # There is no edit-create journey for quota definitions so edits of a
+                # newly created object will add a new update object to the workbasket
+                if self.update_type == UpdateType.UPDATE:
+                    url += "-update"
+
+            url = reverse(
+                url,
+                kwargs={"sid": self.sid},
+            )
+            return url
+        except NoReverseMatch:
+            return None
+
 
 class QuotaAssociation(TrackedModel):
     """The quota association defines the relation between quota and sub-
diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index 0211992a6..2a51525e5 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -561,6 +561,24 @@ def quota_definition_1(main_quota_order_number, date_ranges) -> QuotaDefinition:
     )
 
 
+@pytest.fixture
+def sub_quota(main_quota_order_number, date_ranges) -> QuotaDefinition:
+    """
+    Provides a definition to be used as a sub_quota.
+
+    It has a valid between in the future as otherwise only the end date can be
+    edited.
+    """
+    return factories.QuotaDefinitionFactory.create(
+        order_number=main_quota_order_number,
+        valid_between=date_ranges.future,
+        is_physical=True,
+        initial_volume=1234,
+        volume=1234,
+        measurement_unit=factories.MeasurementUnitFactory(),
+    )
+
+
 def test_select_sub_quota_form_set_staged_definition_data(
     quota_definition_1,
     session_request,
@@ -616,7 +634,7 @@ def test_quota_duplicator_form_clean_QA2(
         )
         assert not form.is_valid()
         assert (
-            "QA2: Validity period for sub quota must be within the validity period of the main quota"
+            "QA2: Validity period for sub-quota must be within the validity period of the main quota"
             in form.errors["__all__"]
         )
 
@@ -760,3 +778,192 @@ def test_quota_duplicator_form_clean_QA5_eq(session_request, quota_definition_1)
             "QA5: Where the relationship type is Equivalent, the coefficient value must be something other than 1"
             in form.errors["__all__"]
         )
+
+
+def test_sub_quota_update_form_valid(session_request_with_workbasket, sub_quota):
+    """Test that the sub-quota update form initialises correctly and is valid
+    when valid data is passed in."""
+    main_quota = factories.QuotaDefinitionFactory.create(
+        volume=9999,
+        initial_volume=9999,
+        measurement_unit=sub_quota.measurement_unit,
+    )
+    association = factories.QuotaAssociationFactory.create(
+        sub_quota=sub_quota,
+        main_quota=main_quota,
+        sub_quota_relation_type="EQ",
+        coefficient=1.5,
+    )
+
+    form = forms.SubQuotaDefinitionAssociationUpdateForm(
+        instance=sub_quota,
+        request=session_request_with_workbasket,
+        sid=sub_quota.sid,
+    )
+    assert float(form.fields["coefficient"].initial) == association.coefficient
+    assert (
+        form.fields["relationship_type"].initial == association.sub_quota_relation_type
+    )
+    assert form.fields["measurement_unit"].initial == sub_quota.measurement_unit
+    assert form.fields["initial_volume"].initial == sub_quota.initial_volume
+    assert form.fields["volume"].initial == sub_quota.volume
+    assert form.fields["start_date"].initial == sub_quota.valid_between.lower
+    assert form.fields["end_date"].initial == sub_quota.valid_between.upper
+
+    data = {
+        "start_date_0": sub_quota.valid_between.lower.day,
+        "start_date_1": sub_quota.valid_between.lower.month,
+        "start_date_2": sub_quota.valid_between.lower.year,
+        "end_date_0": sub_quota.valid_between.upper.day,
+        "end_date_1": sub_quota.valid_between.upper.month,
+        "end_date_2": sub_quota.valid_between.upper.year,
+        "measurement_unit": sub_quota.measurement_unit,
+        "volume": 100,
+        "initial_volume": 100,
+        "coefficient": 1.5,
+        "relationship_type": "EQ",
+    }
+
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.SubQuotaDefinitionAssociationUpdateForm(
+            request=session_request_with_workbasket,
+            data=data,
+            sid=sub_quota.sid,
+            instance=sub_quota,
+        )
+        assert form.is_valid()
+
+
+def test_sub_quota_update_form_invalid(session_request_with_workbasket, sub_quota):
+    """Test that the sub-quota update form is invalid when invalid data is
+    passed in."""
+    main_quota = factories.QuotaDefinitionFactory.create(
+        volume=9999,
+        initial_volume=9999,
+        measurement_unit=sub_quota.measurement_unit,
+    )
+    factories.QuotaAssociationFactory.create(
+        sub_quota=sub_quota,
+        main_quota=main_quota,
+        sub_quota_relation_type="EQ",
+        coefficient=1.5,
+    )
+
+    data = {
+        "start_date_0": sub_quota.valid_between.lower.day,
+        "start_date_1": sub_quota.valid_between.lower.month,
+        "start_date_2": sub_quota.valid_between.lower.year,
+        "end_date_0": sub_quota.valid_between.upper.day,
+        "end_date_1": sub_quota.valid_between.upper.month,
+        "end_date_2": sub_quota.valid_between.upper.year,
+        "measurement_unit": sub_quota.measurement_unit,
+        "volume": 100,
+        "initial_volume": 100,
+        "coefficient": 1,
+        "relationship_type": "EQ",
+    }
+
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.SubQuotaDefinitionAssociationUpdateForm(
+            request=session_request_with_workbasket,
+            data=data,
+            sid=sub_quota.sid,
+            instance=sub_quota,
+        )
+        assert not form.is_valid()
+        assert (
+            "QA5: Where the relationship type is Equivalent, the coefficient value must be something other than 1"
+            in form.errors["__all__"]
+        )
+
+
+def test_only_end_date_editable_for_active_definitions(
+    date_ranges,
+    session_request_with_workbasket,
+):
+    """Test that it is not possible for a user to edit any field other than the
+    end-date for a sub-quota which has already begun."""
+    active_sub_quota = factories.QuotaDefinitionFactory.create(
+        order_number=factories.QuotaOrderNumberFactory.create(),
+        valid_between=date_ranges.normal,
+        is_physical=True,
+        initial_volume=1234,
+        volume=1234,
+        measurement_unit=factories.MeasurementUnitFactory(),
+    )
+    main_quota = factories.QuotaDefinitionFactory.create(
+        volume=9999,
+        initial_volume=9999,
+        measurement_unit=active_sub_quota.measurement_unit,
+    )
+    factories.QuotaAssociationFactory.create(
+        sub_quota=active_sub_quota,
+        main_quota=main_quota,
+        sub_quota_relation_type="EQ",
+        coefficient=1.5,
+    )
+
+    new_measurement_unit = factories.MeasurementUnitFactory.create()
+
+    data = {
+        "end_date_0": 1,
+        "end_date_1": 1,
+        "end_date_2": 2035,
+        "measurement_unit": new_measurement_unit,
+        "volume": 100,
+        "coefficient": 1,
+    }
+
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.SubQuotaDefinitionAssociationUpdateForm(
+            request=session_request_with_workbasket,
+            data=data,
+            sid=active_sub_quota.sid,
+            instance=active_sub_quota,
+        )
+        assert form.is_valid()
+        cleaned_data = form.cleaned_data
+        assert not cleaned_data["coefficient"] == 1
+        assert not cleaned_data["volume"] == 100
+        assert not cleaned_data["measurement_unit"] == new_measurement_unit
+        assert cleaned_data["valid_between"].upper == datetime.date(2035, 1, 1)
+
+
+def test_quota_association_edit_form_valid():
+    "Test that the quota association edit form is valid when valid data is passed in."
+    association = factories.QuotaAssociationFactory.create(
+        coefficient=1.67,
+        sub_quota_relation_type="EQ",
+    )
+
+    data = {
+        "coefficient": 1.5,
+        "sub_quota_relation_type": "EQ",
+        "main_quota": association.main_quota,
+        "sub_quota": association.sub_quota,
+    }
+    form = forms.QuotaAssociationEdit(data=data, instance=association)
+
+    assert form.is_valid()
+
+
+def test_quota_association_edit_form_invalid():
+    "Test that the quota association edit form is invalid when data is passed in."
+    association = factories.QuotaAssociationFactory.create(
+        coefficient=1.67,
+        sub_quota_relation_type="EQ",
+    )
+
+    data = {
+        "coefficient": "String",
+        "sub_quota_relation_type": "Equivalent",
+        "main_quota": association.main_quota,
+        "sub_quota": association.sub_quota,
+    }
+    form = forms.QuotaAssociationEdit(data=data, instance=association)
+    assert (
+        "Select a valid choice. Equivalent is not one of the available choices."
+        in form.errors["sub_quota_relation_type"]
+    )
+    assert "Enter a number." in form.errors["coefficient"]
+    assert not form.is_valid()
diff --git a/quotas/tests/test_models.py b/quotas/tests/test_models.py
index 1efe2b318..d1f150aef 100644
--- a/quotas/tests/test_models.py
+++ b/quotas/tests/test_models.py
@@ -7,6 +7,7 @@
 from common.serializers import AutoCompleteSerializer
 from common.tests import factories
 from common.tests.util import raises_if
+from common.validators import UpdateType
 
 pytestmark = pytest.mark.django_db
 
@@ -167,3 +168,23 @@ def test_quota_definition_urls(url_name, exp_path):
         sid=987654321,
     )
     assert definition.get_url(url_name) == exp_path
+
+
+def test_get_association_edit_url(workbasket):
+    """Test that the correct edit url is generated for the sub-quota edit and
+    edit-update journeys."""
+    quota = factories.QuotaOrderNumberFactory.create(sid=123456789)
+    definition = factories.QuotaDefinitionFactory.create(
+        order_number=quota,
+        sid=987654321,
+    )
+    exp_path = reverse("sub_quota_definition-edit", kwargs={"sid": definition.sid})
+    assert definition.get_association_edit_url() == exp_path
+
+    definition.new_version(workbasket=workbasket, update_type=UpdateType.UPDATE)
+    updated_definition_instance = definition.version_at(workbasket.transactions.last())
+    exp_path = reverse(
+        "sub_quota_definition-edit-update",
+        kwargs={"sid": definition.sid},
+    )
+    assert updated_definition_instance.get_association_edit_url() == exp_path
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index 875c953bc..29ab8e2d7 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -116,7 +116,7 @@ def test_quota_delete_form(factory, use_delete_form):
 def test_quota_detail_views(
     view,
     url_pattern,
-    valid_user_client,
+    client_with_current_workbasket,
     mock_quota_api_no_data,
 ):
     """Verify that quota detail views are under the url quotas and don't return
@@ -124,7 +124,7 @@ def test_quota_detail_views(
     assert_model_view_renders(
         view,
         url_pattern,
-        valid_user_client,
+        client_with_current_workbasket,
         override_models={"quotas.views.QuotaDefinitionCreate": models.QuotaOrderNumber},
     )
 
@@ -389,17 +389,20 @@ def test_quota_event_api_list_view(valid_user_client):
     )
 
 
-def test_quota_definitions_list_200(valid_user_client, quota_order_number):
+def test_quota_definitions_list_200(client_with_current_workbasket, quota_order_number):
     factories.QuotaDefinitionFactory.create_batch(5, order_number=quota_order_number)
 
     url = reverse("quota_definition-ui-list", kwargs={"sid": quota_order_number.sid})
 
-    response = valid_user_client.get(url)
+    response = client_with_current_workbasket.get(url)
 
     assert response.status_code == 200
 
 
-def test_quota_definitions_list_no_quota_data(valid_user_client, quota_order_number):
+def test_quota_definitions_list_no_quota_data(
+    client_with_current_workbasket,
+    quota_order_number,
+):
     factories.QuotaDefinitionFactory.create_batch(5, order_number=quota_order_number)
 
     url = (
@@ -410,13 +413,16 @@ def test_quota_definitions_list_no_quota_data(valid_user_client, quota_order_num
     with mock.patch(
         "common.tariffs_api.get_quota_definitions_data",
     ) as mock_get_quotas:
-        response = valid_user_client.get(url)
+        response = client_with_current_workbasket.get(url)
         mock_get_quotas.assert_not_called()
 
     assert response.status_code == 200
 
 
-def test_quota_definitions_list_sids(valid_user_client, quota_order_number):
+def test_quota_definitions_list_sids(
+    client_with_current_workbasket,
+    quota_order_number,
+):
     definitions = factories.QuotaDefinitionFactory.create_batch(
         5,
         order_number=quota_order_number,
@@ -424,7 +430,7 @@ def test_quota_definitions_list_sids(valid_user_client, quota_order_number):
 
     url = reverse("quota_definition-ui-list", kwargs={"sid": quota_order_number.sid})
 
-    response = valid_user_client.get(url)
+    response = client_with_current_workbasket.get(url)
 
     soup = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     sids = {
@@ -437,12 +443,15 @@ def test_quota_definitions_list_sids(valid_user_client, quota_order_number):
     assert not sids.difference(object_sids)
 
 
-def test_quota_definitions_list_title(valid_user_client, quota_order_number):
+def test_quota_definitions_list_title(
+    client_with_current_workbasket,
+    quota_order_number,
+):
     factories.QuotaDefinitionFactory.create_batch(5, order_number=quota_order_number)
 
     url = reverse("quota_definition-ui-list", kwargs={"sid": quota_order_number.sid})
 
-    response = valid_user_client.get(url)
+    response = client_with_current_workbasket.get(url)
 
     soup = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     title = soup.select("h1")[0].text
@@ -450,7 +459,7 @@ def test_quota_definitions_list_title(valid_user_client, quota_order_number):
 
 
 def test_quota_definitions_list_current_versions(
-    valid_user_client,
+    client_with_current_workbasket,
     approved_transaction,
 ):
     quota_order_number = factories.QuotaOrderNumberFactory()
@@ -477,7 +486,7 @@ def test_quota_definitions_list_current_versions(
 
     url = reverse("quota_definition-ui-list", kwargs={"sid": quota_order_number.sid})
 
-    response = valid_user_client.get(url)
+    response = client_with_current_workbasket.get(url)
 
     soup = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     num_definitions = len(
@@ -515,7 +524,7 @@ def test_quota_definitions_list_current_measures(
 
 
 def test_quota_definitions_list_edit_delete(
-    valid_user_client,
+    client_with_current_workbasket,
     date_ranges,
     mock_quota_api_no_data,
 ):
@@ -537,7 +546,7 @@ def test_quota_definitions_list_edit_delete(
 
     url = reverse("quota_definition-ui-list", kwargs={"sid": quota_order_number.sid})
 
-    response = valid_user_client.get(url)
+    response = client_with_current_workbasket.get(url)
 
     soup = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     actions = [item.text for item in soup.select("table tbody tr td:last-child")]
@@ -557,7 +566,7 @@ def test_quota_definitions_list_edit_delete(
 
 
 def test_quota_definitions_list_sort_by_start_date(
-    valid_user_client,
+    client_with_current_workbasket,
     date_ranges,
 ):
     """Test that quota definitions list can be sorted by start date in ascending
@@ -575,7 +584,9 @@ def test_quota_definitions_list_sort_by_start_date(
     )
     url = reverse("quota_definition-ui-list", kwargs={"sid": quota_order_number.sid})
 
-    response = valid_user_client.get(f"{url}?sort_by=valid_between&ordered=asc")
+    response = client_with_current_workbasket.get(
+        f"{url}?sort_by=valid_between&ordered=asc",
+    )
     assert response.status_code == 200
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     definition_sids = [
@@ -584,7 +595,9 @@ def test_quota_definitions_list_sort_by_start_date(
     ]
     assert definition_sids == [definition1.sid, definition2.sid]
 
-    response = valid_user_client.get(f"{url}?sort_by=valid_between&ordered=desc")
+    response = client_with_current_workbasket.get(
+        f"{url}?sort_by=valid_between&ordered=desc",
+    )
     assert response.status_code == 200
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     definition_sids = [
@@ -697,7 +710,7 @@ def test_quota_detail_sub_quota_tab(
 
 def test_current_quota_order_number_returned(
     workbasket,
-    valid_user_client,
+    client_with_current_workbasket,
     mock_quota_api_no_data,
     date_ranges,
 ):
@@ -713,7 +726,7 @@ def test_current_quota_order_number_returned(
         valid_between=date_ranges.normal,
     )
     url = reverse("quota_definition-ui-list", kwargs={"sid": current_version.sid})
-    response = valid_user_client.get(url)
+    response = client_with_current_workbasket.get(url)
 
     assert response.status_code == 200
 
@@ -1913,7 +1926,7 @@ def test_quota_blocking_confirm_create_view(valid_user_client):
     )
 
 
-def test_quota_definition_view(valid_user_client):
+def test_quota_definition_view(client_with_current_workbasket):
     """Test all 4 of the quota definition tabs load and display the correct
     objects."""
     main_quota_definition = factories.QuotaDefinitionFactory.create(sid=123)
@@ -1933,7 +1946,7 @@ def test_quota_definition_view(valid_user_client):
     )
 
     # Definition period tab
-    response = valid_user_client.get(
+    response = client_with_current_workbasket.get(
         reverse("quota_definition-ui-list", kwargs={"sid": main_quota.sid}),
     )
     assert response.status_code == 200
@@ -1943,8 +1956,8 @@ def test_quota_definition_view(valid_user_client):
     )[0].text.strip()
     assert int(sid_cell_text) == main_quota_definition.sid
 
-    # Sub quotas tab
-    response = valid_user_client.get(
+    # Sub-quotas tab
+    response = client_with_current_workbasket.get(
         reverse(
             "quota_definition-ui-list-filter",
             kwargs={"sid": main_quota.sid, "quota_type": "sub_quotas"},
@@ -1956,7 +1969,7 @@ def test_quota_definition_view(valid_user_client):
     assert int(sid_cell_text) == sub_quota_definition.sid
 
     # Blocking periods tab
-    response = valid_user_client.get(
+    response = client_with_current_workbasket.get(
         reverse(
             "quota_definition-ui-list-filter",
             kwargs={"sid": main_quota.sid, "quota_type": "blocking_periods"},
@@ -1968,7 +1981,7 @@ def test_quota_definition_view(valid_user_client):
     assert description_cell_text == blocking.description
 
     # Suspension period tab
-    response = valid_user_client.get(
+    response = client_with_current_workbasket.get(
         reverse(
             "quota_definition-ui-list-filter",
             kwargs={"sid": main_quota.sid, "quota_type": "suspension_periods"},
@@ -2247,3 +2260,135 @@ def test_format_date(wizard):
     date_str = "2021-01-01"
     formatted_date = wizard.format_date(date_str)
     assert formatted_date == "01 Jan 2021"
+
+
+@pytest.fixture
+def sub_quota_association(date_ranges):
+    sub_quota = factories.QuotaDefinitionFactory.create(
+        valid_between=date_ranges.future,
+        is_physical=True,
+        initial_volume=1234,
+        volume=1234,
+        measurement_unit=factories.MeasurementUnitFactory(),
+    )
+    main_quota = factories.QuotaDefinitionFactory.create(
+        valid_between=date_ranges.future,
+        volume=9999,
+        initial_volume=9999,
+        measurement_unit=sub_quota.measurement_unit,
+    )
+    association = factories.QuotaAssociationFactory.create(
+        sub_quota=sub_quota,
+        main_quota=main_quota,
+        sub_quota_relation_type="EQ",
+        coefficient=1.5,
+    )
+    return association
+
+
+def test_sub_quota_update(sub_quota_association, client_with_current_workbasket):
+    """Test that SubQuotaDefinitionAssociationUpdate returns 200 and creates an
+    update object for sub-quota definition and association."""
+    sub_quota = sub_quota_association.sub_quota
+    response = client_with_current_workbasket.get(
+        reverse("sub_quota_definition-edit", kwargs={"sid": sub_quota.sid}),
+    )
+    assert response.status_code == 200
+
+    form_data = {
+        "coefficient": 1.2,
+        "start_date_0": sub_quota.valid_between.lower.day,
+        "start_date_1": sub_quota.valid_between.lower.month,
+        "start_date_2": sub_quota.valid_between.lower.year,
+        "measurement_unit": sub_quota.measurement_unit.pk,
+        "relationship_type": "EQ",
+        "end_date_0": sub_quota.valid_between.lower.day,
+        "end_date_1": sub_quota.valid_between.lower.month,
+        "end_date_2": sub_quota.valid_between.lower.year,
+        "volume": 100,
+        "initial_volume": 100,
+    }
+    response = client_with_current_workbasket.post(
+        reverse("sub_quota_definition-edit", kwargs={"sid": sub_quota.sid}),
+        form_data,
+    )
+    assert response.status_code == 302
+    assert response.url == reverse(
+        "sub_quota_definition-confirm-update",
+        kwargs={"sid": sub_quota.sid},
+    )
+    tx = Transaction.objects.last()
+    sub_quota_association = models.QuotaAssociation.objects.approved_up_to_transaction(
+        tx,
+    ).get(sub_quota__sid=sub_quota.sid)
+    assert str(sub_quota_association.coefficient) == "1.20000"
+    assert sub_quota_association.sub_quota.volume == 100
+    assert sub_quota_association.update_type == UpdateType.UPDATE
+    assert sub_quota_association.sub_quota.update_type == UpdateType.UPDATE
+
+
+def test_sub_quota_edit_update(sub_quota_association, client_with_current_workbasket):
+    """Test that SubQuotaDefinitionAssociationEditUpdate returns 200 and
+    overwrites the update objects for the sub-quota definition and
+    association."""
+    # Call the previous test first to create the objects and some update instances of them
+    test_sub_quota_update(sub_quota_association, client_with_current_workbasket)
+    sub_quota = sub_quota_association.sub_quota
+    response = client_with_current_workbasket.get(
+        reverse("sub_quota_definition-edit-update", kwargs={"sid": sub_quota.sid}),
+    )
+    assert response.status_code == 200
+
+    form_data = {
+        "coefficient": 1,
+        "start_date_0": sub_quota.valid_between.lower.day,
+        "start_date_1": sub_quota.valid_between.lower.month,
+        "start_date_2": sub_quota.valid_between.lower.year,
+        "measurement_unit": sub_quota.measurement_unit.pk,
+        "relationship_type": "NM",
+        "end_date_0": sub_quota.valid_between.lower.day,
+        "end_date_1": sub_quota.valid_between.lower.month,
+        "end_date_2": sub_quota.valid_between.lower.year,
+        "volume": 200,
+        "initial_volume": 200,
+    }
+    response = client_with_current_workbasket.post(
+        reverse("sub_quota_definition-edit-update", kwargs={"sid": sub_quota.sid}),
+        form_data,
+    )
+    assert response.status_code == 302
+    # Assert that the update instances have been edited rather than creating another 2 update instances
+    tx = Transaction.objects.last()
+    sub_quota_association = models.QuotaAssociation.objects.approved_up_to_transaction(
+        tx,
+    ).get(sub_quota__sid=sub_quota.sid)
+    assert str(sub_quota_association.coefficient) == "1.00000"
+    assert sub_quota_association.sub_quota.volume == 200
+    sub_quota_definitions = models.QuotaDefinition.objects.all().filter(
+        sid=sub_quota.sid,
+    )
+    sub_quota_associations = models.QuotaAssociation.objects.all().filter(
+        sub_quota__sid=sub_quota.sid,
+    )
+    assert len(sub_quota_definitions) == 2
+    assert len(sub_quota_associations) == 2
+    assert sub_quota_definitions[1].update_type == UpdateType.UPDATE
+    assert sub_quota_associations[1].update_type == UpdateType.UPDATE
+
+
+def test_sub_quota_confirm_update_page(
+    client_with_current_workbasket,
+    sub_quota_association,
+):
+    sub_quota = sub_quota_association.sub_quota
+    response = client_with_current_workbasket.get(
+        reverse(
+            "sub_quota_definition-confirm-update",
+            kwargs={"sid": sub_quota.sid},
+        ),
+    )
+    workbasket = response.context_data["view"].workbasket
+    assert (
+        f"Sub-quota definition: {sub_quota.sid} and association have been updated in workbasket {workbasket.pk}"
+        in str(response.content)
+    )
diff --git a/quotas/urls.py b/quotas/urls.py
index 4b000f931..37ff0fbbc 100644
--- a/quotas/urls.py
+++ b/quotas/urls.py
@@ -95,6 +95,21 @@
         views.QuotaDefinitionDuplicatorSuccess.as_view(),
         name="sub_quota_definitions-ui-success",
     ),
+    path(
+        f"quotas/sub_quotas_definition_update/<sid>",
+        views.SubQuotaDefinitionAssociationUpdate.as_view(),
+        name="sub_quota_definition-edit",
+    ),
+    path(
+        f"quotas/sub_quotas_definition_update-edit/<sid>",
+        views.SubQuotaDefinitionAssociationEditUpdate.as_view(),
+        name="sub_quota_definition-edit-update",
+    ),
+    path(
+        f"quotas/sub_quotas_definition_confirm-update/<sid>",
+        views.SubQuotaConfirmUpdate.as_view(),
+        name="sub_quota_definition-confirm-update",
+    ),
     path(
         f"quota_definitions/<sid>/confirm-create/",
         views.QuotaDefinitionConfirmCreate.as_view(),
diff --git a/quotas/views.py b/quotas/views.py
index bb39106d4..15289a155 100644
--- a/quotas/views.py
+++ b/quotas/views.py
@@ -6,6 +6,7 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import transaction
+from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -13,7 +14,6 @@
 from django.utils.safestring import mark_safe
 from django.views.generic import FormView
 from django.views.generic import TemplateView
-from django.views.generic.edit import FormMixin
 from django.views.generic.list import ListView
 from formtools.wizard.views import NamedUrlSessionWizardView
 from rest_framework import permissions
@@ -307,7 +307,11 @@ def suspension_periods(self):
 
     @property
     def sub_quotas(self):
-        return QuotaAssociation.objects.filter(main_quota__order_number=self.quota)
+        return (
+            QuotaAssociation.objects.current()
+            .filter(main_quota__order_number=self.quota)
+            .order_by("sub_quota__sid")
+        )
 
     @cached_property
     def quota_data(self):
@@ -1128,3 +1132,159 @@ def get_context_data(self, *args, **kwargs):
             },
         )
         return context
+
+
+class SubQuotaDefinitionAssociationMixin:
+    template_name = "quota-definitions/sub-quota-definitions-updates.jinja"
+    form_class = forms.SubQuotaDefinitionAssociationUpdateForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["sid"] = self.kwargs["sid"]
+        kwargs["request"] = self.request
+        return kwargs
+
+    def dispatch(self, request, *args, **kwargs):
+        """
+        Should a user land on the form for a definition which is not a sub-
+        quota, perform a redirect.
+
+        This is not possible with current user journeys but this is included for
+        security and test purposes.
+        """
+        try:
+            self.association
+        except models.QuotaAssociation.DoesNotExist:
+            return HttpResponseRedirect(
+                reverse(
+                    "quota-ui-detail",
+                    kwargs={"sid": self.sub_quota.order_number.sid},
+                ),
+            )
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_success_url(self):
+        return reverse(
+            "sub_quota_definition-confirm-update",
+            kwargs={"sid": self.kwargs["sid"]},
+        )
+
+    @property
+    def last_transaction(self):
+        return self.workbasket.transactions.last()
+
+    @property
+    def sub_quota(self):
+        return models.QuotaDefinition.objects.current().get(sid=self.kwargs["sid"])
+
+    @property
+    def association(self):
+        return models.QuotaAssociation.objects.current().get(
+            sub_quota__sid=self.sub_quota.sid,
+        )
+
+    def get_main_definition(self):
+        return self.association.main_quota
+
+
+class SubQuotaDefinitionAssociationUpdate(
+    SubQuotaDefinitionAssociationMixin,
+    QuotaDefinitionUpdate,
+):
+
+    @transaction.atomic
+    def get_result_object(self, form):
+        self.original_association = self.association
+        instance = super().get_result_object(form)
+
+        sub_quota_relation_type = form.cleaned_data.get("relationship_type")
+        coefficient = form.cleaned_data.get("coefficient")
+
+        self.update_association(instance, sub_quota_relation_type, coefficient)
+
+        return instance
+
+    def update_association(self, instance, sub_quota_relation_type, coefficient):
+        "Update the association too if there is updated data submitted."
+        form_data = {
+            "main_quota": self.get_main_definition(),
+            "sub_quota": self.sub_quota,
+            "coefficient": coefficient,
+            "sub_quota_relation_type": sub_quota_relation_type,
+        }
+
+        form = forms.QuotaAssociationEdit(
+            data=form_data,
+            instance=self.original_association,
+        )
+
+        form.instance.new_version(
+            workbasket=WorkBasket.current(self.request),
+            transaction=instance.transaction,
+            sub_quota=instance,
+            main_quota=self.get_main_definition(),
+            coefficient=coefficient,
+            sub_quota_relation_type=sub_quota_relation_type,
+        )
+
+
+class SubQuotaDefinitionAssociationEditUpdate(
+    SubQuotaDefinitionAssociationMixin,
+    QuotaDefinitionEditUpdate,
+):
+
+    @transaction.atomic
+    def get_result_object(self, form):
+        instance = super().get_result_object(form)
+
+        sub_quota_relation_type = form.cleaned_data.get("relationship_type")
+        coefficient = form.cleaned_data.get("coefficient")
+
+        self.update_association(instance, sub_quota_relation_type, coefficient)
+
+        return instance
+
+    def update_association(self, instance, sub_quota_relation_type, coefficient):
+        "Update the association too if there is updated data submitted."
+        current_instance = self.association.version_at(self.last_transaction)
+        form_data = {
+            "main_quota": self.get_main_definition(),
+            "sub_quota": instance,
+            "coefficient": coefficient,
+            "sub_quota_relation_type": sub_quota_relation_type,
+        }
+
+        form = forms.QuotaAssociationEdit(data=form_data, instance=current_instance)
+        form.save()
+
+
+class SubQuotaConfirmUpdate(TrackedModelDetailView):
+    model = models.QuotaDefinition
+    template_name = "quota-definitions/sub-quota-definitions-confirm-update.jinja"
+
+    @property
+    def association(self):
+        return QuotaAssociation.objects.current().get(sub_quota__sid=self.kwargs["sid"])
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["association"] = self.association
+        return context
+
+    def dispatch(self, request, *args, **kwargs):
+        """
+        Should a user land on the this page for a definition which is not a sub-
+        quota, perform a redirect.
+
+        This is not possible with current user journeys but this is included for
+        security and test purposes.
+        """
+        try:
+            self.association
+        except models.QuotaAssociation.DoesNotExist:
+            return HttpResponseRedirect(
+                reverse(
+                    "quota-ui-list",
+                ),
+            )
+        return super().dispatch(request, *args, **kwargs)
diff --git a/workbaskets/views/generic.py b/workbaskets/views/generic.py
index 3cadc3acb..376b5c781 100644
--- a/workbaskets/views/generic.py
+++ b/workbaskets/views/generic.py
@@ -61,8 +61,9 @@ class EditTaricView(
     generic.UpdateView,
 ):
     """
-    View used to change an existing model instance in the current workbasket
-    without creating a new version. The model instance may have an update_type.
+    View used to change an existing model instance that is in the current
+    workbasket without creating a new version. The model instance may have an
+    update_type.
 
     of either Create or Update - Delete is not an editable update type.
     """

From 21653dd202398d140b260f5d927ead9d8d40b3a1 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:40:28 +0100
Subject: [PATCH 04/12] TP2000-1500 Update find commodity code view (#1299)

* Update existing styling

* Add date columns

* Add end date filter

* Fix failing sub-quota test

* Delete venv committed

* Update test
---
 commodities/filters.py                        | 10 ++++--
 commodities/forms.py                          | 19 ++++++++++--
 .../jinja2/includes/commodities/table.jinja   |  4 +++
 commodities/tests/test_views.py               | 16 ++++++++++
 common/filters.py                             | 18 ++++++++++-
 common/static/common/scss/_components.scss    |  4 +++
 quotas/tests/test_forms.py                    | 31 ++++++++++---------
 7 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/commodities/filters.py b/commodities/filters.py
index 31aa18234..16a9f294f 100644
--- a/commodities/filters.py
+++ b/commodities/filters.py
@@ -9,6 +9,7 @@
 from commodities.models.orm import GoodsNomenclature
 from common.filters import ActiveStateMixin
 from common.filters import CurrentWorkBasketMixin
+from common.filters import EndDateMixin
 from common.filters import TamatoFilter
 from common.filters import TamatoFilterBackend
 from common.validators import AlphanumericValidator
@@ -33,9 +34,14 @@ def search_queryset(self, queryset, search_term):
         return super().search_queryset(queryset, search_term)
 
 
-class CommodityFilter(ActiveStateMixin, TamatoFilter, CurrentWorkBasketMixin):
+class CommodityFilter(
+    ActiveStateMixin,
+    TamatoFilter,
+    CurrentWorkBasketMixin,
+    EndDateMixin,
+):
     item_id = CharFilter(
-        label="Code",
+        label="Commodity code",
         widget=forms.TextInput(),
         lookup_expr="startswith",
         validators=[NumericValidator],
diff --git a/commodities/forms.py b/commodities/forms.py
index 9d5895a70..2992b5038 100644
--- a/commodities/forms.py
+++ b/commodities/forms.py
@@ -24,15 +24,28 @@ def __init__(self, *args, **kwargs):
         self.helper.layout = Layout(
             Field.text("item_id", label_size=Size.SMALL),
             Field.text("descriptions__description", label_size=Size.SMALL),
-            Field.text("active_state", label_size=Size.SMALL),
+            Field.checkboxes(
+                "active_state",
+                legend_size=Size.SMALL,
+            ),
             Fieldset(
                 Field.text("with_footnotes", label_size=Size.SMALL),
                 legend="Footnotes",
+                legend_size=Size.SMALL,
+            ),
+            Fieldset(
+                Field.text("with_end_date", label_size=Size.SMALL),
+                legend="End date",
+                legend_size=Size.SMALL,
+            ),
+            Fieldset(
+                Field.text("current_work_basket", label_size=Size.SMALL),
+                legend="Workbasket",
+                legend_size=Size.SMALL,
             ),
-            Field.text("current_work_basket", label_size=Size.SMALL),
             Button(
                 "submit",
-                "Search and Filter",
+                "Search and filter",
             ),
             HTML(
                 f'<a class="govuk-button govuk-button--secondary" href="{self.clear_url}"> Clear </a>',
diff --git a/commodities/jinja2/includes/commodities/table.jinja b/commodities/jinja2/includes/commodities/table.jinja
index c8c047835..2375e01ca 100644
--- a/commodities/jinja2/includes/commodities/table.jinja
+++ b/commodities/jinja2/includes/commodities/table.jinja
@@ -15,6 +15,8 @@
         {"text": commodity.suffix},
         {"text": commodity.get_indent_as_at(today).indent},
         {"text": commodity.get_description().description},
+        {"text": "{:%d %b %Y}".format(commodity.valid_between.lower)},
+        {"text": "{:%d %b %Y}".format(commodity.valid_between.upper) if commodity.valid_between.upper else "-"},
         {"text": commodity_footnotes},
     ]) or "" }}
 {% endfor %}
@@ -24,6 +26,8 @@
         {"text": "Suffix"},
         {"text": "Indent"},
         {"text": "Commodity description"},
+        {"text": "Start date"},
+        {"text": "End date"},
         {"text": "Footnotes"},
 
     ],
diff --git a/commodities/tests/test_views.py b/commodities/tests/test_views.py
index 02bf7ae01..3e026ed63 100644
--- a/commodities/tests/test_views.py
+++ b/commodities/tests/test_views.py
@@ -27,6 +27,7 @@
 
 def test_commodity_list_displays_commodity_suffix_indent_and_description(
     valid_user_client,
+    date_ranges,
 ):
     """Test that a list of commodity codes with links and their suffixes,
     indents and descriptions are displayed on the list view template."""
@@ -37,6 +38,9 @@ def test_commodity_list_displays_commodity_suffix_indent_and_description(
         description="A second commodity code description",
     ).described_goods_nomenclature
 
+    commodity2.valid_between = date_ranges.normal
+    commodity2.save(force_write=True)
+
     url = reverse("commodity-ui-list")
     response = valid_user_client.get(url)
     page = BeautifulSoup(
@@ -51,6 +55,10 @@ def test_commodity_list_displays_commodity_suffix_indent_and_description(
         text=commodity1.get_indent_as_at(datetime.date.today()).indent,
     )
     assert page.find("tbody").find("td", text="A commodity code description")
+    assert page.find("tbody").find(
+        "td",
+        text=f"{commodity1.valid_between.lower:%d %b %Y}",
+    )
 
     assert page.find("tbody").find("td", text=commodity2.item_id)
     assert page.find("tbody").find(href=f"/commodities/{commodity2.sid}/")
@@ -60,6 +68,14 @@ def test_commodity_list_displays_commodity_suffix_indent_and_description(
         text=commodity2.get_indent_as_at(datetime.date.today()).indent,
     )
     assert page.find("tbody").find("td", text="A second commodity code description")
+    assert page.find("tbody").find(
+        "td",
+        text=f"{commodity2.valid_between.lower:%d %b %Y}",
+    )
+    assert page.find("tbody").find(
+        "td",
+        text=f"{commodity2.valid_between.upper:%d %b %Y}",
+    )
 
 
 def test_commodity_list_queryset():
diff --git a/common/filters.py b/common/filters.py
index c453109a5..e5a0c1663 100644
--- a/common/filters.py
+++ b/common/filters.py
@@ -248,7 +248,7 @@ class ActiveStateMixin(FilterSet):
         widget=forms.CheckboxSelectMultiple,
         method="filter_active_state",
         label="Active state",
-        help_text="Select all that apply",
+        help_text="Select one to filter by active or terminated items",
         required=False,
     )
 
@@ -348,3 +348,19 @@ def filter_work_basket(self, queryset, name, value):
                 id__in=wanted_objects_id,
             )
         return queryset
+
+
+class EndDateMixin(FilterSet):
+    """A filter to only show objects which have an end date."""
+
+    with_end_date = BooleanFilter(
+        label="Show items with an end date",
+        widget=forms.CheckboxInput(),
+        method="filter_end_date",
+        required=False,
+    )
+
+    def filter_end_date(self, queryset, name, value):
+        if value:
+            queryset = queryset.filter(valid_between__upper_inf=False)
+        return queryset
diff --git a/common/static/common/scss/_components.scss b/common/static/common/scss/_components.scss
index c6c0606dd..a0b8ed9d9 100644
--- a/common/static/common/scss/_components.scss
+++ b/common/static/common/scss/_components.scss
@@ -161,3 +161,7 @@
 .homepage-workbasket-action {
   width: 100%;
 }
+
+.govuk-checkboxes__label:before {
+  background-color: white
+}
diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index 2a51525e5..8550aa46c 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -794,21 +794,22 @@ def test_sub_quota_update_form_valid(session_request_with_workbasket, sub_quota)
         sub_quota_relation_type="EQ",
         coefficient=1.5,
     )
-
-    form = forms.SubQuotaDefinitionAssociationUpdateForm(
-        instance=sub_quota,
-        request=session_request_with_workbasket,
-        sid=sub_quota.sid,
-    )
-    assert float(form.fields["coefficient"].initial) == association.coefficient
-    assert (
-        form.fields["relationship_type"].initial == association.sub_quota_relation_type
-    )
-    assert form.fields["measurement_unit"].initial == sub_quota.measurement_unit
-    assert form.fields["initial_volume"].initial == sub_quota.initial_volume
-    assert form.fields["volume"].initial == sub_quota.volume
-    assert form.fields["start_date"].initial == sub_quota.valid_between.lower
-    assert form.fields["end_date"].initial == sub_quota.valid_between.upper
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.SubQuotaDefinitionAssociationUpdateForm(
+            instance=sub_quota,
+            request=session_request_with_workbasket,
+            sid=sub_quota.sid,
+        )
+        assert float(form.fields["coefficient"].initial) == association.coefficient
+        assert (
+            form.fields["relationship_type"].initial
+            == association.sub_quota_relation_type
+        )
+        assert form.fields["measurement_unit"].initial == sub_quota.measurement_unit
+        assert form.fields["initial_volume"].initial == sub_quota.initial_volume
+        assert form.fields["volume"].initial == sub_quota.volume
+        assert form.fields["start_date"].initial == sub_quota.valid_between.lower
+        assert form.fields["end_date"].initial == sub_quota.valid_between.upper
 
     data = {
         "start_date_0": sub_quota.valid_between.lower.day,

From a1e23267bcd7d414790783be38151f3119a723db Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:08:41 +0100
Subject: [PATCH 05/12] TP2000-1506 Create data creation management command for
 performance testing (#1300)

* Create experimental create_async_measures command

* Make wb_title and measures_count optional.

* Guard against invalid get().

* Factor out workbasket creation.

* Initial goods creation implementation

* Measures count output

* Add goods descriptions

* Create unique geo area for new measures

* Create goods and related objects

* Output info about goods count

* Move create_async_measures command to new tests app

* Rename tests app to test_utils

* Add missing __init__.py

---------

Co-authored-by: Paul Pepper <paul.pepper@digital.trade.gov.uk>
---
 settings/common.py                            |   1 +
 test_utils/management/__init__.py             |   0
 test_utils/management/commands/__init__.py    |   0
 .../commands/create_async_measures.py         | 355 ++++++++++++++++++
 4 files changed, 356 insertions(+)
 create mode 100644 test_utils/management/__init__.py
 create mode 100644 test_utils/management/commands/__init__.py
 create mode 100644 test_utils/management/commands/create_async_measures.py

diff --git a/settings/common.py b/settings/common.py
index a4c235f55..dacc84c50 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -141,6 +141,7 @@
     "exporter.apps.ExporterConfig",
     "crispy_forms",
     "crispy_forms_gds",
+    "test_utils",
 ]
 
 APPS_THAT_MUST_COME_LAST = ["django.forms"]
diff --git a/test_utils/management/__init__.py b/test_utils/management/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test_utils/management/commands/__init__.py b/test_utils/management/commands/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test_utils/management/commands/create_async_measures.py b/test_utils/management/commands/create_async_measures.py
new file mode 100644
index 000000000..51a34a790
--- /dev/null
+++ b/test_utils/management/commands/create_async_measures.py
@@ -0,0 +1,355 @@
+from datetime import datetime
+from datetime import timedelta
+
+from django.contrib.auth import get_user_model
+from django.core.management.base import BaseCommand
+from django.core.management.base import CommandError
+from django.db.transaction import atomic
+
+from commodities.models import GoodsNomenclature
+from commodities.models import GoodsNomenclatureDescription
+from commodities.models import GoodsNomenclatureIndent
+from commodities.models import GoodsNomenclatureOrigin
+from common.util import TaricDateRange
+from common.validators import UpdateType
+from geo_areas.models import GeographicalArea
+from geo_areas.validators import AreaCode
+from measures.models import MeasureType
+from measures.models.bulk_processing import MeasuresBulkCreator
+from regulations.models import Regulation
+from workbaskets.models import WorkBasket
+
+User = get_user_model()
+
+
+class Command(BaseCommand):
+    help = (
+        "Creates new measures asynchronously in a newly created workbasket for "
+        "perfomance testing purposes."
+    )
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--user_name",
+            required=True,
+            help=(
+                "Username of the person performing the test who will be the "
+                "author of the workbasket."
+            ),
+        )
+        parser.add_argument(
+            "--wb-title",
+            required=False,
+            help=(
+                "Title given to the workbasket being created for the "
+                "performance test. If none is provided then a system timestamp "
+                "will be used to form part of a unique title."
+            ),
+        )
+        parser.add_argument(
+            "--count",
+            required=False,
+            type=int,
+            default=99,
+            help=(
+                "Number of measures to create (1-99). If no count is "
+                "specified, then a default count of 99 is used."
+            ),
+        )
+
+    def handle(self, *args, **options):
+        username = options["user_name"]
+        try:
+            user = User.objects.get(username=username)
+        except User.DoesNotExist:
+            raise CommandError(f"User '{username}' does not exist.")
+
+        count = options["count"]
+        if count < 1:
+            raise CommandError("count must be greater than zero.")
+
+        title = self.get_title(options["wb_title"])
+        workbasket = self.create_workbasket(user, title)
+        measure_type = self.get_measure_type()
+        start_date = self.get_start_date()
+
+        commodities = self.create_commodities(
+            workbasket,
+            start_date,
+            count,
+        )
+        geo_area = self.create_country(workbasket, start_date)
+
+        form_data = self.generate_form_data(
+            measure_type,
+            start_date,
+            commodities,
+            geo_area,
+        )
+        form_kwargs = self.generate_form_kwargs(
+            measure_type,
+            start_date,
+            len(commodities),
+        )
+
+        measures_bulk_creator = MeasuresBulkCreator.objects.create(
+            form_data=form_data,
+            form_kwargs=form_kwargs,
+            workbasket=workbasket,
+            user=user,
+        )
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Successfully created MeasuresBulkCreator: ID "
+                f"{measures_bulk_creator.id} - generating {count} measure(s).",
+            ),
+        )
+
+        measures_bulk_creator.schedule_task()
+
+    def create_workbasket(self, user, title: str = None) -> WorkBasket:
+        workbasket = WorkBasket.objects.create(
+            title=title,
+            reason="Created for performance testing purposes.",
+            author=user,
+        )
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Successfully created worbasket: {workbasket} - {workbasket.title}",
+            ),
+        )
+        return workbasket
+
+    def get_title(self, title: str = None) -> str:
+        if title:
+            return title
+        now = datetime.now().replace(microsecond=0).isoformat(" ")
+        return f"Perf test {now}"
+
+    def generate_form_data(
+        self,
+        measure_type: MeasureType,
+        start_date: datetime,
+        commodities: list[GoodsNomenclature],
+        geo_area: GeographicalArea,
+    ) -> dict:
+        return {
+            "footnotes": self.get_footnotes(),
+            "conditions": self.get_conditions(),
+            "commodities": self.get_commodities_and_duties(commodities),
+            "regulation_id": self.get_regulation(),
+            "additional_code": self.get_additional_code(),
+            "measure_details": self.get_measure_details(
+                measure_type,
+                start_date,
+                len(commodities),
+            ),
+            "geographical_area": self.get_geographical_areas(geo_area),
+            "quota_order_number": self.get_order_number(),
+        }
+
+    def generate_form_kwargs(
+        self,
+        measure_type: MeasureType,
+        start_date: datetime,
+        commodity_count: int,
+    ):
+        return {
+            "footnotes": {},
+            "conditions": {
+                "form_kwargs": {
+                    "measure_type_pk": measure_type.pk,
+                    "measure_start_date": start_date.strftime("%Y-%m-%d"),
+                },
+            },
+            "commodities": {
+                "form_kwargs": {
+                    "measure_type_pk": measure_type.pk,
+                },
+                "measure_start_date": start_date.strftime("%Y-%m-%d"),
+                "min_commodity_count": commodity_count,
+            },
+            "regulation_id": {},
+            "additional_code": {},
+            "measure_details": {},
+            "geographical_area": {},
+            "quota_order_number": {},
+        }
+
+    def get_measure_type(self) -> MeasureType:
+        return MeasureType.objects.filter(sid=142).last()
+
+    def get_start_date(self) -> datetime:
+        return datetime.today()
+
+    def get_footnotes(self) -> dict:
+        return {}
+
+    def get_conditions(self) -> dict:
+        return {}
+
+    def create_country(
+        self,
+        workbasket: WorkBasket,
+        start_date: datetime,
+    ) -> GeographicalArea:
+        return GeographicalArea.create(
+            area_code=AreaCode.COUNTRY,
+            area_id="OO",
+            description="Country created for perfomance testing purposes.",
+            valid_between=TaricDateRange(lower=start_date.date(), upper=None),
+            update_type=UpdateType.CREATE,
+            transaction=workbasket.new_transaction(),
+        )
+
+    def create_commodities(
+        self,
+        workbasket: WorkBasket,
+        start_date: datetime,
+        commodities_count: int,
+    ) -> list[GoodsNomenclature]:
+        """
+        Create and return new goods in workbasket.
+
+        Note that a new chapter-level goods item will be created in addition to
+        the goods returned by this function, adding one to the total created
+        commodity count.
+        """
+
+        commodities = []
+
+        # Create a new chapter-level commodity that can be used as the origin
+        # for all new goods (start date must be at least the day before the
+        # start date of the goods that use them).
+        chapter_good = self.create_commodity(
+            workbasket=workbasket,
+            hs_chapter=99,
+            taric_subheading=0,
+            start_date=start_date - timedelta(days=1),
+        )
+
+        for i in range(1, commodities_count + 1):
+            good = self.create_commodity(
+                workbasket=workbasket,
+                hs_chapter=99,
+                taric_subheading=i,
+                start_date=start_date,
+                origin_good=chapter_good,
+            )
+            commodities.append(good)
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Successfully created {commodities_count + 1} new good(s).",
+            ),
+        )
+
+        return commodities
+
+    @atomic
+    def create_commodity(
+        self,
+        workbasket: WorkBasket,
+        hs_chapter: int,
+        taric_subheading: int,
+        start_date: datetime,
+        origin_good: GoodsNomenclature = None,
+    ) -> GoodsNomenclature:
+        """
+        Create and return a new commodity.
+
+        If this is a new chapter-level
+        commodity, then `origin_good` should be None, otherwise, `origin_good`
+        should be a commodity higher in the goods hierarchy.
+        """
+
+        if hs_chapter > 99:
+            raise Exception("hs_chapter must be 99 or less.")
+
+        if taric_subheading > 99:
+            raise Exception("hs_chapter must be 99 or less.")
+
+        transaction = workbasket.new_transaction()
+        common_kwargs = {
+            "transaction": transaction,
+            "update_type": UpdateType.CREATE.value,
+        }
+
+        good = GoodsNomenclature.objects.create(
+            sid=900000 + taric_subheading,
+            item_id=f"{hs_chapter:<06d}{taric_subheading:>04d}",
+            suffix="80",
+            statistical=False,
+            valid_between=(start_date, None),
+            **common_kwargs,
+        )
+
+        GoodsNomenclatureDescription.objects.create(
+            sid=900000 + taric_subheading,
+            described_goods_nomenclature=good,
+            description=f"Performance test commodity {good.item_id}",
+            validity_start=start_date,
+            **common_kwargs,
+        )
+
+        GoodsNomenclatureIndent.objects.create(
+            sid=900000 + taric_subheading,
+            indent=0,
+            indented_goods_nomenclature=good,
+            validity_start=start_date,
+            **common_kwargs,
+        )
+
+        if origin_good:
+            GoodsNomenclatureOrigin.objects.create(
+                new_goods_nomenclature=good,
+                derived_from_goods_nomenclature=origin_good,
+                **common_kwargs,
+            )
+
+        return good
+
+    def get_commodities_and_duties(self, commodities: list[GoodsNomenclature]) -> dict:
+        commodities_and_duties = {}
+        for i, commodity in enumerate(commodities):
+            commodities_and_duties[f"measure_commodities_duties_formset-{i}-duties"] = (
+                "0%"
+            )
+            commodities_and_duties[
+                f"measure_commodities_duties_formset-{i}-commodity"
+            ] = f"{commodity.pk}"
+        return commodities_and_duties
+
+    def get_regulation(self) -> dict:
+        regulation = Regulation.objects.filter(regulation_id="C2100001").last()
+        return {
+            "generating_regulation": str(regulation.pk),
+        }
+
+    def get_additional_code(self) -> dict:
+        return {"additional_code": ""}
+
+    def get_measure_details(self, measure_type, start_date, commodity_count) -> dict:
+        return {
+            "end_date_0": "",
+            "end_date_1": "",
+            "end_date_2": "",
+            "measure_type": str(measure_type.pk),
+            "start_date_0": start_date.day,
+            "start_date_1": start_date.month,
+            "start_date_2": start_date.year,
+            "min_commodity_count": str(commodity_count),
+        }
+
+    def get_geographical_areas(self, geo_area: GeographicalArea) -> dict:
+        return {
+            "geographical_area-geo_area": "COUNTRY",
+            "geographical_area-geographical_area_group": "",
+            "country_region_formset-0-geographical_area_country_or_region": str(
+                geo_area.pk,
+            ),
+        }
+
+    def get_order_number(self) -> dict:
+        return {"order_number": ""}

From 577989b9fabb3f203574a221cbc8376e27ca0c56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 11:12:19 +0100
Subject: [PATCH 06/12] Bump django from 4.2.15 to 4.2.16 (#1303)

Bumps [django](https://github.com/django/django) from 4.2.15 to 4.2.16.
- [Commits](https://github.com/django/django/compare/4.2.15...4.2.16)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3d434b6d0..3d54e5f75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ django-staff-sso-client==4.2.1
 django-storages==1.14.3
 django-test-migrations==1.3.0
 django-webpack-loader==3.0.1
-django==4.2.15
+django==4.2.16
 djangorestframework==3.15.2
 drf-extra-fields==3.7.0
 drf-flex-fields==1.0.2

From 26013d8dda89771f8031fb48eae3f74eb83b0af1 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:16:58 +0100
Subject: [PATCH 07/12] TP2000-1515 Deleting definition deletes association too
 (#1301)

* Delete associations as well as definition

* Add test

* Prevent business rules from failing

* Refactor if statement
---
 quotas/business_rules.py   |  8 +++---
 quotas/forms.py            |  2 +-
 quotas/tests/test_forms.py |  4 +--
 quotas/tests/test_views.py | 50 ++++++++++++++++++++++++++++++++++++++
 quotas/views.py            | 30 +++++++++++++++++++++--
 5 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/quotas/business_rules.py b/quotas/business_rules.py
index 92f5c718f..88c5a9d86 100644
--- a/quotas/business_rules.py
+++ b/quotas/business_rules.py
@@ -525,7 +525,7 @@ def validate(self, association):
 
 def check_QA6_dict(main_quota, new_relation_type, transaction=None):
     """
-    Confirms the provided data is compliant with the above businsess rule.
+    Confirms the provided data is compliant with the above business rule.
 
     The above test will be re-run so as to separate historic violations, which
     will require TAP to fix, from a user trying to introduce a new violation.
@@ -540,10 +540,12 @@ def check_QA6_dict(main_quota, new_relation_type, transaction=None):
         .order_by("sub_quota_relation_type")
         .distinct()
     )
-    if relation_type.count() > 1:
-        return False
+    if relation_type.count() == 0:
+        return True
     elif relation_type.count() == 1:
         return relation_type[0]["sub_quota_relation_type"] == new_relation_type
+    else:
+        return False
 
 
 class SameMainAndSubQuota(BusinessRule):
diff --git a/quotas/forms.py b/quotas/forms.py
index 8ebc4ddc5..0d30029ad 100644
--- a/quotas/forms.py
+++ b/quotas/forms.py
@@ -1386,7 +1386,7 @@ def init_fields(self):
             self.fields["measurement_unit"].disabled = True
 
 
-class QuotaAssociationEdit(forms.ModelForm):
+class QuotaAssociationUpdateForm(forms.ModelForm):
     class Meta:
         model = models.QuotaAssociation
         fields = [
diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index 8550aa46c..6a2811b94 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -943,7 +943,7 @@ def test_quota_association_edit_form_valid():
         "main_quota": association.main_quota,
         "sub_quota": association.sub_quota,
     }
-    form = forms.QuotaAssociationEdit(data=data, instance=association)
+    form = forms.QuotaAssociationUpdateForm(data=data, instance=association)
 
     assert form.is_valid()
 
@@ -961,7 +961,7 @@ def test_quota_association_edit_form_invalid():
         "main_quota": association.main_quota,
         "sub_quota": association.sub_quota,
     }
-    form = forms.QuotaAssociationEdit(data=data, instance=association)
+    form = forms.QuotaAssociationUpdateForm(data=data, instance=association)
     assert (
         "Select a valid choice. Equivalent is not one of the available choices."
         in form.errors["sub_quota_relation_type"]
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index 29ab8e2d7..53c890479 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -969,6 +969,56 @@ def test_delete_quota_definition(client_with_current_workbasket, date_ranges):
     )
 
 
+def test_delete_quota_definition_deletes_associations(
+    client_with_current_workbasket,
+    date_ranges,
+):
+    """Test that when a quota definition is deleted that all linked associations
+    are deleted too."""
+    main_quota = factories.QuotaDefinitionFactory.create(
+        sid=1,
+        valid_between=date_ranges.future,
+        measurement_unit=factories.MeasurementUnitFactory(),
+    )
+    for i in range(2, 6):
+        factories.QuotaAssociationFactory.create(
+            sub_quota=factories.QuotaDefinitionFactory.create(
+                sid=i,
+                valid_between=date_ranges.future,
+            ),
+            main_quota=main_quota,
+        )
+
+    # Delete a sub-quota and verify the related association gets deleted too
+    sub_quota_2 = models.QuotaDefinition.objects.all().get(sid=2)
+    url = reverse("quota_definition-ui-delete", kwargs={"sid": sub_quota_2.sid})
+    client_with_current_workbasket.post(url, {"submit": "Delete"})
+
+    sub_quota_2_new_version = models.QuotaDefinition.objects.all().filter(sid=2).last()
+    association_2_new_version = (
+        models.QuotaAssociation.objects.all().filter(sub_quota__sid=2).last()
+    )
+    assert sub_quota_2_new_version.update_type == UpdateType.DELETE
+    assert association_2_new_version.update_type == UpdateType.DELETE
+
+    # Delete the main_quota and verify that all remaining associations get deleted too
+    url = reverse("quota_definition-ui-delete", kwargs={"sid": main_quota.sid})
+    client_with_current_workbasket.post(url, {"submit": "Delete"})
+
+    main_quota_new_version = models.QuotaDefinition.objects.all().filter(sid=1).last()
+    association_new_versions = [
+        models.QuotaAssociation.objects.all().filter(sub_quota__sid=i).last()
+        for i in range(3, 6)
+    ]
+
+    deleted_associations = models.QuotaAssociation.objects.all().filter(
+        update_type=UpdateType.DELETE,
+    )
+    assert main_quota_new_version.update_type == UpdateType.DELETE
+    for association in association_new_versions:
+        assert association in deleted_associations
+
+
 def test_quota_create_with_origins(
     client_with_current_workbasket,
     date_ranges,
diff --git a/quotas/views.py b/quotas/views.py
index 15289a155..736a36b11 100644
--- a/quotas/views.py
+++ b/quotas/views.py
@@ -6,6 +6,7 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import transaction
+from django.db.models import Q
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
 from django.urls import reverse
@@ -755,6 +756,28 @@ class QuotaDefinitionDelete(
     form_class = delete_form_for(models.QuotaDefinition)
     template_name = "quota-definitions/delete.jinja"
 
+    @property
+    def related_associations(self):
+        return models.QuotaAssociation.objects.current().filter(
+            Q(main_quota__sid=self.object.sid) | Q(sub_quota__sid=self.object.sid),
+        )
+
+    @transaction.atomic
+    def get_result_object(self, form):
+        """Delete the definition and any linked associations."""
+        definition_instance = super().get_result_object(form)
+        for association in self.related_associations:
+            association_form = forms.QuotaAssociationUpdateForm(
+                instance=association,
+            )
+            association_form.instance.new_version(
+                workbasket=self.workbasket,
+                update_type=self.update_type,
+                transaction=definition_instance.transaction,
+            )
+
+        return definition_instance
+
     def form_valid(self, form):
         messages.success(
             self.request,
@@ -1213,7 +1236,7 @@ def update_association(self, instance, sub_quota_relation_type, coefficient):
             "sub_quota_relation_type": sub_quota_relation_type,
         }
 
-        form = forms.QuotaAssociationEdit(
+        form = forms.QuotaAssociationUpdateForm(
             data=form_data,
             instance=self.original_association,
         )
@@ -1254,7 +1277,10 @@ def update_association(self, instance, sub_quota_relation_type, coefficient):
             "sub_quota_relation_type": sub_quota_relation_type,
         }
 
-        form = forms.QuotaAssociationEdit(data=form_data, instance=current_instance)
+        form = forms.QuotaAssociationUpdateForm(
+            data=form_data,
+            instance=current_instance,
+        )
         form.save()
 
 

From 874f05b58bc7d7ec6a1bdf291e0024224d5dd9b1 Mon Sep 17 00:00:00 2001
From: Charlie Prichard <46421052+CPrich905@users.noreply.github.com>
Date: Fri, 11 Oct 2024 15:33:10 +0100
Subject: [PATCH 08/12] Tp2000 1516 delete quota association (#1304)

* adding view and url

* wip

* wip - urlconf issues

* Fix url args issue

* adding tests

* responding to CR comments

---------

Co-authored-by: Edie Pearce <edie.pearce@digital.trade.gov.uk>
---
 .../quota-associations/confirm-delete.jinja   | 18 +++++++++
 quotas/jinja2/quota-associations/delete.jinja | 30 +++++++++++++++
 quotas/jinja2/quotas/tables/sub_quotas.jinja  | 14 ++++---
 quotas/tests/test_views.py                    | 37 +++++++++++++++++++
 quotas/urls.py                                | 10 +++++
 quotas/views.py                               | 31 ++++++++++++++++
 6 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 quotas/jinja2/quota-associations/confirm-delete.jinja
 create mode 100644 quotas/jinja2/quota-associations/delete.jinja

diff --git a/quotas/jinja2/quota-associations/confirm-delete.jinja b/quotas/jinja2/quota-associations/confirm-delete.jinja
new file mode 100644
index 000000000..70a0f1979
--- /dev/null
+++ b/quotas/jinja2/quota-associations/confirm-delete.jinja
@@ -0,0 +1,18 @@
+{% extends "layouts/confirm.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Delete quota definition" %}
+
+{% set messages %}
+  {% for message in get_messages(request) %}
+    {{ message }}
+  {% endfor %}
+{% endset  %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": messages,
+    "text": "This change has been added to your workbasket",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-associations/delete.jinja b/quotas/jinja2/quota-associations/delete.jinja
new file mode 100644
index 000000000..c6ef1e6c0
--- /dev/null
+++ b/quotas/jinja2/quota-associations/delete.jinja
@@ -0,0 +1,30 @@
+{% extends "layouts/form.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/warning-text/macro.njk" import govukWarningText %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Delete " ~ object._meta.verbose_name ~ " between main quota " ~ object.main_quota ~ " and sub-quota " ~ object.sub_quota %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and edit quotas", "href": url("quota-ui-list") },
+      {"text": object._meta.verbose_name|capitalize ~ ": " ~ object.pk, "href": object.get_url()},
+      {"text": page_title }
+    ])
+  }}
+{% endblock %}
+
+{% block form %}
+  {{ govukWarningText({
+    "text": "Are you sure you want to delete this " ~ object._meta.verbose_name ~ "?"
+  }) }}
+  {% call django_form(action="") %}
+    {{ crispy(form) }}
+  {% endcall %}
+
+  {{ govukButton({
+    "text": "Cancel",
+    "href": object.get_url(),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
diff --git a/quotas/jinja2/quotas/tables/sub_quotas.jinja b/quotas/jinja2/quotas/tables/sub_quotas.jinja
index 947746eeb..430089fa7 100644
--- a/quotas/jinja2/quotas/tables/sub_quotas.jinja
+++ b/quotas/jinja2/quotas/tables/sub_quotas.jinja
@@ -2,7 +2,6 @@
 <h2 class="govuk-heading-l">Sub-quotas</h2>
 
 {% set table_rows = [] %}
-
 {% if sub_quotas %}
   {% for object in sub_quotas %}
     {% set definition_link -%}
@@ -11,9 +10,12 @@
     {% set sub_quota_link -%}
       <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.sub_quota.order_number.sid]) }}">{{ object.sub_quota.order_number.order_number }}</a>
     {% endset %}
-    {% set edit_link -%}
-      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit</a>
+    {% set actions_html %}
+      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit association</a>
+      <br/>
+      <a class="govuk-link" href="{{ url('quota_association-ui-delete', args=[object.pk]) }}">Delete association</a>
     {% endset %}
+
     {{ table_rows.append([
       {"text": definition_link },
       {"text": sub_quota_link },
@@ -21,17 +23,17 @@
       {"text": "{:%d %b %Y}".format(object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).valid_between.upper) if object.sub_quota.valid_between.upper else "-"},
       {"text": object.get_sub_quota_relation_type_display() },
       {"text": object.coefficient },
-      {"text": edit_link },
+      {"text": actions_html },
     ]) or "" }}
   {% endfor %}
 
   {{ govukTable({
     "head": [
-      {"text": "Quota definition sid"},
+      {"text": "Quota definition SID"},
       {"text": "Sub-quota order number"},
       {"text": "Start date"},
       {"text": "End date"},
-      {"text": "Relation type"},
+      {"text": "Relationship type"},
       {"text": "Coefficient"},
       {"text": "Actions"},
     ],
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index 53c890479..eb960c1a5 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -2442,3 +2442,40 @@ def test_sub_quota_confirm_update_page(
         f"Sub-quota definition: {sub_quota.sid} and association have been updated in workbasket {workbasket.pk}"
         in str(response.content)
     )
+
+
+def test_delete_quota_association(client_with_current_workbasket):
+    main_quota = factories.QuotaDefinitionFactory.create()
+    sub_quota = factories.QuotaDefinitionFactory.create()
+    quota_association = factories.QuotaAssociationFactory.create(
+        main_quota=main_quota,
+        sub_quota=sub_quota,
+    )
+
+    url = reverse(
+        "quota_association-ui-delete",
+        kwargs={"pk": quota_association.pk},
+    )
+
+    response = client_with_current_workbasket.post(url, {"submit": "Delete"})
+    assert response.status_code == 302
+    assert response.url == reverse(
+        "quota_association-ui-confirm-delete",
+        kwargs={"sid": sub_quota.sid},
+    )
+
+    tx = Transaction.objects.last()
+
+    assert tx.workbasket.tracked_models.first().update_type == UpdateType.DELETE
+    confirm_response = client_with_current_workbasket.get(response.url)
+
+    soup = BeautifulSoup(
+        confirm_response.content.decode(response.charset),
+        "html.parser",
+    )
+    h1 = soup.select("h1")[0]
+
+    assert (
+        h1.text.strip()
+        == f"Quota association between {main_quota.sid} and {sub_quota.sid} has been deleted"
+    )
diff --git a/quotas/urls.py b/quotas/urls.py
index 37ff0fbbc..bfa967752 100644
--- a/quotas/urls.py
+++ b/quotas/urls.py
@@ -185,5 +185,15 @@
         views.QuotaBlockingConfirmCreate.as_view(),
         name="quota_blocking-ui-confirm-create",
     ),
+    path(
+        f"quota_definitions/quota-association/<pk>/delete/",
+        views.QuotaAssociationDelete.as_view(),
+        name="quota_association-ui-delete",
+    ),
+    path(
+        f"quota_definitions/<sid>/quota-associations/confirm-delete/",
+        views.QuotaAssociationConfirmDelete.as_view(),
+        name="quota_association-ui-confirm-delete",
+    ),
     path("api/", include(api_router.urls)),
 ]
diff --git a/quotas/views.py b/quotas/views.py
index 736a36b11..af6bf09e3 100644
--- a/quotas/views.py
+++ b/quotas/views.py
@@ -1314,3 +1314,34 @@ def dispatch(self, request, *args, **kwargs):
                 ),
             )
         return super().dispatch(request, *args, **kwargs)
+
+
+class QuotaAssociationDelete(
+    CreateTaricDeleteView,
+):
+    form_class = delete_form_for(models.QuotaAssociation)
+    template_name = "quota-associations/delete.jinja"
+    model = models.QuotaAssociation
+
+    def form_valid(self, form):
+        messages.success(
+            self.request,
+            f"Quota association between {self.object.main_quota.sid} and {self.object.sub_quota.sid} has been deleted",
+        )
+        return super().form_valid(form)
+
+    def get_queryset(self):
+        return models.QuotaAssociation.objects.current()
+
+    def get_success_url(self):
+        return reverse(
+            "quota_association-ui-confirm-delete",
+            kwargs={"sid": self.object.sub_quota.sid},
+        )
+
+
+class QuotaAssociationConfirmDelete(
+    TrackedModelDetailView,
+):
+    template_name = "quota-associations/confirm-delete.jinja"
+    model = models.QuotaDefinition

From 534d4da8b59009b21d99d8d6864ee26ad68f2b9d Mon Sep 17 00:00:00 2001
From: Charlie Prichard <46421052+CPrich905@users.noreply.github.com>
Date: Mon, 21 Oct 2024 11:32:52 +0100
Subject: [PATCH 09/12] Tp2000 1517 implement improved quota views for users
 (#1307)

* working through current/approved up to transaction issues

* updating to use .all() on querysearch; adding actions column on QuotaDetail view

* fixing broken test

* adding title caption

* copy changes requested by UR team

* tidying up tabs/sub_quotas.jinja

* alligning tab headings with tab names

* fixing conditional headings

* changing query to .current

* fix
---
 common/jinja2/layouts/detail.jinja            |  7 ++
 quotas/jinja2/includes/quotas/actions.jinja   | 23 +++---
 .../quotas/tabs/blocking_periods.jinja        |  2 +-
 .../includes/quotas/tabs/core_data.jinja      |  4 +-
 .../quotas/tabs/definition_details.jinja      |  2 +-
 .../includes/quotas/tabs/measures.jinja       |  2 +-
 .../includes/quotas/tabs/sub_quotas.jinja     | 70 ++++++++++++++-----
 .../quotas/tabs/suspension_periods.jinja      |  2 +-
 .../sub-quota-definitions-updates.jinja       |  3 +-
 quotas/jinja2/quotas/definitions.jinja        | 23 ++++--
 quotas/jinja2/quotas/detail.jinja             | 12 +++-
 quotas/jinja2/quotas/tables/definitions.jinja |  2 +-
 quotas/jinja2/quotas/tables/sub_quotas.jinja  | 48 +++++++++++--
 quotas/tests/test_views.py                    |  3 +-
 quotas/views.py                               | 16 ++++-
 15 files changed, 165 insertions(+), 54 deletions(-)

diff --git a/common/jinja2/layouts/detail.jinja b/common/jinja2/layouts/detail.jinja
index 6356a88a6..d0a607a09 100644
--- a/common/jinja2/layouts/detail.jinja
+++ b/common/jinja2/layouts/detail.jinja
@@ -12,6 +12,13 @@
 {% block content %}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
+      {% if title_caption %}
+      {% block page_subtitle%}
+        <span class="govuk-caption-xl">
+          {{ title_caption }}
+        </span>
+      {% endblock %}
+      {% endif %}
       <h1 class="govuk-heading-xl">{{ page_title }}</h1>
     </div>
   </div>
diff --git a/quotas/jinja2/includes/quotas/actions.jinja b/quotas/jinja2/includes/quotas/actions.jinja
index 393fe213c..88e8ee8c0 100644
--- a/quotas/jinja2/includes/quotas/actions.jinja
+++ b/quotas/jinja2/includes/quotas/actions.jinja
@@ -2,15 +2,7 @@
   <div class="app-related-items" role="complementary">
       <h2 class="govuk-heading-s" id="subsection-title">Actions</h2>
       <ul class="govuk-list govuk-!-font-size-16">
-            <li><a class="govuk-link" href="{{ url('quota_definition-ui-list', args=[object.sid]) }}">View and edit quota data</a></li>
-            <li><a class="govuk-link" href="{{ url('quota_definition-ui-create', args=[object.sid]) }}">Create definition period</a></li>
-            <br>
-            <li><a class="govuk-link" href="{{ url('sub_quota_definitions-ui-create') }}">Create quota associations</a></li>
-            <br>
-            <li><a class="govuk-link" href="{{ url('quota_suspension_or_blocking-ui-create', args=[object.sid]) }}">Create suspension or blocking period</a></li>
-            <br>
-            <li><a class="govuk-link" href="{{ measures_url }}">View all measures</a></li>
-            <br>
+          <strong class=govuk-heading-xs">Edit and delete quota</strong>
           {% set edit_url = object.get_url('edit') %}
           {% if edit_url %}
             <li><a class="govuk-link" href="{{ edit_url }}">Edit this {{object._meta.verbose_name}}</a></li>
@@ -19,8 +11,17 @@
           {% if delete_url %}
             <li><a class="govuk-link" href="{{ delete_url }}">Delete this {{object._meta.verbose_name}}</a></li>
           {% endif %}
-          <br><br>
-          <li><a class="govuk-link" href="{{ uk_tariff_url }}" target="_blank" noopener noreferrer>View this quota on the UK Integrated Online Tariff </a></li>
+          <br>
+          <strong class=govuk-heading-xs">Create quota data</strong>
+            <li><a class="govuk-link" href="{{ url('quota_definition-ui-create', args=[object.sid]) }}">Create definition period</a></li>
+            <li><a class="govuk-link" href="{{ url('sub_quota_definitions-ui-create') }}">Create quota associations</a></li>
+            <li><a class="govuk-link" href="{{ url('quota_suspension_or_blocking-ui-create', args=[object.sid]) }}">Create suspension or blocking period</a></li>
+          <br>
+          <strong class=govuk-heading-xs">View and edit quota data</strong>
+            <li><a class="govuk-link" href="{{ url('quota_definition-ui-list', args=[object.sid]) }}">View and edit quota data</a></li>
+            <li><a class="govuk-link" href="{{ measures_url }}">View all measures</a></li>
+            <li><a class="govuk-link" href="{{ uk_tariff_url }}" target="_blank" noopener noreferrer>View this quota on the UK Integrated Online Tariff </a></li>
+            
       </ul>
   </div>
 </div>
diff --git a/quotas/jinja2/includes/quotas/tabs/blocking_periods.jinja b/quotas/jinja2/includes/quotas/tabs/blocking_periods.jinja
index 542ebaa28..e65adc223 100644
--- a/quotas/jinja2/includes/quotas/tabs/blocking_periods.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/blocking_periods.jinja
@@ -1,6 +1,6 @@
 <div class="quota__blocking-periods govuk-grid-row">
     <div class="quota__blocking-periods__content govuk-grid-column-three-quarters">
-        <h2 class="govuk-heading-l">Details</h2>
+        <h2 class="govuk-heading-l">Blocking periods</h2>
         {% if blocking_period %}
             {{ govukSummaryList({
                 "rows": [
diff --git a/quotas/jinja2/includes/quotas/tabs/core_data.jinja b/quotas/jinja2/includes/quotas/tabs/core_data.jinja
index d5209de73..f88e22ddf 100644
--- a/quotas/jinja2/includes/quotas/tabs/core_data.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/core_data.jinja
@@ -8,11 +8,11 @@
 
 <div class="quota__core-data govuk-grid-row">
     <div class="quota__core-data__content govuk-grid-column-three-quarters">
-        <h2 class="govuk-heading-l">Details</h2>
+        <h2 class="govuk-heading-l">Order number details</h2>
         {{ govukSummaryList({
             "rows": [
             {
-                "key": {"text": "Order Number"},
+                "key": {"text": "Order number"},
                 "value": {"text": object.order_number},
                 "actions": {"items": []}
             },
diff --git a/quotas/jinja2/includes/quotas/tabs/definition_details.jinja b/quotas/jinja2/includes/quotas/tabs/definition_details.jinja
index 628036b57..1cc10892a 100644
--- a/quotas/jinja2/includes/quotas/tabs/definition_details.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/definition_details.jinja
@@ -1,6 +1,6 @@
 <div class="quota__definition-details govuk-grid-row">
     <div class="quota__definition-details__content govuk-grid-column-three-quarters">
-        <h2 class="govuk-heading-l">Details</h2>
+        <h2 class="govuk-heading-l">Definition details</h2>
         {% if current_definition %}
             {{ govukSummaryList({
                 "rows": [
diff --git a/quotas/jinja2/includes/quotas/tabs/measures.jinja b/quotas/jinja2/includes/quotas/tabs/measures.jinja
index 7798c56df..761e6a562 100644
--- a/quotas/jinja2/includes/quotas/tabs/measures.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/measures.jinja
@@ -24,7 +24,7 @@
 
 <div class="quota__measures govuk-grid-row">
     <div class="quota__measures__content govuk-grid-column-three-quarters">
-        <h2 class="govuk-heading-l">Details</h2>
+        <h2 class="govuk-heading-l">Measures</h2>
         {% if measures %}
         <p class="govuk-body">Showing currently active measures.</p>
         {{ govukTable({
diff --git a/quotas/jinja2/includes/quotas/tabs/sub_quotas.jinja b/quotas/jinja2/includes/quotas/tabs/sub_quotas.jinja
index a03d4147e..f8514ccba 100644
--- a/quotas/jinja2/includes/quotas/tabs/sub_quotas.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/sub_quotas.jinja
@@ -1,33 +1,69 @@
 {% set table_rows = [] %}
-{% for quota_association in quota_associations %}
+{% for object in sub_quota_associations %}
   {% set sub_quota_link %}
     <a class="govuk-link govuk-!-font-weight-bold"
-      href="{{ url('quota-ui-detail', args=[quota_association.sub_quota.order_number.sid]) }}">
-      {{ quota_association.sub_quota.order_number }}
+      href="{{ url('quota-ui-detail', args=[object.sub_quota.order_number.sid]) }}">
+      {{ object.sub_quota.order_number }}
     </a>
   {% endset %}
+  {% set actions_html %}
+      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit</a>
+      <br/>
+      <a class="govuk-link" href="{{ url('quota_association-ui-delete', args=[object.pk]) }}">Delete</a>
+  {% endset %}
   {{ table_rows.append([
     {"html": sub_quota_link},
-    {"html": quota_association.sub_quota_relation_type},
-    {"text": quota_association.coefficient},
+    {"html": object.get_sub_quota_relation_type_display()},
+    {"text": object.coefficient},
+    {"text": actions_html }
+  ]) or "" }}
+{% endfor %}
+
+{% for object in main_quota_associations %}
+  {% set main_quota_link %}
+    <a class="govuk-link govuk-!-font-weight-bold"
+      href="{{ url('quota-ui-detail', args=[object.main_quota.order_number.sid]) }}">
+      {{ object.main_quota.order_number }}
+    </a>
+  {% endset %}
+  {% set actions_html %}
+      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit</a>
+      <br/>
+      <a class="govuk-link" href="{{ url('quota_association-ui-delete', args=[object.pk]) }}">Delete</a>
+  {% endset %}
+
+  {{ table_rows.append([
+    {"html": main_quota_link},
+    {"html": object.get_sub_quota_relation_type_display()},
+    {"text": object.coefficient},
+    {"text": actions_html }
   ]) or "" }}
 {% endfor %}
 
 <div class="quota__sub-quotas govuk-grid-row">
     <div class="quota__sub-quotas__content govuk-grid-column-three-quarters">
-        <h2 class="govuk-heading-l">Details</h2>
-        {% if quota_associations %}
-        {{ govukTable({
-            "head": [
-                {"text": "Sub-quota order number"},
-                {"text": "Relation type"},
+      <h2 class="govuk-heading-l">Quota associations</h2>
+      {% if sub_quota_associations or main_quota_associations %}
+          {% if main_quota_associations %}
+            <h3>Main quota</h3>
+          {% elif sub_quota_associations %}
+            <h3>Sub-quotas</h3>
+          {% endif %}
+          {{
+            govukTable({
+              "head": [
+                {"text": "Order number"},
+                {"text": "Relationship type"},
                 {"text": "Co-efficient"},
-            ],
-            "rows": table_rows
-            }) }}
-        {% else %}
-          <p class="govuk-body">No active sub-quotas.</p>
-        {% endif %}
+                {"text": "Actions"}
+              ],
+              "rows": table_rows
+            })
+          }}
+    {% else %}
+      <p class="govuk-body">No active main or sub-quotas.</p>
+    {% endif %}
+        
     </div>
     {% include "includes/quotas/actions.jinja"%}
 </div>
diff --git a/quotas/jinja2/includes/quotas/tabs/suspension_periods.jinja b/quotas/jinja2/includes/quotas/tabs/suspension_periods.jinja
index 960fc4e3f..722db386e 100644
--- a/quotas/jinja2/includes/quotas/tabs/suspension_periods.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/suspension_periods.jinja
@@ -1,6 +1,6 @@
 <div class="quota__suspension-periods govuk-grid-row">
     <div class="quota__suspension-periods__content govuk-grid-column-three-quarters">
-        <h2 class="govuk-heading-l">Details</h2>
+        <h2 class="govuk-heading-l">Suspension periods</h2>
         {% if suspension_period %}
             {{ govukSummaryList({
                 "rows": [
diff --git a/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja b/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja
index 8d6974575..303aba2f4 100644
--- a/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja
+++ b/quotas/jinja2/quota-definitions/sub-quota-definitions-updates.jinja
@@ -3,9 +3,10 @@
 
 {% from "components/table/macro.njk" import govukTable %}
 
-{% set page_title = "Update sub-quota definition and association" %}
+{% set page_title = "Edit sub-quota definition and association" %}
 
 {% block content %}
+    <h1 class="govuk-heading-xl">{{ page_title }}</h1>
     <h2 class="govuk-heading">Main quota definition details</h2>
     {% set main_definition = view.get_main_definition() %}
     {% set table_rows = [] %}
diff --git a/quotas/jinja2/quotas/definitions.jinja b/quotas/jinja2/quotas/definitions.jinja
index 7fdf121a9..614da2ec4 100644
--- a/quotas/jinja2/quotas/definitions.jinja
+++ b/quotas/jinja2/quotas/definitions.jinja
@@ -10,6 +10,12 @@
 {% set page_title = "Quota ID: " ~ quota.order_number ~ " - Data" %}
 {% set find_edit_url = url("quota-ui-list") %}
 
+{% if sub_quotas %}
+  {% set page_subtitle = "Main quota" %}
+{% elif main_quotas %}
+  {% set page_subtitle = "Sub-quota" %}
+{% endif %}
+
 {% set links = [
     {
       "text": "Quota definition periods",
@@ -17,9 +23,9 @@
       "selected": quota_type == None
     },
     {
-      "text": "Sub-quotas",
-      "href": url('quota_definition-ui-list-filter', kwargs={"sid": quota.sid, "quota_type": "sub_quotas"}),
-      "selected": quota_type == "sub_quotas",
+      "text": "Quota associations",
+      "href": url('quota_definition-ui-list-filter', kwargs={"sid": quota.sid, "quota_type": "quota_associations"}),
+      "selected": quota_type == "quota_associations",
     },
     {
       "text": "Blocking periods",
@@ -43,9 +49,16 @@
 {% endblock %}
 
 {% block content %}
-
+{% if page_subtitle %}
+  <span class="govuk-caption-xl">
+    {% block page_subtitle %}
+      {{ page_subtitle }}
+    {% endblock %}
+  </span>
+{% endif %}
 <h1 class="govuk-heading-xl">{{ page_title }}</h1>
 
+
 {{ fake_tabs(links) }}
 <div class="quota-definitions">
   {% set base_url = url('quota_definition-ui-list', args=[quota.sid] ) %}
@@ -54,7 +67,7 @@
     {% include "quotas/tables/blocking_periods.jinja" %}
   {% elif quota_type == "suspension_periods" %}
     {% include "quotas/tables/suspension_periods.jinja" %}
-  {% elif quota_type == "sub_quotas" %}
+  {% elif quota_type == "quota_associations" %}
     {% include "quotas/tables/sub_quotas.jinja" %}
   {% else %}
     {% include "quotas/tables/definitions.jinja" %}
diff --git a/quotas/jinja2/quotas/detail.jinja b/quotas/jinja2/quotas/detail.jinja
index 77d02fa2d..a3f18e522 100644
--- a/quotas/jinja2/quotas/detail.jinja
+++ b/quotas/jinja2/quotas/detail.jinja
@@ -2,9 +2,15 @@
 {% from "components/summary-list/macro.njk" import govukSummaryList %}
 {% from "components/table/macro.njk" import govukTable %}
 
-{% set page_title = "Quota ID: " ~ object.order_number %}
+{% set page_title = "Quota order number: " ~ object.order_number %}
 {% set find_edit_url = url("quota-ui-list") %}
 
+{% if sub_quota_associations %}
+  {% set title_caption = "Main quota" %}
+{% elif main_quota_associations %}
+  {% set title_caption = "Sub-quota" %}
+{% endif %}
+
 {% set core_data_tab_html %}{% include "includes/quotas/tabs/core_data.jinja" %}{% endset %}
 {% set definition_details_html %}{% include "includes/quotas/tabs/definition_details.jinja" %}{% endset %}
 {% set sub_quotas_html %}{% include "includes/quotas/tabs/sub_quotas.jinja" %}{% endset %}
@@ -30,8 +36,8 @@
         }
       },
       {
-        "label": "Sub-quotas",
-        "id": "sub-quotas",
+        "label": "Quota associations",
+        "id": "quotas-associations",
         "panel": {
           "html": sub_quotas_html
         }
diff --git a/quotas/jinja2/quotas/tables/definitions.jinja b/quotas/jinja2/quotas/tables/definitions.jinja
index 27105d196..494a25dca 100644
--- a/quotas/jinja2/quotas/tables/definitions.jinja
+++ b/quotas/jinja2/quotas/tables/definitions.jinja
@@ -65,7 +65,7 @@
 {% endfor %}
 
 {% set sid %}
-  {{ create_sortable_anchor(request, "sid", "Quota definition sid", base_url) }}
+  {{ create_sortable_anchor(request, "sid", "Quota definition SID", base_url) }}
 {% endset %}
 
 {% set start_date %}
diff --git a/quotas/jinja2/quotas/tables/sub_quotas.jinja b/quotas/jinja2/quotas/tables/sub_quotas.jinja
index 430089fa7..acc8b0701 100644
--- a/quotas/jinja2/quotas/tables/sub_quotas.jinja
+++ b/quotas/jinja2/quotas/tables/sub_quotas.jinja
@@ -1,8 +1,8 @@
 
-<h2 class="govuk-heading-l">Sub-quotas</h2>
-
+<h2 class="govuk-heading-l">Quota associations</h2>
 {% set table_rows = [] %}
 {% if sub_quotas %}
+<h3 class="govuk-heading-m">Sub-quotas</h3>
   {% for object in sub_quotas %}
     {% set definition_link -%}
       <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.sub_quota.order_number.sid]) }}#definition-details">{{ object.sub_quota.sid }}</a>
@@ -11,9 +11,9 @@
       <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.sub_quota.order_number.sid]) }}">{{ object.sub_quota.order_number.order_number }}</a>
     {% endset %}
     {% set actions_html %}
-      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit association</a>
+      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit</a>
       <br/>
-      <a class="govuk-link" href="{{ url('quota_association-ui-delete', args=[object.pk]) }}">Delete association</a>
+      <a class="govuk-link" href="{{ url('quota_association-ui-delete', args=[object.pk]) }}">Delete</a>
     {% endset %}
 
     {{ table_rows.append([
@@ -30,7 +30,43 @@
   {{ govukTable({
     "head": [
       {"text": "Quota definition SID"},
-      {"text": "Sub-quota order number"},
+      {"text": "Order number"},
+      {"text": "Start date"},
+      {"text": "End date"},
+      {"text": "Relationship type"},
+      {"text": "Coefficient"},
+      {"text": "Actions"},
+    ],
+    "rows": table_rows
+  }) }}
+{% elif main_quotas %}
+<h3 class="govuk-heading-m">Main quotas</h3>
+  {% for object in main_quotas %}
+    {% set definition_link -%}
+      <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.main_quota.order_number.sid]) }}#definition-details">{{ object.main_quota.sid }}</a>
+    {% endset %}
+    {% set main_quota_link -%}
+      <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.main_quota.order_number.sid]) }}">{{ object.main_quota.order_number.order_number }}</a>
+    {% endset %}
+    {% set actions_html %}
+      <a class="govuk-link" href="{{ object.sub_quota.version_at(request.user.current_workbasket.transactions.last()).get_association_edit_url() }}">Edit</a>
+      <br/>
+      <a class="govuk-link" href="{{ url('quota_association-ui-delete', args=[object.pk]) }}">Delete</a>
+    {% endset %}
+    {{ table_rows.append([
+      {"text": definition_link },
+      {"text": main_quota_link },
+      {"text": "{:%d %b %Y}".format(object.main_quota.version_at(request.user.current_workbasket.transactions.last()).valid_between.lower) },
+      {"text": "{:%d %b %Y}".format(object.main_quota.version_at(request.user.current_workbasket.transactions.last()).valid_between.upper) if object.main_quota.valid_between.upper else "-"},
+      {"text": object.get_sub_quota_relation_type_display() },
+      {"text": object.coefficient },
+      {"text": actions_html },
+    ]) or "" }}
+  {% endfor %}
+  {{ govukTable({
+    "head": [
+      {"text": "Quota definition SID"},
+      {"text": "Order number"},
       {"text": "Start date"},
       {"text": "End date"},
       {"text": "Relationship type"},
@@ -40,5 +76,5 @@
     "rows": table_rows
   }) }}
 {% else %}
-  <p class="govuk-body">There are no sub-quotas for this quota order number.</p>
+  <p class="govuk-body">There are no main or sub-quotas for this quota order number.</p>
 {% endif %}
\ No newline at end of file
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index eb960c1a5..ca366c957 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -680,6 +680,7 @@ def test_quota_detail_sub_quota_tab(
     valid_user_client,
     date_ranges,
     mock_quota_api_no_data,
+    session_request_with_workbasket,
 ):
     quota_order_number = factories.QuotaOrderNumberFactory()
     current_definition = factories.QuotaDefinitionFactory.create(
@@ -2010,7 +2011,7 @@ def test_quota_definition_view(client_with_current_workbasket):
     response = client_with_current_workbasket.get(
         reverse(
             "quota_definition-ui-list-filter",
-            kwargs={"sid": main_quota.sid, "quota_type": "sub_quotas"},
+            kwargs={"sid": main_quota.sid, "quota_type": "quota_associations"},
         ),
     )
     assert response.status_code == 200
diff --git a/quotas/views.py b/quotas/views.py
index af6bf09e3..d373a8a3f 100644
--- a/quotas/views.py
+++ b/quotas/views.py
@@ -240,12 +240,14 @@ def get_context_data(self, *args, **kwargs):
             f"{URLs.BASE_URL.value}quota_search?order_number={self.object.order_number}"
         )
 
-        context[
-            "quota_associations"
-        ] = QuotaAssociation.objects.latest_approved().filter(
+        context["sub_quota_associations"] = QuotaAssociation.objects.current().filter(
             main_quota=current_definition,
         )
 
+        context["main_quota_associations"] = QuotaAssociation.objects.current().filter(
+            sub_quota=current_definition,
+        )
+
         context["blocking_period"] = (
             QuotaBlocking.objects.filter(quota_definition=current_definition)
             .as_at_and_beyond(date.today())
@@ -314,6 +316,13 @@ def sub_quotas(self):
             .order_by("sub_quota__sid")
         )
 
+    @property
+    def main_quotas(self):
+        main_quotas = QuotaAssociation.objects.current().filter(
+            sub_quota__order_number=self.quota,
+        )
+        return main_quotas
+
     @cached_property
     def quota_data(self):
         if not self.kwargs.get("quota_type"):
@@ -332,6 +341,7 @@ def get_context_data(self, *args, **kwargs):
             blocking_periods=self.blocking_periods,
             suspension_periods=self.suspension_periods,
             sub_quotas=self.sub_quotas,
+            main_quotas=self.main_quotas,
             *args,
             **kwargs,
         )

From eb9a3100a0e9b481fe6efa846ce461e855ab663c Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:39:54 +0100
Subject: [PATCH 10/12] TP2000-1477 Edit capability for suspension periods
 (#1306)

* Ability to edit suspension periods

* Add ability to delete a suspension period

* Form tests

* View tests

* Fix failing tests

* Fix and reorder cancel button

* Redesign confirm pages

* PR review comments

* test changes following PR review

* Update get_success_url to make kwarg clearer
---
 common/forms.py                               | 19 +++--
 common/jinja2/common/delete.jinja             |  6 --
 quotas/forms.py                               | 65 +++++++++++++++
 .../quota-suspensions/confirm-delete.jinja    | 49 ++++++++++++
 .../quota-suspensions/confirm-update.jinja    | 25 ++++++
 quotas/jinja2/quota-suspensions/delete.jinja  | 13 +++
 quotas/jinja2/quota-suspensions/edit.jinja    | 14 ++++
 .../quotas/tables/suspension_periods.jinja    |  9 ++-
 quotas/models.py                              | 18 +++++
 quotas/tests/test_forms.py                    | 52 +++++++++++-
 quotas/tests/test_views.py                    | 79 ++++++++++++++++++-
 quotas/urls.py                                | 30 +++++++
 quotas/views.py                               | 77 +++++++++++++++++-
 13 files changed, 439 insertions(+), 17 deletions(-)
 create mode 100644 quotas/jinja2/quota-suspensions/confirm-delete.jinja
 create mode 100644 quotas/jinja2/quota-suspensions/confirm-update.jinja
 create mode 100644 quotas/jinja2/quota-suspensions/delete.jinja
 create mode 100644 quotas/jinja2/quota-suspensions/edit.jinja

diff --git a/common/forms.py b/common/forms.py
index af31c8386..2da520ca7 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -7,6 +7,7 @@
 
 from crispy_forms_gds.fields import DateInputField
 from crispy_forms_gds.helper import FormHelper
+from crispy_forms_gds.layout import HTML
 from crispy_forms_gds.layout import Div
 from crispy_forms_gds.layout import Field
 from crispy_forms_gds.layout import Layout
@@ -458,12 +459,18 @@ def __init__(self, *args, **kwargs):
         self.helper.label_size = Size.SMALL
         self.helper.legend_size = Size.SMALL
         self.helper.layout = Layout(
-            Submit(
-                "submit",
-                "Delete",
-                css_class="govuk-button--warning",
-                data_module="govuk-button",
-                data_prevent_double_click="true",
+            Div(
+                Submit(
+                    "submit",
+                    "Delete",
+                    css_class="govuk-button--warning",
+                    data_module="govuk-button",
+                    data_prevent_double_click="true",
+                ),
+                HTML(
+                    f"<a class='govuk-button govuk-button--secondary' href={self.instance.get_url()}>Cancel</a>",
+                ),
+                css_class="govuk-button-group",
             ),
         )
 
diff --git a/common/jinja2/common/delete.jinja b/common/jinja2/common/delete.jinja
index e4baf83fe..cc8761c44 100644
--- a/common/jinja2/common/delete.jinja
+++ b/common/jinja2/common/delete.jinja
@@ -22,10 +22,4 @@
   {% call django_form(action=object.get_url("delete")) %}
     {{ crispy(form) }}
   {% endcall %}
-
-  {{ govukButton({
-    "text": "Cancel",
-    "href": object.get_url(),
-    "classes": "govuk-button--secondary"
-  }) }}
 {% endblock %}
diff --git a/quotas/forms.py b/quotas/forms.py
index 0d30029ad..0550b5240 100644
--- a/quotas/forms.py
+++ b/quotas/forms.py
@@ -999,6 +999,71 @@ def create_blocking_period(self, workbasket):
         )
 
 
+class QuotaSuspensionUpdateForm(ValidityPeriodForm, forms.ModelForm):
+
+    description = forms.CharField(
+        label="Description",
+        widget=forms.Textarea(),
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.init_layout()
+
+    def init_layout(self):
+        cancel_url = reverse_lazy(
+            "quota-ui-detail",
+            kwargs={"sid": self.instance.quota_definition.order_number.sid},
+        )
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "start_date",
+            "end_date",
+            Field.textarea("description", rows=5),
+            Div(
+                Submit(
+                    "submit",
+                    "Save",
+                    css_class="govuk-button--primary",
+                    data_module="govuk-button",
+                    data_prevent_double_click="true",
+                ),
+                HTML(
+                    f"<a class='govuk-button govuk-button--secondary' href={cancel_url}>Cancel</a>",
+                ),
+                css_class="govuk-button-group",
+            ),
+        )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        definition_period = self.instance.quota_definition.valid_between
+        validity_period = cleaned_data.get("valid_between")
+        if (
+            definition_period
+            and validity_period
+            and not validity_range_contains_range(definition_period, validity_period)
+        ):
+            raise ValidationError(
+                f"The start and end date must sit within the selected quota definition's start and end date ({definition_period.lower} - {definition_period.upper})",
+            )
+
+        return cleaned_data
+
+    class Meta:
+        model = models.QuotaSuspension
+        fields = [
+            "valid_between",
+            "description",
+        ]
+
+
+QuotaSuspensionDeleteForm = delete_form_for(models.QuotaSuspension)
+
+
 class DuplicateQuotaDefinitionPeriodStartForm(forms.Form):
     pass
 
diff --git a/quotas/jinja2/quota-suspensions/confirm-delete.jinja b/quotas/jinja2/quota-suspensions/confirm-delete.jinja
new file mode 100644
index 000000000..4646fea93
--- /dev/null
+++ b/quotas/jinja2/quota-suspensions/confirm-delete.jinja
@@ -0,0 +1,49 @@
+{% extends "layouts/confirm.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Quota suspension deleted" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and edit quotas", "href": url("quota-ui-list")},
+      {"text": "Quota " ~ object.quota_definition.order_number|string, "href": object.quota_definition.order_number.get_url()},
+      {"text": "Quota ID: " ~ object.quota_definition.order_number ~ " - Data", "href": url("quota_definition-ui-list", args=[object.quota_definition.order_number.sid])},
+      {"text": "Suspension periods", "href": url('quota_definition-ui-list-filter', kwargs={'sid': object.quota_definition.order_number.sid, 'quota_type': "suspension_periods"})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Quota suspension period " ~ object.sid ~ " has been deleted",
+    "text": "This change has been added to your workbasket",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block main_button %}
+{{ govukButton({
+  "text": "View other suspension periods for this quota order number",
+  "href": url('quota_definition-ui-list-filter', kwargs={'sid': object.quota_definition.order_number.sid, 'quota_type': "suspension_periods"}),
+  "classes": "govuk-button--secondary"
+}) }}
+{% endblock%}
+
+
+{% block button_group %}
+          {{ govukButton({
+            "text": "View workbasket summary",
+            "href": url("workbaskets:current-workbasket"),
+            "classes": "govuk-button"
+          }) }}
+          {{ govukButton({
+            "text": "View quota order number: " ~ object.quota_definition.order_number|string,
+            "href": object.quota_definition.order_number.get_url(),
+            "classes": "govuk-button--secondary"
+          }) }}
+{% endblock %}
+
+{% block actions %}
+<li><a href="{{ object.quota_definition.order_number.get_url('list') }}">Find and edit quotas</a></li>
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-suspensions/confirm-update.jinja b/quotas/jinja2/quota-suspensions/confirm-update.jinja
new file mode 100644
index 000000000..83fe99be2
--- /dev/null
+++ b/quotas/jinja2/quota-suspensions/confirm-update.jinja
@@ -0,0 +1,25 @@
+{% extends "common/confirm_update.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and edit quotas", "href": url("quota-ui-list")},
+      {"text": object.quota_definition.order_number._meta.verbose_name|capitalize ~ ": " ~ object.quota_definition.order_number|string, "href": object.quota_definition.order_number.get_url()},
+      {"text": "Quota ID: " ~ object.quota_definition.order_number.order_number ~ " - Data", "href": url("quota_definition-ui-list", args=[object.quota_definition.order_number.sid])},
+      {"text": "Suspension periods", "href": url('quota_definition-ui-list-filter', kwargs={'sid': object.quota_definition.order_number.sid, 'quota_type': "suspension_periods"})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
+
+{% block main_button %}
+{{ govukButton({
+  "text": "View other suspension periods for this quota order number",
+  "href": url('quota_definition-ui-list-filter', kwargs={'sid': object.quota_definition.order_number.sid, 'quota_type': "suspension_periods"}),
+  "classes": "govuk-button--secondary"
+}) }}
+{% endblock%}
+
+{% block actions %}
+<li><a href="{{ object.quota_definition.order_number.get_url('list') }}">Find and edit quotas</a></li>
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-suspensions/delete.jinja b/quotas/jinja2/quota-suspensions/delete.jinja
new file mode 100644
index 000000000..35d59c2ff
--- /dev/null
+++ b/quotas/jinja2/quota-suspensions/delete.jinja
@@ -0,0 +1,13 @@
+{% extends "common/delete.jinja" %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and edit quotas", "href": url("quota-ui-list")},
+      {"text": object.quota_definition.order_number._meta.verbose_name|capitalize ~ " " ~ object.quota_definition.order_number|string, "href": object.quota_definition.order_number.get_url()},
+      {"text": object.quota_definition.order_number._meta.verbose_name|capitalize ~ " " ~ object.quota_definition.order_number|string ~ ": Data" , "href": url('quota_definition-ui-list', args=[object.quota_definition.order_number.sid])},
+      {"text": "Suspension periods", "href": url('quota_definition-ui-list-filter', kwargs={'sid': object.quota_definition.order_number.sid, 'quota_type': "suspension_periods"})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quota-suspensions/edit.jinja b/quotas/jinja2/quota-suspensions/edit.jinja
new file mode 100644
index 000000000..83030483d
--- /dev/null
+++ b/quotas/jinja2/quota-suspensions/edit.jinja
@@ -0,0 +1,14 @@
+{% extends "common/edit.jinja" %}
+
+{% set page_title = "Edit quota suspension details" %} 
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and edit quotas", "href": url("quota-ui-list")},
+      {"text": object.quota_definition.order_number._meta.verbose_name|capitalize ~ " " ~ object.quota_definition.order_number|string, "href": object.quota_definition.order_number.get_url()},
+      {"text": object.quota_definition.order_number._meta.verbose_name|capitalize ~ " " ~ object.quota_definition.order_number|string ~ ": Data" , "href": url('quota_definition-ui-list', args=[object.quota_definition.order_number.sid])},
+      {"text": "Suspension periods", "href": url('quota_definition-ui-list-filter', kwargs={'sid': object.quota_definition.order_number.sid, 'quota_type': "suspension_periods"})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
\ No newline at end of file
diff --git a/quotas/jinja2/quotas/tables/suspension_periods.jinja b/quotas/jinja2/quotas/tables/suspension_periods.jinja
index 2e2e81924..8d72277f3 100644
--- a/quotas/jinja2/quotas/tables/suspension_periods.jinja
+++ b/quotas/jinja2/quotas/tables/suspension_periods.jinja
@@ -1,4 +1,3 @@
-
 <h2 class="govuk-heading-l">Suspension periods</h2>
 
 {% set table_rows = [] %}
@@ -7,21 +6,27 @@
   {% for object in suspension_periods %}
     {% set definition_link -%}
       <a class="govuk-link" href="{{ url('quota-ui-detail', args=[object.quota_definition.order_number.sid]) }}#definition-details">{{ object.quota_definition.sid }}</a>
+    {% endset %}
+    {% set actions  %}
+         <a class="govuk-link" href="{{ object.get_url('edit') }}">Edit</a><br>
+         <a class="govuk-link" href="{{ object.get_url('delete') }}">Delete</a>
     {% endset %}
       {{ table_rows.append([
         {"text": definition_link },
         {"text": "{:%d %b %Y}".format(object.valid_between.lower) },
         {"text": "{:%d %b %Y}".format(object.valid_between.upper) if object.valid_between.upper else "-"},
         {"text": object.description },
+        {"html": actions},
       ]) or "" }}
     {% endfor %}
 
   {{ govukTable({
     "head": [
-      {"text": "Quota definition sid"},
+      {"text": "Quota definition SID"},
       {"text": "Start date"},
       {"text": "End date"},
       {"text": "Description", "classes": "govuk-!-width-one-half"},
+      {"text": "Actions",},
     ],
     "rows": table_rows
   }) }}
diff --git a/quotas/models.py b/quotas/models.py
index 402a6654a..9a6232f33 100644
--- a/quotas/models.py
+++ b/quotas/models.py
@@ -480,6 +480,24 @@ class QuotaSuspension(TrackedModel, ValidityMixin):
 
     business_rules = (business_rules.QSP2, UniqueIdentifyingFields, UpdateValidity)
 
+    def get_url(self, action: str = "detail") -> Optional[str]:
+        """Overrides the parent get_url as there is no detail view for
+        QuotaSuspensions for it to default to."""
+        url = super().get_url(action=action)
+        if not url:
+            url = reverse(
+                "quota_definition-ui-list-filter",
+                kwargs={
+                    "sid": self.quota_definition.order_number.sid,
+                    "quota_type": "suspension_periods",
+                },
+            )
+
+        return url
+
+    def __str__(self):
+        return f"{self.sid}"
+
 
 class QuotaBlocking(TrackedModel, ValidityMixin):
     """Defines a blocking period for a (sub-)quota."""
diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index 6a2811b94..5ecf1d449 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -949,7 +949,7 @@ def test_quota_association_edit_form_valid():
 
 
 def test_quota_association_edit_form_invalid():
-    "Test that the quota association edit form is invalid when data is passed in."
+    "Test that the quota association edit form is invalid when invalid data is passed in."
     association = factories.QuotaAssociationFactory.create(
         coefficient=1.67,
         sub_quota_relation_type="EQ",
@@ -968,3 +968,53 @@ def test_quota_association_edit_form_invalid():
     )
     assert "Enter a number." in form.errors["coefficient"]
     assert not form.is_valid()
+
+
+def test_quota_suspension_update_form_valid(date_ranges):
+    "Test that the quota suspension update form is valid when correct data is passed in"
+    suspension = factories.QuotaSuspensionFactory.create(
+        valid_between=date_ranges.normal,
+    )
+    current_validity = suspension.valid_between
+    data = {
+        "start_date_0": current_validity.lower.day + 1,
+        "start_date_1": current_validity.lower.month,
+        "start_date_2": current_validity.lower.year,
+        "end_date_0": "",
+        "end_date_1": "",
+        "end_date_2": "",
+        "description": "New description",
+    }
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.QuotaSuspensionUpdateForm(
+            data=data,
+            instance=suspension,
+        )
+        assert form.is_valid()
+
+
+def test_quota_suspension_update_form_invalid(date_ranges):
+    "Test that the quota suspension update form is invalid when the validity period does not span the validity of the definition"
+    definition = factories.QuotaDefinitionFactory.create(
+        valid_between=date_ranges.normal,
+    )
+    suspension = factories.QuotaSuspensionFactory.create(
+        quota_definition=definition,
+        valid_between=date_ranges.normal,
+    )
+    data = {
+        "start_date_0": date_ranges.earlier.lower.day,
+        "start_date_1": date_ranges.earlier.lower.month,
+        "start_date_2": date_ranges.earlier.lower.year,
+    }
+
+    with override_current_transaction(Transaction.objects.last()):
+        form = forms.QuotaSuspensionUpdateForm(
+            data=data,
+            instance=suspension,
+        )
+        assert not form.is_valid()
+        assert (
+            f"The start and end date must sit within the selected quota definition's start and end date ({definition.valid_between.lower} - {definition.valid_between.upper})"
+            in form.errors["__all__"]
+        )
diff --git a/quotas/tests/test_views.py b/quotas/tests/test_views.py
index ca366c957..70c285a35 100644
--- a/quotas/tests/test_views.py
+++ b/quotas/tests/test_views.py
@@ -2040,7 +2040,7 @@ def test_quota_definition_view(client_with_current_workbasket):
     )
     assert response.status_code == 200
     soup = BeautifulSoup(response.content.decode(response.charset), "html.parser")
-    description_cell_text = soup.select("tbody tr:first-child td:last-child")[0].text
+    description_cell_text = soup.select("tbody tr:first-child td")[-2].text
     assert description_cell_text == suspension.description
 
 
@@ -2480,3 +2480,80 @@ def test_delete_quota_association(client_with_current_workbasket):
         h1.text.strip()
         == f"Quota association between {main_quota.sid} and {sub_quota.sid} has been deleted"
     )
+
+
+def test_quota_suspension_edit(client_with_current_workbasket):
+    """Test the QuotaSuspensionUpdate view including the
+    QuotaSuspensionUpdateMixin."""
+    suspension = factories.QuotaSuspensionFactory.create()
+    current_validity = suspension.valid_between
+    data = {
+        "start_date_0": current_validity.lower.day,
+        "start_date_1": current_validity.lower.month,
+        "start_date_2": current_validity.lower.year,
+        "end_date_0": current_validity.upper.day,
+        "end_date_1": current_validity.upper.month,
+        "end_date_2": current_validity.upper.year,
+        "description": "New description",
+    }
+
+    url = reverse("quota_suspension-ui-edit", kwargs={"sid": suspension.sid})
+
+    response = client_with_current_workbasket.post(url, data=data)
+    assert response.status_code == 302
+    assert response.url == reverse(
+        "quota_suspension-ui-confirm-update",
+        kwargs={"sid": suspension.sid},
+    )
+
+    updated_suspension = models.QuotaSuspension.objects.approved_up_to_transaction(
+        Transaction.objects.last(),
+    ).get(sid=suspension.sid)
+    assert updated_suspension.description == "New description"
+    assert updated_suspension.update_type == UpdateType.UPDATE
+
+    confirm_response = client_with_current_workbasket.get(response.url)
+
+    soup = BeautifulSoup(
+        confirm_response.content.decode(response.charset),
+        "html.parser",
+    )
+    div = soup.select("div .govuk-panel__body")[0]
+
+    assert f"Quota suspension: {suspension.sid} has been updated" in div.text.strip()
+
+
+def test_quota_suspension_edit_update(client_with_current_workbasket):
+    """Test that posting the edit update form edits the existing quota
+    suspension update object rather than creating a new one."""
+    suspension = factories.QuotaSuspensionFactory.create()
+    data = {
+        "start_date_0": suspension.valid_between.lower.day,
+        "start_date_1": suspension.valid_between.lower.month,
+        "start_date_2": suspension.valid_between.lower.year,
+        "end_date_0": suspension.valid_between.upper.day,
+        "end_date_1": suspension.valid_between.upper.month,
+        "end_date_2": suspension.valid_between.upper.year,
+        "description": "New description",
+    }
+
+    edit_url = reverse("quota_suspension-ui-edit", kwargs={"sid": suspension.sid})
+    client_with_current_workbasket.post(edit_url, data=data)
+    edit_update_url = reverse(
+        "quota_suspension-ui-edit-update",
+        kwargs={"sid": suspension.sid},
+    )
+    response = client_with_current_workbasket.post(edit_update_url, data=data)
+    assert response.status_code == 302
+    versions = models.QuotaSuspension.objects.all().filter(sid=suspension.sid)
+    assert len(versions) == 2
+    assert versions.first().update_type == UpdateType.CREATE
+    assert versions.last().update_type == UpdateType.UPDATE
+
+
+@pytest.mark.parametrize(
+    "factory",
+    (factories.QuotaSuspensionFactory,),
+)
+def test_quota_suspension_delete_form(factory, use_delete_form):
+    use_delete_form(factory())
diff --git a/quotas/urls.py b/quotas/urls.py
index bfa967752..899f43134 100644
--- a/quotas/urls.py
+++ b/quotas/urls.py
@@ -185,6 +185,36 @@
         views.QuotaBlockingConfirmCreate.as_view(),
         name="quota_blocking-ui-confirm-create",
     ),
+    path(
+        f"quotas/suspension-periods/<sid>/edit/",
+        views.QuotaSuspensionUpdate.as_view(),
+        name="quota_suspension-ui-edit",
+    ),
+    path(
+        f"quotas/suspension-periods/<sid>/edit-create/",
+        views.QuotaSuspensionEditCreate.as_view(),
+        name="quota_suspension-ui-edit-create",
+    ),
+    path(
+        f"quotas/suspension-periods/<sid>/edit-update/",
+        views.QuotaSuspensionEditUpdate.as_view(),
+        name="quota_suspension-ui-edit-update",
+    ),
+    path(
+        f"quotas/suspension-periods/<sid>/confirm-update/",
+        views.QuotaSuspensionConfirmUpdate.as_view(),
+        name="quota_suspension-ui-confirm-update",
+    ),
+    path(
+        f"quotas/suspension-periods/<sid>/delete/",
+        views.QuotaSuspensionDelete.as_view(),
+        name="quota_suspension-ui-delete",
+    ),
+    path(
+        f"quotas/suspension-periods/<sid>/confirm-delete/",
+        views.QuotaSuspensionConfirmDelete.as_view(),
+        name="quota_suspension-ui-confirm-delete",
+    ),
     path(
         f"quota_definitions/quota-association/<pk>/delete/",
         views.QuotaAssociationDelete.as_view(),
diff --git a/quotas/views.py b/quotas/views.py
index d373a8a3f..254913c9e 100644
--- a/quotas/views.py
+++ b/quotas/views.py
@@ -306,7 +306,11 @@ def blocking_periods(self):
 
     @property
     def suspension_periods(self):
-        return QuotaSuspension.objects.filter(quota_definition__order_number=self.quota)
+        return (
+            QuotaSuspension.objects.current()
+            .filter(quota_definition__order_number=self.quota)
+            .order_by("quota_definition__sid")
+        )
 
     @property
     def sub_quotas(self):
@@ -1167,6 +1171,77 @@ def get_context_data(self, *args, **kwargs):
         return context
 
 
+class QuotaSuspensionUpdateMixin(TrackedModelDetailMixin):
+    model = QuotaSuspension
+    template_name = "quota-suspensions/edit.jinja"
+    form_class = forms.QuotaSuspensionUpdateForm
+    permission_required = ["common.change_trackedmodel"]
+
+    def get_success_url(self):
+        return reverse(
+            "quota_suspension-ui-confirm-update",
+            kwargs={"sid": self.object.sid},
+        )
+
+
+class QuotaSuspensionUpdate(
+    QuotaSuspensionUpdateMixin,
+    CreateTaricUpdateView,
+):
+    pass
+
+
+class QuotaSuspensionEditCreate(
+    QuotaSuspensionUpdateMixin,
+    EditTaricView,
+):
+    pass
+
+
+class QuotaSuspensionEditUpdate(
+    QuotaSuspensionUpdateMixin,
+    EditTaricView,
+):
+    pass
+
+
+class QuotaSuspensionConfirmUpdate(TrackedModelDetailView):
+    model = models.QuotaSuspension
+    template_name = "quota-suspensions/confirm-update.jinja"
+
+
+class QuotaSuspensionDelete(TrackedModelDetailMixin, CreateTaricDeleteView):
+    form_class = forms.QuotaSuspensionDeleteForm
+    model = models.QuotaSuspension
+    template_name = "quota-suspensions/delete.jinja"
+
+    def get_success_url(self):
+        return reverse(
+            "quota_suspension-ui-confirm-delete",
+            kwargs={"sid": self.object.sid},
+        )
+
+
+class QuotaSuspensionConfirmDelete(TrackedModelDetailView):
+    model = QuotaSuspension
+    template_name = "quota-suspensions/confirm-delete.jinja"
+
+    @property
+    def deleted_suspension(self):
+        return QuotaSuspension.objects.filter(sid=self.kwargs["sid"]).last()
+
+    def get_queryset(self):
+        """
+        Returns a queryset with one single version of the suspension in
+        question.
+
+        Done this way so the sid can be rendered on the confirm delete page and
+        generic tests don't fail which try to load the page without having
+        deleted anything.
+        """
+        return QuotaSuspension.objects.filter(pk=self.deleted_suspension)
+
+
 class SubQuotaDefinitionAssociationMixin:
     template_name = "quota-definitions/sub-quota-definitions-updates.jinja"
     form_class = forms.SubQuotaDefinitionAssociationUpdateForm

From 4d5fc904b5e76d1de3703874b66d669ccc18cca4 Mon Sep 17 00:00:00 2001
From: Matthew McKenzie <97194636+mattjamc@users.noreply.github.com>
Date: Mon, 21 Oct 2024 13:50:16 +0100
Subject: [PATCH 11/12] TP2000-1477 Edit capability for suspension periods pt2
 (#1309)

* Ability to edit suspension periods

* Add ability to delete a suspension period

* Form tests

* View tests

* Fix failing tests

* Fix and reorder cancel button

* Redesign confirm pages

* PR review comments

* test changes following PR review

* Update get_success_url to make kwarg clearer

* Get rid of +1 to prevent flaky test
---
 quotas/tests/test_forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quotas/tests/test_forms.py b/quotas/tests/test_forms.py
index 5ecf1d449..5f56e0e47 100644
--- a/quotas/tests/test_forms.py
+++ b/quotas/tests/test_forms.py
@@ -977,7 +977,7 @@ def test_quota_suspension_update_form_valid(date_ranges):
     )
     current_validity = suspension.valid_between
     data = {
-        "start_date_0": current_validity.lower.day + 1,
+        "start_date_0": current_validity.lower.day,
         "start_date_1": current_validity.lower.month,
         "start_date_2": current_validity.lower.year,
         "end_date_0": "",

From 40ab16a821dfe5963b15ba87904a43c57c22e65e Mon Sep 17 00:00:00 2001
From: Lawrence <34475808+acodeninja@users.noreply.github.com>
Date: Thu, 24 Oct 2024 20:11:07 +0100
Subject: [PATCH 12/12] fix: run collect static at build time (#1311)

---
 .copilot/image_build_run.sh      |  1 +
 .profile                         | 20 --------------------
 scripts/web-worker-entrypoint.sh |  2 ++
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100755 .profile

diff --git a/.copilot/image_build_run.sh b/.copilot/image_build_run.sh
index 7a42ecf3b..a8eaefa02 100755
--- a/.copilot/image_build_run.sh
+++ b/.copilot/image_build_run.sh
@@ -3,3 +3,4 @@
 set -e
 
 # Add commands below to run inside the container after all the other buildpacks have been applied
+python manage.py collectstatic --noinput --clear
diff --git a/.profile b/.profile
deleted file mode 100755
index ee12fb823..000000000
--- a/.profile
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# custom initialisation tasks
-# ref - https://docs.cloudfoundry.org/devguide/deploy-apps/deploy-app.html
-
-echo "---- RUNNING release tasks (.profile) ------"
-
-if [[ "$MAINTENANCE_MODE" != "True" && "$MAINTENANCE_MODE" != "true" ]] ; then
-  echo "---- Apply Migrations ------"
-  python manage.py migrate
-else
-  echo "---- Skip Applying Migrations (Maintenance Mode) ------"
-fi
-
-echo "---- Collect Static Files ------"
-OUTPUT=$(python manage.py collectstatic --noinput --clear)
-mkdir -p ~/logs
-echo ${OUTPUT} > ~/logs/collectstatic.txt
-echo ${OUTPUT##*$'\n'}
-echo "NOTE: the full output of collectstatic has been saved to ~/logs/collectstatic.txt"
-echo "---- FINISHED release tasks (.profile) ------"
diff --git a/scripts/web-worker-entrypoint.sh b/scripts/web-worker-entrypoint.sh
index 6a7c0882d..23ec23b2c 100755
--- a/scripts/web-worker-entrypoint.sh
+++ b/scripts/web-worker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+python manage.py migrate
+
 WORKER_COMMAND="gunicorn wsgi --bind 0.0.0.0:${PORT} --timeout 1000 --worker-class=gevent --worker-connections=1000 --workers 9"
 
 echo "Starting worker using the command: ${WORKER_COMMAND}"