Merge pull request #9790 from alphagov/fix-worldwide-org-contact-unpu…

…blishing

Ensure worldwide org office contacts are unpublished effectively

app/services/service_listeners/publishing_api_associated_documents.rb

@@ -55,22 +55,30 @@ def unpublish(allow_draft: false)
                     end
 
       current_associated_documents.each do |associated_document|
-        if associated_document.respond_to?(:translations)
-          associated_document.translations.each do |translation|
+        locales_to_unpublish =
+          if associated_document.respond_to?(:translations)
+            associated_document.translations.map(&:locale).map(&:to_s)
+          else
+            [locale_for_document(associated_document).to_s]
+          end
+
+        locales_to_unpublish.each do |locale|
+          if associated_document.respond_to?(:base_path)
             PublishingApiRedirectWorker.new.perform(
               associated_document.content_id,
               destination,
-              translation.locale.to_s,
+              locale,
+              allow_draft,
+            )
+          else
+            PublishingApiGoneWorker.new.perform(
+              associated_document.content_id,
+              nil,
+              nil,
+              locale,
               allow_draft,
             )
           end
-        else
-          PublishingApiRedirectWorker.new.perform(
-            associated_document.content_id,
-            destination,
-            locale_for_document(associated_document).to_s,
-            allow_draft,
-          )
         end
       end
     end

test/factories/worldwide_offices.rb

@@ -2,10 +2,11 @@
   factory :worldwide_office do
     transient do
       title { "Contact title" }
+      translated_into { nil }
     end
     sequence(:slug) { |index| "worldwide-office-#{index}" }
     content_id { SecureRandom.uuid }
-    contact { create :contact_with_country, title: }
+    contact { create :contact_with_country, title:, translated_into: }
     edition { create :worldwide_organisation }
     worldwide_office_type_id { WorldwideOfficeType.all.sample.id }
   end

test/factories/worldwide_organisations.rb

@@ -23,6 +23,12 @@
       end
     end
 
+    trait(:with_translated_main_office) do
+      after :create do |organisation, _evaluator|
+        FactoryBot.create(:worldwide_office, edition: organisation, translated_into: :fr)
+      end
+    end
+
     trait(:with_home_page_offices) do
       after :create do |organisation, _evaluator|
         worldwide_office = create(:worldwide_office, edition: organisation)

test/unit/app/services/service_listeners/publishing_api_associated_documents_test.rb

@@ -481,6 +481,29 @@ class Unpublish < PublishingApiAssociatedDocumentsTest
         call(worldwide_organisation)
       end
 
+      test "for an worldwide organisation that has been unpublished publishes a gone unpublishing for all the office contact translations" do
+        worldwide_organisation = create(:unpublished_worldwide_organisation, :with_translated_main_office, translated_into: :fr)
+        office = worldwide_organisation.main_office
+
+        PublishingApiGoneWorker.any_instance.expects(:perform).with(
+          office.contact.content_id,
+          nil,
+          nil,
+          "en",
+          false,
+        )
+
+        PublishingApiGoneWorker.any_instance.expects(:perform).with(
+          office.contact.content_id,
+          nil,
+          nil,
+          "fr",
+          false,
+        )
+
+        call(worldwide_organisation)
+      end
+
       test "for an worldwide organisation that has been consolidated publishes a redirect to the alternative url" do
         worldwide_organisation = create(:unpublished_worldwide_organisation_consolidated, :with_main_office, :with_page)
         office = worldwide_organisation.main_office
@@ -493,9 +516,10 @@ class Unpublish < PublishingApiAssociatedDocumentsTest
           false,
         )
 
-        PublishingApiRedirectWorker.any_instance.expects(:perform).with(
+        PublishingApiGoneWorker.any_instance.expects(:perform).with(
           office.contact.content_id,
-          "/government/another/page",
+          nil,
+          nil,
           "en",
           false,
         )
@@ -533,9 +557,10 @@ class Unpublish < PublishingApiAssociatedDocumentsTest
           false,
         )
 
-        PublishingApiRedirectWorker.any_instance.expects(:perform).with(
+        PublishingApiGoneWorker.any_instance.expects(:perform).with(
           office.contact.content_id,
-          "/government/another/page",
+          nil,
+          nil,
           "en",
           false,
         )
@@ -569,9 +594,10 @@ class Unpublish < PublishingApiAssociatedDocumentsTest
           false,
         )
 
-        PublishingApiRedirectWorker.any_instance.expects(:perform).with(
+        PublishingApiGoneWorker.any_instance.expects(:perform).with(
           office.contact.content_id,
-          external_url,
+          nil,
+          nil,
           "en",
           false,
         )
@@ -610,9 +636,10 @@ class Unpublish < PublishingApiAssociatedDocumentsTest
           false,
         )
 
-        PublishingApiRedirectWorker.any_instance.expects(:perform).with(
+        PublishingApiGoneWorker.any_instance.expects(:perform).with(
           office.contact.content_id,
-          worldwide_organisation.search_link,
+          nil,
+          nil,
           "en",
           false,
         )