Merge pull request #2620 from basecamp/identity-accounts

Only return identity accounts that are active with an active user

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)

app/views/my/identities/show.json.jbuilder

@@ -1,6 +1,6 @@
 json.id @identity.id
 
-json.accounts @identity.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