Fetch service plan visibilities with eager loading

app/fetchers/service_plan_list_fetcher.rb

@@ -6,10 +6,10 @@ class << self
       def fetch(message, omniscient: false, readable_orgs_query: nil, readable_spaces_query: nil, eager_loaded_associations: [])
         super(ServicePlan,
               message,
-              omniscient:,
-              readable_orgs_query:,
-              readable_spaces_query:,
-              eager_loaded_associations:)
+              omniscient: omniscient,
+              readable_orgs_query: readable_orgs_query,
+              readable_spaces_query: readable_spaces_query,
+              eager_loaded_associations: eager_loaded_associations.append(:orgs_visibility))
       end
 
       private

app/models/services/service_plan.rb

@@ -11,6 +11,8 @@ class ServicePlan < Sequel::Model
 
     add_association_dependencies service_plan_visibilities: :destroy
 
+    one_to_many(:orgs_visibility, clone: :service_plan_visibilities) { |ds| ds.select(:service_plan_id).distinct }
+
     one_to_many :labels, class: 'VCAP::CloudController::ServicePlanLabelModel', key: :resource_guid, primary_key: :guid
     add_association_dependencies labels: :destroy
 
@@ -180,7 +182,7 @@ def visibility_type
 
       return ServicePlanVisibilityTypes::SPACE if broker_space_scoped?
 
-      return ServicePlanVisibilityTypes::ORGANIZATION unless service_plan_visibilities_dataset.empty?
+      return ServicePlanVisibilityTypes::ORGANIZATION unless orgs_visibility.empty?
 
       ServicePlanVisibilityTypes::ADMIN
     end

db/migrations/20231113105256_add_service_plan_id_index.rb

@@ -0,0 +1,9 @@
+Sequel.migration do
+  up do
+    add_index :service_plan_visibilities, :service_plan_id, name: :spv_service_plan_id_index, options: [:concurrently] if database_type == :postgres
+  end
+
+  down do
+    drop_index :service_plan_visibilities, nil, name: :spv_service_plan_id_index, options: [:concurrently] if database_type == :postgres
+  end
+end