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

CLDC-2385 Increase soft maximum for care home charges (#1651) 

* Increase soft maximum for carehome charges

* import test
pull/1656/head
kosiakkatrina 2 years ago committed by GitHub
parent
f5bba4ac5b
commit
d3d457d501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 24 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/validations/financial_validations.rb
  2. 40
      spec/models/validations/financial_validations_spec.rb
  3. 4
      spec/services/imports/lettings_logs_import_service_spec.rb

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

@ -133,8 +133,8 @@ module Validations::FinancialValidations
if record.chcharge.blank? if record.chcharge.blank?
# record.errors.add :is_carehome, I18n.t("validations.financial.carehome.not_provided", period:) # record.errors.add :is_carehome, I18n.t("validations.financial.carehome.not_provided", period:)
# record.errors.add :chcharge, I18n.t("validations.financial.carehome.not_provided", period:) # record.errors.add :chcharge, I18n.t("validations.financial.carehome.not_provided", period:)
elsif !weekly_value_in_range(record, "chcharge", 10, 1000) elsif !weekly_value_in_range(record, "chcharge", 10, 5000)
max_chcharge = record.weekly_to_value_per_period(1000) max_chcharge = record.weekly_to_value_per_period(5000)
min_chcharge = record.weekly_to_value_per_period(10) min_chcharge = record.weekly_to_value_per_period(10)
message = I18n.t("validations.financial.carehome.out_of_range", period:, min_chcharge:, max_chcharge:) message = I18n.t("validations.financial.carehome.out_of_range", period:, min_chcharge:, max_chcharge:)

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

@ -916,42 +916,42 @@ RSpec.describe Validations::FinancialValidations do
context "and charges are over the valid limit (£1,000 per week)" do context "and charges are over the valid limit (£1,000 per week)" do
it "validates charge when period is weekly for 52 weeks" do it "validates charge when period is weekly for 52 weeks" do
record.period = 1 record.period = 1
record.chcharge = 1001 record.chcharge = 5001
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £10.00 and £1,000.00 if paying weekly for 52 weeks") .to include("Household rent and other charges must be between £10.00 and £5,000.00 if paying weekly for 52 weeks")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £10.00 and £1,000.00 if paying weekly for 52 weeks") .to include("Household rent and other charges must be between £10.00 and £5,000.00 if paying weekly for 52 weeks")
end end
it "validates charge when period is monthly" do it "validates charge when period is monthly" do
record.period = 4 record.period = 4
record.chcharge = 4334 record.chcharge = 21_667
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £43.00 and £4,333.00 if paying every calendar month") .to include("Household rent and other charges must be between £43.00 and £21,666.00 if paying every calendar month")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £43.00 and £4,333.00 if paying every calendar month") .to include("Household rent and other charges must be between £43.00 and £21,666.00 if paying every calendar month")
end end
it "validates charge when period is every 2 weeks" do it "validates charge when period is every 2 weeks" do
record.period = 2 record.period = 2
record.chcharge = 2001 record.chcharge = 12_001
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £20.00 and £2,000.00 if paying every 2 weeks") .to include("Household rent and other charges must be between £20.00 and £10,000.00 if paying every 2 weeks")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £20.00 and £2,000.00 if paying every 2 weeks") .to include("Household rent and other charges must be between £20.00 and £10,000.00 if paying every 2 weeks")
end end
it "validates charge when period is every 4 weeks" do it "validates charge when period is every 4 weeks" do
record.period = 3 record.period = 3
record.chcharge = 4001 record.chcharge = 24_001
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £40.00 and £4,000.00 if paying every 4 weeks") .to include("Household rent and other charges must be between £40.00 and £20,000.00 if paying every 4 weeks")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £40.00 and £4,000.00 if paying every 4 weeks") .to include("Household rent and other charges must be between £40.00 and £20,000.00 if paying every 4 weeks")
end end
end end
@ -1007,9 +1007,9 @@ RSpec.describe Validations::FinancialValidations do
record.chcharge = 9 record.chcharge = 9
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £10.00 and £1,000.00 if paying weekly for 52 weeks") .to include("Household rent and other charges must be between £10.00 and £5,000.00 if paying weekly for 52 weeks")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £10.00 and £1,000.00 if paying weekly for 52 weeks") .to include("Household rent and other charges must be between £10.00 and £5,000.00 if paying weekly for 52 weeks")
end end
it "validates charge when period is monthly" do it "validates charge when period is monthly" do
@ -1017,9 +1017,9 @@ RSpec.describe Validations::FinancialValidations do
record.chcharge = 42 record.chcharge = 42
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £43.00 and £4,333.00 if paying every calendar month") .to include("Household rent and other charges must be between £43.00 and £21,666.00 if paying every calendar month")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £43.00 and £4,333.00 if paying every calendar month") .to include("Household rent and other charges must be between £43.00 and £21,666.00 if paying every calendar month")
end end
it "validates charge when period is every 2 weeks" do it "validates charge when period is every 2 weeks" do
@ -1027,9 +1027,9 @@ RSpec.describe Validations::FinancialValidations do
record.chcharge = 19 record.chcharge = 19
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £20.00 and £2,000.00 if paying every 2 weeks") .to include("Household rent and other charges must be between £20.00 and £10,000.00 if paying every 2 weeks")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £20.00 and £2,000.00 if paying every 2 weeks") .to include("Household rent and other charges must be between £20.00 and £10,000.00 if paying every 2 weeks")
end end
it "validates charge when period is every 4 weeks" do it "validates charge when period is every 4 weeks" do
@ -1037,9 +1037,9 @@ RSpec.describe Validations::FinancialValidations do
record.chcharge = 39 record.chcharge = 39
financial_validator.validate_care_home_charges(record) financial_validator.validate_care_home_charges(record)
expect(record.errors["chcharge"]) expect(record.errors["chcharge"])
.to include("Household rent and other charges must be between £40.00 and £4,000.00 if paying every 4 weeks") .to include("Household rent and other charges must be between £40.00 and £20,000.00 if paying every 4 weeks")
expect(record.errors["period"]) expect(record.errors["period"])
.to include("Household rent and other charges must be between £40.00 and £4,000.00 if paying every 4 weeks") .to include("Household rent and other charges must be between £40.00 and £20,000.00 if paying every 4 weeks")
end end
end end
end end

