Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

services/backend/api/v1/users/views.py

@@ -1,3 +1,5 @@
+from http import HTTPStatus as status
+
 from ninja import Router
 from ninja.errors import AuthenticationError
 
@@ -12,8 +14,8 @@ router = Router(tags=["user"])
 @router.post(
     path="/sign-up",
     response={
-        201: TokenSchema,
+        status.CREATED: TokenSchema,
-        400: BadRequestError,
+        status.BAD_REQUEST: BadRequestError,
     }
 )
 def sign_up(request, data: RegisterSchema):
@@ -22,15 +24,15 @@ def sign_up(request, data: RegisterSchema):
     user.save()
 
     token = BearerAuth.generate_jwt(user)
-    return 201, TokenSchema(token=token)
+    return status.CREATED, TokenSchema(token=token)
 
 
 @router.post(
     path="/sign-in",
     response={
-        200: TokenSchema,
+        status.OK: TokenSchema,
-        400: BadRequestError,
+        status.BAD_REQUEST: BadRequestError,
-        401: ForbiddenError,
+        status.UNAUTHORIZED: ForbiddenError,
     }
 )
 def sign_in(request, data: LoginSchema):
@@ -41,15 +43,15 @@ def sign_in(request, data: LoginSchema):
         raise AuthenticationError
 
     token = BearerAuth.generate_jwt(user)
-    return 200, TokenSchema(token=token)
+    return status.OK, TokenSchema(token=token)
 
 
 @router.get(
     path="/user/{user_id}",
     response={
-        200: UserSchema,
+        status.OK: UserSchema,
-        400: BadRequestError,
+        status.BAD_REQUEST: BadRequestError,
-        404: NotFoundError,
+        status.NOT_FOUND: NotFoundError,
     }
 )
 def get_user(request, user_id: str):

services/backend/apps/user/models.py

@@ -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