From e0133e35bf78288c5381c89240bf02f839a4b61f Mon Sep 17 00:00:00 2001 From: Katherine Langford Date: Tue, 20 Jan 2026 11:16:58 +0000 Subject: [PATCH] CLDC-4177: Do not include sexRAB in pre-2026 exports --- app/services/exports/sales_log_export_constants.rb | 7 ++++++- app/services/exports/sales_log_export_service.rb | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/services/exports/sales_log_export_constants.rb b/app/services/exports/sales_log_export_constants.rb index 99a99a65a..a901c1ebf 100644 --- a/app/services/exports/sales_log_export_constants.rb +++ b/app/services/exports/sales_log_export_constants.rb @@ -137,11 +137,16 @@ module Exports::SalesLogExportConstants (1..6).each do |index| EXPORT_FIELDS << "AGE#{index}" EXPORT_FIELDS << "ECSTAT#{index}" - EXPORT_FIELDS << "SEXRAB#{index}" EXPORT_FIELDS << "SEX#{index}" end (2..6).each do |index| EXPORT_FIELDS << "RELAT#{index}" end + + POST_2026_EXPORT_FIELDS = Set[] + + (1..6).each do |index| + POST_2026_EXPORT_FIELDS << "SEXRAB#{index}" + end end diff --git a/app/services/exports/sales_log_export_service.rb b/app/services/exports/sales_log_export_service.rb index 7fac8d27e..e894f9dda 100644 --- a/app/services/exports/sales_log_export_service.rb +++ b/app/services/exports/sales_log_export_service.rb @@ -151,7 +151,8 @@ module Exports end def is_omitted_field?(field_name, _sales_log) - !EXPORT_FIELDS.include?(field_name) + !EXPORT_FIELDS.include?(field_name) || + (!_sales_log.form.start_year_2026_or_later? && POST_2026_EXPORT_FIELDS.include?(field_name)) end def build_export_xml(sales_logs)