From 74eac289ee579e2f2ee5c4a8c4f80399439893bc Mon Sep 17 00:00:00 2001
From: Jay Ohms <jay@37signals.com>
Date: Fri, 27 Feb 2026 09:17:12 -0500
Subject: [PATCH] Improve the structure so users_with_active_accounts is
 available on identity

---
 app/controllers/my/identities_controller.rb       | 4 ----
 app/models/identity.rb                            | 4 ++++
 app/views/my/identities/show.json.jbuilder        | 2 +-
 test/controllers/my/identities_controller_test.rb | 9 ++-------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/controllers/my/identities_controller.rb b/app/controllers/my/identities_controller.rb
index 07b54e4c7..7a388a3c3 100644
--- a/app/controllers/my/identities_controller.rb
+++ b/app/controllers/my/identities_controller.rb
@@ -3,9 +3,5 @@ class My::IdentitiesController < ApplicationController
 
   def show
     @identity = Current.identity
-    @active_users = @identity.users.active
-      .joins(:account)
-      .merge(Account.active)
-      .includes(:account)
   end
 end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index 7495e37c3..18f4e3163 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -28,6 +28,10 @@ class Identity < ApplicationRecord
     end
   end
 
+  def users_with_active_accounts
+    users.joins(:account).merge(Account.active).includes(:account)
+  end
+
   private
     def deactivate_users
       users.find_each(&:deactivate)
diff --git a/app/views/my/identities/show.json.jbuilder b/app/views/my/identities/show.json.jbuilder
index ce28fa53f..8db250846 100644
--- a/app/views/my/identities/show.json.jbuilder
+++ b/app/views/my/identities/show.json.jbuilder
@@ -1,6 +1,6 @@
 json.id @identity.id
 
-json.accounts @active_users do |user|
+json.accounts @identity.users_with_active_accounts do |user|
   json.partial! "my/identities/account", account: user.account
   json.user user, partial: "users/user", as: :user
 end
diff --git a/test/controllers/my/identities_controller_test.rb b/test/controllers/my/identities_controller_test.rb
index 29888e9db..3771d5396 100644
--- a/test/controllers/my/identities_controller_test.rb
+++ b/test/controllers/my/identities_controller_test.rb
@@ -7,7 +7,7 @@ class My::IdentitiesControllerTest < ActionDispatch::IntegrationTest
 
   test "show as JSON" do
     identity = identities(:kevin)
-    expected_count = identity.users.active.joins(:account).merge(Account.active).count
+    expected_count = identity.users_with_active_accounts.count
 
     untenanted do
       get my_identity_path, as: :json
@@ -17,21 +17,17 @@ class My::IdentitiesControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "show as JSON includes active users from active accounts only" do
+  test "show as JSON includes users from active accounts only" do
     identity = identities(:kevin)
 
     active_account = Account.create!(external_account_id: 9999981, name: "Active Account")
     cancelled_account = Account.create!(external_account_id: 9999982, name: "Cancelled Account")
-    inactive_user_account = Account.create!(external_account_id: 9999983, name: "Inactive User Account")
 
     identity.users.create!(account: active_account, name: "Kevin", role: :owner)
 
     cancelling_user = identity.users.create!(account: cancelled_account, name: "Kevin", role: :owner)
     cancelled_account.cancel(initiated_by: cancelling_user)
 
-    inactive_user = identity.users.create!(account: inactive_user_account, name: "Kevin", role: :owner)
-    inactive_user.update!(active: false)
-
     untenanted do
       get my_identity_path, as: :json
       assert_response :success
@@ -40,7 +36,6 @@ class My::IdentitiesControllerTest < ActionDispatch::IntegrationTest
 
       assert_includes account_ids, active_account.id
       assert_not_includes account_ids, cancelled_account.id
-      assert_not_includes account_ids, inactive_user_account.id
     end
   end
 end