From ceaa70fcfc802f443575eaacd58a8660be8af7dd Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Sun, 13 Dec 2015 13:41:44 +0200
Subject: [PATCH] Story #109367694 - add better support for cr_id

---
 app/models/concerns/user_events.rb    | 12 ++++++++++++
 app/models/version/contact_version.rb |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/user_events.rb b/app/models/concerns/user_events.rb
index 12ff18444..9d87b4d71 100644
--- a/app/models/concerns/user_events.rb
+++ b/app/models/concerns/user_events.rb
@@ -1,6 +1,18 @@
 module UserEvents
   extend ActiveSupport::Concern
 
+  def cr_id
+    if versions.first.object.nil?
+      cr_registrar_id =versions.first.object_changes['registrar_id'].second
+    else
+      # untested, expected never to execute
+      cr_registrar_id = versions.first.object['registrar_id']
+    end
+    if cr_registrar_id.present?
+      Registrar.find(cr_registrar_id).code
+    end
+  end
+
   # TODO: remove old
   # module ClassMethods
     # def registrar_events(id)
diff --git a/app/models/version/contact_version.rb b/app/models/version/contact_version.rb
index 987dbc1fd..4b7e38364 100644
--- a/app/models/version/contact_version.rb
+++ b/app/models/version/contact_version.rb
@@ -3,7 +3,7 @@ class ContactVersion < PaperTrail::Version
   self.table_name    = :log_contacts
   self.sequence_name = :log_contacts_id_seq
 
-  # include UserEvents
+  include UserEvents
 
   # scope :deleted, -> { where(event: 'destroy') }
 end