diff --git a/apps/marks/models.py b/apps/marks/models.py index e9a3cb63f..0c7cb477c 100644 --- a/apps/marks/models.py +++ b/apps/marks/models.py @@ -239,7 +239,9 @@ def __str__(self): def save(self, *args, **kwargs): now = timezone.now() - if should_be_suspended(self.user, user_weight(self.user) + self.mark.weight, now.date()): + if should_be_suspended( + self.user, user_weight(self.user) + self.mark.weight, now.date() + ): s = Suspension( title=_("For mange prikker på rad"), description=_( @@ -365,14 +367,13 @@ class Suspended: def should_be_suspended(u: User, weight: int, today: date): - has_suspension = (Suspension.active_suspensions(u, today) + has_suspension = ( + Suspension.active_suspensions(u, today) .filter(cause=Suspension.Cause.MARKS) - .exists()) - has_too_much_mark_weight = weight >= 6 - should_be_suspended = ( - has_too_much_mark_weight - and not has_suspension + .exists() ) + has_too_much_mark_weight = weight >= 6 + should_be_suspended = has_too_much_mark_weight and not has_suspension logger.info("Checking sanctions for %s. %s", u.pk, f"{weight=}; {has_suspension=}") return should_be_suspended diff --git a/apps/marks/tests.py b/apps/marks/tests.py index 69d7b197f..4d343f0c6 100644 --- a/apps/marks/tests.py +++ b/apps/marks/tests.py @@ -83,7 +83,7 @@ def test_suspensions_and_marks_over_time(db): assert type(user_sanctions(user, now.date())) is MarkDelay sanction_users(m[1], [user], now) - + assert type(user_sanctions(user, now.date())) is Suspended sanction_users(m[2], [user], now) diff --git a/apps/payment/mommy.py b/apps/payment/mommy.py index 07f404014..0f897aad9 100644 --- a/apps/payment/mommy.py +++ b/apps/payment/mommy.py @@ -15,6 +15,7 @@ logger = logging.getLogger(__name__) + def payment_reminder(): event_payments = Payment.objects.filter( payment_type=PaymentTypes.DEADLINE,