Skip to content
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

Always include to_one linkage #1218

Merged
merged 15 commits into from
Feb 11, 2019
Merged

Always include to_one linkage #1218

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
895c5da
Add test for empty included relationships containing data elements
lgebhardt Jan 9, 2019
86f0c0d
Remove find_records overrides from tests
lgebhardt Jan 14, 2019
087568e
Remove unused `retrieve_records` method
lgebhardt Jan 14, 2019
fe5c5f1
Move `records` method to ActiveRelationResourceFinder
lgebhardt Jan 14, 2019
3213d57
Introduce Path class for parsing include, filter and sort paths
lgebhardt Feb 6, 2019
825c964
Update test fixtures and data
lgebhardt Feb 6, 2019
789b3b7
Rework joins and support belongs_to linkages without includes
lgebhardt Feb 6, 2019
9c00a9a
Fix count on `records` that select a column on rails 4
lgebhardt Feb 6, 2019
48f1c0a
Add join_left ActiveRecordAdapter to ponyfill
lgebhardt Feb 7, 2019
dd9ab5e
Do not use pagination or sorting in `count`
lgebhardt Feb 7, 2019
6243176
Rename PathPart to PathSegment
lgebhardt Feb 8, 2019
9c0391d
Clarify logic for processing polymorphic path segments with resource …
lgebhardt Feb 8, 2019
14b1a1e
Clarify model check
lgebhardt Feb 8, 2019
9918556
Test caching for `show_related_resource` requests
lgebhardt Feb 8, 2019
d82073c
Simplify and test `relationship_segments`
lgebhardt Feb 8, 2019
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
Prev Previous commit
Next Next commit
Clarify logic for processing polymorphic path segments with resource … 
…type
  • Loading branch information
@lgebhardt
lgebhardt committed Feb 8, 2019
commit 9c0391d5e9486bf57d4ee0383fb6459571a9605b
7 changes: 6 additions & 1 deletion lib/jsonapi/active_relation_resource_finder/join_tree.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ def process_path_to_tree(path_segments, resource_klass, default_join_type, defau

segment.relationship.resource_types.each do |related_resource_type|
related_resource_klass = resource_klass.resource_klass_for(related_resource_type)
if !segment.path_specified_resource_klass? || related_resource_klass == segment.resource_klass

# If the resource type was specified in the path segment we want to only process the next segments for
# that resource type, otherwise process for all
process_all_types = !segment.path_specified_resource_klass?

if process_all_types || related_resource_klass == segment.resource_klass
related_resource_tree = process_path_to_tree(path_segments.dup, related_resource_klass, default_join_type, default_polymorphic_join_type)
node[:resource_klasses][resource_klass][:relationships][segment.relationship].deep_merge!(related_resource_tree)
end
Expand Down