Browse Source

Merge pull request #63 from communitiesuk/CLDC-471-pregnancy-validation

Cldc 471 pregnancy validation
pull/62/head
Milo 3 years ago committed by GitHub
parent
commit
db346f7cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 22
      app/models/case_log.rb
  2. 8
      config/forms/2021_2022.json
  3. 8
      db/migrate/20211026123542_change_to_person1_gender_age.rb
  4. 6
      db/schema.rb
  5. 8
      docs/api/DLUHC-CORE-Data.v1.json
  6. 2
      spec/factories/case_log.rb
  7. 87
      spec/features/case_log_spec.rb
  8. 4
      spec/fixtures/complete_case_log.json
  9. 10
      spec/fixtures/forms/test_form.json
  10. 2
      spec/helpers/check_answers_helper_spec.rb
  11. 6
      spec/models/case_log_spec.rb
  12. 6
      spec/models/form_spec.rb
  13. 14
      spec/requests/case_log_controller_spec.rb

22
app/models/case_log.rb

@ -3,9 +3,9 @@ class CaseLogValidator < ActiveModel::Validator
# followed by field name this is how the metaprogramming of the method # followed by field name this is how the metaprogramming of the method
# name being call in the validate method works. # name being call in the validate method works.
def validate_tenant_age(record) def validate_person_1_age(record)
if record.tenant_age && !/^[1-9][0-9]?$|^120$/.match?(record.tenant_age.to_s) if record.person_1_age && !/^[1-9][0-9]?$|^120$/.match?(record.person_1_age.to_s)
record.errors.add :tenant_age, "Tenant age must be between 0 and 120" record.errors.add :person_1_age, "Tenant age must be between 0 and 120"
end end
end end
@ -55,6 +55,12 @@ class CaseLogValidator < ActiveModel::Validator
end end
end end
def validate_household_pregnancy(record)
if (record.pregnancy == "Yes" || record.pregnancy == "Prefer not to say") && !women_of_child_bearing_age_in_household(record)
record.errors.add :pregnancy, "You must answer no as there are no female tenants aged 16-50 in the property"
end
end
def validate(record) def validate(record)
# If we've come from the form UI we only want to validate the specific fields # If we've come from the form UI we only want to validate the specific fields
# that have just been submitted. If we're submitting a log via API or Bulk Upload # that have just been submitted. If we're submitting a log via API or Bulk Upload
@ -71,6 +77,16 @@ class CaseLogValidator < ActiveModel::Validator
validation_methods.each { |meth| public_send(meth, record) } validation_methods.each { |meth| public_send(meth, record) }
end end
end end
private
def women_of_child_bearing_age_in_household(record)
(1..8).any? do |n|
next if record["person_#{n}_gender"].nil? || record["person_#{n}_age"].nil?
record["person_#{n}_gender"] == "Female" && record["person_#{n}_age"] >= 16 && record["person_#{n}_age"] <= 50
end
end
end end
class CaseLog < ApplicationRecord class CaseLog < ApplicationRecord

8
config/forms/2021_2022.json

