Clean up Request object

users/admin.py

@@ -12,11 +12,7 @@ from django.utils.translation import ugettext_lazy as _
 from reversion.admin import VersionAdmin
 
 from .forms import UserCreationAdminForm
-from .models import Adhesion, Clef, Request, User
-
-
-class RequestAdmin(admin.ModelAdmin):
-    list_display = ('user', 'type', 'created_at', 'expires_at')
+from .models import Adhesion, Clef, User
 
 
 class ClefAdmin(VersionAdmin):
@@ -127,6 +123,5 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
 
 
 admin.site.register(User, UserAdmin)
-admin.site.register(Request, RequestAdmin)
 admin.site.register(Adhesion, AdhesionAdmin)
 admin.site.register(Clef, ClefAdmin)

users/migrations/0027_auto_20190809_2317.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.22 on 2019-08-09 21:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0026_auto_20190809_0802'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='request',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='Request',
+        ),
+    ]

users/models.py

@@ -2,15 +2,11 @@
 # Copyright (C) 2017-2019 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import datetime
-import uuid
-
 from django.contrib.auth.models import AbstractUser
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
-from med.settings import MAX_EMPRUNT, REQ_EXPIRE_HRS
+from med.settings import MAX_EMPRUNT
 
 
 class User(AbstractUser):
@@ -48,28 +44,6 @@ class User(AbstractUser):
         return last_adh_year and self in last_adh_year.adherent.all()
 
 
-class Request(models.Model):
-    PASSWD = 'PW'
-    EMAIL = 'EM'
-    TYPE_CHOICES = (
-        (PASSWD, 'Mot de passe'),
-        (EMAIL, 'Email'),
-    )
-    type = models.CharField(max_length=2, choices=TYPE_CHOICES)
-    token = models.CharField(max_length=32)
-    user = models.ForeignKey('User', on_delete=models.PROTECT)
-    created_at = models.DateTimeField(auto_now_add=True, editable=False)
-    expires_at = models.DateTimeField()
-
-    def save(self):
-        if not self.expires_at:
-            self.expires_at = timezone.now()
-            self.expires_at += datetime.timedelta(hours=REQ_EXPIRE_HRS)
-        if not self.token:
-            self.token = str(uuid.uuid4()).replace('-', '')  # remove hyphens
-        super().save()
-
-
 class Clef(models.Model):
     nom = models.CharField(max_length=255, unique=True)
     proprio = models.ForeignKey('User', on_delete=models.PROTECT, blank=True,