feat: Added user_id to appform database table, fixed fatal bug in authentication

dev/req3d/appform/models.py

 from django.db import models
 from django.utils.crypto import get_random_string
+import oauth.models as users
 
 # Create your models here.
 
@@ -46,6 +47,7 @@ class Articles(models.Model):
     )
 
     number = models.CharField(max_length=20, unique=True, default=func, verbose_name='Номер заявки')
+    user = models.ForeignKey(users.DiscordUser, on_delete=models.PROTECT)
     mail = models.EmailField('Электронная почта', max_length=100)
     name = models.CharField('ФИО', max_length=50)
     op = models.CharField('ОП', max_length=6, choices=GROUPS)

dev/req3d/appform/views.py

@@ -10,6 +10,7 @@ from django.contrib.auth.decorators import login_required
 def appform_view(request):
     if request.method == 'POST':
         mail = request.POST['mail']
+
         name = request.POST['name']
         op = request.POST['op']
         course = request.POST['course']
@@ -19,7 +20,7 @@ def appform_view(request):
         dmodel = request.FILES['dmodel']
         note = request.FILES['note']
         if mail and name:
-            data = Articles(mail=mail, name=name, op=op, course=course, project_name=project_name, teach_name=teach_name,phone=phone, dmodel=dmodel, note=note)
+            data = Articles(mail=mail, name=name, op=op, course=course, project_name=project_name, teach_name=teach_name,phone=phone, dmodel=dmodel, note=note, user_id=request.user.id)
             data.save()
             return render(request,'home/index.html')
     else:

dev/req3d/oauth/models.py

@@ -5,10 +5,9 @@ from .managers import DiscordUserOAuth2Manager
 
 class DiscordUser(models.Model):
   objects = DiscordUserOAuth2Manager()
-
-  id = models.BigIntegerField(primary_key=True)
+  id = models.BigIntegerField(primary_key=True, default='')
   discord_tag = models.CharField(max_length=100)
-  avatar = models.CharField(max_length=100)
+  avatar = models.CharField(max_length=100, null=True)
   public_flags = models.IntegerField()
   flags = models.IntegerField()
   locale = models.CharField(max_length=100)

dev/req3d/oauth/views.py

@@ -45,7 +45,11 @@ def discord_login_redirect(request: HttpRequest):
   print(code)
   user = exchange_code(code)
   discord_user = authenticate(request, user=user)
-  discord_user = list(discord_user).pop()
+  try:
+      discord_user = list(discord_user).pop()
+  except TypeError:
+      print(discord_user)
+
   print(discord_user)
   login(request, discord_user)
   return redirect(next_url)