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

Update needstype values in our JSON form

pull/470/head
Stéphane Meny 3 years ago
parent
02e8831029
commit
8162768cf3
No known key found for this signature in database
GPG Key ID: 9D0AFEA988527923
6 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/models/case_log.rb
  2. 2
      app/models/validations/financial_validations.rb
  3. 48
      config/forms/2021_2022.json
  4. 2
      spec/fixtures/exports/case_logs.xml
  5. 14
      spec/models/case_log_spec.rb
  6. 4
      spec/models/validations/financial_validations_spec.rb

4
app/models/case_log.rb
Unescape View File

@ -161,8 +161,8 @@ class CaseLog < ApplicationRecord
end end
def is_supported_housing? def is_supported_housing?
# 0: Supported Housing # 2: Supported Housing
!!needstype&.zero? needstype == 2
end end
def has_hbrentshortfall? def has_hbrentshortfall?

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

@ -116,7 +116,7 @@ private
}.freeze }.freeze
LANDLORD_VALUES = { 1 => :this_landlord, 2 => :other_landlord }.freeze LANDLORD_VALUES = { 1 => :this_landlord, 2 => :other_landlord }.freeze
NEEDSTYPE_VALUES = { 0 => :supported_housing, 1 => :general_needs }.freeze NEEDSTYPE_VALUES = { 2 => :supported_housing, 1 => :general_needs }.freeze
def validate_charges(record) def validate_charges(record)
%i[scharge pscharge supcharg].each do |charge| %i[scharge pscharge supcharg].each do |charge|

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

@ -22,7 +22,7 @@
"1": { "1": {
"value": "General needs" "value": "General needs"
}, },
"0": { "2": {
"value": "Supported housing" "value": "Supported housing"
} }
} }
@ -1090,7 +1090,7 @@
}, },
"depends_on": [ "depends_on": [
{ {
"needstype": 0 "needstype": 2
} }
] ]
} }
@ -3587,7 +3587,7 @@
"depends_on": [ "depends_on": [
{ {
"renewal": 1, "renewal": 1,
"needstype": 0 "needstype": 2
} }
] ]
}, },
@ -4383,7 +4383,7 @@
"depends_on": [ "depends_on": [
{ {
"managing_organisation.provider_type": "LA", "managing_organisation.provider_type": "LA",
"needstype": 0, "needstype": 2,
"renewal": 0 "renewal": 0
} }
] ]
@ -4443,7 +4443,7 @@
"depends_on": [ "depends_on": [
{ {
"managing_organisation.provider_type": "PRP", "managing_organisation.provider_type": "PRP",
"needstype": 0, "needstype": 2,
"renewal": 0 "renewal": 0
} }
] ]
@ -4658,7 +4658,7 @@
}, },
"depends_on": [ "depends_on": [
{ {
"needstype": 0 "needstype": 2
} }
] ]
}, },
@ -4748,62 +4748,62 @@
"depends_on": [ "depends_on": [
{ {
"period": 1, "period": 1,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 1, "period": 1,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
}, },
{ {
"period": 5, "period": 5,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 5, "period": 5,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
}, },
{ {
"period": 6, "period": 6,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 6, "period": 6,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
}, },
{ {
"period": 7, "period": 7,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 7, "period": 7,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
}, },
{ {
"period": 8, "period": 8,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 8, "period": 8,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
}, },
{ {
"period": 9, "period": 9,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 9, "period": 9,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
} }
] ]
@ -4845,12 +4845,12 @@
"depends_on": [ "depends_on": [
{ {
"period": 2, "period": 2,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 2, "period": 2,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
} }
] ]
@ -4892,12 +4892,12 @@
"depends_on": [ "depends_on": [
{ {
"period": 3, "period": 3,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 3, "period": 3,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
} }
] ]
@ -4939,12 +4939,12 @@
"depends_on": [ "depends_on": [
{ {
"period": 4, "period": 4,
"needstype": 0, "needstype": 2,
"household_charge": 0 "household_charge": 0
}, },
{ {
"period": 4, "period": 4,
"needstype": 0, "needstype": 2,
"household_charge": null "household_charge": null
} }
] ]

2
spec/fixtures/exports/case_logs.xml vendored
Unescape View File

@ -44,7 +44,7 @@
<startertenancy>0</startertenancy> <startertenancy>0</startertenancy>
<tenancylength>5</tenancylength> <tenancylength>5</tenancylength>
<tenancy>1</tenancy> <tenancy>1</tenancy>
<landlord>3</landlord> <landlord>2</landlord>
<ppostcode_full>SE26RT</ppostcode_full> <ppostcode_full>SE26RT</ppostcode_full>
<rsnvac>6</rsnvac> <rsnvac>6</rsnvac>
<unittype_gn>7</unittype_gn> <unittype_gn>7</unittype_gn>

