diff --git a/app/assets/javascripts/initializers/initScrolling.js.erb b/app/assets/javascripts/initializers/initScrolling.js.erb index 901783156..53e566051 100644 --- a/app/assets/javascripts/initializers/initScrolling.js.erb +++ b/app/assets/javascripts/initializers/initScrolling.js.erb @@ -226,7 +226,7 @@ function paginate(tag, params, requiresApproval) { } else { searchHash.class_name = "Article"; searchHash["published_at[gte]"] = homeEl.dataset.articlesSince; - searchHash.sort_by = "positive_reactions_count"; + searchHash.sort_by = "public_reactions_count"; } // Brute force copying code from a utlity for quick fix diff --git a/app/assets/javascripts/initializers/initializeCommentsPage.js.erb b/app/assets/javascripts/initializers/initializeCommentsPage.js.erb index 62fde8dde..3086d5d5c 100644 --- a/app/assets/javascripts/initializers/initializeCommentsPage.js.erb +++ b/app/assets/javascripts/initializers/initializeCommentsPage.js.erb @@ -18,21 +18,21 @@ function initializeCommentsPage() { var responseObj = JSON.parse(ajaxReq.response); var reactions = responseObj.reactions; var allNodes = document.getElementsByClassName('single-comment-node'); - var positiveReactionCounts = responseObj.positive_reaction_counts; + var publicReactionCounts = responseObj.public_reaction_counts; for (var i = 0; i < reactions.length; i++) { var buttForComment = document.getElementById('button-for-comment-' + reactions[i].reactable_id); if (buttForComment) { buttForComment.classList.add('reacted'); } } - for (var i = 0; i < positiveReactionCounts.length; i++) { - var buttForComment = document.getElementById('button-for-comment-' + positiveReactionCounts[i].id); + for (var i = 0; i < publicReactionCounts.length; i++) { + var buttForComment = document.getElementById('button-for-comment-' + publicReactionCounts[i].id); if (buttForComment) { - if (positiveReactionCounts[i].count > 0) { - if (!document.getElementById('reactions-count-' + positiveReactionCounts[i].id)) { - buttForComment.innerHTML = buttForComment.innerHTML + "" + positiveReactionCounts[i].count + ''; + if (publicReactionCounts[i].count > 0) { + if (!document.getElementById('reactions-count-' + publicReactionCounts[i].id)) { + buttForComment.innerHTML = buttForComment.innerHTML + "" + publicReactionCounts[i].count + ''; } else { - document.getElementById('reactions-count-' + positiveReactionCounts[i].id).innerHTML = positiveReactionCounts[i].count; + document.getElementById('reactions-count-' + publicReactionCounts[i].id).innerHTML = publicReactionCounts[i].count; } } } diff --git a/app/assets/javascripts/utilities/buildArticleHTML.js.erb b/app/assets/javascripts/utilities/buildArticleHTML.js.erb index 5788a79d3..c8978f78b 100644 --- a/app/assets/javascripts/utilities/buildArticleHTML.js.erb +++ b/app/assets/javascripts/utilities/buildArticleHTML.js.erb @@ -51,7 +51,7 @@ function buildArticleHTML(article) { flareTag = "person" } - var rc = article.positive_reactions_count + var rc = article.public_reactions_count var reactionsCount = (rc || '0') var reactionsDisplay = ''; diff --git a/app/assets/javascripts/utilities/buildCommentHTML.js.erb b/app/assets/javascripts/utilities/buildCommentHTML.js.erb index 3e2abd549..295b06528 100644 --- a/app/assets/javascripts/utilities/buildCommentHTML.js.erb +++ b/app/assets/javascripts/utilities/buildCommentHTML.js.erb @@ -108,6 +108,6 @@ function reactions(comment) { return ''; + '+comment.public_reactions_count+''; } } diff --git a/app/controllers/api/v0/articles_controller.rb b/app/controllers/api/v0/articles_controller.rb index 5edc13aee..4b5a80544 100644 --- a/app/controllers/api/v0/articles_controller.rb +++ b/app/controllers/api/v0/articles_controller.rb @@ -76,7 +76,7 @@ module Api id user_id organization_id collection_id title description main_image published_at crossposted_at social_image cached_tag_list slug path canonical_url comments_count - positive_reactions_count created_at edited_at last_comment_at published + public_reactions_count created_at edited_at last_comment_at published updated_at video_thumbnail_url ].freeze private_constant :INDEX_ATTRIBUTES_FOR_SERIALIZATION @@ -89,7 +89,7 @@ module Api ME_ATTRIBUTES_FOR_SERIALIZATION = %i[ id user_id organization_id title description main_image published published_at cached_tag_list - slug path canonical_url comments_count positive_reactions_count + slug path canonical_url comments_count public_reactions_count page_views_count crossposted_at body_markdown updated_at ].freeze private_constant :ME_ATTRIBUTES_FOR_SERIALIZATION diff --git a/app/controllers/internal/articles_controller.rb b/app/controllers/internal/articles_controller.rb index 14468c62a..b6d93ee25 100644 --- a/app/controllers/internal/articles_controller.rb +++ b/app/controllers/internal/articles_controller.rb @@ -54,7 +54,7 @@ class Internal::ArticlesController < Internal::ApplicationController where("published_at > ? OR crossposted_at > ?", days_ago.days.ago, days_ago.days.ago). includes(:user). limited_columns_internal_select. - order("positive_reactions_count DESC"). + order("public_reactions_count DESC"). page(params[:page]). per(50) end @@ -64,7 +64,7 @@ class Internal::ArticlesController < Internal::ApplicationController where("published_at > ?", months_ago). includes(user: [:notes]). limited_columns_internal_select. - order("positive_reactions_count DESC"). + order("public_reactions_count DESC"). page(params[:page]). per(50) end diff --git a/app/controllers/internal/comments_controller.rb b/app/controllers/internal/comments_controller.rb index e7d07244c..488535529 100644 --- a/app/controllers/internal/comments_controller.rb +++ b/app/controllers/internal/comments_controller.rb @@ -6,7 +6,7 @@ class Internal::CommentsController < Internal::ApplicationController Comment. includes(:user). includes(:commentable). - order("positive_reactions_count DESC"). + order("public_reactions_count DESC"). where("created_at > ?", params[:state].split("-").last.to_i.days.ago). page(params[:page] || 1).per(50) else diff --git a/app/controllers/reactions_controller.rb b/app/controllers/reactions_controller.rb index f040b1aff..b8013dc61 100644 --- a/app/controllers/reactions_controller.rb +++ b/app/controllers/reactions_controller.rb @@ -10,7 +10,7 @@ class ReactionsController < ApplicationController id = params[:article_id] reactions = if session_current_user_id - Reaction.positive. + Reaction.public_category. where( reactable_id: id, reactable_type: "Article", @@ -24,20 +24,20 @@ class ReactionsController < ApplicationController else comments = Comment. where(commentable_id: params[:commentable_id], commentable_type: params[:commentable_type]). - select(%i[id positive_reactions_count]) + select(%i[id public_reactions_count]) reaction_counts = comments.map do |comment| - { id: comment.id, count: comment.positive_reactions_count } + { id: comment.id, count: comment.public_reactions_count } end reactions = if session_current_user_id comment_ids = reaction_counts.map { |rc| rc[:id] } - cached_user_positive_reactions(current_user).where(reactable_id: comment_ids) + cached_user_public_reactions(current_user).where(reactable_id: comment_ids) else Reaction.none end - result = { positive_reaction_counts: reaction_counts } + result = { public_reaction_counts: reaction_counts } end render json: { @@ -95,9 +95,9 @@ class ReactionsController < ApplicationController render json: { result: result, category: category } end - def cached_user_positive_reactions(user) - Rails.cache.fetch("cached_user_reactions-#{user.id}-#{user.positive_reactions_count}", expires_in: 24.hours) do - user.reactions.positive + def cached_user_public_reactions(user) + Rails.cache.fetch("cached_user_reactions-#{user.id}-#{user.public_reactions_count}", expires_in: 24.hours) do + user.reactions.public_category end end diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb index 92306c899..7db08083d 100644 --- a/app/controllers/stories_controller.rb +++ b/app/controllers/stories_controller.rb @@ -1,7 +1,7 @@ class StoriesController < ApplicationController DEFAULT_HOME_FEED_ATTRIBUTES_FOR_SERIALIZATION = { only: %i[ - title path id user_id comments_count positive_reactions_count organization_id + title path id user_id comments_count public_reactions_count organization_id reading_time video_thumbnail_url video video_duration_in_minutes language experience_level_rating experience_level_rating_distribution cached_user cached_organization classified_listing_category_id @@ -319,7 +319,7 @@ class StoriesController < ApplicationController def stories_by_timeframe if %w[week month year infinity].include?(params[:timeframe]) @stories.where("published_at > ?", Timeframer.new(params[:timeframe]).datetime). - order("positive_reactions_count DESC") + order("public_reactions_count DESC") elsif params[:timeframe] == "latest" @stories.where("score > ?", -20).order("published_at DESC") else diff --git a/app/javascript/articles/__tests__/utilities/articleUtilities.js b/app/javascript/articles/__tests__/utilities/articleUtilities.js index 4616fc3c5..9add848b7 100644 --- a/app/javascript/articles/__tests__/utilities/articleUtilities.js +++ b/app/javascript/articles/__tests__/utilities/articleUtilities.js @@ -127,7 +127,7 @@ export const articleWithReactions = { published_at: '2020-03-19T10:04:15-05:00', readable_publish_date: 'February 18', top_comments: [], - positive_reactions_count: 232, + public_reactions_count: 232, }; export const articleWithComments = { @@ -169,7 +169,7 @@ export const articleWithComments = { profile_image_90: '/images/7.png', }, ], - positive_reactions_count: 428, + public_reactions_count: 428, comments_count: 213, }; @@ -311,7 +311,7 @@ export const userArticle = { export const featuredArticle = { ...article, main_image: '/images/onboarding-background.png', - positive_reactions_count: 428, + public_reactions_count: 428, comments_count: 213, }; diff --git a/app/javascript/articles/components/ReactionsCount.jsx b/app/javascript/articles/components/ReactionsCount.jsx index 80ab1db5a..f4672401e 100644 --- a/app/javascript/articles/components/ReactionsCount.jsx +++ b/app/javascript/articles/components/ReactionsCount.jsx @@ -3,7 +3,7 @@ import { articlePropTypes } from '../../common-prop-types'; import { Button } from '../../crayons/Button'; export const ReactionsCount = ({ article }) => { - const totalReactions = article.positive_reactions_count || 0; + const totalReactions = article.public_reactions_count || 0; const reactionsSVG = () => ( ?", 24).find_each do |comment| + Comment.where("public_reactions_count > ?", 24).find_each do |comment| message = "You're famous! [This is the comment](https://#{ApplicationConfig['APP_DOMAIN']}#{comment.path}) for which you are being recognized. 😄" achievement = BadgeAchievement.create( user_id: comment.user_id, diff --git a/app/labor/cache_buster.rb b/app/labor/cache_buster.rb index ad6cbd434..c07fca2c4 100644 --- a/app/labor/cache_buster.rb +++ b/app/labor/cache_buster.rb @@ -77,7 +77,7 @@ module CacheBuster end TIMEFRAMES.each do |timestamp, interval| if Article.published.where("published_at > ?", timestamp). - order("positive_reactions_count DESC").limit(3).pluck(:id).include?(article.id) + order("public_reactions_count DESC").limit(3).pluck(:id).include?(article.id) bust("/top/#{interval}") bust("/top/#{interval}?i=i") bust("/top/#{interval}/?i=i") @@ -100,7 +100,7 @@ module CacheBuster end TIMEFRAMES.each do |timestamp, interval| if Article.published.where("published_at > ?", timestamp).tagged_with(tag). - order("positive_reactions_count DESC").limit(3).pluck(:id).include?(article.id) + order("public_reactions_count DESC").limit(3).pluck(:id).include?(article.id) bust("/top/#{interval}") bust("/top/#{interval}?i=i") bust("/top/#{interval}/?i=i") diff --git a/app/labor/reading_list.rb b/app/labor/reading_list.rb index d5126d034..c20696179 100644 --- a/app/labor/reading_list.rb +++ b/app/labor/reading_list.rb @@ -14,7 +14,7 @@ class ReadingList end def cached_ids_of_articles - Rails.cache.fetch("reading_list_ids_of_articles_#{user.id}_#{user.positive_reactions_count}") do + Rails.cache.fetch("reading_list_ids_of_articles_#{user.id}_#{user.public_reactions_count}") do ids_of_articles end end diff --git a/app/labor/sticky_article_collection.rb b/app/labor/sticky_article_collection.rb index 073d0ef0a..d4a4a4d0b 100644 --- a/app/labor/sticky_article_collection.rb +++ b/app/labor/sticky_article_collection.rb @@ -23,7 +23,7 @@ class StickyArticleCollection def tag_articles @tag_articles ||= Article.published.tagged_with(article_tags, any: true). includes(:user). - where("positive_reactions_count > ? OR comments_count > ?", reaction_count_num, comment_count_num). + where("public_reactions_count > ? OR comments_count > ?", reaction_count_num, comment_count_num). where.not(id: article.id, user_id: article.user_id). where("featured_number > ?", 5.days.ago.to_i). order(Arel.sql("RANDOM()")). diff --git a/app/models/article.rb b/app/models/article.rb index 5b6f108eb..3ca64ae0b 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -119,7 +119,7 @@ class Article < ApplicationRecord scope :limited_column_select, lambda { select(:path, :title, :id, :published, - :comments_count, :positive_reactions_count, :cached_tag_list, + :comments_count, :public_reactions_count, :cached_tag_list, :main_image, :main_image_background_hex_color, :updated_at, :slug, :video, :user_id, :organization_id, :video_source_url, :video_code, :video_thumbnail_url, :video_closed_caption_track_url, :language, @@ -130,7 +130,7 @@ class Article < ApplicationRecord scope :limited_columns_internal_select, lambda { select(:path, :title, :id, :featured, :approved, :published, - :comments_count, :positive_reactions_count, :cached_tag_list, + :comments_count, :public_reactions_count, :cached_tag_list, :main_image, :main_image_background_hex_color, :updated_at, :boost_states, :video, :user_id, :organization_id, :video_source_url, :video_code, :video_thumbnail_url, :video_closed_caption_track_url, :social_image, @@ -157,7 +157,7 @@ class Article < ApplicationRecord case kind when "creation" then :created_at when "views" then :page_views_count - when "reactions" then :positive_reactions_count + when "reactions" then :public_reactions_count when "comments" then :comments_count when "published" then :published_at else @@ -339,7 +339,7 @@ class Article < ApplicationRecord private def search_score - calculated_score = hotness_score.to_i + ((comments_count * 3).to_i + positive_reactions_count.to_i * 300 * user.reputation_modifier * score.to_i) + calculated_score = hotness_score.to_i + ((comments_count * 3).to_i + public_reactions_count.to_i * 300 * user.reputation_modifier * score.to_i) calculated_score.to_i end diff --git a/app/models/concerns/reactable.rb b/app/models/concerns/reactable.rb index 7aefbdfaa..5b33c91c0 100644 --- a/app/models/concerns/reactable.rb +++ b/app/models/concerns/reactable.rb @@ -6,6 +6,6 @@ module Reactable end def sync_reactions_count - update_column(:positive_reactions_count, reactions.positive.size) + update_column(:public_reactions_count, reactions.public_category.size) end end diff --git a/app/models/podcast_episode.rb b/app/models/podcast_episode.rb index dbd84866c..f44580ba4 100644 --- a/app/models/podcast_episode.rb +++ b/app/models/podcast_episode.rb @@ -75,7 +75,6 @@ class PodcastEpisode < ApplicationRecord end alias hotness_score zero_method alias search_score zero_method - alias positive_reactions_count zero_method alias public_reactions_count zero_method def class_name diff --git a/app/models/reaction.rb b/app/models/reaction.rb index 28a5614f7..93c5d30fc 100644 --- a/app/models/reaction.rb +++ b/app/models/reaction.rb @@ -5,6 +5,7 @@ class Reaction < ApplicationRecord SEARCH_CLASS = Search::Reaction CATEGORIES = %w[like readinglist unicorn thinking hands thumbsdown vomit].freeze + PUBLIC_CATEGORIES = %w[like readinglist unicorn thinking hands].freeze REACTABLE_TYPES = %w[Comment Article User].freeze STATUSES = %w[valid invalid confirmed archived].freeze @@ -13,11 +14,11 @@ class Reaction < ApplicationRecord counter_culture :reactable, column_name: proc { |model| - model.points.positive? ? "positive_reactions_count" : "reactions_count" + PUBLIC_CATEGORIES.include?(model.category) ? "public_reactions_count" : "reactions_count" } counter_culture :user - scope :positive, -> { where("points > ?", 0) } + scope :public_category, -> { where(category: PUBLIC_CATEGORIES) } scope :readinglist, -> { where(category: "readinglist") } scope :for_articles, ->(ids) { where(reactable_type: "Article", reactable_id: ids) } scope :eager_load_serialized_data, -> { includes(:reactable, :user) } @@ -53,7 +54,7 @@ class Reaction < ApplicationRecord def cached_any_reactions_for?(reactable, user, category) class_name = reactable.class.name == "ArticleDecorator" ? "Article" : reactable.class.name - cache_name = "any_reactions_for-#{class_name}-#{reactable.id}-#{user.reactions_count}-#{user.positive_reactions_count}-#{category}" + cache_name = "any_reactions_for-#{class_name}-#{reactable.id}-#{user.reactions_count}-#{user.public_reactions_count}-#{category}" Rails.cache.fetch(cache_name, expires_in: 24.hours) do Reaction.where(reactable_id: reactable.id, reactable_type: class_name, user: user, category: category).any? end diff --git a/app/models/user.rb b/app/models/user.rb index c9d084a03..0c427ba9f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -143,7 +143,6 @@ class User < ApplicationRecord validate :can_send_confirmation_email validate :update_rate_limit - alias_attribute :positive_reactions_count, :reactions_count alias_attribute :public_reactions_count, :reactions_count alias_attribute :subscribed_to_welcome_notifications?, :welcome_notifications diff --git a/app/serializers/search/article_serializer.rb b/app/serializers/search/article_serializer.rb index 209d5d29d..377762fd5 100644 --- a/app/serializers/search/article_serializer.rb +++ b/app/serializers/search/article_serializer.rb @@ -7,7 +7,7 @@ module Search attributes :approved, :body_text, :class_name, :cloudinary_video_url, :comments_count, :experience_level_rating, :experience_level_rating_distribution, :featured, :featured_number, :hotness_score, :language, - :main_image, :path, :positive_reactions_count, :public_reactions_count, :published, + :main_image, :path, :public_reactions_count, :published, :published_at, :reactions_count, :reading_time, :score, :title # video_duration_in_minutes in Elasticsearch is mapped as an integer diff --git a/app/serializers/search/comment_serializer.rb b/app/serializers/search/comment_serializer.rb index 63a239641..944fe9be2 100644 --- a/app/serializers/search/comment_serializer.rb +++ b/app/serializers/search/comment_serializer.rb @@ -4,7 +4,7 @@ module Search attribute :id, &:search_id - attributes :path, :positive_reactions_count, :public_reactions_count + attributes :path, :public_reactions_count attribute :body_text, &:body_markdown attribute :class_name do |comment| diff --git a/app/serializers/search/podcast_episode_serializer.rb b/app/serializers/search/podcast_episode_serializer.rb index f90bd031e..c32a945ec 100644 --- a/app/serializers/search/podcast_episode_serializer.rb +++ b/app/serializers/search/podcast_episode_serializer.rb @@ -5,7 +5,7 @@ module Search attribute :id, &:search_id attributes :body_text, :class_name, :comments_count, :hotness_score, :path, - :positive_reactions_count, :public_reactions_count, :published, :published_at, :quote, + :public_reactions_count, :published, :published_at, :quote, :reactions_count, :search_score, :subtitle, :summary, :title, :website_url diff --git a/app/serializers/search/user_serializer.rb b/app/serializers/search/user_serializer.rb index c328fc1a1..84391e996 100644 --- a/app/serializers/search/user_serializer.rb +++ b/app/serializers/search/user_serializer.rb @@ -12,7 +12,6 @@ module Search :mostly_work_with, :name, :path, - :positive_reactions_count, :public_reactions_count, :profile_image_90, :reactions_count, diff --git a/app/serializers/webhook/article_serializer.rb b/app/serializers/webhook/article_serializer.rb index 5fe8ef721..6f9d7ad8a 100644 --- a/app/serializers/webhook/article_serializer.rb +++ b/app/serializers/webhook/article_serializer.rb @@ -4,7 +4,7 @@ module Webhook set_type :article attributes :title, :description, :readable_publish_date, :cached_tag_list, :cached_tag_list_array, - :slug, :path, :url, :comments_count, :positive_reactions_count, :body_markdown + :slug, :path, :url, :comments_count, :public_reactions_count, :body_markdown attribute :canonical_url, &:processed_canonical_url attribute :body_html, &:processed_html diff --git a/app/services/analytics_service.rb b/app/services/analytics_service.rb index aca9a0ce7..11146edfb 100644 --- a/app/services/analytics_service.rb +++ b/app/services/analytics_service.rb @@ -85,7 +85,7 @@ class AnalyticsService where("score > 0") @follow_data = Follow. where(followable_type: user_or_org.class.name, followable_id: user_or_org.id) - @reaction_data = Reaction.positive. + @reaction_data = Reaction.public_category. where(reactable_id: article_ids, reactable_type: "Article") @page_view_data = PageView.where(article_id: article_ids) diff --git a/app/services/article_api_index_service.rb b/app/services/article_api_index_service.rb index 5ae93671d..a5ec7428b 100644 --- a/app/services/article_api_index_service.rb +++ b/app/services/article_api_index_service.rb @@ -63,7 +63,7 @@ class ArticleApiIndexService articles.where(approved: true).order("featured_number DESC") elsif top.present? articles.where("published_at > ?", top.to_i.days.ago). - order("positive_reactions_count DESC") + order("public_reactions_count DESC") else articles.order("hotness_score DESC") end @@ -74,7 +74,7 @@ class ArticleApiIndexService def top_articles Article.published.includes(:user, :organization). where("published_at > ?", top.to_i.days.ago). - order("positive_reactions_count DESC"). + order("public_reactions_count DESC"). page(page).per(per_page || DEFAULT_PER_PAGE) end @@ -83,11 +83,11 @@ class ArticleApiIndexService articles = if state == "fresh" articles.where( - "positive_reactions_count < ? AND featured_number > ? AND score > ?", 2, 7.hours.ago.to_i, -2 + "public_reactions_count < ? AND featured_number > ? AND score > ?", 2, 7.hours.ago.to_i, -2 ) elsif state == "rising" articles.where( - "positive_reactions_count > ? AND positive_reactions_count < ? AND featured_number > ?", + "public_reactions_count > ? AND public_reactions_count < ? AND featured_number > ?", 19, 33, 3.days.ago.to_i ) else diff --git a/app/services/articles/analytics_updater.rb b/app/services/articles/analytics_updater.rb index 538357122..ceb60c5d4 100644 --- a/app/services/articles/analytics_updater.rb +++ b/app/services/articles/analytics_updater.rb @@ -23,7 +23,7 @@ module Articles def fetch_and_update_page_views_and_reaction_counts(qualified_articles) qualified_articles.each_slice(15) do |chunk| chunk.each do |article| - article.update_columns(previous_positive_reactions_count: article.positive_reactions_count) + article.update_columns(previous_public_reactions_count: article.public_reactions_count) # Notification.send_milestone_notification(type: "Reaction", article_id: article.id) # Notification.send_milestone_notification(type: "View", article_id: article.id) end @@ -41,7 +41,7 @@ module Articles def should_fetch(article) return true if @context == "force" - article.positive_reactions_count > article.previous_positive_reactions_count || occasionally_force_fetch? + article.public_reactions_count > article.previous_public_reactions_count || occasionally_force_fetch? end def occasionally_force_fetch? diff --git a/app/services/exporter/articles.rb b/app/services/exporter/articles.rb index e1a7a7f81..113718f4d 100644 --- a/app/services/exporter/articles.rb +++ b/app/services/exporter/articles.rb @@ -53,7 +53,7 @@ module Exporter main_image main_image_background_hex_color path - positive_reactions_count + public_reactions_count processed_html published published_from_feed diff --git a/app/services/exporter/comments.rb b/app/services/exporter/comments.rb index a794be17f..0b0bd9939 100644 --- a/app/services/exporter/comments.rb +++ b/app/services/exporter/comments.rb @@ -26,7 +26,7 @@ module Exporter edited_at id_code markdown_character_count - positive_reactions_count + public_reactions_count processed_html receive_notifications ] diff --git a/app/services/notifications/milestone/send.rb b/app/services/notifications/milestone/send.rb index 50d7dc85b..7884d32b8 100644 --- a/app/services/notifications/milestone/send.rb +++ b/app/services/notifications/milestone/send.rb @@ -58,7 +58,7 @@ module Notifications if type == "View" last_milestone_notification.blank? && article.page_views_count > @next_milestone elsif type == "Reaction" - last_milestone_notification.blank? && article.positive_reactions_count > @next_milestone + last_milestone_notification.blank? && article.public_reactions_count > @next_milestone end end @@ -69,7 +69,7 @@ module Notifications milestone_count = article.page_views_count when "Reaction" milestones = [64, 128, 256, 512, 1024, 2048, 4096, 8192] - milestone_count = article.positive_reactions_count + milestone_count = article.public_reactions_count end closest_number = milestones.min_by { |num| (milestone_count - num).abs } diff --git a/app/services/search/query_builders/feed_content.rb b/app/services/search/query_builders/feed_content.rb index 99027516c..988367e01 100644 --- a/app/services/search/query_builders/feed_content.rb +++ b/app/services/search/query_builders/feed_content.rb @@ -51,7 +51,6 @@ module Search flare_tag_hash main_image path - positive_reactions_count public_reactions_count published_at readable_publish_date_string diff --git a/app/services/search/user.rb b/app/services/search/user.rb index 29b55d65c..0e8961089 100644 --- a/app/services/search/user.rb +++ b/app/services/search/user.rb @@ -21,7 +21,7 @@ module Search "path" => source["path"], "id" => source["id"], "class_name" => "User", - "positive_reactions_count" => source["positive_reactions_count"], + "public_reactions_count" => source["public_reactions_count"], "comments_count" => source["comments_count"], "badge_achievements_count" => source["badge_achievements_count"], "last_comment_at" => source["last_comment_at"], diff --git a/app/services/suggester/articles/classic.rb b/app/services/suggester/articles/classic.rb index 73ae52a4c..9a0372850 100644 --- a/app/services/suggester/articles/classic.rb +++ b/app/services/suggester/articles/classic.rb @@ -29,7 +29,7 @@ module Suggester includes(:user). limited_column_select. where(featured: true). - where("positive_reactions_count > ?", MIN_REACTION_COUNT). + where("public_reactions_count > ?", MIN_REACTION_COUNT). where("published_at > ?", 10.months.ago). order(Arel.sql("RANDOM()")).pluck(:id) end diff --git a/app/services/suggester/articles/high_quality.rb b/app/services/suggester/articles/high_quality.rb index e3237a1a0..7804278d1 100644 --- a/app/services/suggester/articles/high_quality.rb +++ b/app/services/suggester/articles/high_quality.rb @@ -11,7 +11,7 @@ module Suggester Article.published.where(featured: true). includes(:user). limited_column_select. - where("positive_reactions_count > ?", MIN_HQ_REACTION_COUNT). + where("public_reactions_count > ?", MIN_HQ_REACTION_COUNT). where.not(id: @not_ids). order(Arel.sql("RANDOM()")). limit(num) diff --git a/app/services/suggester/users/sidebar.rb b/app/services/suggester/users/sidebar.rb index 576022fb3..0b0e2a888 100644 --- a/app/services/suggester/users/sidebar.rb +++ b/app/services/suggester/users/sidebar.rb @@ -10,7 +10,7 @@ module Suggester Rails.cache.fetch(generate_cache_name, expires_in: 120.hours) do reaction_count = Rails.env.production? ? 25 : 0 user_ids = Article.published.tagged_with([given_tag], any: true). - where("positive_reactions_count > ?", reaction_count). + where("public_reactions_count > ?", reaction_count). where("published_at > ?", 4.months.ago). where("user_id != ?", user.id). where.not(user_id: user.following_by_type("User")). diff --git a/app/views/additional_content_boxes/_article_content_area.html.erb b/app/views/additional_content_boxes/_article_content_area.html.erb index 33fa0f834..2d2e6008d 100644 --- a/app/views/additional_content_boxes/_article_content_area.html.erb +++ b/app/views/additional_content_boxes/_article_content_area.html.erb @@ -12,8 +12,8 @@ <%= article.description %>
- <% if article.positive_reactions_count > 0 %> - " alt="Reactions" /> <%= article.positive_reactions_count %> + <% if article.public_reactions_count > 0 %> + " alt="Reactions" /> <%= article.public_reactions_count %> <% end %> <% if article.comments_count > 0 %> " alt="Reactions" class="comments-bubble" /> <%= article.comments_count %> diff --git a/app/views/api/v0/articles/_article.json.jbuilder b/app/views/api/v0/articles/_article.json.jbuilder index 4d8d69ed7..30a67282a 100644 --- a/app/views/api/v0/articles/_article.json.jbuilder +++ b/app/views/api/v0/articles/_article.json.jbuilder @@ -10,11 +10,12 @@ json.extract!( :path, :url, :comments_count, - :positive_reactions_count, + :public_reactions_count, :collection_id, :published_timestamp, ) +json.positive_reactions_count article.public_reactions_count json.cover_image cloud_cover_url(article.main_image) json.social_image article_social_image_url(article) json.canonical_url article.processed_canonical_url diff --git a/app/views/api/v0/articles/me.json.jbuilder b/app/views/api/v0/articles/me.json.jbuilder index ff9754d47..e090d35d3 100644 --- a/app/views/api/v0/articles/me.json.jbuilder +++ b/app/views/api/v0/articles/me.json.jbuilder @@ -12,12 +12,13 @@ json.array! @articles do |article| :path, :url, :comments_count, - :positive_reactions_count, + :public_reactions_count, :page_views_count, :published_timestamp, :body_markdown, ) + json.positive_reactions_count article.public_reactions_count json.cover_image cloud_cover_url(article.main_image) json.tag_list article.cached_tag_list_array json.canonical_url article.processed_canonical_url diff --git a/app/views/api/v0/articles/onboarding.json.jbuilder b/app/views/api/v0/articles/onboarding.json.jbuilder index 52c9a9086..ce578dd28 100644 --- a/app/views/api/v0/articles/onboarding.json.jbuilder +++ b/app/views/api/v0/articles/onboarding.json.jbuilder @@ -6,7 +6,7 @@ json.array! @articles do |article| :description, :published_at, :comments_count, - :positive_reactions_count, + :public_reactions_count, ) json.tag_list article.cached_tag_list diff --git a/app/views/articles/_single_story.html.erb b/app/views/articles/_single_story.html.erb index 94ac6f2bd..d6868efa6 100644 --- a/app/views/articles/_single_story.html.erb +++ b/app/views/articles/_single_story.html.erb @@ -1,17 +1,17 @@
<% if featured == true %> -
- -
- +
+ +
+ <% end %> <% if story.video.present? && story.video_thumbnail_url.present? %> - - - <%= story.video_duration_in_minutes %> - - + + + <%= story.video_duration_in_minutes %> + + <% end %>
@@ -19,9 +19,9 @@
<% if story.cached_organization && !@organization_article_index %> - + <% end %> @@ -34,10 +34,10 @@ <%= story.cached_user.name %> <% if story.cached_organization && !@organization_article_index %> - - for - <%= story.cached_organization.name %> - + + for + <%= story.cached_organization.name %> + <% end %>

