Merge branch 'fix-future-renewal-service' into 'master'

Fix a bug when checking future renewals for a subgroup

See merge request gitlab-org/gitlab!61139

ee/app/services/gitlab_subscriptions/check_future_renewal_service.rb

@@ -10,11 +10,12 @@
 module GitlabSubscriptions
   class CheckFutureRenewalService
     def initialize(namespace:)
-      @namespace = namespace
+      @namespace = namespace.root_ancestor
     end
 
     def execute
       return false unless Feature.enabled?(:gitlab_subscription_future_renewal, default_enabled: :yaml)
+      return false unless namespace.gitlab_subscription.present?
 
       future_renewal
     end

ee/lib/gitlab/expiring_subscription_message.rb

@@ -120,7 +120,7 @@ module Gitlab
     end
 
     def subscription_future_renewal?
-      return if self_managed? || namespace.nil?
+      return if self_managed? || namespace.nil? || !namespace.gitlab_subscription.present?
 
       ::GitlabSubscriptions::CheckFutureRenewalService.new(namespace: namespace).execute
     end

ee/spec/lib/gitlab/expiring_subscription_message_spec.rb

@@ -112,7 +112,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
                   context 'with namespace' do
                     let(:has_future_renewal) { false }
 
-                    let_it_be(:namespace) { create(:group, name: 'No Limit Records') }
+                    let_it_be(:namespace) { create(:group_with_plan, name: 'No Limit Records') }
 
                     before do
                       allow_next_instance_of(GitlabSubscriptions::CheckFutureRenewalService, namespace: namespace) do |service|
@@ -141,6 +141,16 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
 
                       it { is_expected.to be_nil }
                     end
+
+                    context 'without gitlab_subscription' do
+                      let(:namespace) { build(:group, name: 'No Subscription Records') }
+
+                      it 'does not check for a future renewal' do
+                        expect(GitlabSubscriptions::CheckFutureRenewalService).not_to receive(:new)
+
+                        subject
+                      end
+                    end
                   end
                 end
 
@@ -200,12 +210,16 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
 
                 let(:has_future_renewal) { false }
 
-                let_it_be(:namespace) { create(:group, name: 'No Limit Records') }
+                let_it_be(:namespace) { create(:group_with_plan, name: 'No Limit Records') }
 
                 before do
                   allow_next_instance_of(GitlabSubscriptions::CheckFutureRenewalService, namespace: namespace) do |service|
                     allow(service).to receive(:execute).and_return(has_future_renewal)
                   end
+
+                  allow_next_instance_of(Group) do |group|
+                    allow(group).to receive(:gitlab_subscription).and_return(gitlab_subscription)
+                  end
                 end
 
                 where plan: %w(gold ultimate)
@@ -255,6 +269,16 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
 
                   it { is_expected.to be_nil }
                 end
+
+                context 'without gitlab_subscription' do
+                  let(:namespace) { build(:group, name: 'No Subscription Records') }
+
+                  it 'does not check for a future renewal' do
+                    expect(GitlabSubscriptions::CheckFutureRenewalService).not_to receive(:new)
+
+                    subject
+                  end
+                end
               end
             end
 

ee/spec/services/gitlab_subscriptions/check_future_renewal_service_spec.rb

@@ -45,6 +45,23 @@ RSpec.describe GitlabSubscriptions::CheckFutureRenewalService, :use_clean_rails_
       end
     end
 
+    context 'when called with a sub-group' do
+      let(:root_namespace) { create(:group_with_plan) }
+      let(:namespace) { build(:group, parent: root_namespace) }
+
+      it 'uses the root ancestor namespace' do
+        expect(Gitlab::SubscriptionPortal::Client).to receive(:subscription_last_term).with(root_namespace.id).and_return({})
+
+        execute_service
+      end
+    end
+
+    context 'when the namespace has no plan' do
+      let(:namespace) { build(:group) }
+
+      it { is_expected.to be false }
+    end
+
     context 'when the `gitlab_subscription_future_renewal` feature flag is disabled' do
       before do
         stub_feature_flags(gitlab_subscription_future_renewal: false)