From 78d2ec98ffd1ef168e3559fa9f7934ac33aa921e Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 27 Mar 2023 12:59:57 +0100
Subject: [PATCH] Update leftreg values

---
 app/models/form/lettings/questions/leftreg.rb         |  6 +++---
 app/models/form/question.rb                           |  4 ++--
 .../bulk_upload/lettings/year2022/row_parser.rb       | 11 +----------
 .../bulk_upload/lettings/year2023/row_parser.rb       | 11 +----------
 config/forms/2022_2023.json                           |  6 +++---
 spec/factories/lettings_log.rb                        |  2 +-
 6 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/app/models/form/lettings/questions/leftreg.rb b/app/models/form/lettings/questions/leftreg.rb
index a6edecbc3..98c6064ac 100644
--- a/app/models/form/lettings/questions/leftreg.rb
+++ b/app/models/form/lettings/questions/leftreg.rb
@@ -12,9 +12,9 @@ class Form::Lettings::Questions::Leftreg < ::Form::Question
   end
 
   ANSWER_OPTIONS = {
-    "0" => { "value" => "Yes" },
-    "1" => { "value" => "No – they left up to and including 5 years ago" },
-    "2" => { "value" => "No – they left more than 5 years ago" },
+    "6" => { "value" => "Yes" },
+    "4" => { "value" => "No – they left up to and including 5 years ago" },
+    "5" => { "value" => "No – they left more than 5 years ago" },
     "divider" => { "value" => true },
     "3" => { "value" => "Person prefers not to say" },
   }.freeze
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index de77674e6..4cc2394c5 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -338,7 +338,7 @@ private
     startertenancy: [0],
     sheltered: [0, 1],
     armedforces: [1, 4, 5],
-    leftreg: [0],
+    leftreg: [6],
     reservist: [1],
     preg_occ: [1],
     illness: [1],
@@ -362,7 +362,7 @@ private
     startertenancy: [1],
     sheltered: [2],
     armedforces: [2],
-    leftreg: [1],
+    leftreg: [4],
     reservist: [2],
     preg_occ: [2],
     illness: [2],
diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb
index d9cc99505..9e7fbaf12 100644
--- a/app/services/bulk_upload/lettings/year2022/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb
@@ -1078,16 +1078,7 @@ private
   end
 
   def leftreg
-    case field_114
-    when 3
-      3
-    when 4
-      1
-    when 5
-      2
-    when 6
-      0
-    end
+    field_114
   end
 
   def homeless
diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb
index dc2a04a66..dfabebee9 100644
--- a/app/services/bulk_upload/lettings/year2023/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb
@@ -1110,16 +1110,7 @@ private
   end
 
   def leftreg
-    case field_80
-    when 3
-      3
-    when 4
-      1
-    when 5
-      2
-    when 6
-      0
-    end
+    field_80
   end
 
   def housingneeds
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 3162a2b36..d9bb4193b 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -5722,13 +5722,13 @@
                   "type": "radio",
                   "check_answer_label": "Person still serving in UK armed forces",
                   "answer_options": {
-                    "0": {
+                    "6": {
                       "value": "Yes"
                     },
-                    "1": {
+                    "4": {
                       "value": "No – they left up to and including 5 years ago"
                     },
-                    "2": {
+                    "5": {
                       "value": "No – they left more than 5 years ago"
                     },
                     "divider": {
diff --git a/spec/factories/lettings_log.rb b/spec/factories/lettings_log.rb
index 994b69c33..ce2b1cee7 100644
--- a/spec/factories/lettings_log.rb
+++ b/spec/factories/lettings_log.rb
@@ -55,7 +55,7 @@ FactoryBot.define do
       ecstat2 { 6 }
       homeless { 1 }
       underoccupation_benefitcap { 0 }
-      leftreg { 1 }
+      leftreg { 4 }
       reservist { 1 }
       illness { 1 }
       preg_occ { 2 }