From 397341a324cbe110f8afb2e8a67e6bd40c3d18cd Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <Andrew@Kvalhe.im>
Date: Wed, 28 Sep 2022 09:34:01 -0700
Subject: [PATCH] Use JSON date serializer

Effective API changes:

  - nil serializes to null, not empty string
  - dates serialize to IETF RFC 3339 with millisecond precision, not
    second precision surrounded by spaces
---
 app/serializers/event_schedule_serializer.rb       | 8 ++------
 app/serializers/event_serializer.rb                | 9 +++------
 spec/serializers/event_schedule_serializer_spec.rb | 2 +-
 spec/serializers/event_serializer_spec.rb          | 4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/serializers/event_schedule_serializer.rb b/app/serializers/event_schedule_serializer.rb
index 71a2ea59..1123907b 100644
--- a/app/serializers/event_schedule_serializer.rb
+++ b/app/serializers/event_schedule_serializer.rb
@@ -3,12 +3,8 @@
 class EventScheduleSerializer < ActiveModel::Serializer
   include ActionView::Helpers::TextHelper
 
-  attributes :date, :room
-
-  def date
-    t = object.start_time
-    t.blank? ? '' : %( #{I18n.l t, format: :short}#{t.formatted_offset(false)} )
-  end
+  attribute :start_time, key: :date
+  attributes :room
 
   def room
     object.room.guid
diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb
index 26d53801..99ba6ecf 100644
--- a/app/serializers/event_serializer.rb
+++ b/app/serializers/event_serializer.rb
@@ -3,12 +3,9 @@
 class EventSerializer < ActiveModel::Serializer
   include ActionView::Helpers::TextHelper
 
-  attributes :guid, :title, :length, :scheduled_date, :language, :abstract, :speaker_ids, :type, :room, :track
-
-  def scheduled_date
-    t = object.time
-    t.blank? ? '' : %( #{I18n.l t, format: :short}#{t.formatted_offset(false)} )
-  end
+  attributes :guid, :title, :length
+  attribute :time, key: :scheduled_date
+  attributes :language, :abstract, :speaker_ids, :type, :room, :track
 
   def speaker_ids
     speakers = object.event_users.select { |i| i.event_role == 'speaker' }
diff --git a/spec/serializers/event_schedule_serializer_spec.rb b/spec/serializers/event_schedule_serializer_spec.rb
index 9d8c62c0..f07919ab 100644
--- a/spec/serializers/event_schedule_serializer_spec.rb
+++ b/spec/serializers/event_schedule_serializer_spec.rb
@@ -12,7 +12,7 @@ describe EventScheduleSerializer, type: :serializer do
 
   it 'sets date and room' do
     expected_json = {
-      date: ' 2000-01-02T03:04:05+0000 ',
+      date: '2000-01-02T03:04:05.000Z',
       room: event_schedule.room.guid
     }.to_json
 
diff --git a/spec/serializers/event_serializer_spec.rb b/spec/serializers/event_serializer_spec.rb
index 2b678319..02e840ae 100644
--- a/spec/serializers/event_serializer_spec.rb
+++ b/spec/serializers/event_serializer_spec.rb
@@ -11,7 +11,7 @@ describe EventSerializer, type: :serializer do
         guid:           event.guid,
         title:          'Some Talk',
         length:         30,
-        scheduled_date: '',
+        scheduled_date: nil,
         language:       nil,
         abstract:       'Lorem ipsum dolor sit amet',
         speaker_ids:    event.speaker_ids,
@@ -41,7 +41,7 @@ describe EventSerializer, type: :serializer do
         guid:           event.guid,
         title:          'Some Talk',
         length:         30,
-        scheduled_date: ' 2014-03-04T09:00:00+0000 ',
+        scheduled_date: '2014-03-04T09:00:00.000Z',
         language:       'English',
         abstract:       'Lorem ipsum dolor sit amet',
         speaker_ids:    [speaker.id],