Merge branch 'master' into '50-unboundlocalerror-local-variable-match-referenced-before-assignment'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -13,6 +13,7 @@ Fixed
 ~~~~~
 
 * Matching for groups while importing lessons was broken in some cases.
+* Import commands `current_next` and `current_future` imported all terms.
 
 `2.2`_ - 2022-04-10
 -------------------

aleksis/apps/untis/commands.py

@@ -5,8 +5,10 @@ from django.utils.functional import classproperty
 
 from aleksis.apps.untis.util.mysql.importers.terms import (
     get_future_terms_for_date,
+    get_future_terms_for_date_query,
     get_terms,
     get_terms_for_date,
+    get_terms_for_date_query,
 )
 
 from .util.mysql.main import untis_import_mysql as _untis_import_mysql
@@ -70,16 +72,20 @@ class CurrentNextImportCommand(ImportCommand):
 
     @classmethod
     def get_terms(cls) -> Optional[QuerySet]:
-        terms = get_terms_for_date()
         future_terms = get_future_terms_for_date()
         if future_terms.exists():
             future_term = future_terms.first()
-            terms = (
-                get_terms()
-                .filter(Q(pk__in=terms.values_list("pk", flat=True)) | Q(pk=future_term.pk))
-                .distinct()
+            return get_terms().filter(
+                get_terms_for_date_query()
+                | Q(
+                    school_id=future_term.school_id,
+                    schoolyear_id=future_term.schoolyear_id,
+                    version_id=future_term.version_id,
+                    term_id=future_term.term_id,
+                )
             )
-        return terms
+        else:
+            return get_terms_for_date()
 
 
 class CurrentFutureImportCommand(ImportCommand):
@@ -89,16 +95,7 @@ class CurrentFutureImportCommand(ImportCommand):
 
     @classmethod
     def get_terms(cls) -> Optional[QuerySet]:
-        terms = get_terms_for_date()
-        future_terms = get_future_terms_for_date()
-        terms = (
-            get_terms()
-            .filter(
-                Q(pk__in=terms.values_list("pk", flat=True))
-                | Q(pk__in=future_terms.values_list("pk", flat=True))
-            )
-            .distinct()
-        )
+        terms = get_terms().filter(get_future_terms_for_date_query() | get_terms_for_date_query())
         return terms
 
 

aleksis/apps/untis/util/mysql/importers/terms.py

@@ -2,7 +2,7 @@ import logging
 from datetime import date
 from typing import Dict, Optional
 
-from django.db.models import Max, OuterRef, QuerySet, Subquery
+from django.db.models import Max, OuterRef, Q, QuerySet, Subquery
 from django.utils import timezone
 
 from tqdm import tqdm
@@ -24,27 +24,32 @@ def get_terms() -> QuerySet:
     return run_using(mysql_models.Terms.objects).order_by("datefrom")
 
 
-def get_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
-    """Get term queryset with term valid for the provided date."""
+def get_terms_for_date_query(for_date: Optional[date] = None) -> QuerySet:
+    """Get term query object with term valid for the provided date."""
     if not for_date:
         for_date = timezone.now().date()
 
-    qs = get_terms().filter(
-        datefrom__lte=date_to_untis_date(for_date),
-        dateto__gte=date_to_untis_date(for_date),
-    )
+    return Q(datefrom__lte=date_to_untis_date(for_date), dateto__gte=date_to_untis_date(for_date))
+
+
+def get_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
+    """Get term queryset with term valid for the provided date."""
+    qs = get_terms().filter(get_terms_for_date_query(for_date))
 
     return qs
 
 
-def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
-    """Get all furture terms (after the current term)."""
+def get_future_terms_for_date_query(for_date: Optional[date] = None) -> QuerySet:
+    """Get term query object with all future terms."""
     if not for_date:
         for_date = timezone.now().date()
 
-    qs = get_terms().filter(
-        datefrom__gt=date_to_untis_date(for_date),
-    )
+    return Q(datefrom__gt=date_to_untis_date(for_date))
+
+
+def get_future_terms_for_date(for_date: Optional[date] = None) -> QuerySet:
+    """Get all future terms (after the current term)."""
+    qs = get_terms().filter(get_future_terms_for_date_query(for_date))
 
     return qs