Remove question if you are an apprentice if checking national living wage eligibility and related regression test artefacts. Add validation to how old are you when checking living wage eligibility to ensure users are at least 25 before continuing.

Author: erkde

lib/smart_answer/calculators/minimum_wage_calculator.rb

@@ -49,6 +49,10 @@ def valid_accommodation_usage?(accommodation_usage)
       accommodation_usage >= 0 && accommodation_usage <= 7
     end
 
+    def valid_age_for_living_wage?(age)
+      age.to_i >= 25
+    end
+
     def basic_rate
       rate = @basic_pay / @basic_hours
       if overtime_hours > 0 and overtime_hourly_rate > 0 and rate > overtime_hourly_rate
@@ -171,7 +175,7 @@ def apprentice_eligible_for_minimum_wage?
     end
 
     def eligible_for_living_wage?
-      age.to_i >= 25
+      valid_age_for_living_wage?(age)
     end
 
     def under_school_leaving_age?

lib/smart_answer_flows/locales/en/am-i-getting-minimum-wage.yml

@@ -45,6 +45,7 @@ en-GB:
         title: "%{age_title}"
         suffix_label: years old
         error_message: Please enter a whole number greater than 0
+        valid_age_for_living_wage?: You must be 25 or over to get the national living wage
       # Q3 Past
       how_old_were_you?:
         title: How old were you at the time?

lib/smart_answer_flows/shared_logic/minimum_wage.rb

@@ -10,13 +10,16 @@
 
   permitted_next_nodes = [
     :are_you_an_apprentice?,
+    :how_old_are_you?,
     :past_payment_date?
   ]
 
   next_node(permitted: permitted_next_nodes) do |response|
     case response
-    when 'current_payment', 'current_payment_april_2016'
+    when 'current_payment'
       :are_you_an_apprentice?
+    when 'current_payment_april_2016'
+      :how_old_are_you?
     when 'past_payment'
       :past_payment_date?
     end
@@ -107,6 +110,14 @@
     calculator.valid_age?(response)
   end
 
+  validate :valid_age_for_living_wage? do |response|
+    if calculator.what_to_check == 'current_payment_april_2016'
+      calculator.valid_age_for_living_wage?(response)
+    else
+      true
+    end
+  end
+
   permitted_next_nodes = [
     :under_school_leaving_age,
     :how_often_do_you_get_paid?

test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/apprentice_over_19_second_year_onwards/25/1/16.0/300.0/0.0/no.txt test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/25/1/16.0/280/0.0/no.txt

@@ -6,7 +6,7 @@ $C
 
 The national living wage per hour for your age will be | Your actual pay
 - | -
-£7.20 | £18.75
+£7.20 | £17.50
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 

test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/apprentice_over_19_second_year_onwards/25/31/16.0/300.0/8.0/10.0/no.txt test/artefacts/am-i-getting-minimum-wage/current_payment_april_2016/25/7/40/480/0.0/no.txt

@@ -6,7 +6,7 @@ $C
 
 The national living wage per hour for your age will be | Your actual pay
 - | -
-£7.20 | £10
+£7.20 | £12
 
 If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.