From e0d63b112f242ee2c63a26c3319aa52fe0e0d4cd Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <nat.dean-lewis@softwire.com>
Date: Tue, 17 Mar 2026 16:02:45 +0000
Subject: [PATCH] CLDC-4297: add R behaviour back in

---
 .../bulk_upload/sales/year2026/row_parser.rb  | 17 ++++++++++------
 .../sales/year2026/row_parser_spec.rb         | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/services/bulk_upload/sales/year2026/row_parser.rb b/app/services/bulk_upload/sales/year2026/row_parser.rb
index 31c6f6a3e..b67d121a8 100644
--- a/app/services/bulk_upload/sales/year2026/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2026/row_parser.rb
@@ -176,6 +176,11 @@ class BulkUpload::Sales::Year2026::RowParser
 
     :field_103, # What is the length of the mortgage in years? - Shared ownership
     :field_133, # What is the length of the mortgage in years? - Discounted ownership
+
+    :field_107, # What are the total monthly service charges for the property?
+    :field_125, # What are the monthly service charges for the property?
+    :field_126, # New monthly service charge amount
+    :field_136, # What are the total monthly leasehold charges for the property?
   ].freeze
 
   attribute :bulk_upload
@@ -296,7 +301,7 @@ class BulkUpload::Sales::Year2026::RowParser
   attribute :field_104, :decimal
   attribute :field_105, :decimal
   attribute :field_106, :decimal
-  attribute :field_107, :decimal
+  attribute :field_107, :string
   attribute :field_108, :decimal
 
   attribute :field_109, :decimal
@@ -315,8 +320,8 @@ class BulkUpload::Sales::Year2026::RowParser
   attribute :field_122, :integer
   attribute :field_123, :decimal
   attribute :field_124, :decimal
-  attribute :field_125, :decimal
-  attribute :field_126, :decimal
+  attribute :field_125, :string
+  attribute :field_126, :string
 
   attribute :field_127, :integer
   attribute :field_128, :decimal
@@ -327,7 +332,7 @@ class BulkUpload::Sales::Year2026::RowParser
   attribute :field_133, :string
   attribute :field_134, :integer
   attribute :field_135, :decimal
-  attribute :field_136, :decimal
+  attribute :field_136, :string
 
   validates :field_1,
             presence: {
@@ -948,7 +953,7 @@ private
     attributes["gender_same_as_sex6"] = field_68
     attributes["gender_description6"] = field_69
 
-    attributes["newservicecharges"] = field_126 if field_126&.positive?
+    attributes["newservicecharges"] = field_126.to_d if field_126.present? && field_126 != "R" && field_126.to_d.positive?
     attributes["hasservicechargeschanged"] = attributes["newservicecharges"].present? ? 1 : 2
 
     attributes["relat2"] = relationship_from_is_partner(field_37)
@@ -1024,7 +1029,7 @@ private
 
     attributes["cashdis"] = field_105
     attributes["mrent"] = mrent
-    attributes["mscharge"] = mscharge if mscharge&.positive?
+    attributes["mscharge"] = mscharge.to_d if mscharge.present? && mscharge != "R" && mscharge.to_d.positive?
     attributes["has_mscharge"] = attributes["mscharge"].present? ? 1 : 0
     attributes["grant"] = field_129
     attributes["discount"] = field_130
diff --git a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb
index bb743f1e9..661e0eae3 100644
--- a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb
@@ -1964,6 +1964,26 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do
       end
     end
 
+    context "when mscharge is set to R for staircasing" do
+      let(:attributes) { valid_attributes.merge(field_125: "R") }
+
+      it "does not set mscharge and sets has_mscharge to no" do
+        log = parser.log
+        expect(log["has_mscharge"]).to eq(0)
+        expect(log["mscharge"]).to be_nil
+      end
+    end
+
+    context "when newservicecharges is set to R" do
+      let(:attributes) { valid_attributes.merge(field_126: "R") }
+
+      it "does not set newservicecharges and sets hasservicechargeschanged to no" do
+        log = parser.log
+        expect(log["newservicecharges"]).to be_nil
+        expect(log["hasservicechargeschanged"]).to eq(2)
+      end
+    end
+
     context "when newservicecharges is positive" do
       let(:attributes) { valid_attributes.merge(field_126: "150") }