-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Add support for autoloading nested related objects on ingredients #72
Open
mamhoff
wants to merge
2
commits into
main
Choose a base branch
from
better-autoloading
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+90
−5
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,10 +38,10 @@ def show | |
def render_pages_json(allowed) | ||
# Only load pages with all includes when browser cache is stale | ||
jsonapi_filter(page_scope_with_includes, allowed) do |filtered| | ||
# decorate with our page model that has a eager loaded elements collection | ||
filtered_pages = filtered.result.map { |page| api_page(page) } | ||
jsonapi_paginate(filtered_pages) do |paginated| | ||
render jsonapi: paginated | ||
jsonapi_paginate(filtered.result) do |paginated| | ||
# decorate with our page model that has a eager loaded elements collection | ||
decorated_pages = preload_ingredients(paginated).map { |page| api_page(page) } | ||
render jsonapi: decorated_pages | ||
end | ||
end | ||
end | ||
|
@@ -74,7 +74,9 @@ def jsonapi_meta(pages) | |
end | ||
|
||
def load_page | ||
@page = load_page_by_id || load_page_by_urlname || raise(ActiveRecord::RecordNotFound) | ||
@page = preload_ingredients( | ||
[load_page_by_id || load_page_by_urlname || raise(ActiveRecord::RecordNotFound)] | ||
).first | ||
end | ||
|
||
def load_page_by_id | ||
|
@@ -109,6 +111,14 @@ def page_scope_with_includes | |
) | ||
end | ||
|
||
def preload_ingredients(scope) | ||
if params[:include]&.match?(/ingredients/) | ||
Alchemy::JsonApi::Page.preload_ingredient_relations(scope, page_version_type) | ||
else | ||
scope | ||
end | ||
end | ||
|
||
def page_version_type | ||
:public_version | ||
end | ||
|
@@ -129,6 +139,42 @@ def base_page_scope | |
def jsonapi_serializer_class(_resource, _is_collection) | ||
::Alchemy::JsonApi::PageSerializer | ||
end | ||
|
||
# These overrides have to be in place until | ||
# https://github.com/stas/jsonapi.rb/pull/91 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since this has been merged, can this be removed? |
||
# is merged and released | ||
def jsonapi_paginate(resources) | ||
@_jsonapi_original_size = resources.size | ||
super | ||
end | ||
|
||
def jsonapi_pagination_meta(resources) | ||
return {} unless JSONAPI::Rails.is_collection?(resources) | ||
|
||
_, limit, page = jsonapi_pagination_params | ||
|
||
numbers = { current: page } | ||
|
||
total = @_jsonapi_original_size | ||
|
||
last_page = [1, (total.to_f / limit).ceil].max | ||
|
||
if page > 1 | ||
numbers[:first] = 1 | ||
numbers[:prev] = page - 1 | ||
end | ||
|
||
if page < last_page | ||
numbers[:next] = page + 1 | ||
numbers[:last] = last_page | ||
end | ||
|
||
if total.present? | ||
numbers[:records] = total | ||
end | ||
|
||
numbers | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We removed essence support. This can probably be removed now.