Add relationship_updated_by_id to tables with joins

Author: parndt

app/models/indicator.rb

@@ -21,6 +21,7 @@ class Indicator < VersionedRecord
   # has_many :direct_recommendations, through: :indicators_recommendations, source: :recommendation
 
   belongs_to :manager, class_name: "User", foreign_key: :manager_id, required: false
+  belongs_to :relationship_updated_by, class_name: "User", required: false
 
   accepts_nested_attributes_for :measure_indicators
 

app/models/measure.rb

@@ -12,6 +12,10 @@ class Measure < VersionedRecord
   has_many :due_dates, through: :indicators
   has_many :progress_reports, through: :indicators
 
+  belongs_to :parent, class_name: "Measure", required: false
+
+  belongs_to :relationship_updated_by, class_name: "User", required: false
+
   accepts_nested_attributes_for :recommendation_measures
   accepts_nested_attributes_for :measure_categories
 

app/models/measure_category.rb

@@ -8,11 +8,14 @@ class MeasureCategory < ApplicationRecord
   validates :measure_id, presence: true
   validates :category_id, presence: true
 
-  after_commit :set_relationship_updated_at, on: [:create, :update, :destroy]
+  after_commit :set_relationship_updated, on: [:create, :update, :destroy]
 
   private
 
-  def set_relationship_updated_at
-    measure.update_column(:relationship_updated_at, Time.zone.now) if measure && !measure.destroyed?
+  def set_relationship_updated
+    if measure && !measure.destroyed?
+      measure.update_column(:relationship_updated_at, Time.zone.now)
+      measure.update_column(:relationship_updated_by_id, ::PaperTrail.request.whodunnit)
+    end
   end
 end

app/models/measure_indicator.rb

@@ -8,12 +8,19 @@ class MeasureIndicator < ApplicationRecord
   validates :measure_id, presence: true
   validates :indicator_id, presence: true
 
-  after_commit :set_relationship_updated_at, on: [:create, :update, :destroy]
+  after_commit :set_relationship_updated, on: [:create, :update, :destroy]
 
   private
 
-  def set_relationship_updated_at
-    measure.update_column(:relationship_updated_at, Time.zone.now) if measure && !measure.destroyed?
-    indicator.update_column(:relationship_updated_at, Time.zone.now) if indicator && !indicator.destroyed?
+  def set_relationship_updated
+    if measure && !measure.destroyed?
+      measure.update_column(:relationship_updated_at, Time.zone.now)
+      measure.update_column(:relationship_updated_by_id, ::PaperTrail.request.whodunnit)
+    end
+
+    if indicator && !indicator.destroyed?
+      indicator.update_column(:relationship_updated_at, Time.zone.now)
+      indicator.update_column(:relationship_updated_by_id, ::PaperTrail.request.whodunnit)
+    end
   end
 end

app/models/user.rb

@@ -20,6 +20,8 @@ class User < VersionedRecord
   has_many :categories, through: :user_categories
   has_many :bookmarks
 
+  belongs_to :relationship_updated_by, class_name: "User", required: false
+
   validates :email, presence: true
   validates :name, presence: true
 

app/models/user_category.rb

@@ -6,11 +6,14 @@ class UserCategory < ApplicationRecord
   validates :user_id, presence: true
   validates :category_id, presence: true
 
-  after_commit :set_relationship_updated_at, on: [:create, :update, :destroy]
+  after_commit :set_relationship_updated, on: [:create, :update, :destroy]
 
   private
 
-  def set_relationship_updated_at
-    user.update_column(:relationship_updated_at, Time.zone.now) if user && !user.destroyed?
+  def set_relationship_updated
+    if user && !user.destroyed?
+      user.update_column(:relationship_updated_at, Time.zone.now)
+      user.update_column(:relationship_updated_by_id, ::PaperTrail.request.whodunnit)
+    end
   end
 end

app/models/user_role.rb

@@ -6,11 +6,14 @@ class UserRole < VersionedRecord
 
   delegate :name, to: :role, prefix: true, allow_nil: true
 
-  after_commit :set_relationship_updated_at, on: [:create, :update, :destroy]
+  after_commit :set_relationship_updated, on: [:create, :update, :destroy]
 
   private
 
