diff --git a/core/apps/products/views/product.py b/core/apps/products/views/product.py index 2dadff8..3c66ed3 100644 --- a/core/apps/products/views/product.py +++ b/core/apps/products/views/product.py @@ -26,9 +26,13 @@ class ProductCreateApiView(generics.GenericAPIView): def post(self, request): serializer = self.serializer_class(data=request.data) if serializer.is_valid(raise_exception=True): - serializer.save() + data = serializer.save() return Response( - {'success': True, 'message': "product successfully created!"}, + { + 'success': True, + 'message': "product successfully created!", + 'product': serializers.ProductListSerializer(data).data + }, status=201 ) return Response( diff --git a/core/apps/projects/views/project.py b/core/apps/projects/views/project.py index 2fefbf8..a1538ff 100644 --- a/core/apps/projects/views/project.py +++ b/core/apps/projects/views/project.py @@ -174,8 +174,11 @@ class ProjectAndFolderApiView(views.APIView): permission_classes = [HasRolePermission] def get(self, request): + mine = request.query_params.get('is_mine') folders = ProjectFolder.objects.prefetch_related('projects') projects = Project.objects.exclude(folder__isnull=False) + if mine and mine.lower() == 'true': + projects = projects.filter(Q(boss=request.user) | Q(foreman=request.user) | Q(other_members=request.user)) projects_serializer = serializers.ProjectsSerializer(projects, many=True) folders_serializer = serializers.ProjectFoldersSerializer(folders, many=True) return Response(