Refactor person question numbers

app/models/form/sales/questions/person_age.rb

@@ -17,11 +17,13 @@ class Form::Sales::Questions::PersonAge < ::Form::Question
   end
 
   def question_number
-    case form.start_date.year
+    base_question_number = case form.start_date.year
-    when 2023
+                           when 2023
-      29 + (4 * @person_index)
+                             29
-    else
+                           else
-      31 + (4 * @person_index)
+                             31
-    end
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end

app/models/form/sales/questions/person_age_known.rb

@@ -28,11 +28,13 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Question
   }.freeze
 
   def question_number
-    case form.start_date.year
+    base_question_number = case form.start_date.year
-    when 2023
+                           when 2023
-      29 + (4 * @person_index)
+                             29
-    else
+                           else
-      31 + (4 * @person_index)
+                             31
-    end
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end

app/models/form/sales/questions/person_gender_identity.rb

@@ -29,11 +29,13 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question
   end
 
   def question_number
-    case form.start_date.year
+    base_question_number = case form.start_date.year
-    when 2023
+                           when 2023
-      30 + (4 * @person_index)
+                             30
-    else
+                           else
-      32 + (4 * @person_index)
+                             32
-    end
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end

app/models/form/sales/questions/person_relationship_to_buyer_1.rb

@@ -23,11 +23,13 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question
   }.freeze
 
   def question_number
-    case form.start_date.year
+    base_question_number = case form.start_date.year
-    when 2023
+                           when 2023
-      28 + (4 * @person_index)
+                             28
-    when 2024
+                           else
-      30 + (4 * @person_index)
+                             30
-    end
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end

app/models/form/sales/questions/person_working_situation.rb

@@ -30,11 +30,13 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
   }.freeze
 
   def question_number
-    case form.start_date.year
+    base_question_number = case form.start_date.year
-    when 2023
+                           when 2023
-      31 + (4 * @person_index)
+                             31
-    else
+                           else
-      33 + (4 * @person_index)
+                             33
-    end
+                           end
+
+    base_question_number + (4 * @person_index)
   end
 end