A platform for community discussion. Free, open, simple.
FIX: Topic Merging with Events (#41369)
Bannon Tanner58629ffb77bf
diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb b/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rbindex de6d316f87f..72565746682 100644--- a/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb+++ b/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb@@ -19,10 +19,12 @@ module DiscoursePostEvent:custom_fieldsdef category_id- object.post.topic.category_id+ object.post&.topic&.category_idenddef post+ return nil if object.post.blank?+{id: object.post.id,post_number: object.post.post_number,diff --git a/plugins/discourse-calendar/lib/discourse_post_event/topic_extension.rb b/plugins/discourse-calendar/lib/discourse_post_event/topic_extension.rbnew file mode 100644index 00000000000..5bfe595a9e4--- /dev/null+++ b/plugins/discourse-calendar/lib/discourse_post_event/topic_extension.rb@@ -0,0 +1,50 @@+# frozen_string_literal: true++module DiscoursePostEvent+ module TopicExtension+ def move_posts(moved_by, post_ids, opts)+ ensure_event_invariants!(post_ids, opts)+ super+ end++ private++ def ensure_event_invariants!(post_ids, opts)+ return unless SiteSetting.discourse_post_event_enabled+ return unless opts[:destination_topic_id]++ destination = Topic.find_by(id: opts[:destination_topic_id])+ return unless destination++ destination_op = destination.first_post+ destination_has_event = destination_op&.event.present?+ incoming_event_post = Post.where(id: post_ids).joins(:event).order(:created_at).first++ return unless destination_has_event || incoming_event_post++ raise_event_move_error! if destination_has_event && incoming_event_post++ chronological = !!opts[:chronological_order]++ if destination_has_event && chronological+ oldest_incoming = Post.where(id: post_ids).order(:created_at).first+ if oldest_incoming && oldest_incoming.created_at < destination_op.created_at+ raise_event_move_error!+ end+ end++ if incoming_event_post && !destination_has_event+ becomes_new_op =+ chronological &&+ (destination_op.nil? || incoming_event_post.created_at < destination_op.created_at)+ raise_event_move_error! unless becomes_new_op+ end+ end++ def raise_event_move_error!+ raise ActiveRecord::RecordNotSaved.new(+ I18n.t("discourse_post_event.errors.models.event.must_be_in_first_post"),+ )+ end+ end+enddiff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rbindex b3030983c29..7e394672eb3 100644--- a/plugins/discourse-calendar/plugin.rb+++ b/plugins/discourse-calendar/plugin.rb@@ -183,6 +183,7 @@ after_initialize dorequire_relative "lib/discourse_post_event/export_csv_controller_extension"require_relative "lib/discourse_post_event/export_csv_file_extension"require_relative "lib/discourse_post_event/post_extension"+ require_relative "lib/discourse_post_event/topic_extension"require_relative "lib/discourse_post_event/rrule_generator"require_relative "lib/discourse_post_event/rrule_configurator"require_relative "lib/discourse_post_event/web_hook_extension"@@ -223,6 +224,7 @@ after_initialize doJobs::ExportCsvFile.prepend(DiscoursePostEvent::ExportPostEventCsvReportExtension)Post.prepend(DiscoursePostEvent::PostExtension)::WebHook.prepend(DiscoursePostEvent::WebHookExtension)+ Topic.prepend(DiscoursePostEvent::TopicExtension)Topic.prepend(DiscourseCalendar::Livestream::TopicExtension)Chat::Channel.prepend(DiscourseCalendar::Livestream::ChatChannelExtension)enddiff --git a/plugins/discourse-calendar/spec/lib/discourse_post_event/topic_extension_spec.rb b/plugins/discourse-calendar/spec/lib/discourse_post_event/topic_extension_spec.rbnew file mode 100644index 00000000000..09d17204d77--- /dev/null+++ b/plugins/discourse-calendar/spec/lib/discourse_post_event/topic_extension_spec.rb@@ -0,0 +1,180 @@+# frozen_string_literal: true++describe DiscoursePostEvent::TopicExtension do+ before do+ freeze_time+ Jobs.run_immediately!+ SiteSetting.calendar_enabled = true+ SiteSetting.discourse_post_event_enabled = true+ end++ fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }++ let(:event_topic) { Fabricate(:topic, user:, created_at: 2.days.ago) }+ let(:event_op) { Fabricate(:post, topic: event_topic, user:, created_at: 2.days.ago) }+ let!(:event) { Fabricate(:event, post: event_op) }++ let(:plain_topic) { Fabricate(:topic, user:, created_at: 2.days.ago) }+ let!(:plain_op) { Fabricate(:post, topic: plain_topic, user:, created_at: 2.days.ago) }++ let(:source_topic) { Fabricate(:topic, user:) }++ def move(from:, post_ids:, into:, chronological_order:)+ from.move_posts(user, post_ids, destination_topic_id: into.id, chronological_order:)+ end++ def expect_block(&block)+ expect(&block).to raise_error(+ ActiveRecord::RecordNotSaved,+ I18n.t("discourse_post_event.errors.models.event.must_be_in_first_post"),+ )+ end++ describe "#move_posts" do+ context "when destination has an event and incoming does not" do+ it "blocks chronological merge with an older incoming post (would displace the event)" do+ older = Fabricate(:post, topic: source_topic, user:, created_at: 5.days.ago)++ expect_block do+ move(+ from: source_topic,+ post_ids: [older.id],+ into: event_topic,+ chronological_order: true,+ )+ end+ expect(event_op.reload.post_number).to eq(1)+ end++ it "allows chronological merge with a newer incoming post" do+ newer = Fabricate(:post, topic: source_topic, user:, created_at: 1.hour.ago)++ expect {+ move(+ from: source_topic,+ post_ids: [newer.id],+ into: event_topic,+ chronological_order: true,+ )+ }.not_to raise_error+ expect(event_op.reload.post_number).to eq(1)+ end++ it "allows sequential merge regardless of created_at" do+ older = Fabricate(:post, topic: source_topic, user:, created_at: 5.days.ago)++ expect {+ move(+ from: source_topic,+ post_ids: [older.id],+ into: event_topic,+ chronological_order: false,+ )+ }.not_to raise_error+ expect(event_op.reload.post_number).to eq(1)+ end+ end++ context "when incoming has an event and destination does not" do+ let(:incoming_topic) { Fabricate(:topic, user:) }+ let(:incoming_event_op) do+ Fabricate(:post, topic: incoming_topic, user:, created_at: 5.days.ago)+ end+ let!(:incoming_event) { Fabricate(:event, post: incoming_event_op) }++ it "allows chronological merge when the incoming event is the oldest post" do+ expect {+ move(+ from: incoming_topic,+ post_ids: [incoming_event_op.id],+ into: plain_topic,+ chronological_order: true,+ )+ }.not_to raise_error+ end++ it "blocks chronological merge when the incoming event is newer than the destination OP" do+ newer_topic = Fabricate(:topic, user:)+ newer_event_op = Fabricate(:post, topic: newer_topic, user:, created_at: 1.hour.ago)+ Fabricate(:event, post: newer_event_op)++ expect_block do+ move(+ from: newer_topic,+ post_ids: [newer_event_op.id],+ into: plain_topic,+ chronological_order: true,+ )+ end+ end++ it "blocks sequential merge (incoming event would land in a non-OP slot)" do+ expect_block do+ move(+ from: incoming_topic,+ post_ids: [incoming_event_op.id],+ into: plain_topic,+ chronological_order: false,+ )+ end+ end+ end++ context "when both destination and incoming have an event" do+ let(:incoming_topic) { Fabricate(:topic, user:) }+ let(:incoming_event_op) do+ Fabricate(:post, topic: incoming_topic, user:, created_at: 1.hour.ago)+ end+ let!(:incoming_event) { Fabricate(:event, post: incoming_event_op) }++ it "blocks the merge whether chronological or sequential" do+ expect_block do+ move(+ from: incoming_topic,+ post_ids: [incoming_event_op.id],+ into: event_topic,+ chronological_order: true,+ )+ end++ expect_block do+ move(+ from: incoming_topic,+ post_ids: [incoming_event_op.id],+ into: event_topic,+ chronological_order: false,+ )+ end+ end+ end++ context "with unrelated merges" do+ it "allows any merge when neither topic has an event" do+ other = Fabricate(:post, topic: source_topic, user:, created_at: 5.days.ago)++ expect {+ move(+ from: source_topic,+ post_ids: [other.id],+ into: plain_topic,+ chronological_order: true,+ )+ }.not_to raise_error+ end++ it "does not block when discourse_post_event is disabled" do+ SiteSetting.discourse_post_event_enabled = false+ older = Fabricate(:post, topic: source_topic, user:, created_at: 5.days.ago)++ expect {+ move(+ from: source_topic,+ post_ids: [older.id],+ into: event_topic,+ chronological_order: true,+ )+ }.not_to raise_error+ end+ end+ end+enddiff --git a/plugins/discourse-calendar/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/discourse_post_event/basic_event_serializer_spec.rbindex 0156f8da92d..8a1d900e600 100644--- a/plugins/discourse-calendar/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb@@ -5,6 +5,7 @@ describe DiscoursePostEvent::BasicEventSerializer doSiteSetting.calendar_enabled = trueSiteSetting.discourse_post_event_enabled = trueSiteSetting.discourse_post_event_allowed_custom_fields = "team"+ Jobs.run_immediately!endfab!(:category)@@ -18,4 +19,17 @@ describe DiscoursePostEvent::BasicEventSerializer dojson = described_class.new(event, scope: Guardian.new, root: false).as_jsonexpect(json[:custom_fields]["team"]).to eq("rocket")end++ it "returns the topic's category_id" do+ json = described_class.new(event, scope: Guardian.new).as_json+ expect(json[:basic_event][:category_id]).to eq(category.id)+ end++ it "serializes without raising when the associated post is gone" do+ event.stubs(:post).returns(nil)++ json = described_class.new(event, scope: Guardian.new).as_json+ expect(json[:basic_event][:category_id]).to be_nil+ expect(json[:basic_event][:post]).to be_nil+ endend