Change session expire_date to expires_at, create migrations

Author: davegaeddert

plain-sessions/plain/sessions/core.py

@@ -188,7 +188,7 @@ def cycle_key(self):
     def _load(self):
         try:
             session = self._model.objects.get(
-                session_key=self.session_key, expire_date__gt=timezone.now()
+                session_key=self.session_key, expires_at__gt=timezone.now()
             )
         except (self._model.DoesNotExist, SuspiciousOperation) as e:
             if isinstance(e, SuspiciousOperation):
@@ -225,7 +225,7 @@ def save(self, must_create=False):
         obj = self._model(
             session_key=self._get_or_create_session_key(),
             session_data=self._encode(data),
-            expire_date=timezone.now() + timedelta(seconds=settings.SESSION_COOKIE_AGE),
+            expires_at=timezone.now() + timedelta(seconds=settings.SESSION_COOKIE_AGE),
         )
 
         using = router.db_for_write(self._model, instance=obj)

plain-sessions/plain/sessions/migrations/0004_alter_session_managers_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Plain 0.34.1 on 2025-03-27 21:50
+
+from plain import models
+from plain.models import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("plainsessions", "0003_alter_session_expire_date_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name="session",
+            managers=[],
+        ),
+        migrations.RemoveIndex(
+            model_name="session",
+            name="plainsessio_expire__b3ffa6_idx",
+        ),
+        migrations.RenameField(
+            model_name="session",
+            old_name="expire_date",
+            new_name="expires_at",
+        ),
+        migrations.AddIndex(
+            model_name="session",
+            index=models.Index(
+                fields=["expires_at"], name="plainsessio_expires_d87cb5_idx"
+            ),
+        ),
+    ]

plain-sessions/plain/sessions/models.py

@@ -7,7 +7,7 @@ def clear_expired(self):
         """
         Clear expired sessions from the database.
         """
-        self.filter(expire_date__lt=timezone.now()).delete()
+        self.filter(expires_at__lt=timezone.now()).delete()
 
 
 @models.register_model
@@ -31,13 +31,13 @@ class Session(models.Model):
 
     session_key = models.CharField(max_length=40, primary_key=True)
     session_data = models.TextField()
-    expire_date = models.DateTimeField()
+    expires_at = models.DateTimeField()
 
     objects = SessionManager()
 
     class Meta:
         indexes = [
-            models.Index(fields=["expire_date"]),
+            models.Index(fields=["expires_at"]),
         ]
 
     def __str__(self):