Merge pull request #8 from xoliqberdiyev/test

Test
This commit is contained in:
xoliqberdiyev
2025-10-06 14:59:04 +05:00
committed by GitHub
3 changed files with 9 additions and 3 deletions

View File

@@ -32,9 +32,13 @@ class CounterpartyCreateApiView(generics.GenericAPIView):
def post(self, request): def post(self, request):
serializer = self.serializer_class(data=request.data) serializer = self.serializer_class(data=request.data)
if serializer.is_valid(raise_exception=True): if serializer.is_valid(raise_exception=True):
serializer.save() data = serializer.save()
return Response( return Response(
{'success': True, 'message': 'Conterparty Created'}, {
'success': True,
'message': 'Conterparty Created',
'data': serializers.CounterpartyListSerializer(data).data
},
status=201 status=201
) )
return Response( return Response(

View File

@@ -258,4 +258,3 @@ class ChangeConfirmationPartyApiView(views.APIView):
}, },
status=200 status=200
) )

View File

@@ -175,10 +175,13 @@ class ProjectAndFolderApiView(views.APIView):
def get(self, request): def get(self, request):
mine = request.query_params.get('is_mine') mine = request.query_params.get('is_mine')
wherehouse_ids = request.query_params.getlist('wherehouse')
folders = ProjectFolder.objects.prefetch_related('projects') folders = ProjectFolder.objects.prefetch_related('projects')
projects = Project.objects.exclude(folder__isnull=False) projects = Project.objects.exclude(folder__isnull=False)
if mine and mine.lower() == 'true': if mine and mine.lower() == 'true':
projects = projects.filter(Q(boss=request.user) | Q(foreman=request.user) | Q(other_members=request.user)) projects = projects.filter(Q(boss=request.user) | Q(foreman=request.user) | Q(other_members=request.user))
if wherehouse_ids:
projects = projects.filter(wherehouse__in=wherehouse_ids)
projects_serializer = serializers.ProjectsSerializer(projects, many=True) projects_serializer = serializers.ProjectsSerializer(projects, many=True)
folders_serializer = serializers.ProjectFoldersSerializer(folders, many=True) folders_serializer = serializers.ProjectFoldersSerializer(folders, many=True)
return Response( return Response(