From 37a94e02adfaa04e8541ad6cb93682b599c7dec8 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 13 Dec 2022 09:15:54 +0000 Subject: [PATCH] Add mortgage and value check column --- db/migrate/20221212155705_add_income1_value_check.rb | 5 ----- .../20221212161657_add_details_known1_to_sales_log.rb | 6 ++++-- .../20221213085819_add_mortgage_and_value_checks.rb | 10 ++++++++++ db/schema.rb | 7 +++++-- spec/models/form_handler_spec.rb | 4 ++-- 5 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 db/migrate/20221212155705_add_income1_value_check.rb create mode 100644 db/migrate/20221213085819_add_mortgage_and_value_checks.rb diff --git a/db/migrate/20221212155705_add_income1_value_check.rb b/db/migrate/20221212155705_add_income1_value_check.rb deleted file mode 100644 index a0e26eab6..000000000 --- a/db/migrate/20221212155705_add_income1_value_check.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddIncome1ValueCheck < ActiveRecord::Migration[7.0] - def change - add_column :sales_logs, :income1_value_check, :integer - end -end diff --git a/db/migrate/20221212161657_add_details_known1_to_sales_log.rb b/db/migrate/20221212161657_add_details_known1_to_sales_log.rb index 0b0799abd..8a928c28b 100644 --- a/db/migrate/20221212161657_add_details_known1_to_sales_log.rb +++ b/db/migrate/20221212161657_add_details_known1_to_sales_log.rb @@ -1,5 +1,7 @@ class AddDetailsKnown1ToSalesLog < ActiveRecord::Migration[7.0] - change_table :sales_logs, bulk: true do |t| - t.column :details_known_1, :integer + def change + change_table :sales_logs, bulk: true do |t| + t.column :details_known_1, :integer + end end end diff --git a/db/migrate/20221213085819_add_mortgage_and_value_checks.rb b/db/migrate/20221213085819_add_mortgage_and_value_checks.rb new file mode 100644 index 000000000..49dcb40d0 --- /dev/null +++ b/db/migrate/20221213085819_add_mortgage_and_value_checks.rb @@ -0,0 +1,10 @@ +class AddMortgageAndValueChecks < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :income1_value_check, :integer + t.column :mortgage, :integer + t.column :inc2mort, :integer + t.column :mortgage_value_check, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c08824a0e..ac78ab8fc 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: 2022_12_12_161657) do +ActiveRecord::Schema[7.0].define(version: 2022_12_13_085819) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -403,8 +403,11 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_12_161657) do t.integer "savings" t.integer "prevown" t.string "sex3" - t.integer "income1_value_check" t.integer "details_known_1" + t.integer "income1_value_check" + t.integer "mortgage" + t.integer "inc2mort" + t.integer "mortgage_value_check" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index c328d6ad0..692b9d2f5 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(51) + expect(form.pages.count).to eq(52) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(51) + expect(form.pages.count).to eq(52) expect(form.name).to eq("2021_2022_sales") end end