Skip to content

Processor#show_related_resources pass options to result if they are calculated #1134

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 1 commit into from
Dec 10, 2017
Merged

Processor#show_related_resources pass options to result if they are calculated #1134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 11 additions & 15 deletions lib/jsonapi/processor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,32 +186,28 @@ def show_related_resources
serializer,
find_options)

opts = result_options
if ((JSONAPI.configuration.top_level_meta_include_record_count) ||
(paginator && paginator.class.requires_record_count) ||
(JSONAPI.configuration.top_level_meta_include_page_count))

record_count = source_resource.class.count_related(
opts[:record_count] = source_resource.class.count_related(
source_resource.identity,
relationship_type,
find_options)
end

if (JSONAPI.configuration.top_level_meta_include_page_count && record_count)
page_count = paginator.calculate_page_count(record_count)
if (JSONAPI.configuration.top_level_meta_include_page_count && opts[:record_count])
opts[:page_count] = paginator.calculate_page_count(opts[:record_count])
end

pagination_params = if paginator && JSONAPI.configuration.top_level_links_include_pagination
page_options = {}
page_options[:record_count] = record_count if paginator.class.requires_record_count
paginator.links_page_params(page_options.merge(fetched_resources: resource_set))
else
{}
end

opts = result_options
opts.merge!(pagination_params: pagination_params) if JSONAPI.configuration.top_level_links_include_pagination
opts.merge!(record_count: record_count) if JSONAPI.configuration.top_level_meta_include_record_count
opts.merge!(page_count: page_count) if JSONAPI.configuration.top_level_meta_include_page_count
opts[:pagination_params] = if paginator && JSONAPI.configuration.top_level_links_include_pagination
page_options = {}
page_options[:record_count] = opts[:record_count] if paginator.class.requires_record_count
paginator.links_page_params(page_options.merge(fetched_resources: resource_set))
else
{}
end

return JSONAPI::RelatedResourcesSetOperationResult.new(:ok,
source_resource,
Expand Down