From ac3be772194c3281ac4439457082ec9600463dbf Mon Sep 17 00:00:00 2001 From: James Mason Date: Sat, 29 Sep 2018 15:56:12 -0700 Subject: [PATCH] Required changes for consistent controller & feature results --- app/controllers/api/v1/speakers_controller.rb | 5 ++++- app/serializers/conferences_array_serializer.rb | 2 +- config/initializers/serializer.rb | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 config/initializers/serializer.rb diff --git a/app/controllers/api/v1/speakers_controller.rb b/app/controllers/api/v1/speakers_controller.rb index 92eadb2c..ea76a32b 100644 --- a/app/controllers/api/v1/speakers_controller.rb +++ b/app/controllers/api/v1/speakers_controller.rb @@ -18,7 +18,10 @@ module Api end users = users.where(event_users: {event_role: :speaker}).uniq - render json: users, each_serializer: SpeakerSerializer, callback: params['callback'] + render json: users, + each_serializer: SpeakerSerializer, + callback: params['callback'], + root: 'speakers' end end end diff --git a/app/serializers/conferences_array_serializer.rb b/app/serializers/conferences_array_serializer.rb index 8ca8df53..4264daf9 100644 --- a/app/serializers/conferences_array_serializer.rb +++ b/app/serializers/conferences_array_serializer.rb @@ -3,7 +3,7 @@ # # Needed in order to add the API version number to the conferences array # -class ConferencesArraySerializer < ActiveModel::ArraySerializer +class ConferencesArraySerializer < ActiveModel::Serializer::CollectionSerializer def as_json(*args) json = super json.merge!(version: 1) diff --git a/config/initializers/serializer.rb b/config/initializers/serializer.rb new file mode 100644 index 00000000..aba3586b --- /dev/null +++ b/config/initializers/serializer.rb @@ -0,0 +1 @@ +ActiveModelSerializers.config.adapter = :json