Skip to content

Commit f86a892

Browse files
kyreevesshishirmk
authored andcommitted
make include_relationship? a public method and use it in get_included_records method
1 parent 30596c4 commit f86a892

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

lib/fast_jsonapi/relationship.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ def fetch_associated_object(record, params)
4242
record.send(object_method_name)
4343
end
4444

45-
private
46-
4745
def include_relationship?(record, serialization_params)
4846
if conditional_proc.present?
4947
conditional_proc.call(record, serialization_params)
@@ -52,6 +50,8 @@ def include_relationship?(record, serialization_params)
5250
end
5351
end
5452

53+
private
54+
5555
def ids_hash_from_record_and_relationship(record, params = {})
5656
return ids_hash(
5757
fetch_id(record, params)

lib/fast_jsonapi/serialization_core.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ def get_included_records(record, includes_list, known_included_objects, params =
112112
items.each do |item|
113113
next unless relationships_to_serialize && relationships_to_serialize[item]
114114
relationship_item = relationships_to_serialize[item]
115-
conditional_proc = relationship_item.conditional_proc
116-
next if conditional_proc && !conditional_proc.call(record, params)
115+
next unless relationship_item.include_relationship?(record, params)
117116
raise NotImplementedError if relationship_item.polymorphic.is_a?(Hash)
118117
record_type = relationship_item.record_type
119118
serializer = relationship_item.serializer.to_s.constantize

0 commit comments

Comments
 (0)