73ff4169e8
There is no reason to create an instance variable as we don't pass this
to the view. Further, by adding this as a before_action there's a
disconnect in logic.
This commit attempts to address those issues.
What follows is a three-fold change:
1. Removing the before action (let's just call the method)
2. Reworking the method to reduce, just a bit, the method cost
3. Removing an unused instance variable
Here are the benchmarks. Note the "follows_limit" as written below is
the "Proposed" route.
```ruby
require 'benchmark'
def follows_limit_original(params:, default: 80, max: 1000)
per_page = (params[:per_page] || default).to_i
@follows_limit = [per_page, max].min
end
def follows_limit(params:, default: 80, max: 1000)
return default unless params.key?(:per_page)
per_page = params[:per_page].to_i
return max
per_page
end
def follows_limit_alt(params:, default: 80, max: 1000)
per_page = params.fetch(:per_page, default).to_i
return max if per_page > max
per_page
end
TIMES = 10_000
Benchmark.bmbm do |b|
b.report("Original no params") { 1000.times { follows_limit_original(params: {}) } }
b.report("Original less than max") { 1000.times { follows_limit_original(params: {per_page: 90 }) } }
b.report("Original greater than max") { 1000.times { follows_limit_original(params: {per_page: 9000 }) } }
b.report("Proposed no params") { 1000.times { follows_limit(params: {}) } }
b.report("Proposed less than max") { 1000.times { follows_limit(params: {per_page: 90 }) } }
b.report("Proposed greater than max") { 1000.times { follows_limit(params: {per_page: 9000 }) } }
b.report("Alt no params") { 1000.times { follows_limit_alt(params: {}) } }
b.report("Alt less than max") { 1000.times { follows_limit_alt(params: {per_page: 90 }) } }
b.report("Alt greater than max") { 1000.times { follows_limit_alt(params: {per_page: 9000 }) } }
end
```
```shell
$ ruby /Users/jfriesen/git/forem/bench.rb
Rehearsal -------------------------------------------------------------
Original no params 0.000403 0.000002 0.000405 ( 0.000405)
Original less than max 0.000109 0.000005 0.000114 ( 0.000114)
Original greater than max 0.000161 0.000006 0.000167 ( 0.000166)
Proposed no params 0.000076 0.000001 0.000077 ( 0.000076)
Proposed less than max 0.000114 0.000009 0.000123 ( 0.000126)
Proposed greater than max 0.000112 0.000011 0.000123 ( 0.000123)
Alt no params 0.000104 0.000007 0.000111 ( 0.000114)
Alt less than max 0.000113 0.000009 0.000122 ( 0.000122)
Alt greater than max 0.000111 0.000001 0.000112 ( 0.000115)
---------------------------------------------------- total: 0.001354sec
user system total real
Original no params 0.000108 0.000000 0.000108 ( 0.000110)
Original less than max 0.000109 0.000001 0.000110 ( 0.000111)
Original greater than max 0.000109 0.000000 0.000109 ( 0.000109)
Proposed no params 0.000071 0.000000 0.000071 ( 0.000071)
Proposed less than max 0.000103 0.000001 0.000104 ( 0.000103)
Proposed greater than max 0.000102 0.000000 0.000102 ( 0.000103)
Alt no params 0.000093 0.000000 0.000093 ( 0.000093)
Alt less than max 0.000103 0.000000 0.000103 ( 0.000104)
Alt greater than max 0.000102 0.000000 0.000102 ( 0.000103)
```
106 lines
3.3 KiB
Ruby
106 lines
3.3 KiB
Ruby
class DashboardsController < ApplicationController
|
|
before_action :set_no_cache_header
|
|
before_action :authenticate_user!
|
|
|
|
LIMIT_PER_PAGE_DEFAULT = 80
|
|
LIMIT_PER_PAGE_MAX = 1000
|
|
def show
|
|
fetch_and_authorize_user
|
|
target = @user
|
|
not_authorized if params[:org_id] && !@user.org_admin?(params[:org_id] || @user.any_admin?)
|
|
|
|
@organizations = @user.admin_organizations
|
|
|
|
if params[:which] == "organization" && params[:org_id] && (@user.org_admin?(params[:org_id]) || @user.any_admin?)
|
|
target = @organizations.find_by(id: params[:org_id])
|
|
@organization = target
|
|
@articles = target.articles
|
|
else
|
|
# if the target is a user, we need to eager load the organization
|
|
@articles = target.articles.includes(:organization)
|
|
end
|
|
|
|
@reactions_count = @articles.sum(&:public_reactions_count)
|
|
@page_views_count = @articles.sum(&:page_views_count)
|
|
|
|
@articles = @articles.includes(:collection).sorting(params[:sort]).decorate
|
|
@articles = Kaminari.paginate_array(@articles).page(params[:page]).per(50)
|
|
@collections_count = target.collections.non_empty.count
|
|
end
|
|
|
|
def following_tags
|
|
fetch_and_authorize_user
|
|
@followed_tags = @user.follows_by_type("ActsAsTaggableOn::Tag")
|
|
.order(points: :desc).includes(:followable).limit(follows_limit)
|
|
end
|
|
|
|
def following_users
|
|
fetch_and_authorize_user
|
|
@follows = @user.follows_by_type("User")
|
|
.order(created_at: :desc).includes(:followable).limit(follows_limit)
|
|
end
|
|
|
|
def following_organizations
|
|
fetch_and_authorize_user
|
|
@followed_organizations = @user.follows_by_type("Organization")
|
|
.order(created_at: :desc).includes(:followable).limit(follows_limit)
|
|
end
|
|
|
|
def following_podcasts
|
|
fetch_and_authorize_user
|
|
@followed_podcasts = @user.follows_by_type("Podcast")
|
|
.order(created_at: :desc).includes(:followable).limit(follows_limit)
|
|
end
|
|
|
|
def followers
|
|
fetch_and_authorize_user
|
|
@follows = Follow.followable_user(@user.id)
|
|
.includes(:follower).order(created_at: :desc).limit(follows_limit)
|
|
end
|
|
|
|
def analytics
|
|
@user_or_org = if params[:org_id]
|
|
Organization.find_by(id: params[:org_id])
|
|
else
|
|
current_user
|
|
end
|
|
@organizations = current_user.member_organizations
|
|
end
|
|
|
|
def subscriptions
|
|
fetch_and_authorize_user
|
|
set_source
|
|
authorize @source
|
|
@subscriptions = @source.user_subscriptions
|
|
.includes(:subscriber).order(created_at: :desc).page(params[:page]).per(100)
|
|
end
|
|
|
|
private
|
|
|
|
def set_source
|
|
source_type = UserSubscription::ALLOWED_TYPES.detect { |allowed_type| allowed_type == params[:source_type] }
|
|
|
|
not_found unless source_type
|
|
|
|
source = source_type.constantize.find_by(id: params[:source_id])
|
|
@source = source || not_found
|
|
end
|
|
|
|
def fetch_and_authorize_user
|
|
@user = if params[:username] && current_user.any_admin?
|
|
User.find_by(username: params[:username])
|
|
else
|
|
current_user
|
|
end
|
|
authorize (@user || User), :dashboard_show?
|
|
end
|
|
|
|
def follows_limit(default: LIMIT_PER_PAGE_DEFAULT, max: LIMIT_PER_PAGE_MAX)
|
|
return default unless params.key?(:per_page)
|
|
|
|
per_page = params[:per_page].to_i
|
|
return max if per_page > max
|
|
|
|
per_page
|
|
end
|
|
end
|