mirror of
https://gitlab.com/megazordpobeda/DataRush.git
synced 2026-05-23 02:47:10 +00:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # services/backend/api/v1/auth.py # services/backend/api/v1/router.py # services/backend/api/v1/user/schemas.py # services/backend/api/v1/user/views.py # services/backend/apps/user/apps.py # services/backend/config/settings.py
This commit is contained in:
@@ -7,7 +7,3 @@ from django.core.cache import cache
|
||||
class CoreConfig(AppConfig):
|
||||
name = "apps.core"
|
||||
label = "core"
|
||||
|
||||
def ready(self) -> None:
|
||||
with contextlib.suppress(Exception):
|
||||
cache.add("current_date", 0, timeout=None)
|
||||
|
||||
@@ -3,11 +3,18 @@ from django.db import models
|
||||
from apps.core.models import BaseModel
|
||||
|
||||
|
||||
class UserRole(models.Choices):
|
||||
STUDENT = "student"
|
||||
METODIST = "metodist"
|
||||
|
||||
|
||||
class User(BaseModel):
|
||||
email = models.EmailField(unique=True, verbose_name="Почта")
|
||||
username = models.SlugField(unique=True, verbose_name="Юзернейм")
|
||||
password = models.TextField(verbose_name="Пароль")
|
||||
|
||||
status = models.CharField(max_length=10, choices=UserRole.choices, default=UserRole.STUDENT)
|
||||
|
||||
def __str__(self):
|
||||
return self.username
|
||||
|
||||
|
||||
Reference in New Issue
Block a user