maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deploy] Rename positive_reactions_count to public_reactions_count in logic (#7926)

Browse source 
* Rename positive_reactions_count to public_reactions_count

* Add positive reactions count back in so we can remove it

* Use public_category method for reactions

* Add positive_reactions_count in case any old caches rely on it

* Add positive_rxn_count to account for API endpoints

* Remove unused method

* One more spot...

* Add method back in because of caches

* Update specs to match new functionality

* Fix typo

* Remove unused methods
This commit is contained in:
Andy Zhao 2020-05-26 12:36:28 -04:00 • committed by GitHub
parent 808380f00e
commit c42fd3461e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 152 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/initializers/initScrolling.js.erb
View file

@ -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

14
app/assets/javascripts/initializers/initializeCommentsPage.js.erb
View file

@ -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 + "<span class='reactions-count' id='reactions-count-" + positiveReactionCounts[i].id + "'>" + positiveReactionCounts[i].count + '</span>';
if (publicReactionCounts[i].count > 0) {
if (!document.getElementById('reactions-count-' + publicReactionCounts[i].id)) {
buttForComment.innerHTML = buttForComment.innerHTML + "<span class='reactions-count' id='reactions-count-" + publicReactionCounts[i].id + "'>" + publicReactionCounts[i].count + '</span>';
} else {
document.getElementById('reactions-count-' + positiveReactionCounts[i].id).innerHTML = positiveReactionCounts[i].count;
document.getElementById('reactions-count-' + publicReactionCounts[i].id).innerHTML = publicReactionCounts[i].count;
}
}
}

2
app/assets/javascripts/utilities/buildArticleHTML.js.erb
View file

@ -51,7 +51,7 @@ function buildArticleHTML(article) {
flareTag = "<span class='crayons-story__flare-tag' style='background:#5874d9;color:white;'>person</span>"
}
var rc = article.positive_reactions_count
var rc = article.public_reactions_count
var reactionsCount = (rc || '0')
var reactionsDisplay = '';

2
app/assets/javascripts/utilities/buildCommentHTML.js.erb
View file

@ -108,6 +108,6 @@ function reactions(comment) {
return '<button style="background:white" class="reaction-button '+ reactedClass +'" id="button-for-comment-'+comment.id+'" data-comment-id="'+comment.id+'">\
<img src="<%= asset_path("favorite-heart-outline-button.svg") %>" alt="Favorite heart outline button">\
<img class="voted-heart" src="<%= asset_path("emoji/emoji-one-heart.png") %>" alt="Favorite heart button">\
<span class="reactions-count" id="reactions-count-'+comment.id+'">'+comment.positive_reactions_count+'</span></button>';
<span class="reactions-count" id="reactions-count-'+comment.id+'">'+comment.public_reactions_count+'</span></button>';
}
}

4
app/controllers/api/v0/articles_controller.rb
View file

@ -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

4
app/controllers/internal/articles_controller.rb
View file

@ -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

2
app/controllers/internal/comments_controller.rb
View file

@ -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

16
app/controllers/reactions_controller.rb
View file

@ -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

4
app/controllers/stories_controller.rb
View file

@ -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

6
app/javascript/articles/__tests__/utilities/articleUtilities.js
View file

@ -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,
};

2
app/javascript/articles/components/ReactionsCount.jsx
View file

