add some new data to device login data, first part of broker to stake holders assignment
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
# Generated by Django 5.0 on 2025-08-27 12:36
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('pos_device', '0063_alter_device_serial'),
|
||||
('product', '0069_quota_group'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='BrokerStakeHolderAssignment',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('create_date', models.DateTimeField(auto_now_add=True)),
|
||||
('modify_date', models.DateTimeField(auto_now=True)),
|
||||
('creator_info', models.CharField(max_length=100, null=True)),
|
||||
('modifier_info', models.CharField(max_length=100, null=True)),
|
||||
('trash', models.BooleanField(default=False)),
|
||||
('broker', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stake_brok_assignment', to='product.broker')),
|
||||
('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_createddby', to=settings.AUTH_USER_MODEL)),
|
||||
('device', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stake_brok_assigment', to='pos_device.device')),
|
||||
('modified_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)s_modifiedby', to=settings.AUTH_USER_MODEL)),
|
||||
('stake_holder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stake_brok_assignment', to='pos_device.stakeholders')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -2,6 +2,7 @@ import random
|
||||
import string
|
||||
|
||||
from apps.authentication.models import Organization
|
||||
from apps.product.models import Broker
|
||||
from apps.product.models import Product
|
||||
from django.contrib.postgres.fields import ArrayField
|
||||
from apps.authorization.models import UserRelations
|
||||
@@ -294,3 +295,29 @@ class POSFreeProducts(BaseModel):
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
return super(POSFreeProducts, self).save(*args, **kwargs)
|
||||
|
||||
|
||||
class BrokerStakeHolderAssignment(BaseModel):
|
||||
device = models.ForeignKey(
|
||||
Device,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="stake_brok_assigment",
|
||||
null=True
|
||||
)
|
||||
stake_holder = models.ForeignKey(
|
||||
StakeHolders,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='stake_brok_assignment',
|
||||
null=True
|
||||
)
|
||||
broker = models.ForeignKey(
|
||||
Broker,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='stake_brok_assignment',
|
||||
null=True
|
||||
)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
return super(BrokerStakeHolderAssignment, self).save(*args, **kwargs)
|
||||
|
||||
|
||||
|
||||
@@ -82,8 +82,9 @@ class POSDeviceViewSet(viewsets.ModelViewSet, POSDeviceMixin):
|
||||
"message": "login success - session activated",
|
||||
"device_identity": device.device_identity,
|
||||
"serial": device.serial,
|
||||
"password": device.password,
|
||||
"provider": organization.name,
|
||||
"provider_users": get_users_of_organization(organization),
|
||||
"provider_tell": '0214021',
|
||||
"device_owner": device_owner_org,
|
||||
"device_owner_users": get_users_of_organization(device_owner_org)
|
||||
}, status=status.HTTP_200_OK)
|
||||
@@ -91,9 +92,10 @@ class POSDeviceViewSet(viewsets.ModelViewSet, POSDeviceMixin):
|
||||
return Response({
|
||||
"message": "device pre registered - unauthorized",
|
||||
"device_identity": device.device_identity,
|
||||
"password": device.password,
|
||||
"serial": device.serial,
|
||||
"provider": organization.name,
|
||||
"provider_users": get_users_of_organization(organization),
|
||||
"provider_tell": '0214021',
|
||||
}, status=status.HTTP_401_UNAUTHORIZED)
|
||||
|
||||
pre_device = pos_models.Device.objects.create(
|
||||
@@ -106,8 +108,9 @@ class POSDeviceViewSet(viewsets.ModelViewSet, POSDeviceMixin):
|
||||
return Response({
|
||||
"message": "device pre-registered",
|
||||
"device_identity": pre_device.device_identity,
|
||||
"password": device.password,
|
||||
"provider": organization.name,
|
||||
"provider_users": get_users_of_organization(organization),
|
||||
"provider_tell": '0214021',
|
||||
}, status=status.HTTP_412_PRECONDITION_FAILED)
|
||||
|
||||
@action(
|
||||
|
||||
@@ -86,3 +86,9 @@ class StakeHoldersSerializer(ModelSerializer):
|
||||
).data
|
||||
|
||||
return representation
|
||||
|
||||
|
||||
class BrokerStakeHolderAssignSerializer(ModelSerializer):
|
||||
class Meta:
|
||||
model = pos_models.BrokerStakeHolderAssignment
|
||||
fields = '__all__'
|
||||
|
||||
@@ -10,6 +10,7 @@ router.register(r'provider', device_views.ProviderCompanyViewSet, basename='prov
|
||||
router.register(r'device', device_views.DeviceViewSet, basename='device')
|
||||
router.register(r'device_assignment', device_views.DeviceAssignmentViewSet, basename='device_assignment')
|
||||
router.register(r'stake_holders', device_views.StakeHoldersViewSet, basename='stake_holders')
|
||||
router.register(r'broker_stake_assign', device_views.BrokerStakeHolderAssignViewSet, basename='broker_stake_assign')
|
||||
|
||||
urlpatterns = [
|
||||
path('v1/pos/', include(router.urls))
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from apps.pos_device.web.api.v1.serilaizers import client as client_serializer
|
||||
from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
|
||||
from apps.pos_device import models as pos_models
|
||||
from rest_framework.response import Response
|
||||
from common.tools import CustomOperations
|
||||
@@ -6,7 +7,7 @@ from rest_framework import viewsets
|
||||
from rest_framework import status
|
||||
|
||||
|
||||
class POSClientViewSet(viewsets.ModelViewSet):
|
||||
class POSClientViewSet(viewsets.ModelViewSet, SoftDeleteMixin):
|
||||
queryset = pos_models.POSClient.objects.all()
|
||||
serializer_class = client_serializer.POSClientSerializer
|
||||
|
||||
@@ -59,11 +60,11 @@ class POSClientViewSet(viewsets.ModelViewSet):
|
||||
return Response(serializer.errors, status=status.HTTP_403_FORBIDDEN)
|
||||
|
||||
|
||||
class POSClientAttributeViewSet(viewsets.ModelViewSet):
|
||||
class POSClientAttributeViewSet(viewsets.ModelViewSet, SoftDeleteMixin):
|
||||
queryset = pos_models.POSClientAttribute.objects.all()
|
||||
serializer_class = client_serializer.POSClientAttributeSerializer
|
||||
|
||||
|
||||
class POSClientAttributeValueViewSet(viewsets.ModelViewSet):
|
||||
class POSClientAttributeValueViewSet(viewsets.ModelViewSet, SoftDeleteMixin):
|
||||
queryset = pos_models.POSClientAttributeValue.objects.all()
|
||||
serializer_class = client_serializer.POSClientAttributeValueSerializer
|
||||
|
||||
@@ -4,6 +4,7 @@ from apps.pos_device.web.api.v1.serilaizers import device as device_serializer
|
||||
from apps.authentication.exceptions import OrganizationBankAccountException
|
||||
from apps.authorization.api.v1.serializers import UserRelationSerializer
|
||||
from apps.pos_device.web.api.v1.viewsets.client import POSClientViewSet
|
||||
from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
|
||||
from apps.authentication.api.v1.api import (
|
||||
Organization,
|
||||
BankAccountInformation,
|
||||
@@ -25,7 +26,7 @@ from django.db import transaction
|
||||
from rest_framework import status
|
||||
|
||||
|
||||
class ProviderCompanyViewSet(viewsets.ModelViewSet): # noqa
|
||||
class ProviderCompanyViewSet(viewsets.ModelViewSet, SoftDeleteMixin): # noqa
|
||||
queryset = pos_models.ProviderCompany.objects.all()
|
||||
serializer_class = device_serializer.ProviderCompanySerializer
|
||||
|
||||
@@ -59,7 +60,7 @@ class ProviderCompanyViewSet(viewsets.ModelViewSet): # noqa
|
||||
return self.get_paginated_response(serializer.data)
|
||||
|
||||
|
||||
class DeviceViewSet(viewsets.ModelViewSet, AdminFilterMixin):
|
||||
class DeviceViewSet(viewsets.ModelViewSet, AdminFilterMixin, SoftDeleteMixin):
|
||||
queryset = pos_models.Device.objects.all()
|
||||
serializer_class = device_serializer.DeviceSerializer
|
||||
|
||||
@@ -151,17 +152,17 @@ class DeviceViewSet(viewsets.ModelViewSet, AdminFilterMixin):
|
||||
return self.get_paginated_response(serializer.data)
|
||||
|
||||
|
||||
class DeviceVersionViewSet(viewsets.ModelViewSet):
|
||||
class DeviceVersionViewSet(viewsets.ModelViewSet, SoftDeleteMixin):
|
||||
queryset = pos_models.DeviceVersion.objects.all()
|
||||
serializer_class = device_serializer.DeviceVersionSerializer
|
||||
|
||||
|
||||
class SessionViewSet(viewsets.ModelViewSet): # noqa
|
||||
class SessionViewSet(viewsets.ModelViewSet, SoftDeleteMixin): # noqa
|
||||
queryset = pos_models.Sessions.objects.all()
|
||||
serializer_class = device_serializer.SessionSerializer
|
||||
|
||||
|
||||
class DeviceAssignmentViewSet(viewsets.ModelViewSet):
|
||||
class DeviceAssignmentViewSet(viewsets.ModelViewSet, SoftDeleteMixin):
|
||||
queryset = pos_models.DeviceAssignment.objects.all()
|
||||
serializer_class = device_serializer.DeviceAssignmentSerializer
|
||||
|
||||
@@ -274,7 +275,7 @@ class DeviceAssignmentViewSet(viewsets.ModelViewSet):
|
||||
raise APIException('Non Object Error', code=403)
|
||||
|
||||
|
||||
class StakeHoldersViewSet(viewsets.ModelViewSet, DynamicSearchMixin):
|
||||
class StakeHoldersViewSet(viewsets.ModelViewSet, DynamicSearchMixin, SoftDeleteMixin):
|
||||
queryset = pos_models.StakeHolders.objects.all()
|
||||
serializer_class = device_serializer.StakeHoldersSerializer
|
||||
|
||||
@@ -317,3 +318,8 @@ class StakeHoldersViewSet(viewsets.ModelViewSet, DynamicSearchMixin):
|
||||
if page is not None:
|
||||
serializer = self.get_serializer(page, many=True)
|
||||
return self.get_paginated_response(serializer.data)
|
||||
|
||||
|
||||
class BrokerStakeHolderAssignViewSet(viewsets.ModelViewSet, DynamicSearchMixin, SoftDeleteMixin):
|
||||
queryset = pos_models.BrokerStakeHolderAssignment.objects.all()
|
||||
serializer_class = device_serializer.BrokerStakeHolderAssignSerializer
|
||||
|
||||
Reference in New Issue
Block a user