diff --git a/backend/api/v1/views.py b/backend/api/v1/views.py index 6acf1b0..7cbdafb 100644 --- a/backend/api/v1/views.py +++ b/backend/api/v1/views.py @@ -152,7 +152,8 @@ class DocumentViewSet(viewsets.ModelViewSet): queryset = Document.objects.all() serializer_class = DocumentReadSerializerMinified http_method_names = ("get", "post", "patch", "delete") - permissions_classes = (IsAuthenticated,) + # permissions_classes = (IsAuthenticated,) + permissions_classes = (AllowAny,) filter_backends = ( filters.SearchFilter, filters.OrderingFilter, @@ -164,8 +165,12 @@ class DocumentViewSet(viewsets.ModelViewSet): def get_queryset(self): """Выдаем только список документов текущего пользователя.""" + #ЗАглушка if self.request.user.is_authenticated: return self.request.user.documents + else: + user = User.objects.get(id=1) + return Document.objects.get(owner=user) return Document.objects.none() def get_serializer_class(self): @@ -182,7 +187,8 @@ def perform_create(self, serializer): @action( detail=False, permission_classes=[ - IsAuthenticated, + # IsAuthenticated, + AllowAny, ], url_path=r"draft", ) @@ -206,7 +212,7 @@ def history_documents(self, request): """Возвращает список законченных документов/история""" user = self.request.user queryset = Document.objects.filter(completed=True, owner=user) - serializer = DocumentReadSerializer( + serializer = DocumentReadSerializerMinified( queryset, many=True, context={"request": request} ) return Response(serializer.data, status=status.HTTP_200_OK) @@ -257,17 +263,19 @@ class DocumentFieldViewSet(viewsets.ModelViewSet): serializer_class = DocumentFieldSerializer http_method_names = ("get",) - permissions_classes = (IsAuthenticated,) + # permissions_classes = (IsAuthenticated,) + permissions_classes = (AllowAny,) pagination_class = None def get_queryset(self): document_id = self.kwargs.get("document_id") document = get_object_or_404(Document, id=document_id) - if ( - not (self.request.user.is_authenticated) - or document.owner != self.request.user - ): - raise PermissionDenied() + #ЗАглушка + # if ( + # not (self.request.user.is_authenticated) + # or document.owner != self.request.user + # ): + # raise PermissionDenied() return document.document_fields.objects.all() @@ -299,9 +307,7 @@ def delete(self, request, **kwargs): ) # проверка, что такой FavTemplate существует в БД if not queryset.exists(): - raise serializers.ValidationError( - "Этот шаблон отсутствует в Избранном!" - ) + return Response(status=status.HTTP_404_NOT_FOUND) queryset.delete() return Response(status=status.HTTP_204_NO_CONTENT) @@ -334,9 +340,7 @@ def delete(self, request, **kwargs): ) # проверка, что такой FavDocument существует в БД if not queryset.exists(): - raise serializers.ValidationError( - "Этот документ отсутствует в Избранном!" - ) + return Response(status=status.HTTP_404_NOT_FOUND) queryset.delete() return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/backend/request/documents.http b/backend/request/documents.http index 32ec0d5..265bb6d 100644 --- a/backend/request/documents.http +++ b/backend/request/documents.http @@ -1,10 +1,11 @@ @TOKEN = Token bb4f5dbedaafd2730f35803e7087e797479d68f5 -@URL = https://documents-template.site/ +# @URL = https://documents-template.site/ +@URL = http://127.0.0.1:8000 ### GET {{URL}}/api/documents/32/ Content-Type: application/json -Authorization: {{TOKEN}} +# Authorization: {{TOKEN}} { } @@ -12,7 +13,7 @@ Authorization: {{TOKEN}} ### POST {{URL}}/api/documents/ Content-Type: application/json -Authorization: {{TOKEN}} +# Authorization: {{TOKEN}} { "description": "doc1", diff --git a/backend/request/users.http b/backend/request/users.http index d2f6eed..5e77a07 100644 --- a/backend/request/users.http +++ b/backend/request/users.http @@ -1,13 +1,13 @@ @TOKEN = Token b5b767cb36da725f900892f627a28dc1c0e40488 -@URL = https://documents-template.site -# @URL = http://127.0.0.1:8000 +# @URL = https://documents-template.site +@URL = http://127.0.0.1:8000 ### POST {{URL}}/api/users/ Content-Type: application/json { - "email": "nikox11882@mail.ru", + "email": "nikox1181182@mail.ru", "username": "nikox1122@mail.ru", "password": "456852Zx", "first_name": "kewk", @@ -19,7 +19,7 @@ POST {{URL}}/api/auth/token/login/ Content-Type: application/json { - "email": "nikox112@mail.ru", + "email": "nikox118182@mail.ru", "password": "456852Zx" }