From b84d39533edad2250f11c217f6f70ee3282c5507 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Fri, 22 Jan 2021 21:55:22 +0100
Subject: [PATCH] Check only not empty personal notes in data checks
---
aleksis/apps/alsijil/data_checks.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/aleksis/apps/alsijil/data_checks.py b/aleksis/apps/alsijil/data_checks.py
index cfb727fba..be36446be 100644
--- a/aleksis/apps/alsijil/data_checks.py
+++ b/aleksis/apps/alsijil/data_checks.py
@@ -56,11 +56,15 @@ class NoPersonalNotesInCancelledLessonsDataCheck(DataCheck):
def check_data(cls):
from .models import PersonalNote
- personal_notes = PersonalNote.objects.filter(
- lesson_period__substitutions__cancelled=True,
- lesson_period__substitutions__week=F("week"),
- lesson_period__substitutions__year=F("year"),
- ).prefetch_related("lesson_period", "lesson_period__substitutions")
+ personal_notes = (
+ PersonalNote.objects.not_empty()
+ .filter(
+ lesson_period__substitutions__cancelled=True,
+ lesson_period__substitutions__week=F("week"),
+ lesson_period__substitutions__year=F("year"),
+ )
+ .prefetch_related("lesson_period", "lesson_period__substitutions")
+ )
for note in personal_notes:
logging.info(f"Check personal note {note}")
@@ -119,7 +123,9 @@ class LessonDocumentationOnHolidaysDataCheck(DataCheck):
holidays = Holiday.objects.all()
- documentations = LessonDocumentation.objects.not_empty().annotate(actual_date=weekday_to_date)
+ documentations = LessonDocumentation.objects.not_empty().annotate(
+ actual_date=weekday_to_date
+ )
q = Q()
for holiday in holidays:
--
GitLab