baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #195 from communitiesuk/single-log-audit-1

pull/197/head
Paul Robert Lloyd 3 years ago committed by GitHub
parent
e1c7fb9378 3ddbf9d8ac
commit
c7d3cafd37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 119 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      app/models/constants/case_log.rb
  2. 4
      app/models/validations/date_validations.rb
  3. 2
      app/models/validations/financial_validations.rb
  4. 6
      app/models/validations/household_validations.rb
  5. 4
      app/models/validations/property_validations.rb
  6. 131
      config/forms/2021_2022.json
  7. 6
      docs/api/DLUHC-CORE-Data.v1.json
  8. 17
      spec/fixtures/forms/2021_2022.json
  9. 4
      spec/fixtures/forms/2022_2023.json
  10. 20
      spec/models/case_log_spec.rb
  11. 2
      spec/requests/form_controller_spec.rb

24
app/models/constants/case_log.rb
Unescape View File

@ -4,7 +4,7 @@ module Constants::CaseLog
"Yes - removal of the spare room subsidy" => 4,
"Yes - both the benefit cap and the removal of the spare room subsidy" => 6,
"No" => 2,
"Do not know" => 3,
"Don’t know" => 3,
"Prefer not to say" => 100,
}.freeze
@ -12,7 +12,7 @@ module Constants::CaseLog
"Social rent basis" => 1,
"Affordable rent basis" => 2,
"Intermediate rent basis" => 4,
"Do not know" => 3,
"Don’t know" => 3,
}.freeze
BUILTYPE = {
@ -147,7 +147,7 @@ module Constants::CaseLog
POLAR_WITH_UNKNOWN = {
"No" => 2,
"Yes" => 1,
"Do not know" => 3,
"Don’t know" => 3,
}.freeze
TENANCY = {
@ -164,8 +164,8 @@ module Constants::CaseLog
}.freeze
RSNVAC = {
"First let of newbuild property" => 15,
"First let of conversion/rehabilitation/acquired property" => 16,
"First let of new-build property" => 15,
"First let of conversion, rehabilitation or acquired property" => 16,
"First let of leased property" => 17,
"Tenant evicted due to arrears" => 10,
"Tenant evicted due to ASB or other reason" => 11,
@ -181,11 +181,11 @@ module Constants::CaseLog
}.freeze
UNITTYPE_GN = {
"Flat / maisonette" => 1,
"Bed-sit" => 2,
"Flat or maisonette" => 1,
"Bedsit" => 2,
"House" => 7,
"Bungalow" => 8,
"Shared flat / maisonette" => 4,
"Shared flat or maisonette" => 4,
"Shared house" => 9,
"Shared bungalow" => 10,
"Other" => 6,
@ -201,7 +201,7 @@ module Constants::CaseLog
"All" => 1,
"Some" => 2,
"None" => 3,
"Do not know" => 4,
"Don’t know" => 4,
}.freeze
PERIOD = {
@ -225,7 +225,7 @@ module Constants::CaseLog
"3 to 4 years" => 9,
"4 to 5 years" => 10,
"5 years or more" => 5,
"Do not know" => 6,
"Don’t know" => 6,
}.freeze
HOUSING_BENEFIT = {
@ -234,7 +234,7 @@ module Constants::CaseLog
"Universal Credit without housing element and no Housing Benefit" => 7,
"Universal Credit and Housing Benefit" => 8,
"Not Housing Benefit or Universal Credit" => 9,
"Do not know" => 3,
"Don’t know" => 3,
"Prefer not to say" => 100,
}.freeze
@ -271,7 +271,7 @@ module Constants::CaseLog
"Discharged from prison" => 44,
"Discharged from long stay hospital or similar institution" => 45,
"Other" => 20,
"Do not know" => 28,
"Don’t know" => 28,
"Prefer not to say" => 100,
}.freeze

4
app/models/validations/date_validations.rb
Unescape View File

