From 852ac3a198dd726ba74d9b6065fee5f29dcdb05a Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 12 Dec 2022 14:29:21 +0000 Subject: [PATCH] lint and add new conditions to check answers for age1 --- app/models/form/question.rb | 4 ++-- app/models/form/sales/questions/age1.rb | 14 +++++++++----- .../form/sales/questions/buyer1_age_known.rb | 3 +++ spec/models/form/sales/questions/age1_spec.rb | 14 ++++++++++---- .../sales/questions/buyer1_age_known_spec.rb | 17 +++++++++++------ 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/app/models/form/question.rb b/app/models/form/question.rb index b415a499c..34b508fc9 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -113,7 +113,7 @@ class Form::Question return unless inferred_check_answers_value inferred_answer = inferred_check_answers_value.find { |inferred_value| inferred_value["condition"].values[0] == log[inferred_value["condition"].keys[0]] } - inferred_answer.present?? inferred_answer["value"] : "" + inferred_answer.present? ? inferred_answer["value"] : "" end def displayed_answer_options(log, _current_user = nil) @@ -278,7 +278,7 @@ private end def has_inferred_display_value?(log) - inferred_check_answers_value.present? && inferred_check_answers_value.any? { |inferred_value| log[inferred_value["condition"].keys.first] == inferred_value["condition"].values.first} + inferred_check_answers_value.present? && inferred_check_answers_value.any? { |inferred_value| log[inferred_value["condition"].keys.first] == inferred_value["condition"].values.first } end def checkbox_answer_label(log) diff --git a/app/models/form/sales/questions/age1.rb b/app/models/form/sales/questions/age1.rb index 6dd500caa..2ac7a9e3f 100644 --- a/app/models/form/sales/questions/age1.rb +++ b/app/models/form/sales/questions/age1.rb @@ -6,12 +6,16 @@ class Form::Sales::Questions::Age1 < ::Form::Question @header = "Age" @type = "numeric" @width = 2 - @inferred_check_answers_value = [{ - "condition" => { - "age1_known" => 1, + @inferred_check_answers_value = [ + { + "condition" => { "age1_known" => 1 }, + "value" => "Not known", }, - "value" => "Not known", - }] + { + "condition" => { "age1_known" => 2 }, + "value" => "Prefers not to say", + }, + ] @check_answers_card_number = 1 end end diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb index 74d9a122b..761bacddb 100644 --- a/app/models/form/sales/questions/buyer1_age_known.rb +++ b/app/models/form/sales/questions/buyer1_age_known.rb @@ -18,6 +18,9 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question { "age1_known" => 1, }, + { + "age1_known" => 2, + }, ], } @check_answers_card_number = 1 diff --git a/spec/models/form/sales/questions/age1_spec.rb b/spec/models/form/sales/questions/age1_spec.rb index 6ff571f69..b5ab5d44b 100644 --- a/spec/models/form/sales/questions/age1_spec.rb +++ b/spec/models/form/sales/questions/age1_spec.rb @@ -40,10 +40,16 @@ RSpec.describe Form::Sales::Questions::Age1, type: :model do end it "has the correct inferred check answers value" do - expect(question.inferred_check_answers_value).to eq([{ - "condition" => { "age1_known" => 1 }, - "value" => "Not known", - }]) + expect(question.inferred_check_answers_value).to eq([ + { + "condition" => { "age1_known" => 1 }, + "value" => "Not known", + }, + { + "condition" => { "age1_known" => 2 }, + "value" => "Prefers not to say", + }, + ]) end it "has the correct check_answers_card_number" do diff --git a/spec/models/form/sales/questions/buyer1_age_known_spec.rb b/spec/models/form/sales/questions/buyer1_age_known_spec.rb index 12518a23d..4337d8cb1 100644 --- a/spec/models/form/sales/questions/buyer1_age_known_spec.rb +++ b/spec/models/form/sales/questions/buyer1_age_known_spec.rb @@ -51,12 +51,17 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do it "has correct hidden_in_check_answers for" do expect(question.hidden_in_check_answers).to eq({ - "depends_on" => [{ - "age1_known" => 0, - }, - { - "age1_known" => 1, - }], + "depends_on" => [ + { + "age1_known" => 0, + }, + { + "age1_known" => 1, + }, + { + "age1_known" => 2, + }, + ], }) end