From 8bf25ef4f0e55f4c8af4cecf585b0b343da5e4c8 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Sun, 21 Nov 2021 23:32:12 +0300
Subject: [PATCH] verified

---
 Main/management/commands/bot.py | 1 +
 Main/models/__init__.py         | 1 -
 Main/models/file.py             | 7 -------
 Main/models/userinfo.py         | 2 ++
 Main/views/RatingView.py        | 4 +++-
 5 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 Main/models/file.py

diff --git a/Main/management/commands/bot.py b/Main/management/commands/bot.py
index b8f0aae..de6f2eb 100644
--- a/Main/management/commands/bot.py
+++ b/Main/management/commands/bot.py
@@ -40,6 +40,7 @@ def do_action(message: Message):
         bot.send_message(message.chat.id, "Отлично! Теперь отправь мне свое имя")
     elif user.userinfo.name is None:
         user.userinfo.name = message.text
+        user.userinfo.verified = True
         user.userinfo.save()
         bot.send_message(message.chat.id, f"Регистрация завершена! Теперь можешь ты можешь войти в сервис под именем пользователя: {user.username}")
     else:
diff --git a/Main/models/__init__.py b/Main/models/__init__.py
index 36d607c..dc84196 100644
--- a/Main/models/__init__.py
+++ b/Main/models/__init__.py
@@ -1,7 +1,6 @@
 from Main.models.userinfo import UserInfo
 from Main.models.group import Group
 from Main.models.task import Task
-from Main.models.file import File
 from Main.models.set import Set
 from Main.models.subscription import Subscription
 from Main.models.settask import SetTask
diff --git a/Main/models/file.py b/Main/models/file.py
deleted file mode 100644
index 3486ef4..0000000
--- a/Main/models/file.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.db import models
-from Main.models.task import Task
-
-
-class File(models.Model):
-    task = models.ForeignKey(Task, on_delete=models.CASCADE)
-    name = models.TextField()
diff --git a/Main/models/userinfo.py b/Main/models/userinfo.py
index 80a7440..faeae75 100644
--- a/Main/models/userinfo.py
+++ b/Main/models/userinfo.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.models import User
 from django.db import models
+from django.db.models import Q
 from django.utils import timezone
 
 from Main.models.group import Group
@@ -21,6 +22,7 @@ class UserInfo(models.Model):
     telegram_chat_id = models.TextField(default="")
     notification_solution_result = models.BooleanField(default=False)
     code = models.IntegerField(null=True)
+    verified = models.BooleanField(default=False)
 
     @property
     def has_favourite_language(self):
diff --git a/Main/views/RatingView.py b/Main/views/RatingView.py
index 9d70109..d569a8d 100644
--- a/Main/views/RatingView.py
+++ b/Main/views/RatingView.py
@@ -8,4 +8,6 @@ class RatingView(BaseView):
     required_login = True
 
     def get(self):
-        self.context["users"] = User.objects.all().order_by('-userinfo__rating')
+        self.context["users"] = User.objects.filter(userinfo__verified=True).order_by(
+            "-userinfo__rating", "date_joined"
+        )