From 7732520ae93669e9792f0380841d953e00478219 Mon Sep 17 00:00:00 2001 From: LolAnthony <126456756+LolAnthony@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:25:03 +0300 Subject: [PATCH 1/2] swagger traceback fix, added DevScript based serializer --- feed/views.py | 3 ++- news/serializers.py | 4 ++++ users/urls.py | 2 +- users/views.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/feed/views.py b/feed/views.py index 122c66bc..6deb61eb 100644 --- a/feed/views.py +++ b/feed/views.py @@ -6,7 +6,7 @@ from feed.pagination import FeedPagination from news.models import News -from news.serializers import NewsFeedListSerializer +from news.serializers import NewsFeedListSerializer, DevScriptSerializer from projects.models import Project from vacancy.models import Vacancy @@ -58,6 +58,7 @@ def get(self, *args, **kwargs): class DevScript(CreateAPIView): + serializer_class = DevScriptSerializer def create(self, request): content_type_project = ContentType.objects.filter(model="project").first() for project in Project.objects.filter(draft=False): diff --git a/news/serializers.py b/news/serializers.py index e9587553..87cb0ecb 100644 --- a/news/serializers.py +++ b/news/serializers.py @@ -164,3 +164,7 @@ class Meta: "is_user_liked", "files", ] + + +class DevScriptSerializer(serializers.Serializer): + status = serializers.CharField() diff --git a/users/urls.py b/users/urls.py index e496b6f3..5326fe95 100644 --- a/users/urls.py +++ b/users/urls.py @@ -39,7 +39,7 @@ path("users/specializations/nested/", UserSpecializationsNestedView.as_view()), path("users/specializations/inline/", UserSpecializationsInlineView.as_view()), path("users//", UserDetail.as_view()), - path("users//subscribed_projects/", UserSubscribedProjectsList.as_view()), + path("users//subscribed_projects/", UserSubscribedProjectsList.as_view()), path("users//set_onboarding_stage/", SetUserOnboardingStage.as_view()), path("users//force_verify/", ForceVerifyView.as_view()), path("users//news/", NewsList.as_view()), diff --git a/users/views.py b/users/views.py index 43f7f699..a6f79784 100644 --- a/users/views.py +++ b/users/views.py @@ -385,7 +385,7 @@ class UserSubscribedProjectsList(ListAPIView): def get_queryset(self): try: - user = User.objects.get(pk=self.kwargs["pk"]) + user = User.objects.get(id=self.kwargs["id"]) return user.subscribed_projects.all() except User.DoesNotExist: raise exceptions.NotFound From 6f536b97b46b81d52510f4a1bd365ae61ae2e5ac Mon Sep 17 00:00:00 2001 From: LolAnthony <126456756+LolAnthony@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:44:27 +0300 Subject: [PATCH 2/2] flake8 fix --- chats/views.py | 4 +++- feed/views.py | 1 + partner_programs/views.py | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chats/views.py b/chats/views.py index a99b5190..84982ce8 100644 --- a/chats/views.py +++ b/chats/views.py @@ -117,7 +117,9 @@ def get(self, request, *args, **kwargs) -> Response: except ValueError: return Response( status=status.HTTP_400_BAD_REQUEST, - data={"detail": "processed id must contain two integers separated by underscore"}, + data={ + "detail": "processed id must contain two integers separated by underscore" + }, ) except AssertionError as e: return Response(status=status.HTTP_400_BAD_REQUEST, data={"detail": str(e)}) diff --git a/feed/views.py b/feed/views.py index 6deb61eb..9f0db961 100644 --- a/feed/views.py +++ b/feed/views.py @@ -59,6 +59,7 @@ def get(self, *args, **kwargs): class DevScript(CreateAPIView): serializer_class = DevScriptSerializer + def create(self, request): content_type_project = ContentType.objects.filter(model="project").first() for project in Project.objects.filter(draft=False): diff --git a/partner_programs/views.py b/partner_programs/views.py index 3be485db..89345d4a 100644 --- a/partner_programs/views.py +++ b/partner_programs/views.py @@ -129,6 +129,7 @@ class PartnerProgramRegister(generics.GenericAPIView): """ Register user to program and save additional program data """ + queryset = PartnerProgram.objects.none() permission_classes = [IsAuthenticated] serializer_class = PartnerProgramUserSerializer