Skip to content

A platform for community discussion. Free, open, simple.

DEV: return 0 instead of nil from user count methods (#38501)

Isaac Janzenc86c2894f1ab
diff --git a/app/models/user.rb b/app/models/user.rb
index a49128ca482..f37294ede88 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1650,7 +1650,7 @@ class User < ActiveRecord::Base
.where(status: "rejected", target_created_by_id: ids)
.group(:target_created_by_id)
.count
- end
+ end || 0
end
def number_of_flags_given
@@ -1667,7 +1667,7 @@ class User < ActiveRecord::Base
.where(target_user_id: ids, action: UserHistory.actions[:silence_user])
.group(:target_user_id)
.count
- end
+ end || 0
end
def number_of_suspensions
@@ -1676,7 +1676,7 @@ class User < ActiveRecord::Base
.where(target_user_id: ids, action: UserHistory.actions[:suspend_user])
.group(:target_user_id)
.count
- end
+ end || 0
end
def create_user_profile
diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index 70f421e614b..0ddc83c4f1a 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -44,15 +44,15 @@ class FlaggedUserSerializer < BasicUserSerializer
end
def silenced_count
- object.number_of_silencings.to_i
+ object.number_of_silencings
end
def suspended_count
- object.number_of_suspensions.to_i
+ object.number_of_suspensions
end
def rejected_posts_count
- object.number_of_rejected_posts.to_i
+ object.number_of_rejected_posts
end
def custom_fields
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 51135cab3af..64f25f2f036 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2134,7 +2134,11 @@ RSpec.describe User do
status: Reviewable.statuses[:approved],
)
- expect(user.number_of_rejected_posts.to_i).to eq(0)
+ expect(user.number_of_rejected_posts).to eq(0)
+ end
+
+ it "returns 0 when user has no rejected posts" do
+ expect(user.number_of_rejected_posts).to eq(0)
end
end
@@ -2164,6 +2168,16 @@ RSpec.describe User do
Fabricate(:user_history, action: UserHistory.actions[:silence_user])
expect(user.reload.number_of_silencings).to eq(3)
end
+
+ it "returns 0 when user has no silencings" do
+ expect(user.number_of_silencings).to eq(0)
+ end
+ end
+
+ describe "#number_of_suspensions" do
+ it "returns 0 when user has no suspensions" do
+ expect(user.number_of_suspensions).to eq(0)
+ end
end
end