diff --git a/app/models/log.rb b/app/models/log.rb index 7d0900692..7741cd8cb 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -188,8 +188,4 @@ 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/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index b82fe6fe3..8d66d2dcd 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -226,6 +226,37 @@ RSpec.describe SalesLog, type: :model do expect(record_from_db["la"]).to eq("E08000003") end + context "with 22/23 logs" do + let(:address_sales_log_22_23) do + described_class.create({ + owning_organisation:, + created_by: created_by_user, + ppcodenk: 1, + postcode_full: "CA10 1AA", + saledate: Time.zone.local(2022, 5, 2), + }) + end + + before do + WebMock.stub_request(:get, /api.postcodes.io\/postcodes\/CA101AA/) + .to_return(status: 200, body: '{"status":200,"result":{"admin_district":"Cumberland","codes":{"admin_district":"E06000063"}}}', headers: {}) + + Timecop.freeze(2023, 5, 1) + Singleton.__init__(FormHandler) + end + + after do + Timecop.unfreeze + Singleton.__init__(FormHandler) + end + + it "correctly sets la as nil" do + record_from_db = ActiveRecord::Base.connection.execute("select la from sales_logs where id=#{address_sales_log_22_23.id}").to_a[0] + expect(address_sales_log_22_23.la).to eq(nil) + expect(record_from_db["la"]).to eq(nil) + end + end + it "errors if the property postcode is emptied" do expect { address_sales_log.update!({ postcode_full: "" }) } .to raise_error(ActiveRecord::RecordInvalid, /#{I18n.t("validations.postcode")}/)