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

Hound is love, Hound is life

Browse source
This commit is contained in:
Luka Murn 2018-10-07 13:28:29 +02:00
parent dc2ab5fdc0
commit a8d56d32e2
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/api/v1/task_inventory_items_controller.rb
View file

@ -12,11 +12,10 @@ module Api
def index
items =
@task.repository_rows
.includes(repository_cells: :repository_column)
.includes(
repository_cells: Extends::REPOSITORY_SEARCH_INCLUDES
).page(params.dig(:page, :number))
.per(params.dig(:page, :size))
.includes(repository_cells: :repository_column)
.includes(repository_cells: Extends::REPOSITORY_SEARCH_INCLUDES)
.page(params.dig(:page, :number))
.per(params.dig(:page, :size))
incl = params[:include] == 'inventory_cells' ? :inventory_cells : nil
render jsonapi: items,
each_serializer: InventoryItemSerializer,

4
app/controllers/api/v1/tasks_controller.rb
View file

@ -23,8 +23,8 @@ module Api
def inputs
inputs = @task.my_module_antecessors
.page(params.dig(:page, :number))
.per(params.dig(:page, :size))
.page(params.dig(:page, :number))
.per(params.dig(:page, :size))
render jsonapi: inputs, each_serializer: TaskSerializer
end

11
app/serializers/api/v1/inventory_column_serializer.rb
View file

@ -5,11 +5,12 @@ module Api
class InventoryColumnSerializer < ActiveModel::Serializer
type :inventory_columns
attributes :name, :data_type
has_many :repository_list_items, key: :inventory_list_items,
serializer: InventoryListItemSerializer,
class_name: 'RepositoryListItem',
if: -> { object.data_type == 'RepositoryListValue' &&
!instance_options[:hide_list_items] }
has_many :repository_list_items,
key: :inventory_list_items,
serializer: InventoryListItemSerializer,
class_name: 'RepositoryListItem',
if: -> { object.data_type == 'RepositoryListValue' &&
!instance_options[:hide_list_items] }
end
end
end

8
app/serializers/api/v1/protocol_serializer.rb
View file

@ -6,10 +6,10 @@ module Api
type :protocols
attributes :id, :name, :authors, :description, :protocol_type
has_many :protocol_keywords,
key: :keywords,
serializer: ProtocolKeywordSerializer,
class_name: 'ProtocolKeyword',
unless: -> { object.protocol_keywords.empty? }
key: :keywords,
serializer: ProtocolKeywordSerializer,
class_name: 'ProtocolKeyword',
unless: -> { object.protocol_keywords.empty? }
belongs_to :parent, serializer: ProtocolSerializer,
if: -> { object.parent.present? }
end

6
spec/requests/api/v1/inventory_columns_controller_spec.rb
View file

@ -93,7 +93,7 @@ RSpec.describe 'Api::V1::InventoryColumnsController', type: :request do
expect(hash_body[:data]).to match(
ActiveModelSerializers::SerializableResource
.new(text_column,
serializer: Api::V1::InventoryColumnSerializer)
serializer: Api::V1::InventoryColumnSerializer)
.as_json[:data]
)
expect(hash_body[:data]).not_to include('relationships')
@ -111,7 +111,7 @@ RSpec.describe 'Api::V1::InventoryColumnsController', type: :request do
expect(hash_body[:data]).to match(
ActiveModelSerializers::SerializableResource
.new(list_column,
serializer: Api::V1::InventoryColumnSerializer)
serializer: Api::V1::InventoryColumnSerializer)
.as_json[:data]
)
expect(hash_body[:data]).to include('relationships')
@ -136,7 +136,7 @@ RSpec.describe 'Api::V1::InventoryColumnsController', type: :request do
expect(hash_body[:data]).to match(
ActiveModelSerializers::SerializableResource
.new(file_column,
serializer: Api::V1::InventoryColumnSerializer)
serializer: Api::V1::InventoryColumnSerializer)
.as_json[:data]
)
expect(hash_body[:data]).not_to include('relationships')