This commit is contained in:
Shaxobff
2026-04-24 16:00:17 +05:00
parent e27a9b7f11
commit deebae384c
7 changed files with 76 additions and 58 deletions

View File

@@ -18,7 +18,7 @@ class User(auth_models.AbstractUser):
default=RoleChoice.USER,
)
avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
role_permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True)
permission = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True)
USERNAME_FIELD = "phone"
objects = UserManager()

View File

@@ -5,7 +5,7 @@ Accounts app urls
from django.urls import path, include
from rest_framework_simplejwt import views as jwt_views
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserListApiView, AdminUserListApiView, \
AdminUpdate, AdminCreate
AdminUpdateAPIView, AdminCreateAPIView
from rest_framework.routers import DefaultRouter
router = DefaultRouter()
@@ -26,6 +26,6 @@ urlpatterns = [
),
path("user/list/", UserListApiView.as_view(), name="user-list"),
path("admin-user/list/", AdminUserListApiView.as_view(), name="admin-user-list"),
path("admin/create/", AdminCreate.as_view(), name="user-create"),
path("admin/update/", AdminUpdate.as_view(), name="user-update"),
path("admin/create/", AdminCreateAPIView.as_view(), name="user-create"),
path("admin/update/", AdminUpdateAPIView.as_view(), name="user-update"),
]

View File

@@ -1,9 +1,9 @@
from django.contrib.auth import get_user_model
from django.shortcuts import get_object_or_404
from drf_spectacular.utils import extend_schema
from h11 import Response
from rest_framework import generics, filters
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
from core.apps.accounts.choices.user import RoleChoice
@@ -36,7 +36,7 @@ class AdminUserListApiView(generics.ListAPIView):
@extend_schema(tags=['User'],
responses={200: UserSerializer},
request=UserCreateSerializer)
class AdminCreate(APIView):
class AdminCreateAPIView(APIView):
permission_classes = [IsAuthenticated]
def post(self, request):
@@ -52,7 +52,7 @@ class AdminCreate(APIView):
@extend_schema(tags=['User'],
responses={200: UserSerializer},
request=UserCreateSerializer)
class AdminUpdate(APIView):
class AdminUpdateAPIView(APIView):
permission_classes = [IsAuthenticated]
def put(self, request, pk):