A platform for community discussion. Free, open, simple.
FIX: show next occurrence for recurring events with show_local_time (#39046)
Régis Hanol96629f67874a
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 c875f0c1126..f236a7856a4 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@@ -70,11 +70,11 @@ module DiscoursePostEventreturn nilend+ timezone_time = object.starts_at&.in_time_zone(object.timezone)+if object.show_local_time- timezone_time = object.original_starts_at&.in_time_zone(object.timezone)timezone_time&.strftime("%Y-%m-%dT%H:%M:%S")else- timezone_time = object.starts_at&.in_time_zone(object.timezone)timezone_time&.iso8601(3)endend@@ -88,9 +88,7 @@ module DiscoursePostEventendif object.show_local_time- ends_at =- object.original_ends_at ||- (object.original_starts_at && object.original_starts_at + 1.hour)+ ends_at = object.ends_at || (object.starts_at && object.starts_at + 1.hour)timezone_ends_at = ends_at&.in_time_zone(object.timezone)timezone_ends_at&.strftime("%Y-%m-%dT%H:%M:%S")elsediff --git a/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rbindex 98dfde7bcb9..98767a5417e 100644--- a/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rb@@ -90,6 +90,43 @@ describe DiscoursePostEvent::EventSerializer doendend+ context "when event is recurring with show_local_time" do+ fab!(:post_recurring) { Fabricate(:post, topic:) }+ fab!(:recurring_event) do+ Fabricate(+ :event,+ post: post_recurring,+ original_starts_at: 2.weeks.ago.change(hour: 14, min: 0, sec: 0),+ original_ends_at: 2.weeks.ago.change(hour: 15, min: 0, sec: 0),+ recurrence: "every_week",+ timezone: "UTC",+ show_local_time: true,+ )+ end++ before { recurring_event.set_next_date }++ it "serializes starts_at using the next occurrence" do+ json =+ DiscoursePostEvent::EventSerializer.new(+ recurring_event.reload,+ scope: Guardian.new,+ ).as_json+ starts_at = Time.parse(json[:event][:starts_at])+ expect(starts_at).to be > Time.current+ end++ it "serializes ends_at using the next occurrence" do+ json =+ DiscoursePostEvent::EventSerializer.new(+ recurring_event.reload,+ scope: Guardian.new,+ ).as_json+ ends_at = Time.parse(json[:event][:ends_at])+ expect(ends_at).to be > Time.current+ end+ end+context "when event is all-day" dofab!(:post_all_day) { Fabricate(:post, topic: topic) }fab!(:all_day_event) do