From f3566f4e8be3e06ad87c302a09c8276b9296f1cf Mon Sep 17 00:00:00 2001 From: Fazliddin Abdurahimov Date: Wed, 6 Aug 2025 10:14:52 +0500 Subject: [PATCH] fix: company//folders code changed --- core/apps/companies/views/companies.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/core/apps/companies/views/companies.py b/core/apps/companies/views/companies.py index f890a15..e8a70aa 100644 --- a/core/apps/companies/views/companies.py +++ b/core/apps/companies/views/companies.py @@ -169,12 +169,9 @@ class CompanyFolderViewSet(BaseViewSetMixin, GenericViewSet): description="List Company Folders" ) @action(methods=["GET"], detail=True, url_path="folders") - def list_folder(self, *args: object, **kwargs: object) -> Response: - company = self.get_object() - folders = CompanyFolderModel.objects.filter(company=company) - ser = self.get_serializer( - instance=folders, many=True, context={"company_id": company.pk} - ) # type: ignore + def list_folder(self, pk: uuid.UUID, *args: object, **kwargs: object) -> Response: + folders = CompanyFolderModel.objects.filter(company__id=pk) + ser = self.get_serializer(instance=folders, many=True) # type: ignore return Response(data=ser.data, status=status.HTTP_200_OK) @extend_schema( @@ -184,7 +181,6 @@ class CompanyFolderViewSet(BaseViewSetMixin, GenericViewSet): @action(url_path="folders", detail=True, methods=["POST"]) def create_folder(self, request: HttpRequest, *args: object, **kwargs: object) -> Response: company = self.get_object() - data = request.data.copy() | dict(company=company.id) # type: ignore - ser = self.get_serializer(data=data) # type: ignore + ser = self.get_serializer(data=data, context={"company": company}) # type: ignore ser.is_valid(raise_exception=True) return Response(data=ser.data, status=status.HTTP_201_CREATED)