Merge pull request #11983 from bmd08a1/opt/fix-enterprise-roles

Improve `admin/enterprise_roles` page performance

app/controllers/admin/enterprise_roles_controller.rb

@@ -3,9 +3,8 @@
 module Admin
   class EnterpriseRolesController < Admin::ResourceController
     def index
-      @enterprise_roles = EnterpriseRole.by_user_email
-      @users = Spree::User.order('spree_users.email')
-      @my_enterprises = @all_enterprises = Enterprise.by_name
+      @enterprise_roles, @users, @all_enterprises = Admin::EnterpriseRolesQuery.query
+      @my_enterprises = @all_enterprises
     end
 
     def create

app/helpers/admin/injection_helper.rb

@@ -27,13 +27,6 @@ module Admin
                                   Api::Admin::EnterpriseRelationshipSerializer
     end
 
-    def admin_inject_enterprise_roles(enterprise_roles)
-      admin_inject_json_ams_array "ofn.admin",
-                                  "enterpriseRoles",
-                                  enterprise_roles,
-                                  Api::Admin::EnterpriseRoleSerializer
-    end
-
     def admin_inject_payment_methods(payment_methods)
       admin_inject_json_ams_array "admin.paymentMethods",
                                   "paymentMethods",
@@ -137,13 +130,6 @@ module Admin
                                   Api::Admin::TaxonSerializer
     end
 
-    def admin_inject_users(users)
-      admin_inject_json_ams_array "ofn.admin",
-                                  "users",
-                                  users,
-                                  Api::Admin::UserSerializer
-    end
-
     def admin_inject_variant_overrides(variant_overrides)
       admin_inject_json_ams_array "admin.variantOverrides",
                                   "variantOverrides",

app/queries/admin/enterprise_roles_query.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Admin
+  class EnterpriseRolesQuery
+    class << self
+      def query
+        enterprise_roles = query_enterprise_roles
+        users = query_users
+        enterprises = query_enterprises
+
+        [enterprise_roles, users, enterprises]
+      end
+
+      private
+
+      def query_enterprise_roles
+        EnterpriseRole.joins(:user, :enterprise).order('spree_users.email ASC').
+          pluck(:id, :user_id, :enterprise_id, 'spree_users.email', 'enterprises.name').
+          map do |data|
+            id, user_id, enterprise_id, user_email, enterprise_name = data
+
+            { id:, user_id:, enterprise_id:, user_email:, enterprise_name: }
+          end
+      end
+
+      def query_users
+        Spree::User.order(:email).pluck(:id, :email).map do |data|
+          id, email = data
+
+          { id:, email: }
+        end
+      end
+
+      def query_enterprises
+        Enterprise.order(:name).pluck(:id, :name).map do |data|
+          id, name = data
+
+          { id:, name: }
+        end
+      end
+    end
+  end
+end

app/views/admin/enterprise_roles/_data.html.haml

@@ -1,4 +1,3 @@
-= admin_inject_enterprise_roles(@enterprise_roles)
-= admin_inject_users(@users)
-= admin_inject_enterprises(@my_enterprises, @all_enterprises)
-
+= admin_inject_json('ofn.admin', 'enterpriseRoles', @enterprise_roles)
+= admin_inject_json('ofn.admin', 'users', @users)
+= admin_inject_json('ofn.admin', 'my_enterprises', @my_enterprises) + admin_inject_json('ofn.admin', 'all_enterprises', @all_enterprises)