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

feat: cache circles and learning units

This commit is contained in:
Reto Aebersold 2023-11-01 11:30:43 +01:00
parent eebb512348
commit 5f436da0a0
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/vbv_lernwelt/dashboard/graphql/types/competence.py
View File

@ -1,6 +1,7 @@
from typing import List, Tuple from typing import List, Tuple
import graphene import graphene
from wagtail.models import Page
from vbv_lernwelt.course.models import CourseCompletion, CourseCompletionStatus from vbv_lernwelt.course.models import CourseCompletion, CourseCompletionStatus
@ -38,25 +39,23 @@ def competences(
completions = CourseCompletion.objects.filter( completions = CourseCompletion.objects.filter(
course_session_id__in=course_session_selection_ids, course_session_id__in=course_session_selection_ids,
page_type="competence.PerformanceCriteria", page_type="competence.PerformanceCriteria",
) ).prefetch_related("course_session", "page")
if user_selection_ids is not None: if user_selection_ids is not None:
completions = completions.filter(user_id__in=user_selection_ids) completions = completions.filter(user_id__in=user_selection_ids)
competence_records = {} competence_records = {}
# purely for performance reasons, since looking up unique_page_ids = {completion.page.id for completion in completions}
# the circle for each completion is expensive :-/ learning_units = {
circle_cache = {} page_id: Page.objects.get(id=page_id).specific.learning_unit
for page_id in unique_page_ids
}
circles = {lu.id: lu.get_circle() for lu in learning_units.values()}
for completion in completions: for completion in completions:
if completion.page.id not in circle_cache: learning_unit = learning_units.get(completion.page.id)
circle_cache[ circle = circles.get(learning_unit.id)
completion.page.id
] = completion.page.specific.learning_unit.get_circle()
circle = circle_cache[completion.page.id]
learning_unit = completion.page.specific.learning_unit
competence_records.setdefault(circle.id, {}).setdefault( competence_records.setdefault(circle.id, {}).setdefault(
learning_unit, learning_unit,

4
server/vbv_lernwelt/dashboard/tests/graphql/test_competence.py
View File

@ -18,10 +18,6 @@ class DashboardCompetenceTestCase(GraphQLTestCase):
GRAPHQL_URL = "/server/graphql/" GRAPHQL_URL = "/server/graphql/"
def test_competence(self): def test_competence(self):
# TODO: Livioso 30.10.2023
# A test that checks the competence records
# would make sense -> missing (circle, learning unit) nesting!
# GIVEN # GIVEN
course, course_page = create_course("Test Course") course, course_page = create_course("Test Course")
course_session = create_course_session(course=course, title="Test Bern 2022 a") course_session = create_course_session(course=course, title="Test Bern 2022 a")