@ -45,8 +45,8 @@ private
end
def is_rsnvac_first_let?(record)
record["rsnvac"] == "First let of newbuild property" ||
record["rsnvac"] == "First let of conversion/rehabilitation/acquired property" ||
record["rsnvac"] == "First let of new-build property" ||
record["rsnvac"] == "First let of conversion, rehabilitation or acquired property" ||
record["rsnvac"] == "First let of leased property"
end
end

2
app/models/validations/financial_validations.rb
Unescape View File

@ -38,7 +38,7 @@ module Validations::FinancialValidations
def validate_hbrentshortfall(record)
is_present = record.hbrentshortfall.present?
is_yes = record.hbrentshortfall == "Yes"
hb_donotknow = record.hb == "Do not know"
hb_donotknow = record.hb == "Don’t know"
hb_no_hb_or_uc = record.hb == "Not Housing Benefit or Universal Credit"
hb_uc_no_hb = record.hb == "Universal Credit without housing element and no Housing Benefit"
hb_no_uc = record.hb == "Housing Benefit, but not Universal Credit"

6
app/models/validations/household_validations.rb
Unescape View File

@ -20,8 +20,8 @@ module Validations::HouseholdValidations
end
def validate_reason_for_leaving_last_settled_home(record)
if record.reason == "Do not know" && record.underoccupation_benefitcap != "Do not know"
record.errors.add :underoccupation_benefitcap, "must be do not know if tenant’s main reason for leaving is do not know"
if record.reason == "Don’t know" && record.underoccupation_benefitcap != "Don’t know"
record.errors.add :underoccupation_benefitcap, "must be don’t know if tenant’s main reason for leaving is don’t know"
end
end
@ -86,7 +86,7 @@ module Validations::HouseholdValidations
def validate_shared_housing_rooms(record)
unless record.unittype_gn.nil?
if record.unittype_gn == "Bed-sit" && record.beds != 1 && record.beds.present?
if record.unittype_gn == "Bedsit" && record.beds != 1 && record.beds.present?
record.errors.add :unittype_gn, "A bedsit can only have one bedroom"
end

4
app/models/validations/property_validations.rb
Unescape View File

