fix bug of inventory entry - fix weight of quotas

This commit is contained in:
2025-08-09 16:15:37 +03:30
parent 365362b739
commit 92a5d3a2eb
10 changed files with 181 additions and 32 deletions

View File

@@ -38,3 +38,9 @@ class DeviceAssignmentSerializer(ModelSerializer):
class Meta:
model = pos_models.DeviceAssignment
fields = '__all__'
class StakeHoldersSerializer(ModelSerializer):
class Meta:
model = pos_models.StakeHolders
fields = '__all__'

View File

@@ -1,6 +1,7 @@
from datetime import timedelta
from apps.pos_device.web.api.v1.serilaizers import device as device_serializer
from apps.authorization.api.v1.serializers import UserRelationSerializer
from apps.authentication.api.v1.api import UserViewSet
from apps.authorization.models import UserRelations
from rest_framework.exceptions import APIException
@@ -19,30 +20,34 @@ class ProviderCompanyViewSet(viewsets.ModelViewSet): # noqa
queryset = pos_models.ProviderCompany.objects.all()
serializer_class = device_serializer.ProviderCompanySerializer
def create(self, request, *args, **kwargs):
""" custom create of provider client """
def list(self, request, *args, **kwargs):
""" list of provider companies """
try:
# creating user & relations
client = UserViewSet().create(request=request)
# paginate devices
page = self.paginate_queryset(self.queryset.order_by('-create_date'))
if page is not None:
serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)
if client.status_code == 201:
@action(
methods=['get'],
detail=False,
url_path='psp_users',
url_name='psp_users',
name='psp_users'
)
def users_with_psp_org(self):
""" list of psp users """
# create provider
serializer = self.serializer_class(data=request.data['provider'])
if serializer.is_valid():
provider = serializer.save()
provider.user_relation = UserRelations.objects.get(
user_id=client.data['id']
)
provider.save()
users = UserRelations.objects.filter(
organization__type__key='PSP'
)
return Response(serializer.data, status=status.HTTP_201_CREATED)
return Response(serializer.errors, status=status.HTTP_403_FORBIDDEN)
else:
return client
except Exception as e:
raise e
# paginate devices
page = self.paginate_queryset(users)
if page is not None:
serializer = UserRelationSerializer(page, many=True)
return self.get_paginated_response(serializer.data)
class DeviceViewSet(viewsets.ModelViewSet):
@@ -127,16 +132,21 @@ class DeviceAssignmentViewSet(viewsets.ModelViewSet):
def device_assignment(self, request):
""" assign pos device to client by company """
company = pos_models.ProviderCompany.objects.get(
user_relation__user=request.user
)
request.data.update({'company': company.id})
if 'company' not in request.data.keys():
company = pos_models.ProviderCompany.objects.get(
user_relation__user=request.user
)
request.data.update({'company': company.id})
# create assignment
serializer = self.serializer_class(data=request.data)
if serializer.is_valid():
assignment = serializer.save()
# set organization having pos status
assignment.company.user_relation.organization.has_pos = True
assignment.company.user_relation.organization.save()
return Response(serializer.data, status=status.HTTP_201_CREATED)
return Response(serializer.errors, status=status.HTTP_403_FORBIDDEN)
@@ -162,3 +172,8 @@ class DeviceAssignmentViewSet(viewsets.ModelViewSet):
return Response(serializer.data, status=status.HTTP_200_OK)
except Exception as e:
raise APIException('Non Object Error', code=403)
class StakeHoldersViewSet(viewsets.ModelViewSet):
queryset = pos_models.StakeHolders.objects.all()
serializer_class = device_serializer.StakeHoldersSerializer