Always associate a actual plan with a namespace

app/controllers/groups/billings_controller.rb

@@ -6,7 +6,7 @@ class Groups::BillingsController < Groups::ApplicationController
 
   def index
     @top_most_group = @group.root_ancestor if @group.has_parent?
-    current_plan = (@top_most_group || @group).actual_plan
+    current_plan = (@top_most_group || @group).actual_plan_name
     @plans_data = FetchSubscriptionPlansService.new(plan: current_plan).execute
   end
 end

app/controllers/profiles/billings_controller.rb

@@ -2,6 +2,8 @@ class Profiles::BillingsController < Profiles::ApplicationController
   before_action :verify_namespace_plan_check_enabled
 
   def index
-    @plans_data = FetchSubscriptionPlansService.new(plan: current_user.namespace.actual_plan).execute
+    @plans_data = FetchSubscriptionPlansService
+      .new(plan: current_user.namespace.actual_plan_name)
+      .execute
   end
 end

app/views/groups/billings/index.html.haml

 - page_title "Billing"
 
 - if @top_most_group
-  - top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan)
+  - top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan_name)
   = render 'shared/billings/billing_plan_header', namespace: @group, plan: top_most_group_plan, parent_group: @top_most_group
 - else
   = render 'shared/billings/billing_plans', plans_data: @plans_data, namespace: @group

app/views/shared/billings/_billing_plans.html.haml

-- current_plan = subscription_plan_info(plans_data, namespace.actual_plan)
+- current_plan = subscription_plan_info(plans_data, namespace.actual_plan_name)
 
 - if current_plan
   = render 'shared/billings/billing_plan_header', namespace: namespace, plan: current_plan

ee/app/models/ee/namespace.rb

@@ -78,8 +78,13 @@ module EE
 
     # The main difference between the "plan" column and this method is that "plan"
     # returns nil / "" when it has no plan. Having no plan means it's a "free" plan.
+    #
     def actual_plan
-      plan&.name || FREE_PLAN
+      self.plan || Plan.find_by(name: FREE_PLAN)
+    end
+
+    def actual_plan_name
+      actual_plan&.name || FREE_PLAN
     end
 
     def actual_shared_runners_minutes_limit