Refactor service plan lookup to eager load service and broker associations

Author: kathap

app/controllers/v3/service_instances_controller.rb

@@ -253,7 +253,11 @@ def create_user_provided(message)
   end
 
   def create_managed(message, space:)
-    service_plan = ServicePlan.first(guid: message.service_plan_guid)
+    service_plan_relations = ServicePlan.eager_graph(service: :service_broker).
+                             where(Sequel[:service_plans][:guid] => message.service_plan_guid).
+                             all
+    service_plan = service_plan_relations[0]
+
     service_plan_does_not_exist! unless service_plan
     service_plan_not_visible_to_user!(service_plan) unless visible_to_current_user?(plan: service_plan)
     unavailable_service_plan!(service_plan) unless service_plan_active?(service_plan)
@@ -270,18 +274,8 @@ def create_managed(message, space:)
         audit_hash: message.audit_hash
       )
 
-      result = VCAP::CloudController::ServicePlan.
-               join(:services, id: :service_id).
-               join(:service_brokers, id: Sequel[:services][:service_broker_id]).
-               where(Sequel[:service_plans][:id] => service_plan.id).
-               select(
-                 Sequel[:services][:label].as(:service_name),
-                 Sequel[:service_brokers][:name].as(:broker_name)
-               ).
-               first
-
-      service_name = result[:service_name]
-      broker_name = result[:broker_name]
+      service_name = service_plan.service.name
+      broker_name = service_plan.service.service_broker.name
 
       logger.info(
         "Creating managed service instance with name '#{instance.name}' " \
@@ -318,26 +312,22 @@ def update_managed(service_instance)
     action.preflight!
     if action.update_broker_needed?
 
-      plan_scope = if message.service_plan_guid
-                     { Sequel[:service_plans][:guid] => message.service_plan_guid }
-                   else
-                     { Sequel[:service_plans][:id] => service_instance.service_plan_id }
-                   end
-
-      result = VCAP::CloudController::ServicePlan.
-               join(:services, id: :service_id).
-               join(:service_brokers, id: Sequel[:services][:service_broker_id]).
-               where(plan_scope).
-               select(
-                 Sequel[:service_plans][:name].as(:plan_name),
-                 Sequel[:services][:label].as(:service_name),
-                 Sequel[:service_brokers][:name].as(:broker_name)
-               ).
-               first
-
-      plan_name     = result[:plan_name]
-      service_name  = result[:service_name]
-      broker_name   = result[:broker_name]
+      service_plan_relations = if message.service_plan_guid
+                                 { Sequel[:service_plans][:guid] => message.service_plan_guid }
+                                 ServicePlan.eager_graph(service: :service_broker).
+                                   where(Sequel[:service_plans][:guid] => message.service_plan_guid).
+                                   all
+                               else
+                                 { Sequel[:service_plans][:id] => service_instance.service_plan_id }
+                                 ServicePlan.eager_graph(service: :service_broker).
+                                   where(Sequel[:service_plans][:id] => service_instance.service_plan_id).
+                                   all
+                               end
+
+      service_plan = service_plan_relations[0]
+      plan_name = service_plan.name
+      service_name = service_plan.service.name
+      broker_name = service_plan.service.service_broker.name
 
       logger.info(
         "Updating managed service instance with name '#{service_instance.name}' " \
@@ -402,20 +392,15 @@ def fetch_writable_service_instance(guid)
   def enqueue_delete_job(service_instance)
     delete_job = V3::DeleteServiceInstanceJob.new(service_instance.guid, user_audit_info)
 
-    result = VCAP::CloudController::ServicePlan.
-             join(:services, id: :service_id).
-             join(:service_brokers, id: Sequel[:services][:service_broker_id]).
-             where(Sequel[:service_plans][:id] => service_instance.service_plan_id).
-             select(
-               Sequel[:service_plans][:name].as(:plan_name),
-               Sequel[:services][:label].as(:service_name),
-               Sequel[:service_brokers][:name].as(:broker_name)
-             ).
-             first
-
-    plan_name     = result[:plan_name]
-    service_name  = result[:service_name]
-    broker_name   = result[:broker_name]
+    service_plan_relations = ServicePlan.eager_graph(service: :service_broker).
+                             where(Sequel[:service_plans][:id] => service_instance.service_plan_id).
+                             all
+
+    service_plan = service_plan_relations[0]
+
+    plan_name = service_plan.name
+    service_name = service_plan.service.name
+    broker_name = service_plan.service.service_broker.name
 
     logger.info(
       "Deleting managed service instance with name '#{service_instance.name}' " \