From a0fc9dd95041c80f92e590a0f3a0fae749ca2243 Mon Sep 17 00:00:00 2001 From: Ana Date: Mon, 18 Jul 2016 11:45:59 +0200 Subject: [PATCH] Default value for length in as_json fixed The default value for length in as_json should be a multiple of EventType::LENGTH_STEP. --- app/models/event.rb | 2 +- app/serializers/event_serializer.rb | 2 +- spec/models/event_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/event.rb b/app/models/event.rb index 157446ac..a079cd13 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -116,7 +116,7 @@ class Event < ActiveRecord::Base json[:room_guid] = room.try(:guid) json[:track_color] = track.try(:color) || '#FFFFFF' - json[:length] = event_type.try(:length) || 25 + json[:length] = event_type.try(:length) || EventType::LENGTH_STEP json end diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index e64a5840..93729e16 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -36,6 +36,6 @@ class EventSerializer < ActiveModel::Serializer # FIXME: duplicated logic from Event#as_json def length - object.event_type.try(:length) || 25 + object.event_type.try(:length) || EventType::LENGTH_STEP end end diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index eee34d98..b3f9a477 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -246,7 +246,7 @@ describe Event do expect(json_hash[:room_guid]).to be_nil expect(json_hash[:track_color]).to eq('#FFFFFF') - expect(json_hash[:length]).to eq(25) + expect(json_hash[:length]).to eq(15) end end