diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index 6491c100f..79562045f 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -593,7 +593,7 @@ private self[postcode_known_key] = 1 inferred_la = get_inferred_la(postcode) self[la_inferred_key] = inferred_la.present? - self[la_key] = inferred_la if inferred_la.present? + self[la_key] = inferred_la end def get_has_benefits diff --git a/app/models/log.rb b/app/models/log.rb index f5f5f4946..5821b41b5 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -137,7 +137,9 @@ private def get_inferred_la(postcode) result = PIO.lookup(postcode) - result[:location_code] if result + if result && !(form.start_date.year < 2023 && new_2023_admin_district_codes.include?(result[:location_code])) + result[:location_code] + end end def upcase_and_remove_whitespace(string) @@ -163,4 +165,8 @@ private def format_as_currency(num_string) ActionController::Base.helpers.number_to_currency(num_string, unit: "£") end + + def new_2023_admin_district_codes + %w[E06000063 E06000064 E06000065 E06000066] + end end diff --git a/db/schema.rb b/db/schema.rb index eccfa98ca..3b26fde33 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -501,6 +501,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_08_101826) 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" @@ -525,14 +526,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_08_101826) 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"