make include_relationship? a public method and use it in get_included_records method
This commit is contained in:
parent
30596c4488
commit
f86a8926f5
@ -42,8 +42,6 @@ module FastJsonapi
|
||||
record.send(object_method_name)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def include_relationship?(record, serialization_params)
|
||||
if conditional_proc.present?
|
||||
conditional_proc.call(record, serialization_params)
|
||||
@ -52,6 +50,8 @@ module FastJsonapi
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def ids_hash_from_record_and_relationship(record, params = {})
|
||||
return ids_hash(
|
||||
fetch_id(record, params)
|
||||
|
@ -112,8 +112,7 @@ module FastJsonapi
|
||||
items.each do |item|
|
||||
next unless relationships_to_serialize && relationships_to_serialize[item]
|
||||
relationship_item = relationships_to_serialize[item]
|
||||
conditional_proc = relationship_item.conditional_proc
|
||||
next if conditional_proc && !conditional_proc.call(record, params)
|
||||
next unless relationship_item.include_relationship?(record, params)
|
||||
raise NotImplementedError if relationship_item.polymorphic.is_a?(Hash)
|
||||
record_type = relationship_item.record_type
|
||||
serializer = relationship_item.serializer.to_s.constantize
|
||||
|
Loading…
x
Reference in New Issue
Block a user