@@ -53,34 +53,29 @@
<% story.cached_tag_list_array.each do |tag| %> - #<%= tag %> + #<%= tag %> <% end %>
<%= inline_svg_tag("small-heart.svg", aria: true, width: 24, height: 24, class: "crayons-icon", title: "Reactions") %> - <%= story.positive_reactions_count %> + <%= story.public_reactions_count %> <% if story.comments_count > 0 %> - - <%= inline_svg_tag("small-comment.svg", aria: true, width: 24, height: 24, class: "crayons-icon", title: "Comments") %> - <%= story.comments_count %> - - + + <%= inline_svg_tag("small-comment.svg", aria: true, width: 24, height: 24, class: "crayons-icon", title: "Comments") %> + <%= story.comments_count %> + + <% end %>
<%= story.reading_time < 1 ? 1 : story.reading_time %> min read - diff --git a/app/views/dashboards/_analytics.html.erb b/app/views/dashboards/_analytics.html.erb index c1750507f..c51528ca3 100644 --- a/app/views/dashboards/_analytics.html.erb +++ b/app/views/dashboards/_analytics.html.erb @@ -2,7 +2,7 @@
- <%= number_with_delimiter(@articles.sum(&:positive_reactions_count), delimeter: ",") %> + <%= number_with_delimiter(@articles.sum(&:public_reactions_count), delimeter: ",") %>
" />" />" /> Total Post Reactions diff --git a/app/views/dashboards/_dashboard_article.html.erb b/app/views/dashboards/_dashboard_article.html.erb index db90e48cf..5d748ba6d 100644 --- a/app/views/dashboards/_dashboard_article.html.erb +++ b/app/views/dashboards/_dashboard_article.html.erb @@ -80,9 +80,9 @@ // - <%= article.positive_reactions_count %> + <%= article.public_reactions_count %> - <%= "reaction".pluralize(count: article.positive_reactions_count) %> + <%= "reaction".pluralize(count: article.public_reactions_count) %> // diff --git a/app/views/internal/articles/_individual_article.html.erb b/app/views/internal/articles/_individual_article.html.erb index 6577e814e..90dda1d79 100644 --- a/app/views/internal/articles/_individual_article.html.erb +++ b/app/views/internal/articles/_individual_article.html.erb @@ -16,7 +16,7 @@ Manage User @<%= article.user&.username %> - ❤️ <%= article.positive_reactions_count %> 💬 <%= article.comments_count %> + ❤️ <%= article.public_reactions_count %> 💬 <%= article.comments_count %> <% if article.published_from_feed? && !article.published? %> RSS Import <%= article.created_at.strftime("%b %d, %Y") %> @@ -29,7 +29,7 @@ <% end %> <% article.decorate.cached_tag_list_array.each do |tag| %> - #<%= tag %> + #<%= tag %> <% end %>
diff --git a/app/views/internal/comments/index.html.erb b/app/views/internal/comments/index.html.erb index 2125e227d..f9f25ee6c 100644 --- a/app/views/internal/comments/index.html.erb +++ b/app/views/internal/comments/index.html.erb @@ -6,7 +6,7 @@
<% if comment.commentable %> - re: <%= comment.commentable.title %> (<%= comment.positive_reactions_count %> ❤️) + re: <%= comment.commentable.title %> (<%= comment.public_reactions_count %> ❤️) <% end %>
diff --git a/app/views/stories/feeds/show.json.jbuilder b/app/views/stories/feeds/show.json.jbuilder index eac912004..e6bb038e9 100644 --- a/app/views/stories/feeds/show.json.jbuilder +++ b/app/views/stories/feeds/show.json.jbuilder @@ -1,5 +1,5 @@ article_attributes_to_include = %i[ - title path id user_id comments_count positive_reactions_count organization_id + title path id user_id comments_count public_reactions_count organization_id reading_time video_thumbnail_url video video_duration_in_minutes language experience_level_rating experience_level_rating_distribution ] diff --git a/config/elasticsearch/mappings/feed_content.json b/config/elasticsearch/mappings/feed_content.json index dcc184196..79c95a78f 100644 --- a/config/elasticsearch/mappings/feed_content.json +++ b/config/elasticsearch/mappings/feed_content.json @@ -84,6 +84,7 @@ "path": { "type": "keyword" }, + // deprecated in favor of public_reactions_count, to be removed "positive_reactions_count": { "type": "integer" }, diff --git a/config/elasticsearch/mappings/users.json b/config/elasticsearch/mappings/users.json index d7c005051..01e3584fb 100644 --- a/config/elasticsearch/mappings/users.json +++ b/config/elasticsearch/mappings/users.json @@ -38,6 +38,7 @@ "path": { "type": "keyword" }, + // deprecated in favor of public_reactions_count, to be removed "positive_reactions_count": { "type": "integer" }, diff --git a/docs/api_v0.yml b/docs/api_v0.yml index 74c581bcc..6fe1dbdfd 100644 --- a/docs/api_v0.yml +++ b/docs/api_v0.yml @@ -154,7 +154,7 @@ components: - url - canonical_url - comments_count - - positive_reactions_count + - public_reactions_count - created_at - edited_at - crossposted_at @@ -200,7 +200,7 @@ components: comments_count: type: integer format: int32 - positive_reactions_count: + public_reactions_count: type: integer format: int32 created_at: @@ -246,7 +246,7 @@ components: - url - canonical_url - comments_count - - positive_reactions_count + - public_reactions_count - created_at - edited_at - crossposted_at @@ -294,7 +294,7 @@ components: comments_count: type: integer format: int32 - positive_reactions_count: + public_reactions_count: type: integer format: int32 created_at: @@ -475,7 +475,7 @@ components: - url - canonical_url - comments_count - - positive_reactions_count + - public_reactions_count - page_views_count - published_timestamp - body_markdown @@ -516,7 +516,7 @@ components: comments_count: type: integer format: int32 - positive_reactions_count: + public_reactions_count: type: integer format: int32 page_views_count: @@ -1060,7 +1060,7 @@ components: url: https://dev.to/devteam/there-s-a-new-dev-theme-in-town-for-all-you-10x-hackers-out-there-plus-one-actually-useful-new-feature-2kgk canonical_url: https://dev.to/devteam/there-s-a-new-dev-theme-in-town-for-all-you-10x-hackers-out-there-plus-one-actually-useful-new-feature-2kgk comments_count: 37 - positive_reactions_count: 142 + public_reactions_count: 142 collection_id: created_at: '2019-10-24T13:41:29Z' edited_at: '2019-10-24T13:56:35Z' @@ -1103,7 +1103,7 @@ components: url: https://dev.to/bytesized/byte-sized-episode-2-the-creation-of-graph-theory-34g1 canonical_url: https://dev.to/bytesized/byte-sized-episode-2-the-creation-of-graph-theory-34g1 comments_count: 21 - positive_reactions_count: 322 + public_reactions_count: 322 collection_id: 1693 created_at: "2019-07-31T11:15:06Z" edited_at: diff --git a/spec/labor/badge_rewarder_spec.rb b/spec/labor/badge_rewarder_spec.rb index 59da595da..d42507035 100644 --- a/spec/labor/badge_rewarder_spec.rb +++ b/spec/labor/badge_rewarder_spec.rb @@ -44,7 +44,7 @@ RSpec.describe BadgeRewarder, type: :labor do it "rewards beloved comment to folks who have a qualifying comment" do create(:badge, title: "Beloved comment", slug: "beloved-comment") comment = create(:comment, commentable: create(:article)) - comment.update(positive_reactions_count: 30) + comment.update(public_reactions_count: 30) described_class.award_beloved_comment_badges expect(BadgeAchievement.count).to eq(1) end diff --git a/spec/labor/email_digest_spec.rb b/spec/labor/email_digest_spec.rb index dab4c67f6..01b1a93df 100644 --- a/spec/labor/email_digest_spec.rb +++ b/spec/labor/email_digest_spec.rb @@ -23,7 +23,7 @@ RSpec.describe EmailDigest, type: :labor do before { user.follow(author) } it "send digest email when there's atleast 3 hot articles" do - create_list(:article, 3, user_id: author.id, positive_reactions_count: 20, score: 20) + create_list(:article, 3, user_id: author.id, public_reactions_count: 20, score: 20) described_class.send_periodic_digest_email expect(DigestMailer).to have_received(:digest_email).with( user, [instance_of(Article), instance_of(Article), instance_of(Article)] diff --git a/spec/labor/email_logic_spec.rb b/spec/labor/email_logic_spec.rb index ab7a56cfd..0c976f4b7 100644 --- a/spec/labor/email_logic_spec.rb +++ b/spec/labor/email_logic_spec.rb @@ -8,26 +8,26 @@ RSpec.describe EmailLogic, type: :labor do it "returns 0.5 for open_percentage" do author = create(:user) user.follow(author) - create_list(:article, 3, user_id: author.id, positive_reactions_count: 20, score: 20) + create_list(:article, 3, user_id: author.id, public_reactions_count: 20, score: 20) h = described_class.new(user).analyze expect(h.open_percentage).to eq(0.5) end it "provides top 3 articles" do - create_list(:article, 3, positive_reactions_count: 40, featured: true, score: 40) + create_list(:article, 3, public_reactions_count: 40, featured: true, score: 40) h = described_class.new(user).analyze expect(h.articles_to_send.length).to eq(3) end it "marks as not ready if there isn't atleast 3 articles" do - create_list(:article, 2, positive_reactions_count: 40, score: 40) + create_list(:article, 2, public_reactions_count: 40, score: 40) h = described_class.new(user).analyze expect(h.should_receive_email?).to eq(false) end it "marks as not ready if there isn't at least 3 email-digest-eligible articles" do - create_list(:article, 2, positive_reactions_count: 40, score: 40) - create_list(:article, 2, positive_reactions_count: 40, email_digest_eligible: false) + create_list(:article, 2, public_reactions_count: 40, score: 40) + create_list(:article, 2, public_reactions_count: 40, email_digest_eligible: false) h = described_class.new(user).analyze expect(h.should_receive_email?).to eq(false) end @@ -37,7 +37,7 @@ RSpec.describe EmailLogic, type: :labor do before do author = create(:user) user.follow(author) - create_list(:article, 3, user_id: author.id, positive_reactions_count: 20, score: 20) + create_list(:article, 3, user_id: author.id, public_reactions_count: 20, score: 20) 10.times do Ahoy::Message.create(mailer: "DigestMailer#digest_email", user_id: user.id, sent_at: Time.current.utc) @@ -57,7 +57,7 @@ RSpec.describe EmailLogic, type: :labor do sent_at: Time.current.utc, opened_at: Time.current.utc) author = create(:user) user.follow(author) - create_list(:article, 3, user_id: author.id, positive_reactions_count: 40, score: 40) + create_list(:article, 3, user_id: author.id, public_reactions_count: 40, score: 40) end end @@ -74,7 +74,7 @@ RSpec.describe EmailLogic, type: :labor do it "reflects @ready_to_receive_email" do author = create(:user) user.follow(author) - create_list(:article, 3, user_id: author.id, positive_reactions_count: 20, score: 20) + create_list(:article, 3, user_id: author.id, public_reactions_count: 20, score: 20) h = described_class.new(user).analyze expect(h.should_receive_email?).to eq(true) end diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index e14ab3965..36eb7b317 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Notification, type: :model do let_it_be_readonly(:user3) { create(:user) } let_it_be_readonly(:organization) { create(:organization) } let_it_be_changeable(:article) do - create(:article, :with_notification_subscription, user: user, page_views_count: 4000, positive_reactions_count: 70) + create(:article, :with_notification_subscription, user: user, page_views_count: 4000, public_reactions_count: 70) end let_it_be_readonly(:user_follows_user2) { user.follow(user2) } let_it_be_changeable(:comment) { create(:comment, user: user2, commentable: article) } diff --git a/spec/models/shared_examples/sync_reactions_count.rb b/spec/models/shared_examples/sync_reactions_count.rb index 4616d80d7..8722f98da 100644 --- a/spec/models/shared_examples/sync_reactions_count.rb +++ b/spec/models/shared_examples/sync_reactions_count.rb @@ -8,11 +8,11 @@ RSpec.shared_examples "#sync_reactions_count" do |reactable_type| end it "syncs reactions count" do - expect(reactable.positive_reactions_count).to eq(0) + expect(reactable.public_reactions_count).to eq(0) reactable.sync_reactions_count reactable.reload - expected_count = reactable.reactions.positive.size - expect(reactable.positive_reactions_count).to eq(expected_count) + expected_count = reactable.reactions.public_category.size + expect(reactable.public_reactions_count).to eq(expected_count) end end end diff --git a/spec/requests/additional_content_boxes_spec.rb b/spec/requests/additional_content_boxes_spec.rb index ffa682920..3ccf992ac 100644 --- a/spec/requests/additional_content_boxes_spec.rb +++ b/spec/requests/additional_content_boxes_spec.rb @@ -8,7 +8,7 @@ RSpec.describe "AdditionalContentBoxes", type: :request do describe "GET /additional_content_boxes" do it "returns an article if there is a published/featured one" do suggestion = create(:article, published: true, published_at: 12.months.ago, featured: true, path: "blah") - suggestion.update(body_markdown: "foobar", title: "Title of the article", positive_reactions_count: 100) + suggestion.update(body_markdown: "foobar", title: "Title of the article", public_reactions_count: 100) get "/additional_content_boxes?article_id=#{regular_article.id}&state=include_sponsors" expect(response.body).to include(CGI.escapeHTML(suggestion.title)) diff --git a/spec/requests/api/v0/articles_spec.rb b/spec/requests/api/v0/articles_spec.rb index 56f70e0df..281686b61 100644 --- a/spec/requests/api/v0/articles_spec.rb +++ b/spec/requests/api/v0/articles_spec.rb @@ -22,7 +22,7 @@ RSpec.describe "Api::V0::Articles", type: :request do index_keys = %w[ type_of id title description cover_image readable_publish_date social_image - tag_list tags slug path url canonical_url comments_count positive_reactions_count + tag_list tags slug path url canonical_url comments_count public_reactions_count positive_reactions_count collection_id created_at edited_at crossposted_at published_at last_comment_at published_timestamp user organization flare_tag ] @@ -215,14 +215,14 @@ RSpec.describe "Api::V0::Articles", type: :request do context "with state param" do it "returns fresh articles" do - article.update_columns(positive_reactions_count: 1, score: 1) + article.update_columns(public_reactions_count: 1, score: 1) get api_articles_path(state: "fresh") expect(response.parsed_body.size).to eq(1) end it "returns rising articles" do - article.update_columns(positive_reactions_count: 32, score: 1, featured_number: 2.days.ago.to_i) + article.update_columns(public_reactions_count: 32, score: 1, featured_number: 2.days.ago.to_i) get api_articles_path(state: "rising") expect(response.parsed_body.size).to eq(1) @@ -235,7 +235,7 @@ RSpec.describe "Api::V0::Articles", type: :request do end it "supports pagination" do - create_list(:article, 2, tags: "discuss", positive_reactions_count: 1, score: 1) + create_list(:article, 2, tags: "discuss", public_reactions_count: 1, score: 1) get api_articles_path(state: "fresh"), params: { page: 1, per_page: 2 } expect(response.parsed_body.length).to eq(2) @@ -244,7 +244,7 @@ RSpec.describe "Api::V0::Articles", type: :request do end it "sets the correct edge caching surrogate key" do - article.update_columns(positive_reactions_count: 1, score: 1) + article.update_columns(public_reactions_count: 1, score: 1) get api_articles_path(state: "fresh") expected_key = ["articles", article.record_key].to_set @@ -280,7 +280,7 @@ RSpec.describe "Api::V0::Articles", type: :request do show_keys = %w[ type_of id title description cover_image readable_publish_date social_image - tag_list tags slug path url canonical_url comments_count positive_reactions_count + tag_list tags slug path url canonical_url comments_count public_reactions_count positive_reactions_count collection_id created_at edited_at crossposted_at published_at last_comment_at published_timestamp body_html body_markdown user organization flare_tag ] diff --git a/spec/requests/reactions_spec.rb b/spec/requests/reactions_spec.rb index 16a79aa68..fe445f0d7 100644 --- a/spec/requests/reactions_spec.rb +++ b/spec/requests/reactions_spec.rb @@ -90,7 +90,7 @@ RSpec.describe "Reactions", type: :request do result = response.parsed_body expect(result["current_user"]).to eq("id" => user.id) - expect(result["positive_reaction_counts"]).to eq([{ "id" => article.comments.last.id, "count" => 1 }]) + expect(result["public_reaction_counts"]).to eq([{ "id" => article.comments.last.id, "count" => 1 }]) expect(result["reactions"].to_json).to eq(user.reactions.where(reactable: comment).to_json) end @@ -113,7 +113,7 @@ RSpec.describe "Reactions", type: :request do result = response.parsed_body expect(result["current_user"]).to eq("id" => nil) - expect(result["positive_reaction_counts"]).to eq([{ "id" => article.comments.last.id, "count" => 1 }]) + expect(result["public_reaction_counts"]).to eq([{ "id" => article.comments.last.id, "count" => 1 }]) expect(result["reactions"]).to be_empty end diff --git a/spec/services/analytics_service_spec.rb b/spec/services/analytics_service_spec.rb index 631a55980..1258b3cda 100644 --- a/spec/services/analytics_service_spec.rb +++ b/spec/services/analytics_service_spec.rb @@ -86,9 +86,9 @@ RSpec.describe AnalyticsService, type: :service do expect(analytics_service.totals[:reactions][:total]).to eq(1) end - it "returns zero as total if there are no reactions with points" do + it "returns zero as total if there are no public category reactions" do reaction = create(:reaction, reactable: article) - reaction.update_columns(points: 0.0) + reaction.update_columns(category: "thumbsdown") expect(analytics_service.totals[:reactions][:total]).to eq(0) end @@ -241,9 +241,9 @@ RSpec.describe AnalyticsService, type: :service do expect(analytics_service.grouped_by_day[date][:reactions][:total]).to eq(1) end - it "returns zero as total if there are no reactions with points" do + it "returns zero as total if there are no public category reactions" do reaction = create(:reaction, reactable: article) - reaction.update_columns(points: 0.0) + reaction.update_columns(category: "thumbsdown") date = format_date(reaction.created_at) analytics_service = described_class.new(user, start_date: date) expect(analytics_service.grouped_by_day[date][:reactions][:total]).to eq(0) diff --git a/spec/services/articles/analytics_updater_spec.rb b/spec/services/articles/analytics_updater_spec.rb index 0aa951e5e..eb3185b45 100644 --- a/spec/services/articles/analytics_updater_spec.rb +++ b/spec/services/articles/analytics_updater_spec.rb @@ -10,16 +10,16 @@ RSpec.describe Articles::AnalyticsUpdater, type: :service do end describe "#call" do - context "when positive_reactions_count is LOWER than previous_positive_reactions_count" do + context "when public_reactions_count is LOWER than previous_public_reactions_count" do it "does nothing " do - build_stubbed(:article, positive_reactions_count: 2, previous_positive_reactions_count: 3, user: user) + build_stubbed(:article, public_reactions_count: 2, previous_public_reactions_count: 3, user: user) described_class.call(user) expect(Notification).not_to have_received(:send_milestone_notification) end end - context "when positive_reactions_count is HIGHER than previous_positive_reactions_count" do - let(:article) { build_stubbed(:article, positive_reactions_count: 5, previous_positive_reactions_count: 3, user: user) } + context "when public_reactions_count is HIGHER than previous_public_reactions_count" do + let(:article) { build_stubbed(:article, public_reactions_count: 5, previous_public_reactions_count: 3, user: user) } let(:pageview) { {} } let(:counts) { 1000 } let(:user_articles) { double } @@ -40,7 +40,7 @@ RSpec.describe Articles::AnalyticsUpdater, type: :service do end it "updates appropriate column" do - expect(article).to have_received(:update_columns).with(previous_positive_reactions_count: article.positive_reactions_count) + expect(article).to have_received(:update_columns).with(previous_public_reactions_count: article.public_reactions_count) end end end diff --git a/spec/services/exporter/articles_spec.rb b/spec/services/exporter/articles_spec.rb index eb9d25a3a..da6da66c9 100644 --- a/spec/services/exporter/articles_spec.rb +++ b/spec/services/exporter/articles_spec.rb @@ -28,7 +28,7 @@ RSpec.describe Exporter::Articles, type: :service do main_image main_image_background_hex_color path - positive_reactions_count + public_reactions_count processed_html published published_at diff --git a/spec/services/exporter/comments_spec.rb b/spec/services/exporter/comments_spec.rb index fda91d75f..45567b065 100644 --- a/spec/services/exporter/comments_spec.rb +++ b/spec/services/exporter/comments_spec.rb @@ -22,7 +22,7 @@ RSpec.describe Exporter::Comments, type: :service do edited_at id_code markdown_character_count - positive_reactions_count + public_reactions_count processed_html receive_notifications commentable_path diff --git a/spec/services/notifications/milestone/send_spec.rb b/spec/services/notifications/milestone/send_spec.rb index ea99ba77f..4010c8095 100644 --- a/spec/services/notifications/milestone/send_spec.rb +++ b/spec/services/notifications/milestone/send_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" RSpec.describe Notifications::Milestone::Send, type: :service do let(:user) { create(:user) } - let(:article) { create(:article, user_id: user.id, page_views_count: 4000, positive_reactions_count: 70) } + let(:article) { create(:article, user_id: user.id, page_views_count: 4000, public_reactions_count: 70) } context "when a user has never received a milestone notification" do it "sends the appropriate level view milestone notification" do @@ -25,7 +25,7 @@ RSpec.describe Notifications::Milestone::Send, type: :service do def mock_previous_reaction_milestone_notification send_milestone_notification_reaction - article.update_column(:positive_reactions_count, 150) + article.update_column(:public_reactions_count, 150) send_milestone_notification_reaction end diff --git a/spec/services/notifications/new_follower/send_spec.rb b/spec/services/notifications/new_follower/send_spec.rb index 0ed4924d3..08520f8ab 100644 --- a/spec/services/notifications/new_follower/send_spec.rb +++ b/spec/services/notifications/new_follower/send_spec.rb @@ -5,7 +5,7 @@ RSpec.describe Notifications::NewFollower::Send, type: :service do let(:user2) { create(:user) } let(:user3) { create(:user) } let(:organization) { create(:organization) } - let(:article) { create(:article, user_id: user.id, page_views_count: 4000, positive_reactions_count: 70) } + let(:article) { create(:article, user_id: user.id, page_views_count: 4000, public_reactions_count: 70) } let!(:follow) { user.follow(user2) } def follow_data(follow) diff --git a/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb b/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb index 08abf5b9e..096baf3df 100644 --- a/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb +++ b/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb @@ -2,9 +2,9 @@ require "rails_helper" RSpec.describe "Sorting Dashboard Articles", type: :system, js: true do let(:user) { create(:user) } - let(:article1) { create(:article, user_id: user.id, published_at: 10.minutes.ago, created_at: 1.day.ago, positive_reactions_count: 5, page_views_count: 0, comments_count: 100) } - let(:article2) { create(:article, user_id: user.id, published_at: 1.minute.ago, created_at: 2.days.ago, positive_reactions_count: 1, page_views_count: 10, comments_count: 0) } - let(:article3) { create(:article, user_id: user.id, published_at: 5.minutes.ago, created_at: 3.days.ago, positive_reactions_count: 0, page_views_count: 1000, comments_count: 50) } + let(:article1) { create(:article, user_id: user.id, published_at: 10.minutes.ago, created_at: 1.day.ago, public_reactions_count: 5, page_views_count: 0, comments_count: 100) } + let(:article2) { create(:article, user_id: user.id, published_at: 1.minute.ago, created_at: 2.days.ago, public_reactions_count: 1, page_views_count: 10, comments_count: 0) } + let(:article3) { create(:article, user_id: user.id, published_at: 5.minutes.ago, created_at: 3.days.ago, public_reactions_count: 0, page_views_count: 1000, comments_count: 50) } let(:articles) { [article1, article2, article3] } let(:article_with_comments_count_of) do @@ -45,7 +45,7 @@ RSpec.describe "Sorting Dashboard Articles", type: :system, js: true do test_article_order.call("/dashboard?sort=views-asc", [article1, article2, article3]) end - it "shows articles sorted by positive_reactions_count ASC" do + it "shows articles sorted by public_reactions_count ASC" do test_article_order.call("/dashboard?sort=reactions-asc", [article3, article2, article1]) end