@ -15,8 +15,8 @@ module Validations::PropertyValidations
end
end
FIRST_LET_VACANCY_REASONS = ["First let of newbuild property",
"First let of conversion/rehabilitation/acquired property",
FIRST_LET_VACANCY_REASONS = ["First let of new-build property",
"First let of conversion, rehabilitation or acquired property",
"First let of leased property"].freeze
def validate_rsnvac(record)
if !record.first_time_property_let_as_social_housing? && FIRST_LET_VACANCY_REASONS.include?(record.rsnvac)

131
config/forms/2021_2022.json
Unescape View File

@ -16,7 +16,7 @@
"gdpr_acceptance": {
"check_answer_label": "Privacy notice seen",
"header": "Has the tenant or buyer seen the Department for Levelling Up, Housing and Communities (DLUHC) privacy notice?",
"hint_text": "You must <a class=\"govuk-link\" href=\"/files/privacy-notice.pdf\">show the privacy notice</a> to the tenant or buyer before you can use this service.",
"hint_text": "You must <a class=\"govuk-link\" href=\"/files/privacy-notice.pdf\">show the privacy notice</a> to the tenant or buyer before you can use this service",
"type": "radio",
"answer_options": {
"0": "Yes",
@ -86,8 +86,8 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "No",
"1": "Yes"
"1": "Yes",
"0": "No"
}
}
},
@ -122,11 +122,11 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "Social rent",
"1": "Affordable rent",
"2": "London Affordable rent",
"3": "Rent to buy",
"2": "London affordable rent",
"4": "London living rent",
"3": "Rent to buy",
"0": "Social rent",
"5": "Other intermediate rent product"
},
"conditional_for": {
@ -146,8 +146,8 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "Supported housing",
"1": "General needs"
"1": "General needs",
"0": "Supported housing"
}
}
},
@ -180,7 +180,7 @@
"propcode": {
"check_answer_label": "Property reference",
"header": "What is the property reference?",
"hint_text": "This is how you refer to the property in your own systems.",
"hint_text": "This is how you refer to the property in your own systems",
"type": "text",
"width": 10
}
@ -872,8 +872,9 @@
"28": "Death of household member in last settled accomodation",
"29": "Discharged from prison",
"30": "Discharged from long stay hospital or similar institution",
"divider": true,
"31": "Other",
"32": "Do not know",
"32": "Don’t know",
"33": "Prefer not to say"
},
"conditional_for": {
@ -894,7 +895,8 @@
"1": "Yes - removal of the spare room subsidy",
"2": "Yes - both the benefit cap and the removal of the spare room subsidy",
"3": "No",
"4": "Do not know",
"divider": true,
"4": "Don’t know",
"5": "Prefer not to say"
}
}
@ -940,6 +942,7 @@
"0": "Yes",
"1": "No - they left up to 5 years ago",
"2": "No - they left more than 5 years ago",
"divider": true,
"3": "Prefer not to say"
}
},
@ -951,6 +954,7 @@
"answer_options": {
"0": "Yes",
"1": "No",
"divider": true,
"2": "Prefer not to say"
}
}
@ -968,6 +972,7 @@
"answer_options": {
"0": "Yes",
"1": "No",
"divider": true,
"2": "Prefer not to say"
}
}
@ -985,6 +990,7 @@
"answer_options": {
"0": "Yes",
"1": "No",
"divider": true,
"2": "Prefer not to say"
}
}
@ -1005,9 +1011,8 @@
"housingneeds_c": "Level access housing",
"housingneeds_f": "Other disability requirements",
"housingneeds_g": "No disability requirements",
"divider_a": true,
"housingneeds_h": "Do not know",
"divider_b": true,
"divider": true,
"housingneeds_h": "Don’t know",
"accessibility_requirements_prefer_not_to_say": "Prefer not to say"
}
}
@ -1139,8 +1144,8 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "No",
"1": "Yes"
"1": "Yes",
"0": "No"
},
"conditional_for": {
"property_postcode": ["Yes"]
@ -1171,8 +1176,8 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "No",
"1": "Yes"
"1": "Yes",
"0": "No"
}
}
},
@ -1515,7 +1520,7 @@
"description": "",
"questions": {
"why_dont_you_know_la": {
"check_answer_label": "Reason for not knowing local authority",
"check_answer_label": "Reason you don’t know the postcode or local authority",
"header": "Give a reason why you don’t know the postcode or local authority",
"hint_text": "",
"type": "textarea"
@ -1528,13 +1533,13 @@
"description": "",
"questions": {
"first_time_property_let_as_social_housing": {
"check_answer_label": "Is this the first time the property has been let as social housing?",
"check_answer_label": "First time being let as social-housing?",
"header": "Is this the first time the property has been let as social housing?",
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "No",
"1": "Yes"
"1": "Yes",
"0": "No"
}
}
},
@ -1545,15 +1550,16 @@
"description": "",
"questions": {
"unitletas": {
"check_answer_label": "Type of let",
"check_answer_label": "Most recent let type",
"header": "What type was the property most recently let as?",
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "Social rent basis",
"1": "Affordable rent basis",
"2": "Intermediate rent basis",
"3": "Do not know"
"0": "Social rent basis",
"divider": true,
"3": "Don’t know"
}
}
},
@ -1567,7 +1573,7 @@
"description": "",
"questions": {
"rsnvac": {
"check_answer_label": "Reason for vacant property",
"check_answer_label": "Vacancy reason",
"header": "What is the reason for the property being vacant?",
"hint_text": "",
"type": "radio",
@ -1596,13 +1602,13 @@
"description": "",
"questions": {
"rsnvac": {
"check_answer_label": "What is the reason for the property vacancy?",
"check_answer_label": "Vacancy reason",
"header": "What is the reason for the property being vacant?",
"hint_text": "",
"type": "radio",
"answer_options": {
"11": "First let of newbuild property",
"12": "First let of conversion/rehabilitation/acquired property",
"11": "First let of new-build property",
"12": "First let of conversion, rehabilitation or acquired property",
"13": "First let of leased property"
}
}
@ -1617,13 +1623,14 @@
"description": "",
"questions": {
"offered": {
"check_answer_label": "Number of times property has been offered since available for relet",
"header": "How many times has this unit been previously offered since becoming available for relet (after the last tenancy ended)?",
"check_answer_label": "Times previously offered since becoming available",
"header": "How many times has the property been previously offered since becoming available for re-let?",
"hint_text": "This is after the last tenancy ended. If the property is being let for the first time, enter 0",
"type": "numeric",
"min": 0,
"max": 150,
"step": 1
"step": 1,
"width": 2
}
},
"depends_on": {
@ -1636,13 +1643,14 @@
"description": "",
"questions": {
"offered": {
"check_answer_label": "How many times has the property been previously offered since becoming available?",
"check_answer_label": "Times previously offered since becoming available",
"header": "How many times has the property been previously offered since becoming available?",
"hint_text": "If the property is being let for the first time, enter 0",
"type": "numeric",
"min": 0,
"max": 150,
"step": 1
"step": 1,
"width": 2
}
},
"depends_on": {
@ -1660,13 +1668,14 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "Flat / maisonette",
"1": "Bed-sit",
"2": "House",
"1": "Bedsit",
"3": "Bungalow",
"4": "Shared flat / maisonette",
"0": "Flat or maisonette",
"2": "House",
"4": "Shared flat or maisonette",
"5": "Shared house",
"6": "Shared bungalow",
"divider": true,
"7": "Other"
}
}
@ -1678,12 +1687,12 @@
"questions": {
"builtype": {
"check_answer_label": "Type of building",
"header": "Which type of building is the property?",
"header": "What type of building is the property?",
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "Purpose built",
"1": "Converted from previous residential or non-residential property"
"1": "Converted from previous residential or non-residential property",
"0": "Purpose built"
}
}
}
@ -1694,7 +1703,7 @@
"questions": {
"wchair": {
"check_answer_label": "Property built or adapted to wheelchair-user standards",
"header": "Is property built or adapted to wheelchair user standards?",
"header": "Is the property built or adapted to wheelchair-user standards?",
"hint_text": "",
"type": "radio",
"answer_options": {
@ -1711,11 +1720,11 @@
"beds": {
"check_answer_label": "Number of bedrooms",
"header": "How many bedrooms does the property have?",
"hint_text": "If shared accommodation, enter number of bedrooms occupied by this household; a bed-sit has 1 bedroom",
"type": "numeric",
"min": 0,
"max": 150,
"step": 1
"step": 1,
"width": 2
}
},
"depends_on": { "needstype": "General needs" }
@ -1727,12 +1736,12 @@
"property_void_date": {
"check_answer_label": "Void or renewal date",
"header": "What is the void or renewal date?",
"hint_text": "",
"hint_text": "For example, 27 3 2021",
"type": "date"
}
},
"depends_on": {
"rsnvac": "First let of newbuild property",
"rsnvac": "First let of new-build property",
"tenant_same_property_renewal": "No"
}
},
@ -1741,8 +1750,8 @@
"description": "",
"questions": {
"property_void_date": {
"check_answer_label": "New build handover date",
"header": "What is the new build handover date?",
"check_answer_label": "New-build handover date",
"header": "What is the new-build handover date?",
"hint_text": "",
"type": "date"
}
@ -1765,8 +1774,8 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "No",
"1": "Yes"
"1": "Yes",
"0": "No"
},
"conditional_for": {
"mrcdate": ["Yes"]
@ -1780,7 +1789,7 @@
}
},
"depends_on": {
"rsnvac": "First let of newbuild property",
"rsnvac": "First let of new-build property",
"tenant_same_property_renewal": "No"
}
}
@ -1857,7 +1866,8 @@
"0": "All",
"1": "Some",
"2": "None",
"3": "Do not know"
"divider": true,
"3": "Don’t know"
}
}
}
@ -1877,7 +1887,8 @@
"2": "Universal Credit without housing element and no Housing Benefit",
"3": "Universal Credit and Housing Benefit",
"4": "Not Housing Benefit or Universal Credit",
"5": "Do not know",
"divider": true,
"5": "Don’t know",
"6": "Prefer not to say"
}
}
@ -1968,7 +1979,8 @@
"answer_options": {
"0": "Yes",
"1": "No",
"2": "Do not know"
"divider": true,
"2": "Don’t know"
},
"conditional_for": {
"tshortfall": ["Yes"]
@ -2012,7 +2024,8 @@
"4": "3 to 4 years",
"5": "4 to 5 years",
"6": "5 years or more",
"7": "Do not know"
"divider": true,
"7": "Don’t know"
}
}
}
@ -2034,7 +2047,8 @@
"4": "3 to 4 years",
"5": "4 to 5 years",
"6": "5 years or more",
"7": "Do not know"
"divider": true,
"7": "Don’t know"
}
}
}
@ -2461,7 +2475,8 @@
"answer_options": {
"0": "Yes",
"1": "No",
"2": "Do not know"
"divider": true,
"2": "Don’t know"
},
"conditional_for": {
"reasonable_preference_reason": ["Yes"]
@ -2478,7 +2493,7 @@
"rp_medwel": "A need to move on medical and welfare grounds (including a disability)",
"rp_hardship": "A need to move to avoid hardship to themselves or others",
"divider": true,
"rp_dontknow": "Do not know"
"rp_dontknow": "Don’t know"
}
}
}

