From e6f70a3dd5c0b63a7faabcced3574010d7f4e40c Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 19 Feb 2025 12:30:54 +0000
Subject: [PATCH] pre-consolidate migration files

---
 ...19122708_remove_manual_address_entry_from_logs.rb | 11 +++++++++++
 ...2817_add_manual_address_entry_selected_to_logs.rb |  6 ++++++
 db/schema.rb                                         | 12 ++++++------
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20250219122708_remove_manual_address_entry_from_logs.rb
 create mode 100644 db/migrate/20250219122817_add_manual_address_entry_selected_to_logs.rb

diff --git a/db/migrate/20250219122708_remove_manual_address_entry_from_logs.rb b/db/migrate/20250219122708_remove_manual_address_entry_from_logs.rb
new file mode 100644
index 000000000..4826e3607
--- /dev/null
+++ b/db/migrate/20250219122708_remove_manual_address_entry_from_logs.rb
@@ -0,0 +1,11 @@
+class RemoveManualAddressEntryFromLogs < ActiveRecord::Migration[7.2]
+  def change
+    if column_exists?(:sales_logs, :manual_address_entry_selected)
+      remove_column :sales_logs, :manual_address_entry_selected, :boolean
+    end
+
+    if column_exists?(:lettings_logs, :manual_address_entry_selected)
+      remove_column :lettings_logs, :manual_address_entry_selected, :boolean
+    end
+  end
+end
diff --git a/db/migrate/20250219122817_add_manual_address_entry_selected_to_logs.rb b/db/migrate/20250219122817_add_manual_address_entry_selected_to_logs.rb
new file mode 100644
index 000000000..a0d0f7529
--- /dev/null
+++ b/db/migrate/20250219122817_add_manual_address_entry_selected_to_logs.rb
@@ -0,0 +1,6 @@
+class AddManualAddressEntrySelectedToLogs < ActiveRecord::Migration[7.2]
+  def change
+    add_column :sales_logs, :manual_address_entry_selected, :boolean, default: false
+    add_column :lettings_logs, :manual_address_entry_selected, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index db06beace..100f020ee 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_02_17_230008) do
+ActiveRecord::Schema[7.2].define(version: 2025_02_19_122817) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -245,14 +245,14 @@ ActiveRecord::Schema[7.2].define(version: 2025_02_17_230008) do
     t.integer "hb"
     t.integer "hbrentshortfall"
     t.integer "property_relet"
-    t.datetime "mrcdate", precision: nil
+    t.datetime "mrcdate"
     t.integer "incref"
-    t.datetime "startdate", precision: nil
+    t.datetime "startdate"
     t.integer "armedforces"
     t.integer "first_time_property_let_as_social_housing"
     t.integer "unitletas"
     t.integer "builtype"
-    t.datetime "voiddate", precision: nil
+    t.datetime "voiddate"
     t.bigint "owning_organisation_id"
     t.bigint "managing_organisation_id"
     t.integer "renttype"
@@ -824,8 +824,8 @@ ActiveRecord::Schema[7.2].define(version: 2025_02_17_230008) do
     t.string "name"
     t.bigint "organisation_id"
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at", precision: nil
-    t.datetime "last_sign_in_at", precision: nil
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
     t.integer "role"