14
spec/models/case_log_spec.rb
Unescape View File

@ -255,7 +255,7 @@ RSpec.describe CaseLog do
before { case_log.owning_organisation.update!(provider_type: 2) } before { case_log.owning_organisation.update!(provider_type: 2) }
context "when the rent type is intermediate rent and supported housing" do context "when the rent type is intermediate rent and supported housing" do
it "correctly derives and saves lettype" do it "correctly derives and saves lettype" do
case_log.update!(rent_type: 4, needstype: 0) case_log.update!(rent_type: 4, needstype: 2)
record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0] record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0]
expect(case_log.lettype).to eq(10) expect(case_log.lettype).to eq(10)
expect(record_from_db["lettype"]).to eq(10) expect(record_from_db["lettype"]).to eq(10)
@ -273,7 +273,7 @@ RSpec.describe CaseLog do
context "when the rent type is affordable rent and supported housing" do context "when the rent type is affordable rent and supported housing" do
it "correctly derives and saves lettype" do it "correctly derives and saves lettype" do
case_log.update!(rent_type: 2, needstype: 0) case_log.update!(rent_type: 2, needstype: 2)
record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0] record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0]
expect(case_log.lettype).to eq(6) expect(case_log.lettype).to eq(6)
expect(record_from_db["lettype"]).to eq(6) expect(record_from_db["lettype"]).to eq(6)
@ -291,7 +291,7 @@ RSpec.describe CaseLog do
context "when the rent type is social rent and supported housing" do context "when the rent type is social rent and supported housing" do
it "correctly derives and saves lettype" do it "correctly derives and saves lettype" do
case_log.update!(rent_type: 0, needstype: 0) case_log.update!(rent_type: 0, needstype: 2)
record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0] record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0]
expect(case_log.lettype).to eq(2) expect(case_log.lettype).to eq(2)
expect(record_from_db["lettype"]).to eq(2) expect(record_from_db["lettype"]).to eq(2)
@ -1051,7 +1051,7 @@ RSpec.describe CaseLog do
context "when the rent type is intermediate rent and supported housing" do context "when the rent type is intermediate rent and supported housing" do
it "correctly derives and saves lettype" do it "correctly derives and saves lettype" do
case_log.update!(rent_type: 4, needstype: 0) case_log.update!(rent_type: 4, needstype: 2)
record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0] record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0]
expect(case_log.lettype).to eq(12) expect(case_log.lettype).to eq(12)
expect(record_from_db["lettype"]).to eq(12) expect(record_from_db["lettype"]).to eq(12)
@ -1069,7 +1069,7 @@ RSpec.describe CaseLog do
context "when the rent type is affordable rent and supported housing" do context "when the rent type is affordable rent and supported housing" do
it "correctly derives and saves lettype" do it "correctly derives and saves lettype" do
case_log.update!(rent_type: 2, needstype: 0) case_log.update!(rent_type: 2, needstype: 2)
record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0] record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0]
expect(case_log.lettype).to eq(8) expect(case_log.lettype).to eq(8)
expect(record_from_db["lettype"]).to eq(8) expect(record_from_db["lettype"]).to eq(8)
@ -1087,7 +1087,7 @@ RSpec.describe CaseLog do
context "when the rent type is social rent and supported housing" do context "when the rent type is social rent and supported housing" do
it "correctly derives and saves lettype" do it "correctly derives and saves lettype" do
case_log.update!(rent_type: 0, needstype: 0) case_log.update!(rent_type: 0, needstype: 2)
record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0] record_from_db = ActiveRecord::Base.connection.execute("select lettype from case_logs where id=#{case_log.id}").to_a[0]
expect(case_log.lettype).to eq(4) expect(case_log.lettype).to eq(4)
expect(record_from_db["lettype"]).to eq(4) expect(record_from_db["lettype"]).to eq(4)
@ -1477,7 +1477,7 @@ RSpec.describe CaseLog do
described_class.create({ described_class.create({
managing_organisation: owning_organisation, managing_organisation: owning_organisation,
owning_organisation:, owning_organisation:,
needstype: 0, needstype: 2,
}) })
end end

4
spec/models/validations/financial_validations_spec.rb
Unescape View File

@ -301,7 +301,7 @@ RSpec.describe Validations::FinancialValidations do
context "when needstype is supported housing" do context "when needstype is supported housing" do
before do before do
record.needstype = 0 record.needstype = 2
record.landlord = 1 record.landlord = 1
end end
@ -497,7 +497,7 @@ RSpec.describe Validations::FinancialValidations do
context "when needstype is supported housing" do context "when needstype is supported housing" do
before do before do
record.needstype = 0 record.needstype = 2
record.landlord = 2 record.landlord = 2
end end

Write Preview
Loading…
Cancel
Save