scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix results API endpoint, return result elements in includes block instead of attributes [SCI-9553] (#6472)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-10-18 10:05:26 +02:00 committed by GitHub
parent fc52b7bdab
commit ba56876bda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/serializers/api/v1/result_serializer.rb
View file

@ -4,25 +4,27 @@ module Api
module V1
class ResultSerializer < ActiveModel::Serializer
type :results
attributes :name, :archived, :result_text, :result_table, :result_asset
attributes :name, :archived
belongs_to :user, serializer: UserSerializer
has_one :result_text, key: :text,
serializer: ResultTextSerializer,
class_name: 'ResultText' do |serializer|
serializer.object.result_texts.first
end
has_one :result_table, key: :table,
serializer: ResultTableSerializer,
class_name: 'ResultTable' do |serializer|
serializer.object.result_tables.first
end
has_one :result_asset, key: :file,
serializer: ResultAssetSerializer,
class_name: 'ResultAsset' do |serializer|
serializer.object.result_assets.first
end
has_many :result_comments, key: :comments, serializer: CommentSerializer
has_many :result_orderable_elements, key: :result_elements, serializer: ResultOrderableElementSerializer
has_many :assets, serializer: AssetSerializer
include TimestampableModel
def result_text
Api::V1::ResultTextSerializer.new(object.result_texts.first).as_json if object.result_texts.any?
end
def result_table
Api::V1::ResultTableSerializer.new(object.result_tables.first).as_json if object.result_tables.any?
end
def result_asset
Api::V1::ResultAssetSerializer.new(object.result_assets.first).as_json if object.result_assets.any?
end
end
end
end

2
app/serializers/api/v1/result_text_serializer.rb
View file

@ -4,7 +4,7 @@ module Api
module V1
class ResultTextSerializer < ActiveModel::Serializer
type :result_texts
attributes :text
attributes :name, :text
end
end
end