Merge branch...

Merge branch '440677-follow-up-from-implement-checking-for-the-add-on-seat-for-chat-users' into 'master' 

Refactor formatting of duo cache key into method

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144229



Merged-by: Marc Shaw <mshaw@gitlab.com>
Approved-by: Michał Zając <mzajac@gitlab.com>
Approved-by: Marc Shaw <mshaw@gitlab.com>
Co-authored-by: Małgorzata Ksionek <mksionek@gitlab.com>

ee/app/graphql/mutations/gitlab_subscriptions/user_add_on_assignments/remove.rb

@@ -29,7 +29,7 @@ def resolve(**)
 
           assignment.destroy!
 
-          Rails.cache.delete(format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: user_to_be_removed.id))
+          Rails.cache.delete(user_to_be_removed.duo_pro_cache_key_formatted)
 
           log_event
 

ee/app/models/ee/user.rb

@@ -631,6 +631,10 @@ def duo_pro_add_on_available?
       GitlabSubscriptions::UserAddOnAssignment.by_user(self).for_active_code_suggestions_purchase.any?
     end
 
+    def duo_pro_cache_key_formatted
+      format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: id)
+    end
+
     def eligible_for_self_managed_code_suggestions?
       return false if gitlab_com_subscription?
 

ee/app/services/gitlab_subscriptions/user_add_on_assignments/base_create_service.rb

@@ -35,7 +35,7 @@ def execute
 
           add_on_purchase.assigned_users.create!(user: user)
 
-          Rails.cache.delete(format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: user.id))
+          Rails.cache.delete(user.duo_pro_cache_key_formatted)
 
           log_event('User AddOn assignment created')
 

ee/spec/models/gitlab_subscriptions/add_on_purchase_spec.rb

@@ -409,8 +409,8 @@
       end
 
       it 'expires the cache keys for the ineligible users', :use_clean_rails_redis_caching do
-        eligible_user_cache_key = format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: eligible_user.id)
-        ineligible_user_cache_key = format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: ineligible_user.id)
+        eligible_user_cache_key = eligible_user.duo_pro_cache_key_formatted
+        ineligible_user_cache_key = ineligible_user.duo_pro_cache_key_formatted
         Rails.cache.write(eligible_user_cache_key, true, expires_in: 1.hour)
         Rails.cache.write(ineligible_user_cache_key, true, expires_in: 1.hour)
 

ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/remove_spec.rb

@@ -142,7 +142,7 @@
     end
 
     it 'expires the cache key for that user', :use_clean_rails_redis_caching do
-      cache_key = format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: remove_user.id)
+      cache_key = remove_user.duo_pro_cache_key_formatted
       Rails.cache.write(cache_key, true, expires_in: 1.hour)
 
       expect do

ee/spec/services/gitlab_subscriptions/user_add_on_assignments/saas/create_service_spec.rb

@@ -38,7 +38,7 @@
       end
 
       it 'expires the user add-on cache', :use_clean_rails_redis_caching do
-        cache_key = format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: user.id)
+        cache_key = user.duo_pro_cache_key_formatted
         Rails.cache.write(cache_key, false, expires_in: 1.hour)
 
         expect { subject }.to change { Rails.cache.read(cache_key) }.from(false).to(nil)

ee/spec/services/gitlab_subscriptions/user_add_on_assignments/self_managed/create_service_spec.rb

@@ -32,7 +32,7 @@
       end
 
       it 'expires the user add-on cache', :use_clean_rails_redis_caching do
-        cache_key = format(User::DUO_PRO_ADD_ON_CACHE_KEY, user_id: user.id)
+        cache_key = user.duo_pro_cache_key_formatted
         Rails.cache.write(cache_key, false, expires_in: 1.hour)
 
         expect { subject }.to change { Rails.cache.read(cache_key) }.from(false).to(nil)