Remove support for multi-part Worldwide Organisation content

In previous commits, we added support for Worldwide Organisations and
their offices to be presented within a single content item.

This approach was decided against, since there were issues with
translated organisations.

Therefore reverting the code that added this support.

This reverts commits 043878e, 0c88e11 and 89e7756.

app/controllers/content_items_controller.rb

@@ -177,7 +177,6 @@ def content_item_template
     return "guide_single" if @content_item.render_guide_as_single_page?
     return "manual_updates" if @content_item.manual_updates?
     return "hmrc_manual_updates" if @content_item.hmrc_manual_updates?
-    return "worldwide_organisation_office" if @content_item.worldwide_organisation_office?
 
     @content_item.schema_name
   end

app/presenters/content_item_presenter.rb

@@ -110,10 +110,6 @@ def hmrc_manual_updates?
     view_context.request.path =~ /^\/hmrc-internal-manuals\/.*\/updates$/ && content_item["schema_name"] == "hmrc_manual"
   end
 
-  def worldwide_organisation_office?
-    view_context.request.path =~ /^\/world\/.*\/office\/.*$/ && content_item["schema_name"] == "worldwide_organisation"
-  end
-
   def show_default_breadcrumbs?
     true
   end

app/presenters/worldwide_organisation_presenter.rb

@@ -79,19 +79,19 @@ def people_in_non_primary_roles
   end
 
   def main_office
-    return unless (office_item = content_item.dig("details", "main_office_parts")&.first)
+    return unless (office_item = content_item.dig("links", "main_office")&.first)
 
-    office_contact_item = linked_contact(office_item["contact_content_id"])
+    office_contact_item = contact_for_office(office_item["content_id"])
     return unless office_contact_item
 
     office(office_item, office_contact_item)
   end
 
   def home_page_offices
-    return [] unless content_item.dig("details", "home_page_office_parts")
+    return [] unless content_item.dig("links", "home_page_offices")
 
-    content_item.dig("details", "home_page_office_parts").map { |office|
-      contact = linked_contact(office["contact_content_id"])
+    content_item.dig("links", "home_page_offices").map { |office|
+      contact = contact_for_office(office["content_id"])
       next unless contact
 
       office(office, contact)
@@ -131,13 +131,19 @@ def office(office, contact)
     WorldwideOffice.new(
       contact: WorldwideOrganisation::LinkedContactPresenter.new(contact),
       has_access_and_opening_times?: office["access_and_opening_times"].present?,
-      public_url: "#{content_item['base_path'].gsub(/\..*?$/, '')}/#{office['slug']}",
+      public_url: "#{content_item['base_path']}/#{office['slug']}",
     )
   end
 
-  def linked_contact(contact_content_id)
+  def contact_for_office(office_content_id)
+    contact_mapping = content_item.dig("details", "office_contact_associations").select { |office_contact_association|
+      office_contact_association["office_content_id"] == office_content_id
+    }.first
+
+    return unless contact_mapping
+
     content_item.dig("links", "contacts").select { |contact|
-      contact["content_id"] == contact_content_id
+      contact["content_id"] == contact_mapping["contact_content_id"]
     }.first
   end
 

app/services/presenter_builder.rb

@@ -37,7 +37,6 @@ def presenter_name
     return service_sign_in_presenter_name if service_sign_in_format?
     return "ManualUpdatesPresenter" if manual_updates?
     return "HmrcManualUpdatesPresenter" if hmrc_manual_updates?
-    return "WorldwideOrganisationOfficePresenter" if worldwide_organisation_office?
 
     "#{content_item['schema_name'].classify}Presenter"
   end
@@ -50,10 +49,6 @@ def hmrc_manual_updates?
     view_context.request.path =~ /^\/hmrc-internal-manuals\/.*\/updates$/ && content_item["schema_name"] == "hmrc_manual"
   end
 
-  def worldwide_organisation_office?
-    view_context.request.path =~ /^\/world\/.*\/office\/.*$/ && content_item["schema_name"] == "worldwide_organisation"
-  end
-
   def service_sign_in_format?
     content_item["schema_name"] == "service_sign_in"
   end

test/integration/worldwide_organisation_test.rb

@@ -108,7 +108,7 @@ class WorldwideOrganisationTest < ActionDispatch::IntegrationTest
     within("#contact-us") do
       assert page.has_text?("Contact us")
       assert page.has_content?("Torre Emperador Castellana")
-      assert page.has_link?(I18n.t("contact.access_and_opening_times"), href: "/world/uk-embassy-in-country/office/british-embassy")
+      assert page.has_link?(I18n.t("contact.access_and_opening_times"), href: "https://www.integration.publishing.service.gov.uk/world/organisations/british-embassy-madrid/office/british-embassy")
     end
   end
 
@@ -174,7 +174,7 @@ class WorldwideOrganisationTest < ActionDispatch::IntegrationTest
     setup_and_visit_content_item(
       "worldwide_organisation",
       {
-        "details" => { "main_office_parts" => nil },
+        "links" => { "main_office" => nil },
       },
     )
     assert_not page.has_text?("Contact us")

test/presenters/worldwide_organisation_presenter_test.rb

@@ -157,31 +157,16 @@ def schema_name
 
   test "#main_office returns nil when there is no main office" do
     without_main_office = schema_item
-    without_main_office["details"].delete("main_office_parts")
+    without_main_office["links"].delete("main_office")
 
     presented = create_presenter(WorldwideOrganisationPresenter, content_item: without_main_office)
 
     assert_nil presented.main_office
   end
 
-  test "#main_office returns the correct link when the worldwide organisation is not a translation" do
-    presented = create_presenter(WorldwideOrganisationPresenter, content_item: schema_item)
-
-    assert_equal "/world/uk-embassy-in-country/office/british-embassy", presented.main_office.public_url
-  end
-
-  test "#main_office returns the correct link when the worldwide organisation is a translation" do
-    content_item = schema_item
-    content_item["base_path"] = "#{content_item['base_path']}.fr"
-
-    presented = create_presenter(WorldwideOrganisationPresenter, content_item:)
-
-    assert_equal "/world/uk-embassy-in-country/office/british-embassy", presented.main_office.public_url
-  end
-
   test "#home_page_offices returns an empty array when there are no home page offices" do
     without_home_page_offices = schema_item
-    without_home_page_offices["details"].delete("home_page_office_parts")
+    without_home_page_offices["links"].delete("home_page_offices")
 
     presented = create_presenter(WorldwideOrganisationPresenter, content_item: without_home_page_offices)