Refactor universal childcare age parameters (#1598)

Author: MaxGhenis

changelog.d/1055.md

@@ -0,0 +1 @@
+- Refactored universal childcare entitlement age parameters into an `age` folder.

…ersal_childcare_entitlement/max_age.yaml …ersal_childcare_entitlement/age/max.yamlpolicyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/max_age.yaml renamed to policyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/age/max.yaml policyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/max_age.yaml renamed to policyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/age/max.yaml

@@ -5,6 +5,7 @@ metadata:
   reference:
     - title: Childcare (Early Years Provision Free of Charge) (Extended Entitlement) Regulations 2016 - Regulation 35(3)
       href: https://www.legislation.gov.uk/uksi/2016/1257/part/4/made
+    # Section 7 establishes the free early years provision duty; Regulation 35(3) supplies the third-birthday timing threshold.
     - title: Childcare Act 2006 - Section 7.1 (Duty to secure free early years provision)
       href: https://www.legislation.gov.uk/ukpga/2006/21/section/7
 values:

…ersal_childcare_entitlement/min_age.yaml …ersal_childcare_entitlement/age/min.yamlpolicyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/min_age.yaml renamed to policyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/age/min.yaml policyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/min_age.yaml renamed to policyengine_uk/parameters/gov/dfe/universal_childcare_entitlement/age/min.yaml

@@ -15,7 +15,7 @@ def formula(person, period, parameters):
         p = parameters(period).gov.dfe.universal_childcare_entitlement
 
         # Check if age is within eligible range
-        meets_age_condition = (age >= p.min_age) & (age < p.max_age)
+        meets_age_condition = (age >= p.age.min) & (age < p.age.max)
 
         # Get the universal childcare entitlement amount
         entitlement_amount = person("universal_childcare_entitlement", period)

policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/is_child_receiving_universal_childcare.py

@@ -17,7 +17,7 @@ def formula(person, period, parameters):
 
         age = person("age", period)
         p = parameters(period).gov.dfe.universal_childcare_entitlement
-        meets_age_condition = (age >= p.min_age) & (age < p.max_age)
+        meets_age_condition = (age >= p.age.min) & (age < p.age.max)
         not_compulsory_age = ~person("is_of_compulsory_school_age", period)
 
         # Check if person has extended childcare. If so, they are not eligible. Combining extended childcare and universal childcare is not allowed.