R2-3197 Performance: N+1 for User Groups API

primeroIMS · Feb 11, 2025 · 71d999f · 71d999f
1 parent e941c5f
commit 71d999f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/models/user_group.rb b/app/models/user_group.rb
@@ -31,7 +31,7 @@ def permitted_api_params
     end
 
     def list(user, opts = {})
-      user_groups = opts[:managed] ? user.permitted_user_groups : UserGroup.all
+      user_groups = opts[:managed] ? user.permitted_user_groups : UserGroup.includes(:agencies).all
       user_groups = user_groups.where(disabled: opts[:disabled]) if opts[:disabled].present?
       if opts[:agency_unique_ids].present?
         user_groups = user_groups.distinct.joins(:agencies).where(agencies: { unique_id: opts[:agency_unique_ids] })

diff --git a/spec/models/user_group_spec.rb b/spec/models/user_group_spec.rb
@@ -30,5 +30,12 @@
       expect(user_groups.size).to eq(3)
       expect(user_groups.pluck(:unique_id)).to match_array(%w[group_1 group_2 group_3])
     end
+
+    it 'when agency filter is not set' do
+      user_groups = UserGroup.list(nil)
+
+      expect(user_groups.size).to eq(3)
+      expect(user_groups.map(&:unique_id)).to match_array(%w[group_1 group_2 group_3])
+    end
   end
 end