From fa464079d8b674f952298f1af6279014a6c73d24 Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Thu, 26 Feb 2026 12:26:21 +0000 Subject: [PATCH] CLDC-4175: export and test updates --- app/services/exports/sales_log_export_constants.rb | 7 ++++--- db/schema.rb | 4 ---- spec/lib/tasks/log_variable_definitions_spec.rb | 2 +- .../shared_ownership_staircasing_transaction_spec.rb | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/services/exports/sales_log_export_constants.rb b/app/services/exports/sales_log_export_constants.rb index 0c7d85edc..427ac8726 100644 --- a/app/services/exports/sales_log_export_constants.rb +++ b/app/services/exports/sales_log_export_constants.rb @@ -134,8 +134,6 @@ module Exports::SalesLogExportConstants "STAIRINITIALDAY", "HASSERVICECHARGES", "SERVICECHARGES", - "HASSERVICECHARGESCHANGED", - "NEWSERVICECHARGES", ] (1..6).each do |index| @@ -148,7 +146,10 @@ module Exports::SalesLogExportConstants ALL_YEAR_EXPORT_FIELDS << "RELAT#{index}" end - YEAR_2026_EXPORT_FIELDS = Set[] + YEAR_2026_EXPORT_FIELDS = Set[ + "HASSERVICECHARGESCHANGED", + "NEWSERVICECHARGES", + ] (1..6).each do |index| YEAR_2026_EXPORT_FIELDS << "SEXRAB#{index}" diff --git a/db/schema.rb b/db/schema.rb index ea3046add..6e8250f20 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -408,10 +408,8 @@ ActiveRecord::Schema[7.2].define(version: 2026_02_25_162121) do t.index ["bulk_upload_id"], name: "index_lettings_logs_on_bulk_upload_id" t.index ["created_by_id"], name: "index_lettings_logs_on_created_by_id" t.index ["location_id"], name: "index_lettings_logs_on_location_id" - t.index ["managing_organisation_id", "id"], name: "index_lettings_logs_on_managing_org_and_id_desc", order: { id: :desc } t.index ["managing_organisation_id"], name: "index_lettings_logs_on_managing_organisation_id" t.index ["old_id"], name: "index_lettings_logs_on_old_id", unique: true - t.index ["owning_organisation_id", "id"], name: "index_lettings_logs_on_owning_org_and_id_desc", order: { id: :desc } t.index ["owning_organisation_id"], name: "index_lettings_logs_on_owning_organisation_id" t.index ["scheme_id"], name: "index_lettings_logs_on_scheme_id" t.index ["updated_by_id"], name: "index_lettings_logs_on_updated_by_id" @@ -829,10 +827,8 @@ ActiveRecord::Schema[7.2].define(version: 2026_02_25_162121) do 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" - t.index ["managing_organisation_id", "id"], name: "index_sales_logs_on_managing_org_and_id_desc", order: { id: :desc } t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["old_id"], name: "index_sales_logs_on_old_id", unique: true - t.index ["owning_organisation_id", "id"], name: "index_sales_logs_on_owning_org_and_id_desc", order: { id: :desc } t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["updated_by_id"], name: "index_sales_logs_on_updated_by_id" end diff --git a/spec/lib/tasks/log_variable_definitions_spec.rb b/spec/lib/tasks/log_variable_definitions_spec.rb index 73ec882c2..56af8ca5c 100644 --- a/spec/lib/tasks/log_variable_definitions_spec.rb +++ b/spec/lib/tasks/log_variable_definitions_spec.rb @@ -6,7 +6,7 @@ RSpec.describe "log_variable_definitions" do subject(:task) { Rake::Task["data_import:add_variable_definitions"] } let(:path) { "spec/fixtures/variable_definitions" } - let(:total_variable_definitions_count) { 450 } + let(:total_variable_definitions_count) { 452 } before do Rake.application.rake_require("tasks/log_variable_definitions") diff --git a/spec/models/form/sales/subsections/shared_ownership_staircasing_transaction_spec.rb b/spec/models/form/sales/subsections/shared_ownership_staircasing_transaction_spec.rb index 3efe482d8..cc811682b 100644 --- a/spec/models/form/sales/subsections/shared_ownership_staircasing_transaction_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_staircasing_transaction_spec.rb @@ -77,6 +77,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipStaircasingTransaction, monthly_rent_staircasing_owned monthly_rent_staircasing service_charge_staircasing + service_charge_changed monthly_charges_shared_ownership_value_check ], )