@ -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 = () => (
<svg
className="crayons-icon"

2
app/javascript/common-prop-types/article-prop-types.js
View file

@ -29,7 +29,7 @@ export const articlePropTypes = PropTypes.shape({
}),
organization: organizationPropType,
highlight: articleSnippetResultPropTypes,
positive_reactions_count: PropTypes.number,
public_reactions_count: PropTypes.number,
reactions_count: PropTypes.number,
comments_count: PropTypes.number,
reading_time: PropTypes.number,

2
app/labor/badge_rewarder.rb
View file

@ -20,7 +20,7 @@ module BadgeRewarder
def self.award_beloved_comment_badges
# ID 3 is the proper ID in prod. We should change in future to ENV var.
badge_id = Badge.find_by(slug: "beloved-comment")&.id || 3
Comment.where("positive_reactions_count > ?", 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,

4
app/labor/cache_buster.rb
View file

@ -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")

2
app/labor/reading_list.rb
View file

@ -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

2
app/labor/sticky_article_collection.rb
View file

@ -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()")).

8
app/models/article.rb
View file

@ -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

2
app/models/concerns/reactable.rb
View file

@ -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

1
app/models/podcast_episode.rb
View file

@ -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

7
app/models/reaction.rb
View file

@ -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

1
app/models/user.rb
View file

@ -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

2
app/serializers/search/article_serializer.rb
View file

@ -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

2
app/serializers/search/comment_serializer.rb
View file

@ -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|

2
app/serializers/search/podcast_episode_serializer.rb
View file

@ -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

1
app/serializers/search/user_serializer.rb
View file

@ -12,7 +12,6 @@ module Search
:mostly_work_with,
:name,
:path,
:positive_reactions_count,
:public_reactions_count,
:profile_image_90,
:reactions_count,

2
app/serializers/webhook/article_serializer.rb
View file

@ -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

2
app/services/analytics_service.rb
View file

@ -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)

8
app/services/article_api_index_service.rb
View file

@ -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

4
app/services/articles/analytics_updater.rb
View file

@ -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?

2
app/services/exporter/articles.rb
View file

@ -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

2
app/services/exporter/comments.rb
View file

@ -26,7 +26,7 @@ module Exporter
edited_at
id_code
markdown_character_count
positive_reactions_count
public_reactions_count
processed_html
receive_notifications
]

4
app/services/notifications/milestone/send.rb
View file

@ -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 }

1
app/services/search/query_builders/feed_content.rb
View file

@ -51,7 +51,6 @@ module Search
flare_tag_hash
main_image
path
positive_reactions_count
public_reactions_count
published_at
readable_publish_date_string

2
app/services/search/user.rb
View file

@ -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"],

2
app/services/suggester/articles/classic.rb
View file

@ -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

2
app/services/suggester/articles/high_quality.rb
View file

@ -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)

2
app/services/suggester/users/sidebar.rb
View file

@ -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")).

4
app/views/additional_content_boxes/_article_content_area.html.erb
View file

@ -12,8 +12,8 @@
<%= article.description %>
</a>
<div class="engagement-count">
<% if article.positive_reactions_count > 0 %>
<img src="<%= asset_path("reactions-stack.png") %>" alt="Reactions" /> <%= article.positive_reactions_count %>
<% if article.public_reactions_count > 0 %>
<img src="<%= asset_path("reactions-stack.png") %>" alt="Reactions" /> <%= article.public_reactions_count %>
<% end %>
<% if article.comments_count > 0 %>
<img src="<%= asset_path("comments-bubble.png") %>" alt="Reactions" class="comments-bubble" /> <%= article.comments_count %>

3
app/views/api/v0/articles/_article.json.jbuilder
View file

@ -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

3
app/views/api/v0/articles/me.json.jbuilder
View file

@ -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

2
app/views/api/v0/articles/onboarding.json.jbuilder
View file

@ -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

53
app/views/articles/_single_story.html.erb
View file

