Merge pull request #2882 from alphagov/content-modelling/562-bug-cont…

…ent-appears-in-showing-multiple-times

(562) Ensure only live organisations appear in join

app/queries/get_embedded_content.rb

@@ -26,7 +26,7 @@ def host_editions
         .joins(:links)
         .joins("LEFT JOIN links AS primary_links ON primary_links.edition_id = editions.id AND primary_links.link_type = 'primary_publishing_organisation'")
         .joins("LEFT JOIN documents ON documents.content_id = primary_links.target_content_id")
-        .joins("LEFT JOIN editions AS org_editions ON org_editions.document_id = documents.id")
+        .joins("LEFT JOIN editions AS org_editions ON org_editions.document_id = documents.id AND org_editions.state = 'published'")
         .where(links: { link_type: embedded_link_type, target_content_id: })
         .select(
           "editions.id, editions.title, editions.base_path, editions.document_type, editions.publishing_app",

spec/queries/get_embedded_content_spec.rb

@@ -1,11 +1,19 @@
 RSpec.describe Queries::GetEmbeddedContent do
   describe "#call" do
     let(:organisation) do
-      create(:live_edition,
-             title: "bar",
-             document_type: "organisation",
-             schema_name: "organisation",
-             base_path: "/government/organisations/bar")
+      edition_params = {
+        title: "bar",
+        document: create(:document),
+        document_type: "organisation",
+        schema_name: "organisation",
+        base_path: "/government/organisations/bar",
+      }
+
+      create(:superseded_edition, **edition_params)
+      live_edition = create(:live_edition, **edition_params.merge({ user_facing_version: 2 }))
+      create(:draft_edition, **edition_params.merge({ user_facing_version: 3 }))
+
+      live_edition
     end
 
     let(:content_block) do