ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: reverts slug at wrong place, adds slug to config

This commit is contained in:
Livio Bieri 2023-10-25 12:58:56 +02:00
parent 228e0c8f31
commit a97628c28c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/vbv_lernwelt/dashboard/graphql/queries.py
View File

@ -3,8 +3,8 @@ from typing import Set, Dict, List, Tuple
import graphene import graphene
from vbv_lernwelt.core.admin import User from vbv_lernwelt.core.admin import User
from vbv_lernwelt.course.models import CourseSessionUser
from vbv_lernwelt.course.models import Course, CourseSession from vbv_lernwelt.course.models import Course, CourseSession
from vbv_lernwelt.course.models import CourseSessionUser
from vbv_lernwelt.course_session_group.models import CourseSessionGroup from vbv_lernwelt.course_session_group.models import CourseSessionGroup
from vbv_lernwelt.dashboard.graphql.types.dashboard import ( from vbv_lernwelt.dashboard.graphql.types.dashboard import (
CourseStatisticsType, CourseStatisticsType,
@ -43,7 +43,6 @@ class DashboardQuery(graphene.ObjectType):
return CourseStatisticsType( return CourseStatisticsType(
id=course.id, # noqa id=course.id, # noqa
course_title=course.title, # noqa course_title=course.title, # noqa
course_slug=course.slug, # noqa
course_session_selection_ids=list(course_session_ids), # noqa course_session_selection_ids=list(course_session_ids), # noqa
) )
@ -74,6 +73,7 @@ def get_user_statistics_dashboards(user: User) -> Tuple[List[Dict[str, str]], Se
{ {
"id": str(course.id), "id": str(course.id),
"name": course.title, "name": course.title,
"slug": course.slug,
"dashboard_type": DashboardType.STATISTICS_DASHBOARD, "dashboard_type": DashboardType.STATISTICS_DASHBOARD,
} }
) )
@ -120,6 +120,7 @@ def get_user_course_session_dashboards(
{ {
"id": str(course.id), "id": str(course.id),
"name": course.title, "name": course.title,
"slug": course.slug,
"dashboard_type": resolved_dashboard_type, "dashboard_type": resolved_dashboard_type,
} }
) )

2
server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
View File

@ -47,13 +47,13 @@ class DashboardType(Enum):
class DashboardConfigType(graphene.ObjectType): class DashboardConfigType(graphene.ObjectType):
id = graphene.ID(required=True) id = graphene.ID(required=True)
name = graphene.String(required=True) name = graphene.String(required=True)
slug = graphene.String(required=True)
dashboard_type = graphene.Field(DashboardType, required=True) dashboard_type = graphene.Field(DashboardType, required=True)
class CourseStatisticsType(graphene.ObjectType): class CourseStatisticsType(graphene.ObjectType):
id = graphene.ID(required=True) id = graphene.ID(required=True)
course_title = graphene.String(required=True) course_title = graphene.String(required=True)
course_slug = graphene.String(required=True)
course_session_properties = graphene.Field(CourseSessionProperties, required=True) course_session_properties = graphene.Field(CourseSessionProperties, required=True)
course_session_selection_ids = graphene.List(graphene.ID, required=True) course_session_selection_ids = graphene.List(graphene.ID, required=True)
course_session_selection_metrics = graphene.Field( course_session_selection_metrics = graphene.Field(

6
server/vbv_lernwelt/dashboard/tests/graphql/test_dashboard.py
View File

@ -55,6 +55,7 @@ class DashboardTestCase(GraphQLTestCase):
dashboard_config { dashboard_config {
id id
name name
slug
dashboard_type dashboard_type
} }
} }
@ -73,6 +74,7 @@ class DashboardTestCase(GraphQLTestCase):
) )
self.assertIsNotNone(course_1_config) self.assertIsNotNone(course_1_config)
self.assertEqual(course_1_config["name"], course_1.title) self.assertEqual(course_1_config["name"], course_1.title)
self.assertEqual(course_1_config["slug"], course_1.slug)
self.assertEqual(course_1_config["dashboard_type"], "PROGRESS_DASHBOARD") self.assertEqual(course_1_config["dashboard_type"], "PROGRESS_DASHBOARD")
course_2_config = find_dashboard_config_by_course_id( course_2_config = find_dashboard_config_by_course_id(
@ -80,6 +82,7 @@ class DashboardTestCase(GraphQLTestCase):
) )
self.assertIsNotNone(course_2_config) self.assertIsNotNone(course_2_config)
self.assertEqual(course_2_config["name"], course_2.title) self.assertEqual(course_2_config["name"], course_2.title)
self.assertEqual(course_2_config["slug"], course_2.slug)
self.assertEqual(course_2_config["dashboard_type"], "STATISTICS_DASHBOARD") self.assertEqual(course_2_config["dashboard_type"], "STATISTICS_DASHBOARD")
course_3_config = find_dashboard_config_by_course_id( course_3_config = find_dashboard_config_by_course_id(
@ -87,6 +90,7 @@ class DashboardTestCase(GraphQLTestCase):
) )
self.assertIsNotNone(course_3_config) self.assertIsNotNone(course_3_config)
self.assertEqual(course_3_config["name"], course_3.title) self.assertEqual(course_3_config["name"], course_3.title)
self.assertEqual(course_3_config["slug"], course_3.slug)
self.assertEqual(course_3_config["dashboard_type"], "SIMPLE_LIST_DASHBOARD") self.assertEqual(course_3_config["dashboard_type"], "SIMPLE_LIST_DASHBOARD")
def test_course_statistics_deny_not_allowed_user(self): def test_course_statistics_deny_not_allowed_user(self):
@ -135,7 +139,6 @@ class DashboardTestCase(GraphQLTestCase):
course_statistics(course_id: $course_id) {{ course_statistics(course_id: $course_id) {{
id id
course_title course_title
course_slug
}} }}
}} }}
""" """
@ -151,7 +154,6 @@ class DashboardTestCase(GraphQLTestCase):
self.assertEqual(course_statistics["id"], str(course_2.id)) self.assertEqual(course_statistics["id"], str(course_2.id))
self.assertEqual(course_statistics["course_title"], course_2.title) self.assertEqual(course_statistics["course_title"], course_2.title)
self.assertEqual(course_statistics["course_slug"], course_2.slug)
def find_dashboard_config_by_course_id(dashboard_configs, course_id): def find_dashboard_config_by_course_id(dashboard_configs, course_id):