From a2b0ae118b873fede5787c71eb3bba3c7c5e719a Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Mon, 9 Mar 2026 11:54:25 +0000 Subject: [PATCH] CLDC-4248: respond to comments --- app/models/validations/sales/financial_validations.rb | 2 +- app/services/csv/sales_log_csv_service.rb | 4 ---- config/locales/forms/2026/sales/sale_information.en.yml | 2 +- db/schema.rb | 6 +++--- spec/models/form/sales/pages/service_charge_changed_spec.rb | 4 +++- .../sales/questions/has_service_charges_changed_spec.rb | 4 +++- .../models/form/sales/questions/new_service_charges_spec.rb | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 16f543989..2443578c0 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -140,7 +140,7 @@ module Validations::Sales::FinancialValidations end def validate_newservicecharges_different_from_mscharge(record) - return unless record.hasservicechargeschanged == 1 && record.newservicecharges && record.mscharge + return unless record.hasservicechargeschanged == 1 && record.newservicecharges && record.has_mscharge == 1 && record.mscharge if record.newservicecharges == record.mscharge record.errors.add :newservicecharges, I18n.t("validations.sales.financial.newservicecharges.same_as_previous") diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb index 87b1dac46..03b1300e8 100644 --- a/app/services/csv/sales_log_csv_service.rb +++ b/app/services/csv/sales_log_csv_service.rb @@ -108,10 +108,6 @@ module Csv labels: %i[mscharge_value], codes: %i[mscharge_value], }, - hasservicechargeschanged: { - labels: %i[hasservicechargeschanged_label], - codes: %i[hasservicechargeschanged], - }, newservicecharges: { labels: %i[newservicecharges], codes: %i[newservicecharges], diff --git a/config/locales/forms/2026/sales/sale_information.en.yml b/config/locales/forms/2026/sales/sale_information.en.yml index 2a5b9d6d0..478c67d0a 100644 --- a/config/locales/forms/2026/sales/sale_information.en.yml +++ b/config/locales/forms/2026/sales/sale_information.en.yml @@ -296,7 +296,7 @@ en: check_answer_label: "New monthly service charges" check_answer_prompt: "" hint_text: "" - question_text: "Yes, enter monthly amount:" + question_text: "Enter the new total monthly charge" purchase_price: discounted_ownership: diff --git a/db/schema.rb b/db/schema.rb index c15f30dc2..37e5c764e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -825,6 +825,9 @@ ActiveRecord::Schema[7.2].define(version: 2026_03_05_095832) do t.string "sexrab5" t.string "sexrab6" t.integer "buildheightclass" + t.integer "mortlen_known" + t.integer "hasservicechargeschanged" + t.decimal "newservicecharges", precision: 10, scale: 2 t.integer "gender_same_as_sex1" t.integer "gender_same_as_sex2" t.integer "gender_same_as_sex3" @@ -837,9 +840,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_03_05_095832) do t.string "gender_description4" t.string "gender_description5" t.string "gender_description6" - t.integer "mortlen_known" - t.integer "hasservicechargeschanged" - t.decimal "newservicecharges", precision: 10, scale: 2 t.index ["assigned_to_id"], name: "index_sales_logs_on_assigned_to_id" t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" diff --git a/spec/models/form/sales/pages/service_charge_changed_spec.rb b/spec/models/form/sales/pages/service_charge_changed_spec.rb index 4f313021a..245c62874 100644 --- a/spec/models/form/sales/pages/service_charge_changed_spec.rb +++ b/spec/models/form/sales/pages/service_charge_changed_spec.rb @@ -1,11 +1,13 @@ require "rails_helper" RSpec.describe Form::Sales::Pages::ServiceChargeChanged, type: :model do + include CollectionTimeHelper + subject(:page) { described_class.new(page_id, page_definition, subsection) } let(:page_id) { nil } let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2026, 4, 1))) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: collection_start_date_for_year(2026))) } it "has correct subsection" do expect(page.subsection).to eq(subsection) diff --git a/spec/models/form/sales/questions/has_service_charges_changed_spec.rb b/spec/models/form/sales/questions/has_service_charges_changed_spec.rb index 3090a35d8..e345abe2c 100644 --- a/spec/models/form/sales/questions/has_service_charges_changed_spec.rb +++ b/spec/models/form/sales/questions/has_service_charges_changed_spec.rb @@ -1,13 +1,15 @@ require "rails_helper" RSpec.describe Form::Sales::Questions::HasServiceChargesChanged, type: :model do + include CollectionTimeHelper + subject(:question) { described_class.new(question_id, question_definition, page) } let(:question_id) { nil } let(:question_definition) { nil } let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } let(:page) { instance_double(Form::Page, subsection:) } - let(:start_date) { Time.utc(2026, 5, 1) } + let(:start_date) { collection_start_date_for_year(2026) } it "has correct page" do expect(question.page).to eq(page) diff --git a/spec/models/form/sales/questions/new_service_charges_spec.rb b/spec/models/form/sales/questions/new_service_charges_spec.rb index 3a5fea1b3..17b967953 100644 --- a/spec/models/form/sales/questions/new_service_charges_spec.rb +++ b/spec/models/form/sales/questions/new_service_charges_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Form::Sales::Questions::NewServiceCharges, type: :model do let(:question_definition) { nil } let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } let(:page) { instance_double(Form::Page, subsection:) } - let(:start_date) { Time.utc(2026, 5, 1) } + let(:start_date) { collection_start_date_for_year(2026) } it "has correct page" do expect(question.page).to eq(page)