refactor. pre-deploy
This commit is contained in:
39
.history/backend/api/urls_20251029194610.py
Normal file
39
.history/backend/api/urls_20251029194610.py
Normal file
@@ -0,0 +1,39 @@
|
||||
from django.urls import path
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
|
||||
from .views import (
|
||||
RegisterView,
|
||||
UserProfileView,
|
||||
LinkViewSet,
|
||||
LinkGroupViewSet,
|
||||
PublicUserGroupsView
|
||||
)
|
||||
from rest_framework.routers import DefaultRouter
|
||||
from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
|
||||
|
||||
router = DefaultRouter()
|
||||
router.register('links', LinkViewSet, basename='link')
|
||||
router.register('groups', LinkGroupViewSet, basename='group')
|
||||
|
||||
urlpatterns = [
|
||||
path('auth/register/', RegisterView.as_view(), name='auth_register'),
|
||||
path('auth/register', RegisterView.as_view(), name='auth_register_no_slash'),
|
||||
path('auth/login/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
|
||||
path('auth/login', TokenObtainPairView.as_view(), name='token_obtain_pair_no_slash'),
|
||||
path('auth/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
|
||||
path('auth/refresh', TokenRefreshView.as_view(), name='token_refresh_no_slash'),
|
||||
path('auth/user/', UserProfileView.as_view(), name='user-profile'), # ← новый
|
||||
path('auth/user', UserProfileView.as_view(), name='user-profile-no-slash'),
|
||||
path('users/<str:username>/public/',
|
||||
PublicUserGroupsView.as_view(),
|
||||
name='public-user-groups'
|
||||
),
|
||||
# схема OpenAPI
|
||||
path('schema/', SpectacularAPIView.as_view(), name='schema'),
|
||||
# Swagger UI, берёт шаблон из drf_spectacular_sidecar
|
||||
path(
|
||||
'swagger/',
|
||||
SpectacularSwaggerView.as_view(url_name='schema'),
|
||||
name='swagger-ui'
|
||||
),
|
||||
|
||||
] + router.urls
|
||||
39
.history/backend/api/urls_20251029194633.py
Normal file
39
.history/backend/api/urls_20251029194633.py
Normal file
@@ -0,0 +1,39 @@
|
||||
from django.urls import path
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
|
||||
from .views import (
|
||||
RegisterView,
|
||||
UserProfileView,
|
||||
LinkViewSet,
|
||||
LinkGroupViewSet,
|
||||
PublicUserGroupsView
|
||||
)
|
||||
from rest_framework.routers import DefaultRouter
|
||||
from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
|
||||
|
||||
router = DefaultRouter()
|
||||
router.register('links', LinkViewSet, basename='link')
|
||||
router.register('groups', LinkGroupViewSet, basename='group')
|
||||
|
||||
urlpatterns = [
|
||||
path('auth/register/', RegisterView.as_view(), name='auth_register'),
|
||||
path('auth/register', RegisterView.as_view(), name='auth_register_no_slash'),
|
||||
path('auth/login/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
|
||||
path('auth/login', TokenObtainPairView.as_view(), name='token_obtain_pair_no_slash'),
|
||||
path('auth/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
|
||||
path('auth/refresh', TokenRefreshView.as_view(), name='token_refresh_no_slash'),
|
||||
path('auth/user/', UserProfileView.as_view(), name='user-profile'), # ← новый
|
||||
path('auth/user', UserProfileView.as_view(), name='user-profile-no-slash'),
|
||||
path('users/<str:username>/public/',
|
||||
PublicUserGroupsView.as_view(),
|
||||
name='public-user-groups'
|
||||
),
|
||||
# схема OpenAPI
|
||||
path('schema/', SpectacularAPIView.as_view(), name='schema'),
|
||||
# Swagger UI, берёт шаблон из drf_spectacular_sidecar
|
||||
path(
|
||||
'swagger/',
|
||||
SpectacularSwaggerView.as_view(url_name='schema'),
|
||||
name='swagger-ui'
|
||||
),
|
||||
|
||||
] + router.urls
|
||||
44
.history/backend/api/urls_20251029201825.py
Normal file
44
.history/backend/api/urls_20251029201825.py
Normal file
@@ -0,0 +1,44 @@
|
||||
from django.urls import path
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
|
||||
from .views import (
|
||||
RegisterView,
|
||||
UserProfileView,
|
||||
LinkViewSet,
|
||||
LinkGroupViewSet,
|
||||
PublicUserGroupsView
|
||||
)
|
||||
from rest_framework.routers import DefaultRouter
|
||||
from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
|
||||
|
||||
class NoTrailingSlashRouter(DefaultRouter):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.trailing_slash = '/?'
|
||||
|
||||
router = NoTrailingSlashRouter()
|
||||
router.register('links', LinkViewSet, basename='link')
|
||||
router.register('groups', LinkGroupViewSet, basename='group')
|
||||
|
||||
urlpatterns = [
|
||||
path('auth/register/', RegisterView.as_view(), name='auth_register'),
|
||||
path('auth/register', RegisterView.as_view(), name='auth_register_no_slash'),
|
||||
path('auth/login/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
|
||||
path('auth/login', TokenObtainPairView.as_view(), name='token_obtain_pair_no_slash'),
|
||||
path('auth/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
|
||||
path('auth/refresh', TokenRefreshView.as_view(), name='token_refresh_no_slash'),
|
||||
path('auth/user/', UserProfileView.as_view(), name='user-profile'), # ← новый
|
||||
path('auth/user', UserProfileView.as_view(), name='user-profile-no-slash'),
|
||||
path('users/<str:username>/public/',
|
||||
PublicUserGroupsView.as_view(),
|
||||
name='public-user-groups'
|
||||
),
|
||||
# схема OpenAPI
|
||||
path('schema/', SpectacularAPIView.as_view(), name='schema'),
|
||||
# Swagger UI, берёт шаблон из drf_spectacular_sidecar
|
||||
path(
|
||||
'swagger/',
|
||||
SpectacularSwaggerView.as_view(url_name='schema'),
|
||||
name='swagger-ui'
|
||||
),
|
||||
|
||||
] + router.urls
|
||||
44
.history/backend/api/urls_20251029201838.py
Normal file
44
.history/backend/api/urls_20251029201838.py
Normal file
@@ -0,0 +1,44 @@
|
||||
from django.urls import path
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView
|
||||
from .views import (
|
||||
RegisterView,
|
||||
UserProfileView,
|
||||
LinkViewSet,
|
||||
LinkGroupViewSet,
|
||||
PublicUserGroupsView
|
||||
)
|
||||
from rest_framework.routers import DefaultRouter
|
||||
from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
|
||||
|
||||
class NoTrailingSlashRouter(DefaultRouter):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.trailing_slash = '/?'
|
||||
|
||||
router = NoTrailingSlashRouter()
|
||||
router.register('links', LinkViewSet, basename='link')
|
||||
router.register('groups', LinkGroupViewSet, basename='group')
|
||||
|
||||
urlpatterns = [
|
||||
path('auth/register/', RegisterView.as_view(), name='auth_register'),
|
||||
path('auth/register', RegisterView.as_view(), name='auth_register_no_slash'),
|
||||
path('auth/login/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
|
||||
path('auth/login', TokenObtainPairView.as_view(), name='token_obtain_pair_no_slash'),
|
||||
path('auth/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
|
||||
path('auth/refresh', TokenRefreshView.as_view(), name='token_refresh_no_slash'),
|
||||
path('auth/user/', UserProfileView.as_view(), name='user-profile'), # ← новый
|
||||
path('auth/user', UserProfileView.as_view(), name='user-profile-no-slash'),
|
||||
path('users/<str:username>/public/',
|
||||
PublicUserGroupsView.as_view(),
|
||||
name='public-user-groups'
|
||||
),
|
||||
# схема OpenAPI
|
||||
path('schema/', SpectacularAPIView.as_view(), name='schema'),
|
||||
# Swagger UI, берёт шаблон из drf_spectacular_sidecar
|
||||
path(
|
||||
'swagger/',
|
||||
SpectacularSwaggerView.as_view(url_name='schema'),
|
||||
name='swagger-ui'
|
||||
),
|
||||
|
||||
] + router.urls
|
||||
121
.history/backend/api/views_20251029194226.py
Normal file
121
.history/backend/api/views_20251029194226.py
Normal file
@@ -0,0 +1,121 @@
|
||||
# coding: utf-8
|
||||
from rest_framework import generics, viewsets, permissions, status
|
||||
from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.response import Response
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.utils.decorators import method_decorator
|
||||
from drf_spectacular.utils import extend_schema, OpenApiParameter
|
||||
from django.contrib.auth import get_user_model
|
||||
|
||||
from .models import Link, LinkGroup
|
||||
from .serializers import (
|
||||
RegisterSerializer,
|
||||
UserSerializer,
|
||||
LinkSerializer,
|
||||
LinkGroupSerializer,
|
||||
)
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class RegisterView(generics.CreateAPIView):
|
||||
queryset = User.objects.all()
|
||||
permission_classes = [permissions.AllowAny]
|
||||
serializer_class = RegisterSerializer
|
||||
|
||||
|
||||
class LoginView(TokenObtainPairView):
|
||||
permission_classes = [permissions.AllowAny]
|
||||
|
||||
|
||||
class LinkGroupViewSet(viewsets.ModelViewSet):
|
||||
queryset = LinkGroup.objects.all()
|
||||
serializer_class = LinkGroupSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
parser_classes = [MultiPartParser, FormParser, JSONParser]
|
||||
|
||||
def get_queryset(self):
|
||||
return self.queryset.filter(owner=self.request.user).order_by('order')
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(owner=self.request.user)
|
||||
|
||||
|
||||
class LinkViewSet(viewsets.ModelViewSet):
|
||||
queryset = Link.objects.all()
|
||||
serializer_class = LinkSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
parser_classes = [MultiPartParser, FormParser, JSONParser]
|
||||
|
||||
def get_queryset(self):
|
||||
return Link.objects.filter(owner=self.request.user).order_by('order')
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(owner=self.request.user)
|
||||
|
||||
|
||||
class UserProfileView(generics.RetrieveAPIView):
|
||||
serializer_class = UserSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
def get_object(self):
|
||||
return self.request.user
|
||||
|
||||
|
||||
class UserLinksListView(generics.ListAPIView):
|
||||
serializer_class = LinkSerializer
|
||||
permission_classes = [permissions.AllowAny]
|
||||
def get_queryset(self):
|
||||
username = self.kwargs['username']
|
||||
return Link.objects.filter(owner__username=username).order_by('order')
|
||||
|
||||
|
||||
class PublicUserGroupsView(APIView):
|
||||
"""
|
||||
GET /api/users/{username}/public/
|
||||
"""
|
||||
permission_classes = [permissions.AllowAny]
|
||||
|
||||
def get(self, request, username):
|
||||
# 1. Ищем пользователя
|
||||
user = get_object_or_404(User, username=username)
|
||||
|
||||
# 2. Берём его группы со ссылками
|
||||
groups_qs = LinkGroup.objects.filter(owner=user).prefetch_related('links')
|
||||
|
||||
result = {
|
||||
"username": user.username,
|
||||
"groups": []
|
||||
}
|
||||
|
||||
for grp in groups_qs:
|
||||
# icon у группы (абсолютный URL)
|
||||
grp_icon_url = None
|
||||
if grp.icon:
|
||||
grp_icon_url = request.build_absolute_uri(grp.icon.url)
|
||||
|
||||
grp_data = {
|
||||
"id": grp.id,
|
||||
"name": grp.name,
|
||||
"icon": grp_icon_url,
|
||||
"links": [],
|
||||
}
|
||||
|
||||
for ln in grp.links.all():
|
||||
# icon у ссылки
|
||||
ln_icon_url = None
|
||||
if ln.icon:
|
||||
ln_icon_url = request.build_absolute_uri(ln.icon.url)
|
||||
|
||||
grp_data["links"].append({
|
||||
"id": ln.id,
|
||||
"title": ln.title,
|
||||
"url": ln.url,
|
||||
"icon": ln_icon_url,
|
||||
})
|
||||
|
||||
result["groups"].append(grp_data)
|
||||
|
||||
return Response(result, status=status.HTTP_200_OK)
|
||||
122
.history/backend/api/views_20251029194232.py
Normal file
122
.history/backend/api/views_20251029194232.py
Normal file
@@ -0,0 +1,122 @@
|
||||
# coding: utf-8
|
||||
from rest_framework import generics, viewsets, permissions, status
|
||||
from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.response import Response
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.utils.decorators import method_decorator
|
||||
from drf_spectacular.utils import extend_schema, OpenApiParameter
|
||||
from django.contrib.auth import get_user_model
|
||||
|
||||
from .models import Link, LinkGroup
|
||||
from .serializers import (
|
||||
RegisterSerializer,
|
||||
UserSerializer,
|
||||
LinkSerializer,
|
||||
LinkGroupSerializer,
|
||||
)
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class RegisterView(generics.CreateAPIView):
|
||||
queryset = User.objects.all()
|
||||
permission_classes = [permissions.AllowAny]
|
||||
serializer_class = RegisterSerializer
|
||||
|
||||
|
||||
@method_decorator(csrf_exempt, name='dispatch')
|
||||
class LoginView(TokenObtainPairView):
|
||||
permission_classes = [permissions.AllowAny]
|
||||
|
||||
|
||||
class LinkGroupViewSet(viewsets.ModelViewSet):
|
||||
queryset = LinkGroup.objects.all()
|
||||
serializer_class = LinkGroupSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
parser_classes = [MultiPartParser, FormParser, JSONParser]
|
||||
|
||||
def get_queryset(self):
|
||||
return self.queryset.filter(owner=self.request.user).order_by('order')
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(owner=self.request.user)
|
||||
|
||||
|
||||
class LinkViewSet(viewsets.ModelViewSet):
|
||||
queryset = Link.objects.all()
|
||||
serializer_class = LinkSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
parser_classes = [MultiPartParser, FormParser, JSONParser]
|
||||
|
||||
def get_queryset(self):
|
||||
return Link.objects.filter(owner=self.request.user).order_by('order')
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(owner=self.request.user)
|
||||
|
||||
|
||||
class UserProfileView(generics.RetrieveAPIView):
|
||||
serializer_class = UserSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
def get_object(self):
|
||||
return self.request.user
|
||||
|
||||
|
||||
class UserLinksListView(generics.ListAPIView):
|
||||
serializer_class = LinkSerializer
|
||||
permission_classes = [permissions.AllowAny]
|
||||
def get_queryset(self):
|
||||
username = self.kwargs['username']
|
||||
return Link.objects.filter(owner__username=username).order_by('order')
|
||||
|
||||
|
||||
class PublicUserGroupsView(APIView):
|
||||
"""
|
||||
GET /api/users/{username}/public/
|
||||
"""
|
||||
permission_classes = [permissions.AllowAny]
|
||||
|
||||
def get(self, request, username):
|
||||
# 1. Ищем пользователя
|
||||
user = get_object_or_404(User, username=username)
|
||||
|
||||
# 2. Берём его группы со ссылками
|
||||
groups_qs = LinkGroup.objects.filter(owner=user).prefetch_related('links')
|
||||
|
||||
result = {
|
||||
"username": user.username,
|
||||
"groups": []
|
||||
}
|
||||
|
||||
for grp in groups_qs:
|
||||
# icon у группы (абсолютный URL)
|
||||
grp_icon_url = None
|
||||
if grp.icon:
|
||||
grp_icon_url = request.build_absolute_uri(grp.icon.url)
|
||||
|
||||
grp_data = {
|
||||
"id": grp.id,
|
||||
"name": grp.name,
|
||||
"icon": grp_icon_url,
|
||||
"links": [],
|
||||
}
|
||||
|
||||
for ln in grp.links.all():
|
||||
# icon у ссылки
|
||||
ln_icon_url = None
|
||||
if ln.icon:
|
||||
ln_icon_url = request.build_absolute_uri(ln.icon.url)
|
||||
|
||||
grp_data["links"].append({
|
||||
"id": ln.id,
|
||||
"title": ln.title,
|
||||
"url": ln.url,
|
||||
"icon": ln_icon_url,
|
||||
})
|
||||
|
||||
result["groups"].append(grp_data)
|
||||
|
||||
return Response(result, status=status.HTTP_200_OK)
|
||||
122
.history/backend/api/views_20251029194257.py
Normal file
122
.history/backend/api/views_20251029194257.py
Normal file
@@ -0,0 +1,122 @@
|
||||
# coding: utf-8
|
||||
from rest_framework import generics, viewsets, permissions, status
|
||||
from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
|
||||
from rest_framework_simplejwt.views import TokenObtainPairView
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.response import Response
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.utils.decorators import method_decorator
|
||||
from drf_spectacular.utils import extend_schema, OpenApiParameter
|
||||
from django.contrib.auth import get_user_model
|
||||
|
||||
from .models import Link, LinkGroup
|
||||
from .serializers import (
|
||||
RegisterSerializer,
|
||||
UserSerializer,
|
||||
LinkSerializer,
|
||||
LinkGroupSerializer,
|
||||
)
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class RegisterView(generics.CreateAPIView):
|
||||
queryset = User.objects.all()
|
||||
permission_classes = [permissions.AllowAny]
|
||||
serializer_class = RegisterSerializer
|
||||
|
||||
|
||||
@method_decorator(csrf_exempt, name='dispatch')
|
||||
class LoginView(TokenObtainPairView):
|
||||
permission_classes = [permissions.AllowAny]
|
||||
|
||||
|
||||
class LinkGroupViewSet(viewsets.ModelViewSet):
|
||||
queryset = LinkGroup.objects.all()
|
||||
serializer_class = LinkGroupSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
parser_classes = [MultiPartParser, FormParser, JSONParser]
|
||||
|
||||
def get_queryset(self):
|
||||
return self.queryset.filter(owner=self.request.user).order_by('order')
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(owner=self.request.user)
|
||||
|
||||
|
||||
class LinkViewSet(viewsets.ModelViewSet):
|
||||
queryset = Link.objects.all()
|
||||
serializer_class = LinkSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
parser_classes = [MultiPartParser, FormParser, JSONParser]
|
||||
|
||||
def get_queryset(self):
|
||||
return Link.objects.filter(owner=self.request.user).order_by('order')
|
||||
|
||||
def perform_create(self, serializer):
|
||||
serializer.save(owner=self.request.user)
|
||||
|
||||
|
||||
class UserProfileView(generics.RetrieveAPIView):
|
||||
serializer_class = UserSerializer
|
||||
permission_classes = [permissions.IsAuthenticated]
|
||||
def get_object(self):
|
||||
return self.request.user
|
||||
|
||||
|
||||
class UserLinksListView(generics.ListAPIView):
|
||||
serializer_class = LinkSerializer
|
||||
permission_classes = [permissions.AllowAny]
|
||||
def get_queryset(self):
|
||||
username = self.kwargs['username']
|
||||
return Link.objects.filter(owner__username=username).order_by('order')
|
||||
|
||||
|
||||
class PublicUserGroupsView(APIView):
|
||||
"""
|
||||
GET /api/users/{username}/public/
|
||||
"""
|
||||
permission_classes = [permissions.AllowAny]
|
||||
|
||||
def get(self, request, username):
|
||||
# 1. Ищем пользователя
|
||||
user = get_object_or_404(User, username=username)
|
||||
|
||||
# 2. Берём его группы со ссылками
|
||||
groups_qs = LinkGroup.objects.filter(owner=user).prefetch_related('links')
|
||||
|
||||
result = {
|
||||
"username": user.username,
|
||||
"groups": []
|
||||
}
|
||||
|
||||
for grp in groups_qs:
|
||||
# icon у группы (абсолютный URL)
|
||||
grp_icon_url = None
|
||||
if grp.icon:
|
||||
grp_icon_url = request.build_absolute_uri(grp.icon.url)
|
||||
|
||||
grp_data = {
|
||||
"id": grp.id,
|
||||
"name": grp.name,
|
||||
"icon": grp_icon_url,
|
||||
"links": [],
|
||||
}
|
||||
|
||||
for ln in grp.links.all():
|
||||
# icon у ссылки
|
||||
ln_icon_url = None
|
||||
if ln.icon:
|
||||
ln_icon_url = request.build_absolute_uri(ln.icon.url)
|
||||
|
||||
grp_data["links"].append({
|
||||
"id": ln.id,
|
||||
"title": ln.title,
|
||||
"url": ln.url,
|
||||
"icon": ln_icon_url,
|
||||
})
|
||||
|
||||
result["groups"].append(grp_data)
|
||||
|
||||
return Response(result, status=status.HTTP_200_OK)
|
||||
Reference in New Issue
Block a user