Add experimental server-side notification grouping (#29889)
This commit is contained in:
parent
db49b0e5e9
commit
974335e414
14 changed files with 618 additions and 0 deletions
|
@ -151,6 +151,66 @@ RSpec.describe Notification do
|
|||
end
|
||||
end
|
||||
|
||||
describe '.paginate_groups_by_max_id' do
|
||||
let(:account) { Fabricate(:account) }
|
||||
|
||||
let!(:notifications) do
|
||||
['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
|
||||
.map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
|
||||
end
|
||||
|
||||
context 'without since_id or max_id' do
|
||||
it 'returns the most recent notifications, only keeping one notification per group' do
|
||||
expect(described_class.without_suspended.paginate_groups_by_max_id(4).pluck(:id))
|
||||
.to eq [notifications[7], notifications[6], notifications[4], notifications[2]].pluck(:id)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with since_id' do
|
||||
it 'returns the most recent notifications, only keeping one notification per group' do
|
||||
expect(described_class.without_suspended.paginate_groups_by_max_id(4, since_id: notifications[4].id).pluck(:id))
|
||||
.to eq [notifications[7], notifications[6]].pluck(:id)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with max_id' do
|
||||
it 'returns the most recent notifications after max_id, only keeping one notification per group' do
|
||||
expect(described_class.without_suspended.paginate_groups_by_max_id(4, max_id: notifications[7].id).pluck(:id))
|
||||
.to eq [notifications[6], notifications[5], notifications[4], notifications[2]].pluck(:id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.paginate_groups_by_min_id' do
|
||||
let(:account) { Fabricate(:account) }
|
||||
|
||||
let!(:notifications) do
|
||||
['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
|
||||
.map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
|
||||
end
|
||||
|
||||
context 'without min_id or max_id' do
|
||||
it 'returns the oldest notifications, only keeping one notification per group' do
|
||||
expect(described_class.without_suspended.paginate_groups_by_min_id(4).pluck(:id))
|
||||
.to eq [notifications[0], notifications[2], notifications[3], notifications[4]].pluck(:id)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with max_id' do
|
||||
it 'returns the oldest notifications, stopping at max_id, only keeping one notification per group' do
|
||||
expect(described_class.without_suspended.paginate_groups_by_min_id(4, max_id: notifications[4].id).pluck(:id))
|
||||
.to eq [notifications[0], notifications[2], notifications[3]].pluck(:id)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with min_id' do
|
||||
it 'returns the most oldest notifications after min_id, only keeping one notification per group' do
|
||||
expect(described_class.without_suspended.paginate_groups_by_min_id(4, min_id: notifications[0].id).pluck(:id))
|
||||
.to eq [notifications[1], notifications[2], notifications[3], notifications[4]].pluck(:id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.preload_cache_collection_target_statuses' do
|
||||
subject do
|
||||
described_class.preload_cache_collection_target_statuses(notifications) do |target_statuses|
|
||||
|
|
161
spec/requests/api/v2_alpha/notifications_spec.rb
Normal file
161
spec/requests/api/v2_alpha/notifications_spec.rb
Normal file
|
@ -0,0 +1,161 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe 'Notifications' do
|
||||
let(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
|
||||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
|
||||
let(:scopes) { 'read:notifications write:notifications' }
|
||||
let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
|
||||
|
||||
describe 'GET /api/v2_alpha/notifications', :sidekiq_inline do
|
||||
subject do
|
||||
get '/api/v2_alpha/notifications', headers: headers, params: params
|
||||
end
|
||||
|
||||
let(:bob) { Fabricate(:user) }
|
||||
let(:tom) { Fabricate(:user) }
|
||||
let(:params) { {} }
|
||||
|
||||
before do
|
||||
first_status = PostStatusService.new.call(user.account, text: 'Test')
|
||||
ReblogService.new.call(bob.account, first_status)
|
||||
mentioning_status = PostStatusService.new.call(bob.account, text: 'Hello @alice')
|
||||
mentioning_status.mentions.first
|
||||
FavouriteService.new.call(bob.account, first_status)
|
||||
FavouriteService.new.call(tom.account, first_status)
|
||||
FollowService.new.call(bob.account, user.account)
|
||||
end
|
||||
|
||||
it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
|
||||
|
||||
context 'with no options' do
|
||||
it 'returns expected notification types', :aggregate_failures do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with exclude_types param' do
|
||||
let(:params) { { exclude_types: %w(mention) } }
|
||||
|
||||
it 'returns everything but excluded type', :aggregate_failures do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
expect(body_as_json.size).to_not eq 0
|
||||
expect(body_json_types.uniq).to_not include 'mention'
|
||||
end
|
||||
end
|
||||
|
||||
context 'with types param' do
|
||||
let(:params) { { types: %w(mention) } }
|
||||
|
||||
it 'returns only requested type', :aggregate_failures do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
expect(body_json_types.uniq).to eq ['mention']
|
||||
end
|
||||
end
|
||||
|
||||
context 'with limit param' do
|
||||
let(:params) { { limit: 3 } }
|
||||
|
||||
it 'returns the requested number of notifications paginated', :aggregate_failures do
|
||||
subject
|
||||
|
||||
notifications = user.account.notifications
|
||||
|
||||
expect(body_as_json.size)
|
||||
.to eq(params[:limit])
|
||||
|
||||
expect(response)
|
||||
.to include_pagination_headers(
|
||||
prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.last.id),
|
||||
# TODO: one downside of the current approach is that we return the first ID matching the group,
|
||||
# not the last that has been skipped, so pagination is very likely to give overlap
|
||||
next: api_v2_alpha_notifications_url(limit: params[:limit], max_id: notifications[1].id)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def body_json_types
|
||||
body_as_json.pluck(:type)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET /api/v2_alpha/notifications/:id' do
|
||||
subject do
|
||||
get "/api/v2_alpha/notifications/#{notification.group_key}", headers: headers
|
||||
end
|
||||
|
||||
let(:notification) { Fabricate(:notification, account: user.account, group_key: 'foobar') }
|
||||
|
||||
it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
|
||||
|
||||
it 'returns http success' do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
end
|
||||
|
||||
context 'when notification belongs to someone else' do
|
||||
let(:notification) { Fabricate(:notification, group_key: 'foobar') }
|
||||
|
||||
it 'returns http not found' do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(404)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'POST /api/v2_alpha/notifications/:id/dismiss' do
|
||||
subject do
|
||||
post "/api/v2_alpha/notifications/#{notification.group_key}/dismiss", headers: headers
|
||||
end
|
||||
|
||||
let!(:notification) { Fabricate(:notification, account: user.account, group_key: 'foobar') }
|
||||
|
||||
it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
|
||||
|
||||
it 'destroys the notification' do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(200)
|
||||
expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
||||
end
|
||||
|
||||
context 'when notification belongs to someone else' do
|
||||
let(:notification) { Fabricate(:notification) }
|
||||
|
||||
it 'returns http not found' do
|
||||
subject
|
||||
|
||||
expect(response).to have_http_status(404)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'POST /api/v2_alpha/notifications/clear' do
|
||||
subject do
|
||||
post '/api/v2_alpha/notifications/clear', headers: headers
|
||||
end
|
||||
|
||||
before do
|
||||
Fabricate(:notification, account: user.account)
|
||||
end
|
||||
|
||||
it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
|
||||
|
||||
it 'clears notifications for the account' do
|
||||
subject
|
||||
|
||||
expect(user.account.reload.notifications).to be_empty
|
||||
expect(response).to have_http_status(200)
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue