github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-17 09:51:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Should not include regular categories in top_category_ids array

Browse Source
This commit is contained in:
Vinoth Kannan 2018-07-30 16:06:36 +05:30
parent 8d1acbd4c2
commit 50df2d7241
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/serializers/current_user_serializer.rb
View File

@ -158,8 +158,9 @@ class CurrentUserSerializer < BasicUserSerializer
end
def top_category_ids
omitted_notification_levels = [CategoryUser.notification_levels[:muted], CategoryUser.notification_levels[:regular]]
CategoryUser.where(user_id: object.id)
.where.not(notification_level: CategoryUser.notification_levels[:muted])
.where.not(notification_level: omitted_notification_levels)
.order("
CASE
WHEN notification_level = 3 THEN 1

6
spec/serializers/current_user_serializer_spec.rb
View File

@ -37,6 +37,7 @@ RSpec.describe CurrentUserSerializer do
let(:user) { Fabricate(:user) }
let(:category1) { Fabricate(:category) }
let(:category2) { Fabricate(:category) }
let(:category3) { Fabricate(:category) }
let :serializer do
CurrentUserSerializer.new(user, scope: Guardian.new, root: false)
end
@ -55,6 +56,11 @@ RSpec.describe CurrentUserSerializer do
CategoryUser.create!(user_id: user.id,
category_id: category2.id,
notification_level: CategoryUser.notification_levels[:watching])
CategoryUser.create!(user_id: user.id,
category_id: category3.id,
notification_level: CategoryUser.notification_levels[:regular])
payload = serializer.as_json
expect(payload[:top_category_ids]).to eq([category2.id, category1.id])
end