Extend validation messagging to supporting orgs

Author: GDSNewt

app/models/concerns/edition/organisations.rb

@@ -72,7 +72,10 @@ def organisation_association_enabled?
   end
 
   def error_labels
-    super.merge({ "lead_organisation_ids" => "Lead organisations" })
+    super.merge({
+      "lead_organisation_ids" => "Lead organisations",
+      "supporting_organisation_ids" => "Supporting organisations",
+    })
   end
 
 private
@@ -87,7 +90,8 @@ def no_duplication_of_organisations
     all_organisation_ids = edition_organisations.reject(&:marked_for_destruction?).map(&:organisation_id)
 
     if all_organisation_ids.uniq.size != all_organisation_ids.size
-      errors.add(:lead_organisation_ids, "and supporting organisations must be unique")
+      errors.add(:lead_organisation_ids, "must be unique")
+      errors.add(:supporting_organisation_ids, "must be unique")
     end
   end
 

app/views/admin/editions/_organisation_fields.html.erb

@@ -32,6 +32,7 @@
       heading_size: "m",
       options: taggable_organisations_container(edition.edition_organisations.reject(&:lead?).map(&:organisation_id)),
       multiple: true,
+      error_message: errors_for_input(edition.errors, :supporting_organisation_ids, "Supporting organisations"),
     } %>
   <% end %>
 <% end %>

test/unit/app/models/edition/validation_test.rb

@@ -92,6 +92,8 @@ class Edition::ValidationTest < ActiveSupport::TestCase
       supporting_organisations: [organisation1],
     )
     assert_not edition.valid?
+    assert edition.errors[:lead_organisation_ids].any?
+    assert edition.errors[:supporting_organisation_ids].any?
   end
 
   test "should be invalid when it duplicates organisations via lead and supporting on save" do
@@ -104,6 +106,8 @@ class Edition::ValidationTest < ActiveSupport::TestCase
     edition.lead_organisations = [organisation1]
     edition.supporting_organisations = [organisation1]
     assert_not edition.valid?
+    assert edition.errors[:lead_organisation_ids].any?
+    assert edition.errors[:supporting_organisation_ids].any?
   end
 
   test "should be invalid when it duplicates organisations via edition organisations directly on create" do
@@ -115,6 +119,8 @@ class Edition::ValidationTest < ActiveSupport::TestCase
                               build(:edition_organisation, organisation: organisation1, lead: false)],
     )
     assert_not edition.valid?
+    assert edition.errors[:lead_organisation_ids].any?
+    assert edition.errors[:supporting_organisation_ids].any?
   end
 
   test "should be invalid when it duplicates organisations via edition organisations directly on save" do
@@ -126,6 +132,8 @@ class Edition::ValidationTest < ActiveSupport::TestCase
     )
     edition.edition_organisations.build(organisation: organisation1, lead: false)
     assert_not edition.valid?
+    assert edition.errors[:lead_organisation_ids].any?
+    assert edition.errors[:supporting_organisation_ids].any?
   end
 
   test "should be invalid when it duplicates support organisations on create" do