-  def set_relationship_updated_at
-    user.update_column(:relationship_updated_at, Time.zone.now) if user && !user.destroyed?
+  def set_relationship_updated
+    if user && !user.destroyed?
+      user.update_column(:relationship_updated_at, Time.zone.now)
+      user.update_column(:relationship_updated_by_id, ::PaperTrail.request.whodunnit)
+    end
   end
 end

app/serializers/indicator_serializer.rb

@@ -1,7 +1,7 @@
 class IndicatorSerializer
   include FastVersionedSerializer
 
-  attributes :title, :description, :reference, :draft, :manager_id, :frequency_months, :start_date, :repeat, :end_date
+  attributes :title, :description, :reference, :draft, :manager_id, :frequency_months, :start_date, :repeat, :end_date, :relationship_updated_at, :relationship_updated_by_id
 
   set_type :indicators
 end

app/serializers/measure_serializer.rb

@@ -1,7 +1,7 @@
 class MeasureSerializer
   include FastVersionedSerializer
 
-  attributes :title, :description, :reference, :target_date, :draft, :outcome, :indicator_summary, :target_date_comment
+  attributes :title, :description, :reference, :target_date, :draft, :outcome, :indicator_summary, :target_date_comment, :relationship_updated_at, :relationship_updated_by_id
 
   set_type :measures
 end

app/serializers/user_serializer.rb

@@ -1,7 +1,10 @@
 class UserSerializer
   include FastVersionedSerializer
 
-  attributes :email, :name
+  attributes :email,
+    :name,
+    :relationship_updated_at,
+    :relationship_updated_by_id
 
   set_type :users
 end

db/migrate/20220913083216_add_relationship_updated_by_id_to_tables_with_joins.rb

@@ -0,0 +1,12 @@
+class AddRelationshipUpdatedByIdToTablesWithJoins < ActiveRecord::Migration[6.1]
+  def change
+    add_column :indicators, :relationship_updated_by_id, :bigint, null: true
+    add_foreign_key :indicators, :users, column: :relationship_updated_by_id, primary_key: :id
+
+    add_column :measures, :relationship_updated_by_id, :bigint, null: true
+    add_foreign_key :measures, :users, column: :relationship_updated_by_id, primary_key: :id
+
+    add_column :users, :relationship_updated_by_id, :bigint, null: true
+    add_foreign_key :users, :users, column: :relationship_updated_by_id, primary_key: :id
+  end
+end

db/schema.rb

@@ -97,6 +97,7 @@
     t.string "reference"
     t.integer "last_modified_user_id"
     t.datetime "relationship_updated_at", precision: 6
+    t.bigint "relationship_updated_by_id"
     t.index ["created_at"], name: "index_indicators_on_created_at"
     t.index ["draft"], name: "index_indicators_on_draft"
     t.index ["manager_id"], name: "index_indicators_on_manager_id"
@@ -129,6 +130,7 @@
     t.integer "last_modified_user_id"
     t.string "reference"
     t.datetime "relationship_updated_at", precision: 6
+    t.bigint "relationship_updated_by_id"
     t.index ["draft"], name: "index_measures_on_draft"
   end
 
@@ -315,6 +317,7 @@
     t.integer "last_modified_user_id"
     t.boolean "allow_password_change", default: true
     t.datetime "relationship_updated_at", precision: 6
+    t.bigint "relationship_updated_by_id"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
@@ -333,10 +336,13 @@
   add_foreign_key "framework_frameworks", "frameworks", column: "other_framework_id"
   add_foreign_key "framework_taxonomies", "frameworks"
   add_foreign_key "framework_taxonomies", "taxonomies"
+  add_foreign_key "indicators", "users", column: "relationship_updated_by_id"
+  add_foreign_key "measures", "users", column: "relationship_updated_by_id"
   add_foreign_key "recommendation_indicators", "indicators"
   add_foreign_key "recommendation_indicators", "recommendations"
   add_foreign_key "recommendation_recommendations", "recommendations"
   add_foreign_key "recommendation_recommendations", "recommendations", column: "other_recommendation_id"
   add_foreign_key "recommendations", "frameworks"
   add_foreign_key "taxonomies", "frameworks"
+  add_foreign_key "users", "users", column: "relationship_updated_by_id"
 end