Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LOD Syncing: create canonical set of assignments when learner is assigned multiple ways #11860

Merged
merged 1 commit into from
Feb 12, 2024
Merged

LOD Syncing: create canonical set of assignments when learner is assigned multiple ways #11860

merged 1 commit into from
Feb 12, 2024

Conversation

bjester
Copy link
Member

@bjester bjester commented Feb 12, 2024 •
edited
Loading

Summary

  • Creates helper function that generates accepts a queryset and returns another queryset that selects only the canonical assignments when a lesson or exam is assigned to the learner through multiple ways, i.e. classroom, group or individual
  • Adds to existing morango integration tests to add coverage on this scenario
  • Adds unit tests for the helper

Note:
I was unable to get the SQLite version to be performed in pure SQL due to issues with Django forcing the CASE expression used in the ORDER BY into the SELECT expression

References

Fixes undocumented issue referenced in #11845

Reviewer guidance

  • Does it make sense?
  • Does the postgres version work?
  • Running morango integration tests help, which I ran both for SQLite and Postgres

Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@github-actions github-actions bot added DEV: backend Python, databases, networking, filesystem... SIZE: medium labels Feb 12, 2024
@bjester bjester requested a review from rtibbles February 12, 2024 20:22
@bjester bjester added the TODO: needs review Waiting for review label Feb 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

Build Artifacts

Asset type Download link
PEX file kolibri-0.16.0b13.dev0_git.20.g91a20ff5.pex
Windows Installer (EXE) kolibri-0.16.0b13.dev0+git.20.g91a20ff5-unsigned.exe
Debian Package kolibri_0.16.0b13.dev0+git.20.g91a20ff5-0ubuntu1_all.deb
Mac Installer (DMG) kolibri-0.16.0b13.dev0+git.20.g91a20ff5-0.3.0.dmg
Android Package (APK) kolibri-0.16.0b13.dev0+git.20.g91a20ff5-0.1.0-debug.apk
TAR file kolibri-0.16.0b13.dev0+git.20.g91a20ff5.tar.gz
WHL file kolibri-0.16.0b13.dev0+git.20.g91a20ff5-py2.py3-none-any.whl

rtibbles
rtibbles approved these changes Feb 12, 2024
View reviewed changes
Copy link
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code readthrough checks out, and integration tests pass.

kolibri/core/auth/utils/sync.py

# Theoretically, we could use a subquery to get the canonical assignment for each resource_id
# but Django pushes the ORDER BY clause into the subquery's SELECT clause, even with
# `values('id')`, which breaks the `id__in` filter because 2 columns are returned instead of 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this sounds very familiar.

@rtibbles rtibbles merged commit 6159752 into learningequality:release-v0.16.x Feb 12, 2024
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rtibbles rtibbles rtibbles approved these changes

Assignees

@rtibbles rtibbles

Labels
DEV: backend Python, databases, networking, filesystem... SIZE: medium TODO: needs review Waiting for review
Projects
None yet
Milestone
Kolibri 0.16.0: Bugs and Regressions
Development

Successfully merging this pull request may close these issues.
2 participants
@bjester @rtibbles