diff --git a/app/controllers/admin/sponsors_controller.rb b/app/controllers/admin/sponsors_controller.rb index fa16493da..52f1a0f30 100644 --- a/app/controllers/admin/sponsors_controller.rb +++ b/app/controllers/admin/sponsors_controller.rb @@ -85,8 +85,14 @@ def audit_contact_subscription(contact) return unless contact.previous_changes.key?(:mailing_list_consent) contact_audit_key = contact.mailing_list_consent ? 'subscribe' : 'unsubscribe' - Auditor::Audit.new(@sponsor, "sponsor.admin_contact_#{contact_audit_key}", current_user, contact) - .log_with_note(contact.email) + + MemberActivityRecorder.record( + actor: current_user, + key: "sponsor.admin_contact_#{contact_audit_key}", + trackable: @sponsor, + recipient: contact, + contact_email: contact.email + ) end def filter_search_params diff --git a/app/controllers/contact_preferences_controller.rb b/app/controllers/contact_preferences_controller.rb index 184fa3e95..1747413d8 100644 --- a/app/controllers/contact_preferences_controller.rb +++ b/app/controllers/contact_preferences_controller.rb @@ -36,7 +36,11 @@ def subscription_preference(contact) end def audit_contact_subscription(contact) - Auditor::Audit.new(contact.sponsor, subscription_preference(contact), contact) - .log_with_note(contact.email) + MemberActivityRecorder.record( + actor: contact, + key: subscription_preference(contact), + trackable: contact.sponsor, + contact_email: contact.email + ) end end diff --git a/app/services/member_activity_recorder.rb b/app/services/member_activity_recorder.rb index b5baf8428..0c82f01f8 100644 --- a/app/services/member_activity_recorder.rb +++ b/app/services/member_activity_recorder.rb @@ -35,6 +35,10 @@ class MemberActivityRecorder workshop.created meeting_invitation.created meeting_invitation.updated + sponsor.admin_contact_subscribe + sponsor.admin_contact_unsubscribe + sponsor.contact_subscribe + sponsor.contact_unsubscribe ].freeze # Start of systematic member-activity collection; earlier rows are incidental and @@ -42,10 +46,11 @@ class MemberActivityRecorder # historical activity is ever backfilled. TRACKING_STARTED_ON = Date.new(2026, 9, 8).freeze - def self.record(actor:, key:, trackable: nil, recipient: nil) + def self.record(actor:, key:, trackable: nil, recipient: nil, contact_email: nil) Rails.logger.warn("MemberActivityRecorder: unregistered key '#{key}'") unless KEYS.include?(key) trackable ||= actor - PublicActivity::Activity.create!(owner: actor, key:, trackable:, recipient:) + params = contact_email ? { note: contact_email } : {} + PublicActivity::Activity.create!(owner: actor, key:, trackable:, recipient:, parameters: params) rescue StandardError => e Rails.logger.warn("MemberActivityRecorder failed (#{key}): #{e.class}: #{e.message}") end diff --git a/spec/controllers/contact_preferences_controller_spec.rb b/spec/controllers/contact_preferences_controller_spec.rb new file mode 100644 index 000000000..a441be22d --- /dev/null +++ b/spec/controllers/contact_preferences_controller_spec.rb @@ -0,0 +1,70 @@ +require 'rails_helper' + +RSpec.describe ContactPreferencesController do + let(:contact) { Fabricate(:contact, mailing_list_consent: false) } + + before do + allow(ContactMailingListService).to receive(:sync) + end + + describe 'GET #show' do + it 'sets the contact for a valid token' do + get :show, params: { token: contact.token } + + expect(response).to have_http_status(:success) + expect(controller.instance_variable_get(:@contact)).to eq(contact) + expect(flash[:notice]).to be_nil + end + + it 'shows an invalid-session notice for an unknown token' do + get :show, params: { token: 'unknown-token' } + + expect(response).to have_http_status(:success) + expect(flash[:notice]).to eq(I18n.t('messages.invalid_session')) + end + end + + describe 'PATCH #update' do + it 'subscribes the contact and records the consent activity' do + patch :update, params: { + contact: { token: contact.token, mailing_list_consent: '1' } + } + + expect(contact.reload.mailing_list_consent).to be(true) + expect(ContactMailingListService).to have_received(:sync).with(contact) + expect(response).to redirect_to( + contact_preferences_path(token: contact.token, notice: I18n.t('messages.contact_preferences.updated')) + ) + + activity = PublicActivity::Activity.find_by!(key: 'sponsor.contact_subscribe') + expect(activity.owner).to eq(contact) + expect(activity.trackable).to eq(contact.sponsor) + expect(activity.recipient).to be_nil + expect(activity.parameters).to include(note: contact.email) + end + + it 'unsubscribes the contact and records the consent activity' do + contact.update!(mailing_list_consent: true) + + patch :update, params: { + contact: { token: contact.token, mailing_list_consent: '0' } + } + + expect(contact.reload.mailing_list_consent).to be(false) + expect(ContactMailingListService).to have_received(:sync).with(contact) + + activity = PublicActivity::Activity.find_by!(key: 'sponsor.contact_unsubscribe') + expect(activity.owner).to eq(contact) + expect(activity.trackable).to eq(contact.sponsor) + expect(activity.parameters).to include(note: contact.email) + end + + it 'returns not found when the submitted token is unknown' do + patch :update, params: { + contact: { token: 'unknown-token', mailing_list_consent: '1' } + } + + expect(response).to have_http_status(:not_found) + end + end +end diff --git a/spec/features/admin/sponsor_spec.rb b/spec/features/admin/sponsor_spec.rb index f5e49c070..0503d7061 100644 --- a/spec/features/admin/sponsor_spec.rb +++ b/spec/features/admin/sponsor_spec.rb @@ -161,8 +161,14 @@ context 'with activities' do scenario 'when there are activities' do contact = sponsor.contacts.first - audit = Auditor::Audit.new(sponsor, 'sponsor.admin_contact_subscribe', manager, contact) - audit.log_with_note(contact.email) + + MemberActivityRecorder.record( + actor: manager, + key: 'sponsor.admin_contact_subscribe', + trackable: sponsor, + recipient: contact, + contact_email: contact.email + ) visit admin_sponsor_path(sponsor) @@ -173,8 +179,14 @@ scenario 'when an activity is associated with a deleted contact' do contact = sponsor.contacts.first - audit = Auditor::Audit.new(sponsor, 'sponsor.admin_contact_subscribe', manager, contact) - audit.log_with_note(contact.email) + + MemberActivityRecorder.record( + actor: manager, + key: 'sponsor.admin_contact_subscribe', + trackable: sponsor, + recipient: contact, + contact_email: contact.email + ) contact.delete diff --git a/spec/services/member_activity_recorder_spec.rb b/spec/services/member_activity_recorder_spec.rb index 6eeda2bc1..d014c37ff 100644 --- a/spec/services/member_activity_recorder_spec.rb +++ b/spec/services/member_activity_recorder_spec.rb @@ -23,6 +23,20 @@ expect(activity.trackable).to eq(member) end + it 'stores the contact email in activity parameters' do + email = 'organiser@example.com' + + activity = described_class.record(actor: member, key: 'sponsor.contact_subscribe', contact_email: email) + + expect(activity.parameters).to eq(note: email) + end + + it 'stores empty parameters when no contact email is provided' do + activity = described_class.record(actor: member, key: 'member.login') + + expect(activity.parameters).to eq({}) + end + it 'never raises on persistence failure' do allow(PublicActivity::Activity).to receive(:create!) .and_raise(ActiveRecord::RecordInvalid)