mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 15:36:22 +08:00
Merge pull request #1302 from okriuchykhin/ok_SCI_2718
Add CREATE Result endpoint: Create Text result [SCI-2718]
This commit is contained in:
commit
38a4360361
|
@ -3,57 +3,123 @@
|
||||||
module Api
|
module Api
|
||||||
module V1
|
module V1
|
||||||
class ResultsController < BaseController
|
class ResultsController < BaseController
|
||||||
before_action :load_team
|
include TinyMceHelper
|
||||||
before_action :load_project
|
|
||||||
before_action :load_experiment
|
before_action :load_vars
|
||||||
before_action :load_task
|
before_action :load_result, only: %i(show)
|
||||||
before_action :load_result, only: :show
|
before_action :check_manage_permissions, only: %i(create)
|
||||||
|
|
||||||
def index
|
def index
|
||||||
results = @my_module.results
|
results = @task.results
|
||||||
.page(params.dig(:page, :number))
|
.page(params.dig(:page, :number))
|
||||||
.per(params.dig(:page, :size))
|
.per(params.dig(:page, :size))
|
||||||
|
render jsonapi: results, each_serializer: ResultSerializer,
|
||||||
|
include: %i(asset table text)
|
||||||
|
end
|
||||||
|
|
||||||
render jsonapi: results, include: %w(
|
def create
|
||||||
result_table result_text result_asset
|
create_text_result if result_text_params.present?
|
||||||
), each_serializer: ResultSerializer
|
throw ActionController::ParameterMissing unless @result
|
||||||
|
render jsonapi: @result,
|
||||||
|
serializer: ResultSerializer,
|
||||||
|
include: %i(asset table text),
|
||||||
|
status: :created
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
render jsonapi: @result, include: %w(
|
render jsonapi: @result, serializer: ResultSerializer,
|
||||||
result_table result_text result_asset
|
include: %i(asset table text)
|
||||||
), serializer: ResultSerializer
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def load_team
|
def load_vars
|
||||||
@team = Team.find(params.require(:team_id))
|
@team = Team.find(params.require(:team_id))
|
||||||
render jsonapi: {}, status: :forbidden unless can_read_team?(@team)
|
render jsonapi: {}, status: :forbidden unless can_read_team?(@team)
|
||||||
end
|
|
||||||
|
|
||||||
def load_project
|
|
||||||
@project = @team.projects.find(params.require(:project_id))
|
@project = @team.projects.find(params.require(:project_id))
|
||||||
render jsonapi: {}, status: :forbidden unless can_read_project?(
|
render jsonapi: {}, status: :forbidden unless can_read_project?(
|
||||||
@project
|
@project
|
||||||
)
|
)
|
||||||
end
|
|
||||||
|
|
||||||
def load_experiment
|
|
||||||
@experiment = @project.experiments.find(params.require(:experiment_id))
|
@experiment = @project.experiments.find(params.require(:experiment_id))
|
||||||
render jsonapi: {}, status: :forbidden unless can_read_experiment?(
|
render jsonapi: {}, status: :forbidden unless can_read_experiment?(
|
||||||
@experiment
|
@experiment
|
||||||
)
|
)
|
||||||
end
|
|
||||||
|
|
||||||
def load_task
|
@task = @experiment.my_modules.find(params.require(:task_id))
|
||||||
@my_module = @experiment.my_modules.find(params.require(:task_id))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def load_result
|
def load_result
|
||||||
@result = @my_module.results.find(
|
@result = @task.results.find(params.require(:id))
|
||||||
params.require(:id)
|
end
|
||||||
)
|
|
||||||
|
def check_manage_permissions
|
||||||
|
render body: nil, status: :forbidden unless can_manage_module?(@task)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_text_result
|
||||||
|
result_text = ResultText.new(text: result_text_params[:text])
|
||||||
|
result_text.transaction do
|
||||||
|
if tiny_mce_asset_params.present?
|
||||||
|
tiny_mce_asset_params.each do |t|
|
||||||
|
image_params = t[:attributes]
|
||||||
|
token = image_params[:file_token]
|
||||||
|
unless result_text.text["[~tiny_mce_id:#{token}]"]
|
||||||
|
raise StandardError, 'Image reference not found in the text'
|
||||||
|
end
|
||||||
|
image = Paperclip.io_adapters.for(image_params[:file_data])
|
||||||
|
image.original_filename = image_params[:file_name]
|
||||||
|
tiny_img = TinyMceAsset.create!(image: image, team: @team)
|
||||||
|
result_text.text.sub!("[~tiny_mce_id:#{token}]",
|
||||||
|
"[~tiny_mce_id:#{tiny_img.id}]")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
@result = Result.new(
|
||||||
|
user: current_user,
|
||||||
|
my_module: @task,
|
||||||
|
name: result_params[:name],
|
||||||
|
result_text: result_text,
|
||||||
|
last_modified_by: current_user
|
||||||
|
)
|
||||||
|
@result.save! && result_text.save!
|
||||||
|
link_tiny_mce_assets(result_text.text, result_text)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def result_params
|
||||||
|
unless params.require(:data).require(:type) == 'results'
|
||||||
|
raise ActionController::BadRequest,
|
||||||
|
'Wrong object type within parameters'
|
||||||
|
end
|
||||||
|
params.require(:data).require(:attributes).require(:name)
|
||||||
|
params.permit(data: { attributes: :name })[:data][:attributes]
|
||||||
|
end
|
||||||
|
|
||||||
|
# Partially implement sideposting draft
|
||||||
|
# https://github.com/json-api/json-api/pull/1197
|
||||||
|
def result_text_params
|
||||||
|
prms =
|
||||||
|
params[:included]&.select { |el| el[:type] == 'result_texts' }&.first
|
||||||
|
prms.require(:attributes).require(:text)
|
||||||
|
prms[:attributes]
|
||||||
|
end
|
||||||
|
|
||||||
|
def tiny_mce_asset_params
|
||||||
|
prms = params[:included]&.select { |el| el[:type] == 'tiny_mce_assets' }
|
||||||
|
prms.each do |p|
|
||||||
|
p.require(:attributes).require(%i(file_data file_name file_token))
|
||||||
|
end
|
||||||
|
file_tokens = prms.map { |p| p[:attributes][:file_token] }
|
||||||
|
result_text_params[:text].scan(
|
||||||
|
/\[~tiny_mce_id:(\w+)\]/
|
||||||
|
).flatten.each do |token|
|
||||||
|
unless file_tokens.include?(token)
|
||||||
|
raise StandardError,
|
||||||
|
'Text contains reference to nonexisting TinyMCE image'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
prms
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
10
app/serializers/api/v1/result_asset_serializer.rb
Normal file
10
app/serializers/api/v1/result_asset_serializer.rb
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module Api
|
||||||
|
module V1
|
||||||
|
class ResultAssetSerializer < ActiveModel::Serializer
|
||||||
|
type :result_assets
|
||||||
|
attributes :asset_id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -4,11 +4,22 @@ module Api
|
||||||
module V1
|
module V1
|
||||||
class ResultSerializer < ActiveModel::Serializer
|
class ResultSerializer < ActiveModel::Serializer
|
||||||
type :results
|
type :results
|
||||||
attributes :id, :name, :user_id, :archived, :result_text,
|
attributes :name, :user_id, :archived
|
||||||
:result_table, :result_asset
|
|
||||||
attribute :my_module_id, key: :task_id
|
attribute :my_module_id, key: :task_id
|
||||||
|
|
||||||
belongs_to :my_module, serializer: MyModuleSerializer
|
belongs_to :my_module, serializer: MyModuleSerializer
|
||||||
|
has_one :result_asset, key: :asset,
|
||||||
|
serializer: ResultAssetSerializer,
|
||||||
|
class_name: 'ResultAsset',
|
||||||
|
if: -> { object.is_asset }
|
||||||
|
has_one :result_table, key: :table,
|
||||||
|
serializer: ResultTableSerializer,
|
||||||
|
class_name: 'ResultTable',
|
||||||
|
if: -> { object.is_table }
|
||||||
|
has_one :result_text, key: :text,
|
||||||
|
serializer: ResultTextSerializer,
|
||||||
|
class_name: 'ResultText',
|
||||||
|
if: -> { object.is_text }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
10
app/serializers/api/v1/result_table_serializer.rb
Normal file
10
app/serializers/api/v1/result_table_serializer.rb
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module Api
|
||||||
|
module V1
|
||||||
|
class ResultTableSerializer < ActiveModel::Serializer
|
||||||
|
type :result_tables
|
||||||
|
attributes :table_id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
10
app/serializers/api/v1/result_text_serializer.rb
Normal file
10
app/serializers/api/v1/result_text_serializer.rb
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module Api
|
||||||
|
module V1
|
||||||
|
class ResultTextSerializer < ActiveModel::Serializer
|
||||||
|
type :result_texts
|
||||||
|
attributes :text
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -582,7 +582,7 @@ Rails.application.routes.draw do
|
||||||
resources :protocols, only: %i(index show),
|
resources :protocols, only: %i(index show),
|
||||||
path: 'protocols',
|
path: 'protocols',
|
||||||
as: :protocols
|
as: :protocols
|
||||||
resources :results, only: %i(index show),
|
resources :results, only: %i(index create show),
|
||||||
path: 'results',
|
path: 'results',
|
||||||
as: :results
|
as: :results
|
||||||
get 'inputs',
|
get 'inputs',
|
||||||
|
|
Loading…
Reference in a new issue