Commit 5024c4aa authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'n-plus-one-notification-recipients' into 'master'

Fix some N+1s when calculating notification recipients

Closes #45534

See merge request gitlab-org/gitlab-ce!19535
parents 4e18206f 0206476a
...@@ -64,7 +64,7 @@ class NotificationRecipient ...@@ -64,7 +64,7 @@ class NotificationRecipient
return false unless @target return false unless @target
return false unless @target.respond_to?(:subscriptions) return false unless @target.respond_to?(:subscriptions)
subscription = @target.subscriptions.find_by_user_id(@user.id) subscription = @target.subscriptions.find { |subscription| subscription.user_id == @user.id }
subscription && !subscription.subscribed subscription && !subscription.subscribed
end end
......
...@@ -1038,7 +1038,10 @@ class User < ActiveRecord::Base ...@@ -1038,7 +1038,10 @@ class User < ActiveRecord::Base
def notification_settings_for(source) def notification_settings_for(source)
if notification_settings.loaded? if notification_settings.loaded?
notification_settings.find { |notification| notification.source == source } notification_settings.find do |notification|
notification.source_type == source.class.base_class.name &&
notification.source_id == source.id
end
else else
notification_settings.find_or_initialize_by(source: source) notification_settings.find_or_initialize_by(source: source)
end end
......
---
title: Fix some sources of excessive query counts when calculating notification recipients
merge_request:
author:
type: performance
require 'spec_helper'
describe NotificationRecipientService do
let(:service) { described_class }
let(:assignee) { create(:user) }
let(:project) { create(:project, :public) }
let(:other_projects) { create_list(:project, 5, :public) }
describe '#build_new_note_recipients' do
let(:issue) { create(:issue, project: project, assignees: [assignee]) }
let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id) }
def create_watcher
watcher = create(:user)
create(:notification_setting, project: project, user: watcher, level: :watch)
other_projects.each do |other_project|
create(:notification_setting, project: other_project, user: watcher, level: :watch)
end
end
it 'avoids N+1 queries' do
create_watcher
service.build_new_note_recipients(note)
control_count = ActiveRecord::QueryRecorder.new do
service.build_new_note_recipients(note)
end
create_watcher
expect { service.build_new_note_recipients(note) }.not_to exceed_query_limit(control_count)
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment