Update keys of rsnvac for first lets

Making it match with what is in the data dictionary. It was a wuick enough
fix to be included in this branch since it pairs well with the newprop derived
variable implementation

app/models/case_log.rb

@@ -185,7 +185,7 @@ class CaseLog < ApplicationRecord
   end
 
   def has_first_let_vacancy_reason?
-    [11, 12, 13].include?(rsnvac)
+    [15, 16, 17].include?(rsnvac)
   end
 
   def previous_tenancy_was_temporary?

app/models/validations/date_validations.rb

@@ -60,6 +60,6 @@ private
   end
 
   def is_rsnvac_first_let?(record)
-    [11, 12, 13].include?(record["rsnvac"])
+    [15, 16, 17].include?(record["rsnvac"])
   end
 end

config/forms/2021_2022.json

@@ -710,14 +710,14 @@
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "12": {
+                    "15": {
+                      "value": "First let of new-build property"
+                    },
+                    "16": {
                       "value": "First let of conversion, rehabilitation or acquired property"
                     },
-                    "13": {
+                    "17": {
                       "value": "First let of leased property"
-                    },
-                    "11": {
-                      "value": "First let of new-build property"
                     }
                   }
                 }
@@ -886,11 +886,11 @@
               "depends_on": [
                 {
                   "renewal": 0,
-                  "rsnvac": 12
+                  "rsnvac": 16
                 },
                 {
                   "renewal": 0,
-                  "rsnvac": 13
+                  "rsnvac": 17
                 }
               ]
             },
@@ -908,7 +908,7 @@
               "depends_on": [
                 {
                   "renewal": 0,
-                  "rsnvac": 11
+                  "rsnvac": 15
                 }
               ]
             },
@@ -945,11 +945,11 @@
               "depends_on": [
                 {
                   "renewal": 0,
-                  "rsnvac": 12
+                  "rsnvac": 16
                 },
                 {
                   "renewal": 0,
-                  "rsnvac": 13
+                  "rsnvac": 17
                 }
               ]
             }

spec/models/validations/date_validations_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe Validations::DateValidations do
 
     context "when reason for vacancy is first let of property" do
       it "validates that no major repair date is provided for a new build" do
-        record.rsnvac = 11
+        record.rsnvac = 15
         record.mrcdate = Time.zone.local(2022, 1, 1)
         date_validator.validate_property_major_repairs(record)
         expect(record.errors["mrcdate"])
@@ -73,7 +73,7 @@ RSpec.describe Validations::DateValidations do
       end
 
       it "validates that no major repair date is provided for a conversion" do
-        record.rsnvac = 12
+        record.rsnvac = 16
         record.mrcdate = Time.zone.local(2022, 1, 1)
         date_validator.validate_property_major_repairs(record)
         expect(record.errors["mrcdate"])
@@ -81,7 +81,7 @@ RSpec.describe Validations::DateValidations do
       end
 
       it "validates that no major repair date is provided for a leased property" do
-        record.rsnvac = 13
+        record.rsnvac = 17
         record.mrcdate = Time.zone.local(2022, 1, 1)
         date_validator.validate_property_major_repairs(record)
         expect(record.errors["mrcdate"])

spec/models/validations/property_validations_spec.rb

@@ -235,13 +235,13 @@ RSpec.describe Validations::PropertyValidations do
 
       it "expects to have a first let reason for vacancy" do
         record.first_time_property_let_as_social_housing = 1
-        record.rsnvac = 11
+        record.rsnvac = 15
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"]).to be_empty
-        record.rsnvac = 12
+        record.rsnvac = 16
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"]).to be_empty
-        record.rsnvac = 13
+        record.rsnvac = 17
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"]).to be_empty
       end
@@ -250,15 +250,15 @@ RSpec.describe Validations::PropertyValidations do
     context "when the property has been let as social housing before" do
       it "validates that the reason for vacancy is not a first let as social housing reason" do
         record.first_time_property_let_as_social_housing = 0
-        record.rsnvac = 11
+        record.rsnvac = 15
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"])
           .to include(match I18n.t("validations.property.rsnvac.first_let_not_social"))
-        record.rsnvac = 12
+        record.rsnvac = 16
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"])
           .to include(match I18n.t("validations.property.rsnvac.first_let_not_social"))
-        record.rsnvac = 13
+        record.rsnvac = 17
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"])
           .to include(match I18n.t("validations.property.rsnvac.first_let_not_social"))
@@ -266,13 +266,13 @@ RSpec.describe Validations::PropertyValidations do
 
       it "expects the reason for vacancy to be a first let as social housing reason" do
         record.first_time_property_let_as_social_housing = 1
-        record.rsnvac = 11
+        record.rsnvac = 15
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"]).to be_empty
-        record.rsnvac = 12
+        record.rsnvac = 16
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"]).to be_empty
-        record.rsnvac = 13
+        record.rsnvac = 17
         property_validator.validate_rsnvac(record)
         expect(record.errors["rsnvac"]).to be_empty
       end