Merge commit '956d238' into fix/target-school-day-30

2026-09-12 14:51:51 +02:00
parent f1485364c9 956d23839f
commit 8c3ab3d1a1
2 changed files with 34 additions and 3 deletions
@@ -372,7 +372,8 @@ def generate_homework_id(
    :rtype: str
    """
    payload = (
-        f"{due_on.isoformat()}|{subject}|{','.join(sorted(teachers))}|{normalized_text}".encode()
+        f"{due_on.isoformat()}|{subject.casefold()}|"
+        f"{','.join(sorted(teacher.casefold() for teacher in teachers))}|{normalized_text}".encode()
    )
    return hashlib.sha1(payload, usedforsecurity=False).hexdigest()[:12]

@@ -399,7 +400,7 @@ def collect_homeworks(lessons: list[Lesson], target_date: date) -> list[Homework
                normalized_text = normalize_homework_text(block.text)
                key = (
                    lesson.subject.casefold(),
-                    tuple(teacher.casefold() for teacher in lesson.teachers),
+                    tuple(sorted(teacher.casefold() for teacher in lesson.teachers)),
                    normalized_text,
                )
                if key not in by_context:
@@ -423,7 +424,7 @@ def collect_homeworks(lessons: list[Lesson], target_date: date) -> list[Homework
                normalized_text = normalize_homework_text(block.text)
                key = (
                    lesson.subject.casefold(),
-                    tuple(teacher.casefold() for teacher in lesson.teachers),
+                    tuple(sorted(teacher.casefold() for teacher in lesson.teachers)),
                    normalized_text,
                )
                if key not in by_context: