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

services/backend/api/v1/auth.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.http import HttpRequest
 from ninja.security import HttpBearer
 
-from apps.users.models import User
+from apps.user.models import User
 
 
 class BearerAuth(HttpBearer):

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

@@ -1,7 +1,7 @@
 from ninja import Schema, ModelSchema
 
 
-from apps.users.models import User
+from apps.user.models import User
 
 
 class TokenSchema(Schema):

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

@@ -4,9 +4,9 @@ from ninja.errors import AuthenticationError
 from api.v1.users.schemas import LoginSchema, RegisterSchema, TokenSchema, UserSchema
 from api.v1.auth import BearerAuth
 from api.v1.schemas import BadRequestError, ForbiddenError, NotFoundError
-from apps.users.models import User
+from apps.user.models import User
 
-router = Router(tags=["users"])
+router = Router(tags=["user"])
 
 
 @router.post(

services/backend/apps/user/apps.py

@@ -3,7 +3,5 @@ from django.apps import AppConfig
 
 class UsersConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.users'
+    name = 'apps.user'
-    label = 'users'
+    label = 'user'
-
-    

services/backend/config/settings.py

@@ -443,7 +443,7 @@ INSTALLED_APPS = [
     "minio_storage",
     # Internal apps
     "apps.core",
-    "apps.users",
+    "apps.user",
 ]
 
 # GUID