Merge branch 'master' into 182-mandate-use-of-aleksis-base-model

aleksis/core/models.py

-from datetime import date, datetime, timedelta
+from datetime import date, datetime
 from typing import Optional, Iterable, Union, Sequence, List
 
 from django.contrib.auth import get_user_model
@@ -15,6 +15,7 @@ from phonenumber_field.modelfields import PhoneNumberField
 from polymorphic.models import PolymorphicModel
 
 from .mixins import ExtensibleModel
+from .util.core_helpers import now_tomorrow
 from .util.notifications import send_notification
 
 from constance import config
@@ -286,7 +287,7 @@ class Announcement(ExtensibleModel):
     )
     valid_until = models.DateTimeField(
         verbose_name=_("Date and time until when to show"),
-        default=lambda: timezone.datetime.now() + timedelta(days=1),
+        default=now_tomorrow,
     )
 
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)

aleksis/core/util/core_helpers.py

+from datetime import datetime, timedelta
 import os
 import pkgutil
 from importlib import import_module
@@ -7,6 +8,7 @@ from uuid import uuid4
 from django.conf import settings
 from django.db.models import Model
 from django.http import HttpRequest
+from django.utils import timezone
 from django.utils.functional import lazy
 
 
@@ -148,3 +150,8 @@ def school_information_processor(request: HttpRequest) -> dict:
     return {
         "SCHOOL": School.get_default,
     }
+
+
+def now_tomorrow() -> datetime:
+    """ Return current time tomorrow """
+    return timezone.datetime.now() + timedelta(days=1)