Update to match new location of programme types field

Author: mikejamesthompson

mavis/reporting/api_client/client.py

@@ -95,8 +95,7 @@ def get_programmes(self) -> list[dict]:
             {"value": "td_ipv", "text": "Td/IPV"},
         ]
 
-        cis2_info = (self.session or {}).get("cis2_info", {})
-        programme_types = cis2_info.get("programme_types", [])
+        programme_types = (self.session or {}).get("programme_types", [])
 
         if not programme_types:
             return all_programmes

mavis/reporting/helpers/auth_helper.py

@@ -89,6 +89,7 @@ def log_user_in(data: dict[str, Any], session: SessionMixin):
     session["user_id"] = jwt_data["user"]["id"]
     session["jwt"] = minimal_jwt(jwt_data)
     session["user_nav"] = data["user_nav"]
+    session["programme_types"] = jwt_data["programme_types"]
 
 
 def minimal_jwt(data):

tests/api_client/test_client.py

@@ -90,15 +90,17 @@ def test_unknown_programme_returns_empty_list(self, api_client):
 
 class TestGetProgrammes:
     def test_returns_all_when_no_programme_types(self, app):
-        client = MavisApiClient(app=app, session={"jwt": "x", "cis2_info": {}})
+        client = MavisApiClient(
+            app=app, session={"jwt": "x", "cis2_info": {}, "programme_types": []}
+        )
         result = client.get_programmes()
         values = [p["value"] for p in result]
         assert values == ["flu", "hpv", "menacwy", "td_ipv"]
 
     def test_filters_by_programme_types(self, app):
         client = MavisApiClient(
             app=app,
-            session={"jwt": "x", "cis2_info": {"programme_types": ["flu", "hpv"]}},
+            session={"jwt": "x", "programme_types": ["flu", "hpv"]},
         )
         result = client.get_programmes()
         values = [p["value"] for p in result]

tests/helpers.py

@@ -33,6 +33,7 @@ def mock_user_info():
                 "team": {"name": "SAIS Team 1"},
                 "workgroups": ["r1l"],
             },
+            "programme_types": ["flu", "hpv"],
         },
         "user_nav": {
             "items": [

tests/helpers/test_auth_helper.py

@@ -45,3 +45,9 @@ def test_log_user_in_sets_jwt(logged_in_session, user_data):
         == user_data["jwt_data"]["user"]["reporting_api_session_token"]
     )
     assert jwt_payload["data"]["cis2_info"] == user_data["jwt_data"]["cis2_info"]
+
+
+def test_log_user_in_sets_programme_types(logged_in_session, user_data):
+    assert (
+        logged_in_session["programme_types"] == user_data["jwt_data"]["programme_types"]
+    )