6
docs/api/DLUHC-CORE-Data.v1.json
Unescape View File

@ -761,7 +761,7 @@
"Discharged from prison",
"Discharged from long stay hospital or similar institution",
"Other",
"Do not know",
"Don’t know",
"Prefer not to say"
]
},
@ -773,7 +773,7 @@
"Yes - removal of the spare room subsidy",
"Yes - both the benefit cap and the removal of the spare room subsidy",
"No",
"Do not know",
"Don’t know",
"Prefer not to say"
]
},
@ -894,7 +894,7 @@
"benefits": {
"type": "string",
"minLength": 1,
"enum": ["All", "Some", "None", "Do not know"]
"enum": ["All", "Some", "None", "Don’t know"]
},
"hb": {
"type": "string",

17
spec/fixtures/forms/2021_2022.json vendored
Unescape View File

@ -162,7 +162,8 @@
"answer_options": {
"0": "Yes",
"1": "No",
"2": "Do not know",
"divider": true,
"2": "Don’t know",
"3": "Prefer not to say"
}
}
@ -179,8 +180,8 @@
"housingneeds_a": "Fully wheelchair accessible housing",
"housingneeds_b": "Wheelchair access to essential rooms",
"housingneeds_c": "Level access housing",
"divider_a": true,
"housingneeds_h": "Do not know"
"divider": true,
"housingneeds_h": "Don’t know"
}
}
}
@ -280,8 +281,8 @@
"property_wheelchair_accessible": {
"questions": {
"wchair": {
"check_answer_label": "Is property built or adapted to wheelchair user standards?",
"header": "Is property built or adapted to wheelchair user standards?",
"check_answer_label": "Wheelchair adaptation",
"header": "Is the property built or adapted to wheelchair-user standards?",
"type": "radio",
"answer_options": {
"0": "Yes",
@ -561,7 +562,8 @@
"4": "3 to 4 years",
"5": "4 to 5 years",
"6": "5 years or more",
"7": "Do not know"
"divider": true,
"7": "Don’t know"
}
}
}
@ -580,7 +582,8 @@
"4": "3 to 4 years",
"5": "4 to 5 years",
"6": "5 years or more",
"7": "Do not know"
"divider": true,
"7": "Don’t know"
}
}
}

