From f861a5cee0455e89a0d9c131826bfcc5c56331bc Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 28 Jan 2026 06:04:00 -0500 Subject: [PATCH] Add `action_logs` association for account (#36022) --- app/controllers/concerns/accountable_concern.rb | 8 +++----- app/models/concerns/account/associations.rb | 1 + spec/models/account_spec.rb | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/concerns/accountable_concern.rb b/app/controllers/concerns/accountable_concern.rb index c1349915f8..9c16d573c5 100644 --- a/app/controllers/concerns/accountable_concern.rb +++ b/app/controllers/concerns/accountable_concern.rb @@ -4,10 +4,8 @@ module AccountableConcern extend ActiveSupport::Concern def log_action(action, target) - Admin::ActionLog.create( - account: current_account, - action: action, - target: target - ) + current_account + .action_logs + .create(action:, target:) end end diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb index c66a26c00f..03ec713941 100644 --- a/app/models/concerns/account/associations.rb +++ b/app/models/concerns/account/associations.rb @@ -12,6 +12,7 @@ module Account::Associations has_many :account_notes has_many :account_pins has_many :account_warnings + has_many :action_logs, class_name: 'Admin::ActionLog' has_many :aliases, class_name: 'AccountAlias' has_many :bookmarks has_many :collections diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 11e7f5e02b..ca85b0fbfc 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -8,6 +8,7 @@ RSpec.describe Account do describe 'Associations' do it { is_expected.to have_many(:account_notes).inverse_of(:account) } + it { is_expected.to have_many(:action_logs).class_name('Admin::ActionLog') } it { is_expected.to have_many(:targeted_account_notes).inverse_of(:target_account) } end