diff --git a/app/serializers/map_serializer.rb b/app/serializers/new_map_serializer.rb similarity index 52% rename from app/serializers/map_serializer.rb rename to app/serializers/new_map_serializer.rb index b9839782..1e27420b 100644 --- a/app/serializers/map_serializer.rb +++ b/app/serializers/new_map_serializer.rb @@ -1,4 +1,4 @@ -class MapSerializer < ActiveModel::Serializer +class NewMapSerializer < ActiveModel::Serializer embed :ids, include: true attributes :id, :name, @@ -8,10 +8,10 @@ class MapSerializer < ActiveModel::Serializer :created_at, :updated_at - has_many :topics - has_many :synapses - has_many :mappings - has_many :contributors, root: :users + has_many :topics, serializer: NewTopicSerializer + has_many :synapses, serializer: NewSynapseSerializer + has_many :mappings, serializer: NewMappingSerializer + has_many :contributors, root: :users, serializer: NewUserSerializer #def filter(keys) # keys.delete(:outcome_author) unless object.outcome_author.present? diff --git a/app/serializers/mapping_serializer.rb b/app/serializers/new_mapping_serializer.rb similarity index 61% rename from app/serializers/mapping_serializer.rb rename to app/serializers/new_mapping_serializer.rb index 400c35ba..9241305a 100644 --- a/app/serializers/mapping_serializer.rb +++ b/app/serializers/new_mapping_serializer.rb @@ -1,13 +1,13 @@ -class MappingSerializer < ActiveModel::Serializer +class NewMappingSerializer < ActiveModel::Serializer embed :ids, include: true attributes :id, :xloc, :yloc, :created_at, :updated_at - has_one :user - has_one :map - has_one :mappable, polymorphic: true + has_one :user, serializer: NewUserSerializer + has_one :map, serializer: NewMapSerializer + has_one :mappable, polymorphic: true ##? def filter(keys) keys.delete(:xloc) unless object.mappable_type == "Topic" diff --git a/app/serializers/metacode_serializer.rb b/app/serializers/new_metacode_serializer.rb similarity index 67% rename from app/serializers/metacode_serializer.rb rename to app/serializers/new_metacode_serializer.rb index 3918d274..e664e7ea 100644 --- a/app/serializers/metacode_serializer.rb +++ b/app/serializers/new_metacode_serializer.rb @@ -1,4 +1,4 @@ -class MetacodeSerializer < ActiveModel::Serializer +class NewMetacodeSerializer < ActiveModel::Serializer attributes :id, :name, :manual_icon, diff --git a/app/serializers/synapse_serializer.rb b/app/serializers/new_synapse_serializer.rb similarity index 56% rename from app/serializers/synapse_serializer.rb rename to app/serializers/new_synapse_serializer.rb index 77c3a159..e7cd9fd7 100644 --- a/app/serializers/synapse_serializer.rb +++ b/app/serializers/new_synapse_serializer.rb @@ -1,4 +1,4 @@ -class SynapseSerializer < ActiveModel::Serializer +class NewSynapseSerializer < ActiveModel::Serializer embed :ids, include: true attributes :id, :desc, @@ -8,9 +8,9 @@ class SynapseSerializer < ActiveModel::Serializer :created_at, :updated_at - has_one :topic1, root: :topics - has_one :topic2, root: :topics - has_one :user + has_one :topic1, root: :topics, serializer: NewTopicSerializer + has_one :topic2, root: :topics, serializer: NewTopicSerializer + has_one :user, serializer: NewUserSerializer #def filter(keys) # keys.delete(:outcome_author) unless object.outcome_author.present? diff --git a/app/serializers/topic_serializer.rb b/app/serializers/new_topic_serializer.rb similarity index 66% rename from app/serializers/topic_serializer.rb rename to app/serializers/new_topic_serializer.rb index 205b8178..d36f1db0 100644 --- a/app/serializers/topic_serializer.rb +++ b/app/serializers/new_topic_serializer.rb @@ -1,4 +1,4 @@ -class TopicSerializer < ActiveModel::Serializer +class NewTopicSerializer < ActiveModel::Serializer embed :ids, include: true attributes :id, :name, @@ -8,8 +8,8 @@ class TopicSerializer < ActiveModel::Serializer :created_at, :updated_at - has_one :user - has_one :metacode + has_one :user, serializer: NewUserSerializer + has_one :metacode, serializer: NewMetacodeSerializer #def filter(keys) # keys.delete(:outcome_author) unless object.outcome_author.present? diff --git a/app/serializers/user_serializer.rb b/app/serializers/new_user_serializer.rb similarity index 80% rename from app/serializers/user_serializer.rb rename to app/serializers/new_user_serializer.rb index b9a3b416..45be36b0 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/new_user_serializer.rb @@ -1,4 +1,4 @@ -class UserSerializer < ActiveModel::Serializer +class NewUserSerializer < ActiveModel::Serializer attributes :id, :name, :avatar,