@ -1,17 +1,17 @@
<div class="crayons-story <% if featured == true %>crayons-story--featured<% end %>" data-content-user-id="<%= story.user_id %>">
<% if featured == true %>
<div id="featured-story-marker" data-featured-article="articles-<%= story.id %>"></div>
<a href="<%= story.path %>" class="crayons-story__cover" data-featured-article="articles-<%= story.id %>">
<div style="background-color: <%= story.main_image_background_hex_color %>; background-image: url(<%= cloud_cover_url(story.main_image) %>);" class="crayons-story__cover__image"></div>
</a>
<div id="featured-story-marker" data-featured-article="articles-<%= story.id %>"></div>
<a href="<%= story.path %>" class="crayons-story__cover" data-featured-article="articles-<%= story.id %>">
<div style="background-color: <%= story.main_image_background_hex_color %>; background-image: url(<%= cloud_cover_url(story.main_image) %>);" class="crayons-story__cover__image"></div>
</a>
<% end %>
<% if story.video.present? && story.video_thumbnail_url.present? %>
<a href="<%= story.path %>" class="crayons-story__video" style="background-image:url(<%= story.cloudinary_video_url %>)">
<span class="crayons-story__video__time">
<%= story.video_duration_in_minutes %>
</span>
</a>
<a href="<%= story.path %>" class="crayons-story__video" style="background-image:url(<%= story.cloudinary_video_url %>)">
<span class="crayons-story__video__time">
<%= story.video_duration_in_minutes %>
</span>
</a>
<% end %>
<div class="crayons-story__body">
@ -19,9 +19,9 @@
<div class="crayons-story__meta">
<div class="crayons-story__author-pic">
<% if story.cached_organization && !@organization_article_index %>
<a class="crayons-logo crayons-logo--l" href="/<%= story.cached_organization.slug %>">
<img alt="<%= story.cached_organization.name %> logo" src="<%= story.cached_organization.profile_image_90 %>" class="crayons-logo__image">
</a>
<a class="crayons-logo crayons-logo--l" href="/<%= story.cached_organization.slug %>">
<img alt="<%= story.cached_organization.name %> logo" src="<%= story.cached_organization.profile_image_90 %>" class="crayons-logo__image">
</a>
<% end %>
<a href="/<%= story.cached_user.username %>" class="crayons-avatar <% if story.cached_organization && !@organization_article_index %> crayons-avatar--s absolute -right-2 -bottom-2 border-solid border-2 border-base-inverted <% else %> crayons-avatar--l <% end %> ">
@ -34,10 +34,10 @@
<%= story.cached_user.name %>
</a>
<% if story.cached_organization && !@organization_article_index %>
<span>
<span class="crayons-story__tertiary fw-normal"> for </span>
<a href="/<%= story.cached_organization.slug %>" class="crayons-story__secondary fw-medium"><%= story.cached_organization.name %></a>
</span>
<span>
<span class="crayons-story__tertiary fw-normal"> for </span>
<a href="/<%= story.cached_organization.slug %>" class="crayons-story__secondary fw-medium"><%= story.cached_organization.name %></a>
</span>
<% end %>
</p>
<a href="<%= story.path %>" class="crayons-story__tertiary fs-xs"><time datetime="<%= story.published_timestamp %>"><%= story.readable_publish_date %></time><span class="time-ago-indicator-initial-placeholder" data-seconds="<%= story.published_at_int %>"></span></a>
@ -53,34 +53,29 @@
</h2>
<div class="crayons-story__tags">
<% story.cached_tag_list_array.each do |tag| %>
<a href="/t/<%= tag %>" class="crayons-tag"><span class="crayons-tag__prefix">#</span><%= tag %></a>
<a href="/t/<%= tag %>" class="crayons-tag"><span class="crayons-tag__prefix">#</span><%= tag %></a>
<% end %>
</div>
<div class="crayons-story__bottom">
<div class="crayons-story__details">
<a href="<%= story.path %>" class="crayons-btn crayons-btn--s crayons-btn--ghost crayons-btn--icon-left" data-reaction-count data-reactable-id="<%= story.id %>">
<%= 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 %>
<span class="hidden s:inline">&nbsp;reactions</span>
</a>
<% if story.comments_count > 0 %>
<a href="<%= story.path %>#comments" class="crayons-btn crayons-btn--s crayons-btn--ghost crayons-btn--icon-left">
<%= inline_svg_tag("small-comment.svg", aria: true, width: 24, height: 24, class: "crayons-icon", title: "Comments") %>
<%= story.comments_count %>
<span class="hidden s:inline">&nbsp;comments</span>
</a>
<a href="<%= story.path %>#comments" class="crayons-btn crayons-btn--s crayons-btn--ghost crayons-btn--icon-left">
<%= inline_svg_tag("small-comment.svg", aria: true, width: 24, height: 24, class: "crayons-icon", title: "Comments") %>
<%= story.comments_count %>
<span class="hidden s:inline">&nbsp;comments</span>
</a>
<% end %>
</div>
<div class="crayons-story__save">
<small class="crayons-story__tertiary fs-xs mr-2">
<%= story.reading_time < 1 ? 1 : story.reading_time %> min read
</small>
<button
type="button"
class="crayons-btn crayons-btn--secondary crayons-btn--s bookmark-button"
data-reactable-id="<%= story.id %>"
aria-label="Save to reading list"
title="Save to reading list">
<button type="button" class="crayons-btn crayons-btn--secondary crayons-btn--s bookmark-button" data-reactable-id="<%= story.id %>" aria-label="Save to reading list" title="Save to reading list">
<span class="bm-initial">Save</span>
<span class="bm-success">Saved</span>
</button>

2
app/views/dashboards/_analytics.html.erb
View file