@ -21,11 +21,11 @@
} }
} }
}, },
"tenant_age": { "person_1_age": {
"header": "", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"tenant_age": { "person_1_age": {
"check_answer_label": "Tenant's age", "check_answer_label": "Tenant's age",
"header": "What is the tenant's age?", "header": "What is the tenant's age?",
"hint_text": "", "hint_text": "",
@ -36,11 +36,11 @@
} }
} }
}, },
"tenant_gender": { "person_1_gender": {
"header": "", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"tenant_gender": { "person_1_gender": {
"check_answer_label": "Tenant's gender", "check_answer_label": "Tenant's gender",
"header": "Which of these best describes the tenant's gender identity?", "header": "Which of these best describes the tenant's gender identity?",
"hint_text": "", "hint_text": "",

8
db/migrate/20211026123542_change_to_person1_gender_age.rb

@ -0,0 +1,8 @@
class ChangeToPerson1GenderAge < ActiveRecord::Migration[6.1]
def change
change_table :case_logs, bulk: true do |t|
t.rename :tenant_age, :person_1_age
t.rename :tenant_gender, :person_1_gender
end
end
end

6
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2021_10_15_090040) do ActiveRecord::Schema.define(version: 2021_10_26_123542) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -20,8 +20,8 @@ ActiveRecord::Schema.define(version: 2021_10_15_090040) do
t.datetime "created_at", precision: 6, null: false t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false
t.string "tenant_code" t.string "tenant_code"
t.integer "tenant_age" t.integer "person_1_age"
t.string "tenant_gender" t.string "person_1_gender"
t.string "tenant_ethnic_group" t.string "tenant_ethnic_group"
t.string "tenant_nationality" t.string "tenant_nationality"
t.string "previous_housing_situation" t.string "previous_housing_situation"

8
docs/api/DLUHC-CORE-Data.v1.json

@ -388,13 +388,13 @@
"type": "string", "type": "string",
"minLength": 1 "minLength": 1
}, },
"tenant_age": { "person_1_age": {
"type": "number", "type": "number",
"description": "The age of the lead tenant", "description": "The age of the lead tenant",
"maximum": 120, "maximum": 120,
"minimum": 0 "minimum": 0
}, },
"tenant_gender": { "person_1_gender": {
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"enum": [ "enum": [
@ -1086,8 +1086,8 @@
}, },
"required": [ "required": [
"tenant_code", "tenant_code",
"tenant_age", "person_1_age",
"tenant_gender", "person_1_gender",
"tenant_ethnic_group", "tenant_ethnic_group",
"tenant_nationality", "tenant_nationality",
"previous_housing_situation", "previous_housing_situation",

2
spec/factories/case_log.rb

@ -6,7 +6,7 @@ FactoryBot.define do
tenant_code { "TH356" } tenant_code { "TH356" }
property_postcode { "SW2 6HI" } property_postcode { "SW2 6HI" }
previous_postcode { "P0 5ST" } previous_postcode { "P0 5ST" }
tenant_age { "12" } person_1_age { "12" }
end end
trait :completed do trait :completed do
status { 2 } status { 2 }

87
spec/features/case_log_spec.rb

@ -7,8 +7,8 @@ RSpec.describe "Test Features" do
question_answers = { question_answers = {
tenant_code: { type: "text", answer: "BZ737" }, tenant_code: { type: "text", answer: "BZ737" },
tenant_age: { type: "numeric", answer: 25 }, person_1_age: { type: "numeric", answer: 25 },
tenant_gender: { type: "radio", answer: "Female" }, person_1_gender: { type: "radio", answer: "Female" },
household_number_of_other_members: { type: "numeric", answer: 2 }, household_number_of_other_members: { type: "numeric", answer: 2 },
} }
@ -93,9 +93,52 @@ RSpec.describe "Test Features" do
) )
end end
context "Validate pregnancy questions" do
it "Cannot answer yes if no female tenants" do
expect {
CaseLog.create!(pregnancy: "Yes",
person_1_gender: "Male",
person_1_age: 20)
}.to raise_error(ActiveRecord::RecordInvalid)
end
it "Cannot answer yes if no female tenants within age range" do
expect {
CaseLog.create!(pregnancy: "Yes",
person_1_gender: "Female",
person_1_age: 51)
}.to raise_error(ActiveRecord::RecordInvalid)
end
it "Cannot answer prefer not to say if no valid tenants" do
expect {
CaseLog.create!(pregnancy: "Prefer not to say",
person_1_gender: "Male",
person_1_age: 20)
}.to raise_error(ActiveRecord::RecordInvalid)
end
it "Can answer yes if valid tenants" do
expect {
CaseLog.create!(pregnancy: "Yes",
person_1_gender: "Female",
person_1_age: 20)
}.not_to raise_error
end
it "Can answer yes if valid second tenant" do
expect {
CaseLog.create!(pregnancy: "Yes",
person_1_gender: "Male", person_1_age: 99,
person_2_gender: "Female",
person_2_age: 20)
}.not_to raise_error
end
end
it "can be accessed by url" do it "can be accessed by url" do
visit("/case_logs/#{id}/tenant_age") visit("/case_logs/#{id}/person_1_age")
expect(page).to have_field("case-log-tenant-age-field") expect(page).to have_field("case-log-person-1-age-field")
end end
it "updates model attributes correctly for each question" do it "updates model attributes correctly for each question" do
@ -140,8 +183,8 @@ RSpec.describe "Test Features" do
end end
it "displays text answers in inputs if they are already saved" do it "displays text answers in inputs if they are already saved" do
visit("/case_logs/#{id}/tenant_age") visit("/case_logs/#{id}/person_1_age")
expect(page).to have_field("case-log-tenant-age-field", with: "12") expect(page).to have_field("case-log-person-1-age-field", with: "12")
end end
it "displays checkbox answers in inputs if they are already saved" do it "displays checkbox answers in inputs if they are already saved" do
@ -173,7 +216,7 @@ RSpec.describe "Test Features" do
it "go back to tenant code page from tenant age page", js: true do it "go back to tenant code page from tenant age page", js: true do
visit("/case_logs/#{id}/tenant_code") visit("/case_logs/#{id}/tenant_code")
click_button("Save and continue") click_button("Save and continue")
visit("/case_logs/#{id}/tenant_age") visit("/case_logs/#{id}/person_1_age")
click_link(text: "Back") click_link(text: "Back")
expect(page).to have_field("case-log-tenant-code-field") expect(page).to have_field("case-log-tenant-code-field")
end end
@ -218,8 +261,8 @@ RSpec.describe "Test Features" do
end end
it "should display answers given by the user for the question in the subsection" do it "should display answers given by the user for the question in the subsection" do
fill_in_number_question(empty_case_log.id, "tenant_age", 28) fill_in_number_question(empty_case_log.id, "person_1_age", 28)
choose("case-log-tenant-gender-non-binary-field") choose("case-log-person-1-gender-non-binary-field")
click_button("Save and continue") click_button("Save and continue")
visit("/case_logs/#{empty_case_log.id}/#{subsection}/check_answers") visit("/case_logs/#{empty_case_log.id}/#{subsection}/check_answers")
expect(page).to have_content("28") expect(page).to have_content("28")
@ -230,15 +273,15 @@ RSpec.describe "Test Features" do
visit("case_logs/#{empty_case_log.id}/#{subsection}/check_answers") visit("case_logs/#{empty_case_log.id}/#{subsection}/check_answers")
assert_selector "a", text: /Answer\z/, count: 4 assert_selector "a", text: /Answer\z/, count: 4
assert_selector "a", text: "Change", count: 0 assert_selector "a", text: "Change", count: 0
expect(page).to have_link("Answer", href: "/case_logs/#{empty_case_log.id}/tenant_age") expect(page).to have_link("Answer", href: "/case_logs/#{empty_case_log.id}/person_1_age")
end end
it "should have a change link for answered questions" do it "should have a change link for answered questions" do
fill_in_number_question(empty_case_log.id, "tenant_age", 28) fill_in_number_question(empty_case_log.id, "person_1_age", 28)
visit("/case_logs/#{empty_case_log.id}/#{subsection}/check_answers") visit("/case_logs/#{empty_case_log.id}/#{subsection}/check_answers")
assert_selector "a", text: /Answer\z/, count: 3 assert_selector "a", text: /Answer\z/, count: 3
assert_selector "a", text: "Change", count: 1 assert_selector "a", text: "Change", count: 1
expect(page).to have_link("Change", href: "/case_logs/#{empty_case_log.id}/tenant_age") expect(page).to have_link("Change", href: "/case_logs/#{empty_case_log.id}/person_1_age")
end end
it "should have a link pointing to the first question if no questions are answered" do it "should have a link pointing to the first question if no questions are answered" do
@ -317,19 +360,19 @@ RSpec.describe "Test Features" do
describe "Question validation" do describe "Question validation" do
context "given an invalid tenant age" do context "given an invalid tenant age" do
it " of less than 0 it shows validation" do it " of less than 0 it shows validation" do
visit("/case_logs/#{id}/tenant_age") visit("/case_logs/#{id}/person_1_age")
fill_in_number_question(empty_case_log.id, "tenant_age", -5) fill_in_number_question(empty_case_log.id, "person_1_age", -5)
expect(page).to have_selector("#error-summary-title") expect(page).to have_selector("#error-summary-title")
expect(page).to have_selector("#case-log-tenant-age-error") expect(page).to have_selector("#case-log-person-1-age-error")
expect(page).to have_selector("#case-log-tenant-age-field-error") expect(page).to have_selector("#case-log-person-1-age-field-error")
end end
it " of greater than 120 it shows validation" do it " of greater than 120 it shows validation" do
visit("/case_logs/#{id}/tenant_age") visit("/case_logs/#{id}/person_1_age")
fill_in_number_question(empty_case_log.id, "tenant_age", 121) fill_in_number_question(empty_case_log.id, "person_1_age", 121)
expect(page).to have_selector("#error-summary-title") expect(page).to have_selector("#error-summary-title")
expect(page).to have_selector("#case-log-tenant-age-error") expect(page).to have_selector("#case-log-person-1-age-error")
expect(page).to have_selector("#case-log-tenant-age-field-error") expect(page).to have_selector("#case-log-person-1-age-field-error")
end end
end end
end end
@ -363,8 +406,8 @@ RSpec.describe "Test Features" do
end end
it "can route based on multiple conditions" do it "can route based on multiple conditions" do
visit("/case_logs/#{id}/tenant_gender") visit("/case_logs/#{id}/person_1_gender")
choose("case-log-tenant-gender-female-field", allow_label_click: true) choose("case-log-person-1-gender-female-field", allow_label_click: true)
click_button("Save and continue") click_button("Save and continue")
visit("/case_logs/#{id}/conditional_question") visit("/case_logs/#{id}/conditional_question")
choose("case-log-pregnancy-yes-field", allow_label_click: true) choose("case-log-pregnancy-yes-field", allow_label_click: true)

4
spec/fixtures/complete_case_log.json vendored

@ -2,8 +2,8 @@
"case_log": "case_log":
{ {
"tenant_code": "T657", "tenant_code": "T657",
"tenant_age": 35, "person_1_age": 35,
"tenant_gender": "Female", "person_1_gender": "Female",
"tenant_ethnic_group": "White: English/Scottish/Welsh/Northern Irish/British", "tenant_ethnic_group": "White: English/Scottish/Welsh/Northern Irish/British",
"tenant_nationality": "UK national resident in UK", "tenant_nationality": "UK national resident in UK",
"previous_housing_situation": "Private sector tenancy", "previous_housing_situation": "Private sector tenancy",

10
spec/fixtures/forms/test_form.json vendored

@ -16,9 +16,9 @@
} }
} }
}, },
"tenant_age": { "person_1_age": {
"questions": { "questions": {
"tenant_age": { "person_1_age": {
"check_answer_label": "Tenant's age", "check_answer_label": "Tenant's age",
"header": "What is the tenant's age?", "header": "What is the tenant's age?",
"type": "numeric", "type": "numeric",
@ -28,9 +28,9 @@
} }
} }
}, },
"tenant_gender": { "person_1_gender": {
"questions": { "questions": {
"tenant_gender": { "person_1_gender": {
"check_answer_label": "Tenant's gender", "check_answer_label": "Tenant's gender",
"header": "Which of these best describes the tenant's gender identity?", "header": "Which of these best describes the tenant's gender identity?",
"type": "radio", "type": "radio",
@ -252,7 +252,7 @@
} }
}, },
"conditional_route_to": { "conditional_route_to": {
"rent": { "pregnancy": "Yes", "tenant_gender": "Female" }, "rent": { "pregnancy": "Yes", "person_1_gender": "Female" },
"conditional_question_yes_page": { "pregnancy": "Yes" }, "conditional_question_yes_page": { "pregnancy": "Yes" },
"conditional_question_no_page": { "pregnancy": "No" } "conditional_question_no_page": { "pregnancy": "No" }
}, },

2
spec/helpers/check_answers_helper_spec.rb

@ -153,7 +153,7 @@ RSpec.describe CheckAnswersHelper do
it "it includes conditional pages and questions that were displayed" do it "it includes conditional pages and questions that were displayed" do
case_log["pregnancy"] = "Yes" case_log["pregnancy"] = "Yes"
case_log["tenant_gender"] = "Female" case_log["person_1_gender"] = "Female"
result = total_questions(conditional_routing_subsection, case_log, form) result = total_questions(conditional_routing_subsection, case_log, form)
expected_keys = %w[pregnancy] expected_keys = %w[pregnancy]
expect(result.keys).to match_array(expected_keys) expect(result.keys).to match_array(expected_keys)

6
spec/models/case_log_spec.rb

@ -3,15 +3,15 @@ require "rails_helper"
RSpec.describe Form, type: :model do RSpec.describe Form, type: :model do
describe "#new" do describe "#new" do
it "validates age is a number" do it "validates age is a number" do
expect { CaseLog.create!(tenant_age: "random") }.to raise_error(ActiveRecord::RecordInvalid) expect { CaseLog.create!(person_1_age: "random") }.to raise_error(ActiveRecord::RecordInvalid)
end end
it "validates age is under 120" do it "validates age is under 120" do
expect { CaseLog.create!(tenant_age: 121) }.to raise_error(ActiveRecord::RecordInvalid) expect { CaseLog.create!(person_1_age: 121) }.to raise_error(ActiveRecord::RecordInvalid)
end end
it "validates age is over 0" do it "validates age is over 0" do
expect { CaseLog.create!(tenant_age: 0) }.to raise_error(ActiveRecord::RecordInvalid) expect { CaseLog.create!(person_1_age: 0) }.to raise_error(ActiveRecord::RecordInvalid)
end end
it "validates number of relets is a number" do it "validates number of relets is a number" do

6
spec/models/form_spec.rb

@ -5,9 +5,9 @@ RSpec.describe Form, type: :model do
let(:form) { form_handler.get_form("test_form") } let(:form) { form_handler.get_form("test_form") }
describe ".next_page" do describe ".next_page" do
let(:previous_page) { "tenant_age" } let(:previous_page) { "person_1_age" }
it "returns the next page given the previous" do it "returns the next page given the previous" do
expect(form.next_page(previous_page)).to eq("tenant_gender") expect(form.next_page(previous_page)).to eq("person_1_gender")
end end
end end
@ -20,7 +20,7 @@ RSpec.describe Form, type: :model do
describe ".previous_page" do describe ".previous_page" do
context "given a page in the middle of a subsection" do context "given a page in the middle of a subsection" do
let(:current_page) { "tenant_age" } let(:current_page) { "person_1_age" }
it "returns the previous page given the current" do it "returns the previous page given the current" do
expect(form.previous_page(current_page)).to eq("tenant_code") expect(form.previous_page(current_page)).to eq("tenant_code")
end end

14
spec/requests/case_log_controller_spec.rb

@ -24,7 +24,7 @@ RSpec.describe CaseLogsController, type: :request do
describe "POST #create" do describe "POST #create" do
let(:tenant_code) { "T365" } let(:tenant_code) { "T365" }
let(:tenant_age) { 35 } let(:person_1_age) { 35 }
let(:property_number_of_times_relet) { 12 } let(:property_number_of_times_relet) { 12 }
let(:property_postcode) { "SE11 6TY" } let(:property_postcode) { "SE11 6TY" }
let(:in_progress) { "in_progress" } let(:in_progress) { "in_progress" }
@ -33,7 +33,7 @@ RSpec.describe CaseLogsController, type: :request do
let(:params) do let(:params) do
{ {
"tenant_code": tenant_code, "tenant_code": tenant_code,
"tenant_age": tenant_age, "person_1_age": person_1_age,
"property_postcode": property_postcode, "property_postcode": property_postcode,
"property_number_of_times_relet": property_number_of_times_relet, "property_number_of_times_relet": property_number_of_times_relet,
} }
@ -55,18 +55,18 @@ RSpec.describe CaseLogsController, type: :request do
it "creates a case log with the values passed" do it "creates a case log with the values passed" do
json_response = JSON.parse(response.body) json_response = JSON.parse(response.body)
expect(json_response["tenant_code"]).to eq(tenant_code) expect(json_response["tenant_code"]).to eq(tenant_code)
expect(json_response["tenant_age"]).to eq(tenant_age) expect(json_response["person_1_age"]).to eq(person_1_age)
expect(json_response["property_postcode"]).to eq(property_postcode) expect(json_response["property_postcode"]).to eq(property_postcode)
end end
context "invalid json params" do context "invalid json params" do
let(:tenant_age) { 2000 } let(:person_1_age) { 2000 }
let(:property_number_of_times_relet) { 21 } let(:property_number_of_times_relet) { 21 }
it "validates case log parameters" do it "validates case log parameters" do
json_response = JSON.parse(response.body) json_response = JSON.parse(response.body)
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(json_response["errors"]).to match_array([["property_number_of_times_relet", ["Must be between 0 and 20"]], ["tenant_age", ["Tenant age must be between 0 and 120"]]]) expect(json_response["errors"]).to match_array([["property_number_of_times_relet", ["Must be between 0 and 20"]], ["person_1_age", ["Tenant age must be between 0 and 120"]]])
end end
end end
@ -149,7 +149,7 @@ RSpec.describe CaseLogsController, type: :request do
end end
context "invalid case log params" do context "invalid case log params" do
let(:params) { { tenant_age: 200 } } let(:params) { { person_1_age: 200 } }
it "returns 422" do it "returns 422" do
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
@ -157,7 +157,7 @@ RSpec.describe CaseLogsController, type: :request do
it "returns an error message" do it "returns an error message" do
json_response = JSON.parse(response.body) json_response = JSON.parse(response.body)
expect(json_response["errors"]).to eq({ "tenant_age" => ["Tenant age must be between 0 and 120"] }) expect(json_response["errors"]).to eq({ "person_1_age" => ["Tenant age must be between 0 and 120"] })
end end
end end

Loading…
Cancel
Save