Merge branch 'move_lb_override_use_project_access_changed_service' into 'master'

Move bulk_stick in UserProjectAccessChangedService to Core [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62745

app/services/user_project_access_changed_service.rb

@@ -13,17 +13,20 @@ class UserProjectAccessChangedService
   def execute(blocking: true, priority: HIGH_PRIORITY)
     bulk_args = @user_ids.map { |id| [id] }
 
-    if blocking
-      AuthorizedProjectsWorker.bulk_perform_and_wait(bulk_args)
-    else
-      if priority == HIGH_PRIORITY
-        AuthorizedProjectsWorker.bulk_perform_async(bulk_args) # rubocop:disable Scalability/BulkPerformWithContext
+    result =
+      if blocking
+        AuthorizedProjectsWorker.bulk_perform_and_wait(bulk_args)
       else
-        AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker.bulk_perform_in( # rubocop:disable Scalability/BulkPerformWithContext
-          DELAY, bulk_args, batch_size: 100, batch_delay: 30.seconds)
+        if priority == HIGH_PRIORITY
+          AuthorizedProjectsWorker.bulk_perform_async(bulk_args) # rubocop:disable Scalability/BulkPerformWithContext
+        else
+          AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker.bulk_perform_in( # rubocop:disable Scalability/BulkPerformWithContext
+            DELAY, bulk_args, batch_size: 100, batch_delay: 30.seconds)
+        end
       end
-    end
+
+    ::Gitlab::Database::LoadBalancing::Sticking.bulk_stick(:user, @user_ids)
+
+    result
   end
 end
-
-UserProjectAccessChangedService.prepend_mod_with('UserProjectAccessChangedService')

ee/app/services/ee/user_project_access_changed_service.rb

-# frozen_string_literal: true
-
-module EE
-  module UserProjectAccessChangedService
-    def execute(blocking: true, priority: ::UserProjectAccessChangedService::HIGH_PRIORITY)
-      result = super
-
-      ::Gitlab::Database::LoadBalancing::Sticking.bulk_stick(:user, @user_ids) # rubocop:disable Gitlab/ModuleWithInstanceVariables
-
-      result
-    end
-  end
-end

ee/spec/services/ee/user_project_access_changed_service_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe EE::UserProjectAccessChangedService do
-  let(:service) { UserProjectAccessChangedService.new([1, 2]) }
-
-  describe '#execute' do
-    before do
-      allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
-
-      expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
-                                            .with([[1], [2]])
-                                            .and_return(10)
-    end
-
-    it 'sticks all the updated users and returns the original result', :aggregate_failures do
-      expect(Gitlab::Database::LoadBalancing::Sticking).to receive(:bulk_stick).with(:user, [1, 2])
-
-      expect(service.execute).to eq(10)
-    end
-
-    it 'avoids N+1 cached queries', :use_sql_query_cache, :request_store do
-      # Run this once to establish a baseline
-      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
-        service.execute
-      end
-
-      service = UserProjectAccessChangedService.new([1, 2, 3, 4, 5])
-
-      allow(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
-                                            .with([[1], [2], [3], [4], [5]])
-                                            .and_return(10)
-
-      expect { service.execute }.not_to exceed_all_query_limit(control_count.count)
-    end
-  end
-end

spec/services/user_project_access_changed_service_spec.rb

@@ -31,4 +31,37 @@ RSpec.describe UserProjectAccessChangedService do
                                           priority: described_class::LOW_PRIORITY)
     end
   end
+
+  context 'with load balancing enabled' do
+    let(:service) { UserProjectAccessChangedService.new([1, 2]) }
+
+    before do
+      allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
+
+      expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
+                                            .with([[1], [2]])
+                                            .and_return(10)
+    end
+
+    it 'sticks all the updated users and returns the original result', :aggregate_failures do
+      expect(Gitlab::Database::LoadBalancing::Sticking).to receive(:bulk_stick).with(:user, [1, 2])
+
+      expect(service.execute).to eq(10)
+    end
+
+    it 'avoids N+1 cached queries', :use_sql_query_cache, :request_store do
+      # Run this once to establish a baseline
+      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+        service.execute
+      end
+
+      service = UserProjectAccessChangedService.new([1, 2, 3, 4, 5])
+
+      allow(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
+                                            .with([[1], [2], [3], [4], [5]])
+                                            .and_return(10)
+
+      expect { service.execute }.not_to exceed_all_query_limit(control_count.count)
+    end
+  end
 end