Skip to content

avoid situation where the linkage data could be partially calculated #789

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
Aug 31, 2016
Merged

avoid situation where the linkage data could be partially calculated #789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49c8bc6
avoid situation where the linkage data could be partially calculated
barelyknown Aug 2, 2016
ea8bb3c
test presence (catch empty strings too) of linkage_id and linkage_type
barelyknown Aug 2, 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: 9 additions & 9 deletions lib/jsonapi/resource_serializer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,16 +353,14 @@ def related_link(source, relationship)
end

def to_one_linkage(source, relationship)
linkage = {}
linkage_id = foreign_key_value(source, relationship)
linkage_type = format_key(relationship.type_for_source(source))
return unless linkage_id.present? && linkage_type.present?

if linkage_id
linkage[:type] = format_key(relationship.type_for_source(source))
linkage[:id] = linkage_id
else
linkage = nil
end
linkage
{
type: linkage_type,
id: linkage_id,
}
end

def to_many_linkage(source, relationship)
Expand Down Expand Up @@ -390,7 +388,9 @@ def to_many_linkage(source, relationship)
end

linkage_types_and_values.each do |type, value|
linkage.append({type: format_key(type), id: @id_formatter.format(value)})
if type && value
linkage.append({type: format_key(type), id: @id_formatter.format(value)})
end
end
linkage
end
Expand Down