remove default from relat mapping

app/services/bulk_upload/sales/year2025/row_parser.rb

@@ -806,31 +806,11 @@ private
     attributes["sex5"] = field_52
     attributes["sex6"] = field_56
 
-    attributes["relat2"] = if field_34 == 1
+    attributes["relat2"] = relationship_from_is_partner(field_34)
-                             "P"
+    attributes["relat3"] = relationship_from_is_partner(field_42)
-                           else
+    attributes["relat4"] = relationship_from_is_partner(field_46)
-                             (field_34 == 2 ? "X" : "R")
+    attributes["relat5"] = relationship_from_is_partner(field_50)
-                           end
+    attributes["relat6"] = relationship_from_is_partner(field_54)
-    attributes["relat3"] = if field_42 == 1
-                             "P"
-                           else
-                             (field_42 == 2 ? "X" : "R")
-                           end
-    attributes["relat4"] = if field_46 == 1
-                             "P"
-                           else
-                             (field_46 == 2 ? "X" : "R")
-                           end
-    attributes["relat5"] = if field_50 == 1
-                             "P"
-                           else
-                             (field_50 == 2 ? "X" : "R")
-                           end
-    attributes["relat6"] = if field_54 == 1
-                             "P"
-                           else
-                             (field_54 == 2 ? "X" : "R")
-                           end
 
     attributes["ecstat1"] = field_32
     attributes["ecstat2"] = field_39
@@ -1043,6 +1023,17 @@ private
     field_55.present? || field_56.present? || field_54.present?
   end
 
+  def relationship_from_is_partner(is_partner)
+    case is_partner
+    when 1
+      "P"
+    when 2
+      "X"
+    when 3
+      "R"
+    end
+  end
+
   def details_known?(person_n)
     send("person_#{person_n}_present?") ? 1 : 2
   end

spec/services/bulk_upload/sales/year2025/row_parser_spec.rb

@@ -1145,6 +1145,52 @@ RSpec.describe BulkUpload::Sales::Year2025::RowParser do
       end
     end
 
+    describe "relationship field mappings" do
+      [
+        %w[field_34 relat2 2],
+        %w[field_42 relat3 3],
+        %w[field_46 relat4 4],
+        %w[field_49 relat5 5],
+        %w[field_54 relat6 6],
+      ].each do |input_field, relationship_attribute, person_num|
+        describe input_field.to_s do
+          context "when #{input_field} is 1" do
+            let(:attributes) { setup_section_params.merge({ input_field.to_sym => "1", field_41: "5" }) }
+
+            it "sets relationship to P" do
+              expect(parser.log.public_send(relationship_attribute)).to eq("P")
+            end
+          end
+
+          context "when #{input_field} is 2" do
+            let(:attributes) { setup_section_params.merge({ input_field.to_sym => "2", field_41: "5" }) }
+
+            it "sets relationship to X" do
+              expect(parser.log.public_send(relationship_attribute)).to eq("X")
+            end
+          end
+
+          context "when #{input_field} is 3" do
+            let(:attributes) { setup_section_params.merge({ input_field.to_sym => "3", field_41: "5" }) }
+
+            it "sets relationship to R" do
+              expect(parser.log.public_send(relationship_attribute)).to eq("R")
+            end
+          end
+
+          context "when #{input_field} is 4" do
+            let(:attributes) { setup_section_params.merge({ input_field.to_sym => "4", field_41: "5" }) }
+
+            it "gives a validation error" do
+              parser.valid?
+              validation_message = "You must answer person #{person_num} is the partner of buyer 1."
+              expect(parser.errors[input_field]).to include validation_message
+            end
+          end
+        end
+      end
+    end
+
     describe "field_39" do # ecstat2
       context "when buyer 2 has no age but has ecstat as child" do
         let(:attributes) { valid_attributes.merge({ field_35: nil, field_39: "9" }) }