Merge branch 'redefined_scope_to_not_use_in_condition' into 'master'

Updated users scope definition to not to use where

See merge request !146595



Merged-by: Bogdan Denkovych <bdenkovych@gitlab.com>
Approved-by: Manoj M J <mmj@gitlab.com>
Approved-by: Bogdan Denkovych <bdenkovych@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>

app/models/user.rb

@@ -622,9 +622,8 @@ def blocked?
         .expiring_soon_and_not_notified)
   end
 
-  scope :with_personal_access_tokens_expiring_soon_and_ids, ->(ids) do
-    where(id: ids)
-    .includes(:expiring_soon_and_unnotified_personal_access_tokens)
+  scope :with_personal_access_tokens_expiring_soon, -> do
+    includes(:expiring_soon_and_unnotified_personal_access_tokens)
   end
 
   scope :order_recent_sign_in, -> { reorder(arel_table[:current_sign_in_at].desc.nulls_last) }

app/workers/personal_access_tokens/expiring_worker.rb

@@ -36,7 +36,7 @@ def process_user_tokens
 
         break if tokens.empty?
 
-        users = User.with_personal_access_tokens_expiring_soon_and_ids(tokens.pluck(:user_id).uniq)
+        users = User.id_in(tokens.pluck(:user_id).uniq).with_personal_access_tokens_expiring_soon
 
         users.each do |user|
           with_context(user: user) do

spec/models/user_spec.rb

@@ -1430,18 +1430,13 @@
       end
     end
 
-    describe '.with_personal_access_tokens_expiring_soon_and_ids' do
+    describe '.with_personal_access_tokens_expiring_soon' do
       let_it_be(:user1) { create(:user) }
       let_it_be(:user2) { create(:user) }
       let_it_be(:pat1) { create(:personal_access_token, user: user1, expires_at: 2.days.from_now) }
       let_it_be(:pat2) { create(:personal_access_token, user: user2, expires_at: 7.days.from_now) }
-      let_it_be(:ids) { [user1.id] }
 
-      subject(:users) { described_class.with_personal_access_tokens_expiring_soon_and_ids(ids) }
-
-      it 'filters users only by id' do
-        expect(users).to contain_exactly(user1)
-      end
+      subject(:users) { described_class.with_personal_access_tokens_expiring_soon }
 
       it 'includes expiring personal access tokens' do
         expect(users.first.expiring_soon_and_unnotified_personal_access_tokens).to be_loaded