Подготовка к замене AuthRejectReason

net/xeaf/rack/models/mixins/deleted_at_mixin.py

@@ -9,9 +9,10 @@
 """
 
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
+from net.xeaf.rack.utils import DateUtils
+
 
 class DeletedAtMixin(models.Model):
     """
@@ -33,7 +34,7 @@ class DeletedAtMixin(models.Model):
         :param save: Признак необходимости сохранения
         """
 
-        self.deleted_at = timezone.now()
+        self.deleted_at = DateUtils.now()
         if save:
             self.save()
 

net/xeaf/rack/models/mixins/expired_at_mixin.py

@@ -8,12 +8,11 @@
 Описание класса ExpiredAtMixin
 """
 
-from datetime import timedelta
-
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
+from net.xeaf.rack.utils import DateUtils
+
 
 class ExpiresAtMixin(models.Model):
     """
@@ -21,8 +20,8 @@ class ExpiresAtMixin(models.Model):
     """
 
     expires_at = models.DateTimeField(
-        null=False,
-        blank=False,
+        null=True,
+        blank=True,
         editable=True,
         verbose_name=_("rack.mixin.expires_at"),
     )
@@ -40,7 +39,7 @@ class ExpiresAtMixin(models.Model):
         if seconds <= 0:
             raise ValueError(f"The seconds parameter must be greater than 0")
 
-        self.expires_at = timezone.now() + timedelta(seconds=seconds)
+        self.expires_at = DateUtils.shift_time(seconds=seconds)
         if save:
             self.save()
 
@@ -51,7 +50,7 @@ class ExpiresAtMixin(models.Model):
         :param save: Признак необходимости сохранения
         """
 
-        self.expires_at = timezone.now()
+        self.expires_at = DateUtils.now()
         if save:
             self.save()
 
@@ -62,7 +61,11 @@ class ExpiresAtMixin(models.Model):
         :return: Признак просроченного значения
         """
 
-        return self.expires_at < timezone.now()
+        # Если None - то значение не просрочено
+        if self.expires_at is None:
+            return False
+
+        return self.expires_at < DateUtils.now()
 
     class Meta:
         """

net/xeaf/rack/models/mixins/updated_at_mixin.py

@@ -11,9 +11,10 @@
 from datetime import datetime
 
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
+from net.xeaf.rack.utils import DateUtils
+
 
 class UpdatedAtMixin(models.Model):
     """
@@ -57,7 +58,7 @@ class UpdatedAtMixin(models.Model):
         :param save: Признак необходимости сохранения
         """
 
-        self.updated_at = timezone.now()
+        self.updated_at = DateUtils.now()
         if save:
             self.save()