4
spec/services/imports/lettings_logs_import_service_spec.rb
Unescape View File

@ -908,7 +908,7 @@ RSpec.describe Imports::LettingsLogsImportService do
before do before do
scheme1.update!(registered_under_care_act: 2) scheme1.update!(registered_under_care_act: 2)
lettings_log_xml.at_xpath("//xmlns:Q18b").content = "2000" lettings_log_xml.at_xpath("//xmlns:Q18b").content = "6000"
lettings_log_xml.at_xpath("//xmlns:Q17").content = "1" lettings_log_xml.at_xpath("//xmlns:Q17").content = "1"
lettings_log_xml.at_xpath("//xmlns:Q18ai").content = "" lettings_log_xml.at_xpath("//xmlns:Q18ai").content = ""
lettings_log_xml.at_xpath("//xmlns:Q18aii").content = "" lettings_log_xml.at_xpath("//xmlns:Q18aii").content = ""
@ -918,7 +918,7 @@ RSpec.describe Imports::LettingsLogsImportService do
end end
it "intercepts the relevant validation error" do it "intercepts the relevant validation error" do
expect(logger).to receive(:warn).with(/Removing chcharge with error: Household rent and other charges must be between £10.00 and £1,000.00 if paying weekly for 52 weeks/) expect(logger).to receive(:warn).with(/Removing chcharge with error: Household rent and other charges must be between £10.00 and £5,000.00 if paying weekly for 52 weeks/)
expect { lettings_log_service.send(:create_log, lettings_log_xml) } expect { lettings_log_service.send(:create_log, lettings_log_xml) }
.not_to raise_error .not_to raise_error
end end

Write Preview
Loading…
Cancel
Save