Remove old_state and new_state

These fields have been replaced with old_value and new_value, this avoids the need to have multiple fields for storing the same thing.
DFE-Digital · Sep 27, 2023 · 943a2fe · 943a2fe
1 parent 8403562
commit 943a2fe
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 30 deletions.
diff --git a/app/components/timeline_entry/component.rb b/app/components/timeline_entry/component.rb
@@ -46,16 +46,14 @@ def state_changed_vars
         old_state:
           render(
             StatusTag::Component.new(
-              status:
-                timeline_event.old_state.presence || timeline_event.old_value,
+              status: timeline_event.old_value,
               class_context: "timeline-event",
             ),
           ).strip,
         new_state:
           render(
             StatusTag::Component.new(
-              status:
-                timeline_event.new_state.presence || timeline_event.new_value,
+              status: timeline_event.new_value,
               class_context: "timeline-event",
             ),
           ).strip,

diff --git a/app/models/timeline_event.rb b/app/models/timeline_event.rb
@@ -15,9 +15,7 @@
 #  mailer_action_name    :string           default(""), not null
 #  mailer_class_name     :string           default(""), not null
 #  message_subject       :string           default(""), not null
-#  new_state             :string           default(""), not null
 #  new_value             :text             default(""), not null
-#  old_state             :string           default(""), not null
 #  old_value             :text             default(""), not null
 #  requestable_type      :string
 #  subjects              :text             default([]), not null, is an Array

diff --git a/config/analytics.yml b/config/analytics.yml
@@ -380,10 +380,8 @@
     - mailer_action_name
     - mailer_class_name
     - message_subject
-    - new_state
     - new_value
     - note_id
-    - old_state
     - old_value
     - requestable_id
     - requestable_type

diff --git a/db/migrate/20230920152618_remove_state_from_timeline_events.rb b/db/migrate/20230920152618_remove_state_from_timeline_events.rb
@@ -0,0 +1,8 @@
+class RemoveStateFromTimelineEvents < ActiveRecord::Migration[7.0]
+  def change
+    change_table :timeline_events, bulk: true do |t|
+      t.remove :old_state, type: :string, default: "", null: false
+      t.remove :new_state, type: :string, default: "", null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/lib/tasks/timeline_events.rake b/lib/tasks/timeline_events.rake
diff --git a/spec/factories/timeline_events.rb b/spec/factories/timeline_events.rb
@@ -13,9 +13,7 @@
 #  mailer_action_name    :string           default(""), not null
 #  mailer_class_name     :string           default(""), not null
 #  message_subject       :string           default(""), not null
-#  new_state             :string           default(""), not null
 #  new_value             :text             default(""), not null
-#  old_state             :string           default(""), not null
 #  old_value             :text             default(""), not null
 #  requestable_type      :string
 #  subjects              :text             default([]), not null, is an Array

diff --git a/spec/models/timeline_event_spec.rb b/spec/models/timeline_event_spec.rb
@@ -13,9 +13,7 @@
 #  mailer_action_name    :string           default(""), not null
 #  mailer_class_name     :string           default(""), not null
 #  message_subject       :string           default(""), not null
-#  new_state             :string           default(""), not null
 #  new_value             :text             default(""), not null
-#  old_state             :string           default(""), not null
 #  old_value             :text             default(""), not null
 #  requestable_type      :string
 #  subjects              :text             default([]), not null, is an Array