From 7989226d3ff300dcf79fdba74413525ecb94028d Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Tue, 26 Oct 2021 10:18:52 -0400 Subject: [PATCH] Jeremyf/refactor order of operations (#15192) * Adding guard clause for nill org feed score There's no sense running a query if we don't have an organization. This is a small refactor that might offer a most nominal speed bump * Caching calculated value Prior to this commit, we calculated the user_experience_level once per article in the feed. This change adds a cache, creating a minor computational improvement. --- .../articles/feeds/large_forem_experimental.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/services/articles/feeds/large_forem_experimental.rb b/app/services/articles/feeds/large_forem_experimental.rb index 0ee5b8e79..671c7301c 100644 --- a/app/services/articles/feeds/large_forem_experimental.rb +++ b/app/services/articles/feeds/large_forem_experimental.rb @@ -1,6 +1,7 @@ module Articles module Feeds class LargeForemExperimental + DEFAULT_USER_XP_LEVEL = 5 def initialize(user: nil, number_of_articles: 50, page: 1, tag: nil) @user = user @number_of_articles = number_of_articles @@ -74,12 +75,13 @@ module Articles # @api private def score_followed_organization(article, followed_org_score: 1, not_followed_org_score: 0) + return not_followed_org_score unless article.organization_id? + user_following_org_ids.include?(article.organization_id) ? followed_org_score : not_followed_org_score end # @api private - def score_experience_level(article, xp_level_weight: @xp_level_weight, default_user_xp_level: 5) - user_experience_level = @user&.setting&.experience_level || default_user_xp_level + def score_experience_level(article, xp_level_weight: @xp_level_weight) - (((article.experience_level_rating - user_experience_level).abs / 2) * xp_level_weight) end @@ -111,6 +113,10 @@ module Articles private + def user_experience_level + @user_experience_level ||= @user&.setting&.experience_level || DEFAULT_USER_XP_LEVEL + end + def experimental_hot_story_grab start_time = [(@user.page_views.second_to_last&.created_at || 7.days.ago) - 18.hours, 7.days.ago].max Article.published.limited_column_select.includes(top_comments: :user)