Skip to content

provide fields parameter from request to operation #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgebhardt merged 2 commits into from
May 24, 2016
Merged

provide fields parameter from request to operation #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5cf559
provide fields parameter from request to operation and from operation…
senid231 May 13, 2016
855466a
Merge branch 'master' into provide_fields_to_operation
senid231 May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions lib/jsonapi/processor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,15 @@ def find
include_directives = params[:include_directives]
sort_criteria = params.fetch(:sort_criteria, [])
paginator = params[:paginator]
fields = params[:fields]

verified_filters = resource_klass.verify_filters(filters, context)
resource_records = resource_klass.find(verified_filters,
context: context,
include_directives: include_directives,
sort_criteria: sort_criteria,
paginator: paginator)
paginator: paginator,
fields: fields)

page_options = {}
if (JSONAPI.configuration.top_level_meta_include_record_count ||
Expand All @@ -97,13 +99,15 @@ def find

def show
include_directives = params[:include_directives]
fields = params[:fields]
id = params[:id]

key = resource_klass.verify_key(id, context)

resource_record = resource_klass.find_by_key(key,
context: context,
include_directives: include_directives)
include_directives: include_directives,
fields: fields)

return JSONAPI::ResourceOperationResult.new(:ok, resource_record)
end
Expand All @@ -123,8 +127,9 @@ def show_related_resource
source_klass = params[:source_klass]
source_id = params[:source_id]
relationship_type = params[:relationship_type].to_sym
fields = params[:fields]

source_resource = source_klass.find_by_key(source_id, context: context)
source_resource = source_klass.find_by_key(source_id, context: context, fields: fields)

related_resource = source_resource.public_send(relationship_type)

Expand All @@ -138,13 +143,15 @@ def show_related_resources
filters = params[:filters]
sort_criteria = params[:sort_criteria]
paginator = params[:paginator]
fields = params[:fields]

source_resource ||= source_klass.find_by_key(source_id, context: context)
source_resource ||= source_klass.find_by_key(source_id, context: context, fields: fields)

related_resources = source_resource.public_send(relationship_type,
filters: filters,
sort_criteria: sort_criteria,
paginator: paginator)
paginator: paginator,
fields: fields)

if ((JSONAPI.configuration.top_level_meta_include_record_count) ||
(paginator && paginator.class.requires_record_count) ||
Expand Down Expand Up @@ -182,7 +189,6 @@ def show_related_resources

def create_resource
data = params[:data]

resource = resource_klass.create(context)
result = resource.replace_fields(data)

Expand Down
18 changes: 12 additions & 6 deletions lib/jsonapi/request_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@ def add_find_operation
filters: @filters,
include_directives: @include_directives,
sort_criteria: @sort_criteria,
paginator: @paginator
paginator: @paginator,
fields: @fields
)
end

Expand All @@ -304,7 +305,8 @@ def add_show_operation
@resource_klass,
context: @context,
id: @id,
include_directives: @include_directives
include_directives: @include_directives,
fields: @fields
)
end

Expand All @@ -323,7 +325,8 @@ def add_show_related_resource_operation(relationship_type)
context: @context,
relationship_type: relationship_type,
source_klass: @source_klass,
source_id: @source_id
source_id: @source_id,
fields: @fields
)
end

Expand All @@ -336,7 +339,8 @@ def add_show_related_resources_operation(relationship_type)
source_id: @source_id,
filters: @source_klass.verify_filters(@filters, @context),
sort_criteria: @sort_criteria,
paginator: @paginator
paginator: @paginator,
fields: @fields
)
end

Expand All @@ -359,7 +363,8 @@ def parse_add_operation(data)
@operations.push JSONAPI::Operation.new(:create_resource,
@resource_klass,
context: @context,
data: data
data: data,
fields: @fields
)
end
rescue JSONAPI::Exceptions::Error => e
Expand Down Expand Up @@ -619,7 +624,8 @@ def parse_single_replace_operation(data, keys, id_key_presence_check_required: t
@resource_klass,
context: @context,
resource_id: key,
data: parse_params(data, updatable_fields)
data: parse_params(data, updatable_fields),
fields: @fields
)
end

Expand Down