CLDC-4175: test and schema updates post merge

app/services/bulk_upload/sales/year2026/csv_parser.rb

@@ -27,7 +27,7 @@ class BulkUpload::Sales::Year2026::CsvParser
 
   def cols
     # TODO: CLDC-4162: Update when 2026 format is known
-    @cols ||= ("A".."DR").to_a
+    @cols ||= ("A".."DT").to_a
   end
 
   def row_parsers

db/migrate/20260225162121_add_service_charge_changed_to_sales_logs.rb

@@ -1,8 +0,0 @@
-class AddServiceChargeChangedToSalesLogs < ActiveRecord::Migration[7.2]
-  def change
-    change_table :sales_logs, bulk: true do |t|
-      t.column :hasservicechargeschanged, :integer
-      t.column :newservicecharges, :decimal, precision: 10, scale: 2
-    end
-  end
-end

db/migrate/20260305095832_add_service_charge_changed_to_sales_logs.rb

@@ -0,0 +1,6 @@
+class AddServiceChargeChangedToSalesLogs < ActiveRecord::Migration[7.2]
+  def change
+    add_column :sales_logs, :hasservicechargeschanged, :integer
+    add_column :sales_logs, :newservicecharges, :decimal, precision: 10, scale: 2
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_02_25_162121) do
+ActiveRecord::Schema[7.2].define(version: 2026_03_05_095832) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -84,7 +84,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_02_25_162121) do
     t.datetime "last_accessed"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.check_constraint "log_type::text = ANY (ARRAY['lettings'::character varying, 'sales'::character varying]::text[])", name: "log_type_check"
+    t.check_constraint "log_type::text = ANY (ARRAY['lettings'::character varying::text, 'sales'::character varying::text])", name: "log_type_check"
     t.check_constraint "year >= 2000 AND year <= 2099", name: "year_check"
   end
 
@@ -824,8 +824,20 @@ ActiveRecord::Schema[7.2].define(version: 2026_02_25_162121) do
     t.string "sexrab4"
     t.string "sexrab5"
     t.string "sexrab6"
-    t.integer "mortlen_known"
     t.integer "buildheightclass"
+    t.integer "gender_same_as_sex1"
+    t.integer "gender_same_as_sex2"
+    t.integer "gender_same_as_sex3"
+    t.integer "gender_same_as_sex4"
+    t.integer "gender_same_as_sex5"
+    t.integer "gender_same_as_sex6"
+    t.string "gender_description1"
+    t.string "gender_description2"
+    t.string "gender_description3"
+    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"