From 5f32e2a5affa33754cacfb85558fd043214532b2 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sun, 21 Apr 2024 17:00:45 +0300 Subject: [PATCH] adjust create event --- lib/submission_events.rb | 5 +++-- lib/submissions/generate_audit_trail.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/submission_events.rb b/lib/submission_events.rb index 0c6fe4c8..e0b9c70b 100644 --- a/lib/submission_events.rb +++ b/lib/submission_events.rb @@ -26,12 +26,13 @@ module SubmissionEvents ).first(TRACKING_PARAM_LENGTH) end - def create_with_tracking_data(submitter, event_type, request) + def create_with_tracking_data(submitter, event_type, request, data = {}) SubmissionEvent.create!(submitter:, event_type:, data: { ip: request.remote_ip, ua: request.user_agent, sid: request.session.id.to_s, - uid: request.env['warden'].user(:user)&.id + uid: request.env['warden'].user(:user)&.id, + **data }.compact_blank) end end diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb index 5045a601..6851d061 100644 --- a/lib/submissions/generate_audit_trail.rb +++ b/lib/submissions/generate_audit_trail.rb @@ -279,7 +279,7 @@ module Submissions font: [FONT_BOLD_NAME, { variant: :bold }] }, event.event_type.include?('send_') ? ' to ' : ' by ', if event.event_type.include?('sms') || event.event_type.include?('phone') - submitter.phone + event.data['phone'] || submitter.phone else submitter.name || submitter.email || submitter.phone end