github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-29 19:13:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: return full name in /notifications.json (#30335)

Browse Source 
* wip: return full name in /notifications.json

* DEV: test for full name

* DEV: add test for enable_names=true

* DEV: add notification6, cleanup

* DEV: fix tests
This commit is contained in:
marstall 2024-12-20 11:43:13 -05:00 committed by GitHub
parent d18bf67868
commit 3e8e861103
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/notification.rb
View File

@ -371,13 +371,17 @@ class Notification < ActiveRecord::Base
(
notification.data_hash[:username] || notification.data_hash[:display_username] ||
notification.data_hash[:mentioned_by_username] ||
notification.data_hash[:invited_by_username]
notification.data_hash[:invited_by_username] ||
notification.data_hash[:original_username]
)&.downcase
end
users = User.where(username_lower: usernames.uniq).index_by(&:username_lower)
notifications.each do |notification|
notification.acting_user = users[notification.acting_username]
notification.data_hash[
:original_name
] = notification.acting_user&.name if SiteSetting.enable_names
end
notifications

24
spec/models/notification_spec.rb
View File

@ -809,10 +809,14 @@ RSpec.describe Notification do
end
describe ".populate_acting_user" do
SiteSetting.enable_names = true
fab!(:user1) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user) }
fab!(:user3) { Fabricate(:user) }
fab!(:user4) { Fabricate(:user) }
fab!(:user5) { Fabricate(:user) }
fab!(:user6) { Fabricate(:user) }
fab!(:notification1) do
Fabricate(:notification, user: user, data: { username: user1.username }.to_json)
end
@ -825,16 +829,32 @@ RSpec.describe Notification do
fab!(:notification4) do
Fabricate(:notification, user: user, data: { invited_by_username: user4.username }.to_json)
end
fab!(:notification5) do
Fabricate(:notification, user: user, data: { original_username: user5.username }.to_json)
end
fab!(:notification6) do
Fabricate(:notification, user: user, data: { original_username: user6.username }.to_json)
end
it "Sets the acting_user correctly for each notification" do
Notification.populate_acting_user(
[notification1, notification2, notification3, notification4],
[notification1, notification2, notification3, notification4, notification5],
)
expect(notification1.acting_user).to eq(user1)
expect(notification2.acting_user).to eq(user2)
expect(notification3.acting_user).to eq(user3)
expect(notification4.acting_user).to eq(user4)
expect(notification5.acting_user).to eq(user5)
expect(notification5.data_hash[:original_name]).to eq user5.name
end
context "with SiteSettings.enable_names=false" do
it "doesn't set the :original_name property" do
SiteSetting.enable_names = false
Notification.populate_acting_user([notification6])
expect(notification6.data_hash[:original_name]).to be_nil
SiteSetting.enable_names = true
end
end
end
end