{{embed:email_address:#{content_block.content_id}}}
\n", - }, - links_hash: { - primary_publishing_organisation: [publishing_organisation.content_id], - embed: [content_block.content_id], - }) + host_edition = Timecop.freeze Time.zone.parse(last_edited_at) do + create_live_edition( + body: "{{embed:content_block_email_address:#{content_block.content_id}}}
\n", + primary_publishing_organisation_uuid: publishing_organisation.content_id, + ) + end statistics_cache = create(:statistics_cache, document: host_edition.document, unique_pageviews: 333) @@ -73,6 +71,7 @@ "last_edited_by_editor_id" => host_edition.last_edited_by_editor_id, "last_edited_at" => last_edited_at, "unique_pageviews" => statistics_cache.unique_pageviews, + "instances" => 1, "primary_publishing_organisation" => { "content_id" => publishing_organisation.content_id, "title" => publishing_organisation.title, @@ -81,6 +80,43 @@ }, ) end + + context "when embedded content appears more than once in a field" do + let!(:host_edition) do + create_live_edition( + body: "{{embed:content_block_email_address:#{content_block.content_id}}} {{embed:content_block_email_address:#{content_block.content_id}}}
\n", + ) + end + + it "should return multiple instances" do + get "/v2/content/#{content_block.content_id}/embedded" + response_body = parsed_response + + expect(response_body["content_id"]).to eq(content_block.content_id) + expect(response_body["total"]).to eq(1) + + expect(response_body["results"][0]["instances"]).to eq(2) + end + + context "when the host edition is changed to reference the content once" do + before do + create_live_edition( + content_id: host_edition.content_id, + body: "{{embed:content_block_email_address:#{content_block.content_id}}}
\n", + ) + end + + it "should return only one instance" do + get "/v2/content/#{content_block.content_id}/embedded" + response_body = parsed_response + + expect(response_body["content_id"]).to eq(content_block.content_id) + expect(response_body["total"]).to eq(1) + + expect(response_body["results"][0]["instances"]).to eq(1) + end + end + end end context "pagination" do @@ -275,4 +311,27 @@ def expect_request_to_order_by(order_argument:, expected_results:) end end end + +private + + def create_live_edition(content_id: SecureRandom.uuid, body: "Some body goes here", primary_publishing_organisation_uuid: nil) + payload.merge!( + document_type: "press_release", + schema_name: "news_article", + details: { body: }, + ) + + if primary_publishing_organisation_uuid.present? + payload.merge!( + links: { + primary_publishing_organisation: [primary_publishing_organisation_uuid], + }, + ) + end + + put "/v2/content/#{content_id}", params: payload.to_json + post "/v2/content/#{content_id}/publish", params: {}.to_json + + Document.find_by(content_id:).live + end end diff --git a/spec/presenters/embedded_content_presenter_spec.rb b/spec/presenters/embedded_content_presenter_spec.rb index a28f413ae..1d2ee05cb 100644 --- a/spec/presenters/embedded_content_presenter_spec.rb +++ b/spec/presenters/embedded_content_presenter_spec.rb @@ -19,7 +19,8 @@ unique_pageviews: 123, primary_publishing_organisation_content_id: organisation_edition_id, primary_publishing_organisation_title: "bar", - primary_publishing_organisation_base_path: "/bar")] + primary_publishing_organisation_base_path: "/bar", + instances: 1)] end let(:result) { described_class.present(target_edition_id, host_editions, total, total_pages) } @@ -38,6 +39,7 @@ last_edited_by_editor_id:, last_edited_at:, unique_pageviews: 123, + instances: 1, primary_publishing_organisation: { content_id: organisation_edition_id, title: "bar", diff --git a/spec/queries/get_embedded_content_spec.rb b/spec/queries/get_embedded_content_spec.rb index c812ffa4c..8e47b8aea 100644 --- a/spec/queries/get_embedded_content_spec.rb +++ b/spec/queries/get_embedded_content_spec.rb @@ -37,6 +37,8 @@ end context "when there are live and draft editions that embed the target content" do + let(:target_content_id) { content_block.content_id } + it "returns the live editions" do target_content_id = content_block.content_id published_host_editions = create_list(:live_edition, 2, @@ -84,8 +86,25 @@ expect(results[i].primary_publishing_organisation_title).to eq(organisation.title) expect(results[i].primary_publishing_organisation_base_path).to eq(organisation.base_path) expect(results[i].unique_pageviews).to eq(expected_pageviews[host_edition.document.id]) + expect(results[i].instances).to eq(1) end end + + it "returns instance counts when the content is embedded more than once" do + create(:live_edition, + details: { + body: "{{embed:email_address:#{target_content_id}}}
\n", + }, + links_hash: { + primary_publishing_organisation: [organisation.content_id], + embed: [target_content_id, target_content_id], + }, + publishing_app: "example-app") + + results = described_class.new(target_content_id).call + + expect(results[0].instances).to eq(2) + end end context "when there are superseded editions that embed the target content" do @@ -147,8 +166,7 @@ def expect_sort_call_for(order_field:, order_direction:) expect(ActiveRecord::Base.connection).to receive(:select_all) { |arel_query| expect(arel_query.orders.length).to eq(1) expect(arel_query.orders[0]).to be_a(order_direction == :asc ? Arel::Nodes::Ascending : Arel::Nodes::Descending) - expect(arel_query.orders[0].expr.relation.name).to eq(order_field.relation.name) - expect(arel_query.orders[0].expr.name).to eq(order_field.name) + expect(arel_query.orders[0].expr).to eq(order_field) }.and_return([]) end end diff --git a/spec/services/embedded_content_finder_service_spec.rb b/spec/services/embedded_content_finder_service_spec.rb index 05d624880..8f6e4a304 100644 --- a/spec/services/embedded_content_finder_service_spec.rb +++ b/spec/services/embedded_content_finder_service_spec.rb @@ -32,6 +32,14 @@ expect(links).to eq([editions[0].content_id, editions[1].content_id]) end + it "returns duplicates when there is more than one content reference in the field" do + details = { field_name => "{{embed:#{document_type}:#{editions[0].content_id}}} {{embed:#{document_type}:#{editions[0].content_id}}} {{embed:#{document_type}:#{editions[1].content_id}}}" } + + links = EmbeddedContentFinderService.new.fetch_linked_content_ids(details, Edition::DEFAULT_LOCALE) + + expect(links).to eq([editions[0].content_id, editions[0].content_id, editions[1].content_id]) + end + it "finds content references when #{field_name} is an array of hashes" do details = { field_name => [{ "content" => "{{embed:#{document_type}:#{editions[0].content_id}}} {{embed:#{document_type}:#{editions[1].content_id}}}" }] } @@ -45,6 +53,10 @@ field_name => [ { body: [ + { + content: "some string with a reference: {{embed:#{document_type}:#{editions[0].content_id}}}", + content_type: "text/html", + }, { content: "some string with a reference: {{embed:#{document_type}:#{editions[0].content_id}}}", content_type: "text/govspeak", @@ -55,6 +67,10 @@ }, { body: [ + { + content: "some string with another reference: {{embed:#{document_type}:#{editions[1].content_id}}}", + content_type: "text/html", + }, { content: "some string with another reference: {{embed:#{document_type}:#{editions[1].content_id}}}", content_type: "text/govspeak", diff --git a/spec/services/get_host_content_service_spec.rb b/spec/services/get_embedded_content_service_spec.rb similarity index 99% rename from spec/services/get_host_content_service_spec.rb rename to spec/services/get_embedded_content_service_spec.rb index 6e660edcc..60f7a62fb 100644 --- a/spec/services/get_host_content_service_spec.rb +++ b/spec/services/get_embedded_content_service_spec.rb @@ -1,4 +1,4 @@ -RSpec.describe GetHostContentService do +RSpec.describe GetEmbeddedContentService do describe "#call" do let(:organisation) do edition_params = {