Merge branch 'prepare-release-2.0rc2' into 'release/2.0'

Prepare release 2.0rc2

See merge request !82

CHANGELOG.rst

@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`2.0rc2`_ - 2021-07-30
+----------------------
+
+Fixed
+~~~~~
+
+* Get validity ranges by Untis ID and the corresponding school term.
+
 `2.0rc1`_ - 2021-06-23
 ----------------------
 
@@ -91,3 +99,4 @@ Fixed
 .. _2.0a2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0a2
 .. _2.0b0: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0b0
 .. _2.0rc1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0rc1
+.. _2.0rc2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Untis/-/tags/2.0rc2

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

@@ -104,7 +104,9 @@ def import_terms(qs: Optional[QuerySet] = None,) -> Dict[int, chronos_models.Val
         school_term.save()
 
         try:
-            validity_range = chronos_models.ValidityRange.objects.get(import_ref_untis=term_id)
+            validity_range = chronos_models.ValidityRange.objects.get(
+                import_ref_untis=term_id, school_term=school_term
+            )
             logger.info("  Validity range found by import reference.")
         except chronos_models.ValidityRange.DoesNotExist:
             try:

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Untis"
-version = "2.0rc1"
+version = "2.0rc2"
 packages = [
     { include = "aleksis" }
 ]