Skip to content

Commit 6e7d8b7

Browse files
kyreevesshishirmk
authored andcommitted
make fetch_associated_object a public method on relationship class so it can be called from SerilizationCore class
1 parent 22d4122 commit 6e7d8b7

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

lib/fast_jsonapi/relationship.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ def serialize(record, serialization_params, output_hash)
3737
end
3838
end
3939

40+
def fetch_associated_object(record, params)
41+
return object_block.call(record, params) unless object_block.nil?
42+
record.send(object_method_name)
43+
end
44+
4045
private
4146

4247
def include_relationship?(record, serialization_params)
@@ -80,11 +85,6 @@ def id_hash(id, associated_record_type, default_return=false)
8085
end
8186
end
8287

83-
def fetch_associated_object(record, params)
84-
return object_block.call(record, params) unless object_block.nil?
85-
record.send(object_method_name)
86-
end
87-
8888
def fetch_id(record, params)
8989
unless object_block.nil?
9090
object = object_block.call(record, params)

lib/fast_jsonapi/serialization_core.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def get_included_records(record, includes_list, known_included_objects, params =
119119
serializer = relationship_item.serializer.to_s.constantize
120120
relationship_type = relationship_item.relationship_type
121121

122-
included_objects = fetch_associated_object(record, relationship_item, params)
122+
included_objects = relationship_item.fetch_associated_object(record, params)
123123
next if included_objects.blank?
124124
included_objects = [included_objects] unless relationship_type == :has_many
125125

@@ -138,11 +138,6 @@ def get_included_records(record, includes_list, known_included_objects, params =
138138
end
139139
end
140140
end
141-
142-
def fetch_associated_object(record, relationship, params)
143-
return relationship.object_block.call(record, params) unless relationship.object_block.nil?
144-
record.send(relationship.object_method_name)
145-
end
146141
end
147142
end
148143
end

0 commit comments

Comments
 (0)