From cd40e3fbfe6620ddea6db74149b75504a6a48324 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Thu, 13 Jul 2023 14:17:41 +0100
Subject: [PATCH] feat: revert db changes

---
 db/schema.rb | 35 ++++++++++++++++++++---------------
 db/seeds.rb  |  2 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 2d8f5b358..111396ef3 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.0].define(version: 2023_06_29_125541) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_10_101532) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -52,8 +52,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.string "old_org_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "signed_at"
+    t.string "organisation_name"
+    t.string "organisation_address"
+    t.string "organisation_phone_number"
+    t.string "data_protection_officer_email"
+    t.string "data_protection_officer_name"
     t.index ["data_protection_officer_id"], name: "dpo_user_id"
-    t.index ["organisation_id", "data_protection_officer_id", "confirmed"], name: "data_protection_confirmations_unique", unique: true
     t.index ["organisation_id"], name: "index_data_protection_confirmations_on_organisation_id"
   end
 
@@ -186,14 +191,14 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.integer "hb"
     t.integer "hbrentshortfall"
     t.integer "property_relet"
-    t.datetime "mrcdate"
+    t.datetime "mrcdate", precision: nil
     t.integer "incref"
-    t.datetime "startdate"
+    t.datetime "startdate", precision: nil
     t.integer "armedforces"
     t.integer "first_time_property_let_as_social_housing"
     t.integer "unitletas"
     t.integer "builtype"
-    t.datetime "voiddate"
+    t.datetime "voiddate", precision: nil
     t.bigint "owning_organisation_id"
     t.bigint "managing_organisation_id"
     t.integer "renttype"
@@ -341,7 +346,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.string "old_id"
     t.string "old_visible_id"
     t.string "mobility_type"
-    t.datetime "startdate"
+    t.datetime "startdate", precision: nil
     t.string "location_admin_district"
     t.boolean "confirmed"
     t.index ["old_id"], name: "index_locations_on_old_id", unique: true
@@ -512,7 +517,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.integer "stairbought"
     t.integer "stairowned"
     t.decimal "mrent", precision: 10, scale: 2
-    t.datetime "exdate"
+    t.datetime "exdate", precision: nil
     t.integer "exday"
     t.integer "exmonth"
     t.integer "exyear"
@@ -548,7 +553,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.integer "wchair"
     t.integer "income2_value_check"
     t.integer "armedforcesspouse"
-    t.datetime "hodate"
+    t.datetime "hodate", precision: nil
     t.integer "hoday"
     t.integer "homonth"
     t.integer "hoyear"
@@ -601,9 +606,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.integer "discounted_sale_value_check"
     t.integer "student_not_child_value_check"
     t.integer "percentage_discount_value_check"
-    t.integer "combined_income_value_check"
     t.integer "buyer_livein_value_check"
     t.integer "status_cache", default: 0, null: false
+    t.integer "combined_income_value_check"
     t.datetime "discarded_at"
     t.integer "stairowned_value_check"
     t.integer "creation_method", default: 1
@@ -656,8 +661,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.string "name"
     t.bigint "organisation_id"
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
     t.integer "role"
@@ -665,7 +670,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.string "phone"
     t.integer "failed_attempts", default: 0
     t.string "unlock_token"
-    t.datetime "locked_at"
+    t.datetime "locked_at", precision: nil
     t.boolean "is_dpo", default: false
     t.boolean "is_key_contact", default: false
     t.integer "second_factor_attempts_count", default: 0
@@ -673,12 +678,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_29_125541) do
     t.string "encrypted_otp_secret_key_iv"
     t.string "encrypted_otp_secret_key_salt"
     t.string "direct_otp"
-    t.datetime "direct_otp_sent_at"
+    t.datetime "direct_otp_sent_at", precision: nil
     t.datetime "totp_timestamp", precision: nil
     t.boolean "active", default: true
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
     t.boolean "initial_confirmation_sent"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
diff --git a/db/seeds.rb b/db/seeds.rb
index 9df0ac194..0358216d0 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -169,7 +169,7 @@ unless Rails.env.test?
 
     User.find_or_create_by!(
       name: "Coordinator",
-      email: "nat.dean-lewis@softwire.com",
+      email: "coordinator@example.com",
       organisation: org,
       role: "data_coordinator",
     ) do |user|