From d82d547f6a0c708cc26c67cdd3f16a4547604261 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 8 Mar 2023 12:37:30 +0000 Subject: [PATCH] feat: fix failing tests --- .../forms/bulk_upload_lettings/prepare_your_file.rb | 2 ++ app/models/forms/bulk_upload_sales/prepare_your_file.rb | 2 ++ db/schema.rb | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb index cc6fe2a7e..b91d1dfc5 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb @@ -34,6 +34,8 @@ module Forms end def specification_path + return if year.blank? + if year <= 2022 "/files/bulk-upload-lettings-specification-2022-23.xlsx" else diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb index e15e89262..1abcb74b2 100644 --- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb @@ -32,6 +32,8 @@ module Forms end def specification_path + return if year.blank? + if year <= 2022 "/files/bulk-upload-sales-specification-2022-23.xlsx" else diff --git a/db/schema.rb b/db/schema.rb index c2f8f8600..6acaba1f5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -491,6 +491,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_01_144555) do t.integer "prevten" t.integer "mortgageused" t.integer "wchair" + t.integer "income2_value_check" t.integer "armedforcesspouse" t.datetime "hodate", precision: nil t.integer "hoday" @@ -515,14 +516,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_01_144555) do t.integer "retirement_value_check" t.integer "hodate_check" t.integer "extrabor_value_check" - t.integer "grant_value_check" - t.integer "staircase_bought_value_check" t.integer "deposit_and_mortgage_value_check" t.integer "shared_ownership_deposit_value_check" + t.integer "grant_value_check" + t.integer "value_value_check" t.integer "old_persons_shared_ownership_value_check" - t.integer "income2_value_check" + t.integer "staircase_bought_value_check" t.integer "monthly_charges_value_check" - t.integer "value_value_check" t.integer "details_known_5" t.integer "details_known_6" t.integer "saledate_check"