4
spec/fixtures/forms/2022_2023.json vendored
Unescape View File

@ -58,8 +58,8 @@
"hint_text": "",
"type": "radio",
"answer_options": {
"0": "No",
"1": "Yes"
"1": "Yes",
"0": "No"
}
}
},

20
spec/models/case_log_spec.rb
Unescape View File

@ -153,7 +153,7 @@ RSpec.describe Form, type: :model do
context "reason for leaving last settled home validation" do
it "Reason for leaving must be don't know if reason for leaving settled home (Q9a) is don't know." do
expect {
CaseLog.create!(reason: "Do not know",
CaseLog.create!(reason: "Don’t know",
underoccupation_benefitcap: "Yes - benefit cap",
owning_organisation: owning_organisation,
managing_organisation: managing_organisation)
@ -290,7 +290,7 @@ RSpec.describe Form, type: :model do
expect {
CaseLog.create!(
first_time_property_let_as_social_housing: "Yes",
unitletas: "Do not know",
unitletas: "Don’t know",
owning_organisation: owning_organisation,
managing_organisation: managing_organisation,
)
@ -301,7 +301,7 @@ RSpec.describe Form, type: :model do
expect {
CaseLog.create!(
first_time_property_let_as_social_housing: "Yes",
rsnvac: "First let of newbuild property",
rsnvac: "First let of new-build property",
owning_organisation: owning_organisation,
managing_organisation: managing_organisation,
)
@ -309,7 +309,7 @@ RSpec.describe Form, type: :model do
expect {
CaseLog.create!(
first_time_property_let_as_social_housing: "Yes",
rsnvac: "First let of conversion/rehabilitation/acquired property",
rsnvac: "First let of conversion, rehabilitation or acquired property",
owning_organisation: owning_organisation,
managing_organisation: managing_organisation,
)
@ -365,7 +365,7 @@ RSpec.describe Form, type: :model do
it "A bedsit must only have one room" do
expect {
CaseLog.create!(unittype_gn: "Bed-sit",
CaseLog.create!(unittype_gn: "Bedsit",
beds: 2,
owning_organisation: owning_organisation,
managing_organisation: managing_organisation)
@ -374,7 +374,7 @@ RSpec.describe Form, type: :model do
it "A bedsit must only have one room" do
expect {
CaseLog.create!(unittype_gn: "Bed-sit",
CaseLog.create!(unittype_gn: "Bedsit",
beds: 0,
owning_organisation: owning_organisation,
managing_organisation: managing_organisation)
@ -741,7 +741,7 @@ RSpec.describe Form, type: :model do
expect {
CaseLog.create!(
mrcdate: Date.new(2020, 10, 10),
rsnvac: "First let of newbuild property",
rsnvac: "First let of new-build property",
owning_organisation: owning_organisation,
managing_organisation: managing_organisation,
)
@ -750,7 +750,7 @@ RSpec.describe Form, type: :model do
expect {
CaseLog.create!(
mrcdate: Date.new(2020, 10, 10),
rsnvac: "First let of conversion/rehabilitation/acquired property",
rsnvac: "First let of conversion, rehabilitation or acquired property",
owning_organisation: owning_organisation,
managing_organisation: managing_organisation,
)
@ -888,14 +888,14 @@ RSpec.describe Form, type: :model do
context "Validate type of unit" do
it "Cannot be bedsit if no of bedrooms is greater than 1" do
expect {
CaseLog.create!(unittype_gn: "Bed-sit",
CaseLog.create!(unittype_gn: "Bedsit",
beds: 2,
owning_organisation: owning_organisation,
managing_organisation: managing_organisation)
}.to raise_error(ActiveRecord::RecordInvalid)
expect {
CaseLog.create!(unittype_gn: "Bed-sit",
CaseLog.create!(unittype_gn: "Bedsit",
beds: 1,
owning_organisation: owning_organisation,
managing_organisation: managing_organisation)

2
spec/requests/form_controller_spec.rb
Unescape View File

@ -216,7 +216,7 @@ RSpec.describe FormController, type: :request do
"housingneeds_f" => "Other disability requirements",
"housingneeds_g" => "No disability requirements",
"divider_a" => true,
"housingneeds_h" => "Do not know",
"housingneeds_h" => "Don’t know",
"divider_b" => true,
"accessibility_requirements_prefer_not_to_say" => "Prefer not to say" },
}, nil

Write Preview
Loading…
Cancel
Save