@ -2,7 +2,7 @@
<div class="dashboard-analytics-header-wrapper">
<div class="dashboard-analytics-header">
<span><%= number_with_delimiter(@articles.sum(&:positive_reactions_count), delimeter: ",") %></span>
<span><%= number_with_delimiter(@articles.sum(&:public_reactions_count), delimeter: ",") %></span>
<div class="dashboard-analytics-sub-indicator">
<img src="<%= asset_path "emoji/emoji-one-heart.png" %>" /><img src="<%= asset_path "emoji/emoji-one-unicorn.png" %>" /><img src="<%= asset_path "emoji/emoji-one-bookmark.png" %>" />
Total Post Reactions

4
app/views/dashboards/_dashboard_article.html.erb
View file

@ -80,9 +80,9 @@
//
<span class="reactions-count">
<span class="value">
<%= article.positive_reactions_count %>
<%= article.public_reactions_count %>
</span>
<%= "reaction".pluralize(count: article.positive_reactions_count) %>
<%= "reaction".pluralize(count: article.public_reactions_count) %>
</span>
//
<span class="comments-count">

4
app/views/internal/articles/_individual_article.html.erb
View file

@ -16,7 +16,7 @@
<button class="btn btn-sm btn-success" data-action="article#increaseFeaturedNumber">Boost</button>
<a class="btn btn-sm btn-secondary" href="/internal/users/<%= article.user_id %>" target="_blank" rel="noopener">Manage User</a>
<a href="/internal/users/<%= article.user_id %>" class="badge badge-light">@<%= article.user&.username %></a>
<span class="badge badge-light">❤️ <%= article.positive_reactions_count %> 💬 <%= article.comments_count %></span>
<span class="badge badge-light">❤️ <%= article.public_reactions_count %> 💬 <%= article.comments_count %></span>
<span class="badge badge-light">
<% if article.published_from_feed? && !article.published? %>
RSS Import <%= article.created_at.strftime("%b %d, %Y") %>
@ -29,7 +29,7 @@
<% end %>
</span>
<% article.decorate.cached_tag_list_array.each do |tag| %>
<a class="badge badge-secondary" href='/t/<%= tag %>'>#<%= tag %></a>
<a class="badge badge-secondary" href='/t/<%= tag %>'>#<%= tag %></a>
<% end %>
</div>

2
app/views/internal/comments/index.html.erb
View file

@ -6,7 +6,7 @@
<div class="card">
<div class="card-header">
<% if comment.commentable %>
<a href="<%= comment.commentable.path %>">re: <%= comment.commentable.title %></a> (<%= comment.positive_reactions_count %> ❤️)
<a href="<%= comment.commentable.path %>">re: <%= comment.commentable.title %></a> (<%= comment.public_reactions_count %> ❤️)
<% end %>
</div>
<div class="card-body">

2
app/views/stories/feeds/show.json.jbuilder
View file

@ -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
]

1
config/elasticsearch/mappings/feed_content.json
View file

@ -84,6 +84,7 @@
"path": {
"type": "keyword"
},
// deprecated in favor of public_reactions_count, to be removed
"positive_reactions_count": {
"type": "integer"
},

1
config/elasticsearch/mappings/users.json
View file

@ -38,6 +38,7 @@
"path": {
"type": "keyword"
},
// deprecated in favor of public_reactions_count, to be removed
"positive_reactions_count": {
"type": "integer"
},

16
docs/api_v0.yml
View file

@ -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:

2
spec/labor/badge_rewarder_spec.rb
View file

@ -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

2
spec/labor/email_digest_spec.rb
View file

@ -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)]

16
spec/labor/email_logic_spec.rb
View file

@ -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

2
spec/models/notification_spec.rb
View file

@ -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) }

6
spec/models/shared_examples/sync_reactions_count.rb
View file

@ -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

2
spec/requests/additional_content_boxes_spec.rb
View file

@ -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))

12
spec/requests/api/v0/articles_spec.rb
View file

@ -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
]

4
spec/requests/reactions_spec.rb
View file

@ -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

8
spec/services/analytics_service_spec.rb
View file

@ -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)

10
spec/services/articles/analytics_updater_spec.rb
View file

@ -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

2
spec/services/exporter/articles_spec.rb
View file

@ -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

2
spec/services/exporter/comments_spec.rb
View file

@ -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

4
spec/services/notifications/milestone/send_spec.rb
View file

@ -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

2
spec/services/notifications/new_follower/send_spec.rb
View file

@ -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)

8
spec/system/dashboards/user_sorts_dashboard_articles_spec.rb
View file

@ -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