Merge pull request #842 from NHSDigital/small-type-fixes

Small type fixes

Author: jf-x-dev

mavis/test/constants.py

@@ -237,15 +237,14 @@ def pre_screening_checks(
 
     @property
     def year_groups(self) -> list[int]:
-        match self:
-            case self.FLU:
-                return list(range(12))
-            case self.HPV:
-                return list(range(8, 12))
-            case self.MMR:
-                return list(range(12))
-            case self.MENACWY | self.TD_IPV:
-                return list(range(9, 12))
+        year_group_map = {
+            self.FLU: list(range(12)),
+            self.HPV: list(range(8, 12)),
+            self.MMR: list(range(12)),
+            self.MENACWY: list(range(9, 12)),
+            self.TD_IPV: list(range(9, 12)),
+        }
+        return year_group_map[self]
 
     @property
     def tally_categories(self) -> list[str]:

tests/test_reset.py

@@ -107,11 +107,9 @@ def test_pre_screening_questions_prefilled_for_multiple_vaccinations(
             SessionsChildrenPage(page).register_child_as_attending(child)
         SessionsChildrenPage(page).tabs.click_children_tab()
         SessionsChildrenPage(page).search.search_and_click_child(child)
-        programmes = (
-            [Programme.MENACWY, Programme.TD_IPV]
-            if programme_group == "doubles"
-            else [programme_group]
-        )
+        programmes = [
+            programme for programme in Programme if programme.group == programme_group
+        ]
         for programme in programmes:
             consent_option = (
                 ConsentOption.NASAL_SPRAY_OR_INJECTION