From 588e97ae2d9ce77c7f38ff1aa1cd5b0e552273dd Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Mon, 11 Aug 2025 11:35:43 +0330 Subject: [PATCH] stakeholders create & list of psp organizations --- apps/authentication/api/v1/api.py | 13 +++- .../0048_remove_device_company_and_more.py | 57 ++++++++++++++ ..._deviceassignment_organization_and_more.py | 23 ++++++ ..._deviceassignment_organization_and_more.py | 26 +++++++ .../0051_stakeholders_device_and_more.py | 25 ++++++ ...2_alter_deviceactivationcode_expires_at.py | 19 +++++ apps/pos_device/models.py | 6 ++ apps/pos_device/web/api/v1/urls.py | 1 + apps/pos_device/web/api/v1/viewsets/device.py | 76 +++++++++++++++++-- 9 files changed, 237 insertions(+), 9 deletions(-) create mode 100644 apps/pos_device/migrations/0048_remove_device_company_and_more.py create mode 100644 apps/pos_device/migrations/0049_remove_deviceassignment_organization_and_more.py create mode 100644 apps/pos_device/migrations/0050_deviceassignment_organization_and_more.py create mode 100644 apps/pos_device/migrations/0051_stakeholders_device_and_more.py create mode 100644 apps/pos_device/migrations/0052_alter_deviceactivationcode_expires_at.py diff --git a/apps/authentication/api/v1/api.py b/apps/authentication/api/v1/api.py index c3398d7..280566a 100644 --- a/apps/authentication/api/v1/api.py +++ b/apps/authentication/api/v1/api.py @@ -221,7 +221,9 @@ class OrganizationViewSet(ModelViewSet, DynamicSearchMixin): def list(self, request, *args, **kwargs): """ all organization """ - page = self.paginate_queryset(self.queryset.order_by('-create_date')) # paginate queryset + query = self.filter_query(self.queryset) + + page = self.paginate_queryset(query.order_by('-create_date')) # paginate queryset if page is not None: serializer = self.serializer_class(page, many=True) @@ -293,9 +295,14 @@ class OrganizationViewSet(ModelViewSet, DynamicSearchMixin): def get_organizations_by_province(self, request): """ list of organizations by province """ - queryset = self.queryset.filter(province=int(request.GET['province'])) + if request.GET['province']: + queryset = self.queryset.filter(province=int(request.GET['province'])) + else: + queryset = self.queryset.filter(province=request.user.province) - page = self.paginate_queryset(queryset) # paginate queryset + filtered_query = self.filter_query(queryset) + + page = self.paginate_queryset(filtered_query.order_by('-create_date')) # paginate queryset if page is not None: serializer = self.serializer_class(page, many=True) diff --git a/apps/pos_device/migrations/0048_remove_device_company_and_more.py b/apps/pos_device/migrations/0048_remove_device_company_and_more.py new file mode 100644 index 0000000..cb9d395 --- /dev/null +++ b/apps/pos_device/migrations/0048_remove_device_company_and_more.py @@ -0,0 +1,57 @@ +# Generated by Django 5.0 on 2025-08-10 09:07 + +import datetime +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authentication', '0032_organization_has_pos'), + ('pos_device', '0047_posclientattribute_custom_field_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='device', + name='company', + ), + migrations.RemoveField( + model_name='deviceactivationcode', + name='company', + ), + migrations.RemoveField( + model_name='deviceassignment', + name='company', + ), + migrations.RemoveField( + model_name='deviceversion', + name='company', + ), + migrations.AddField( + model_name='device', + name='organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='devices', to='authentication.organization'), + ), + migrations.AddField( + model_name='deviceactivationcode', + name='organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='device_activations', to='authentication.organization'), + ), + migrations.AddField( + model_name='deviceassignment', + name='organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='device_assignments', to='authentication.organization'), + ), + migrations.AddField( + model_name='deviceversion', + name='organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='device_versions', to='authentication.organization'), + ), + migrations.AlterField( + model_name='deviceactivationcode', + name='expires_at', + field=models.DateTimeField(default=datetime.datetime(2025, 8, 10, 12, 37, 38, 697616)), + ), + ] diff --git a/apps/pos_device/migrations/0049_remove_deviceassignment_organization_and_more.py b/apps/pos_device/migrations/0049_remove_deviceassignment_organization_and_more.py new file mode 100644 index 0000000..595fd57 --- /dev/null +++ b/apps/pos_device/migrations/0049_remove_deviceassignment_organization_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 5.0 on 2025-08-10 09:08 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pos_device', '0048_remove_device_company_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='deviceassignment', + name='organization', + ), + migrations.AlterField( + model_name='deviceactivationcode', + name='expires_at', + field=models.DateTimeField(default=datetime.datetime(2025, 8, 10, 12, 38, 16, 534323)), + ), + ] diff --git a/apps/pos_device/migrations/0050_deviceassignment_organization_and_more.py b/apps/pos_device/migrations/0050_deviceassignment_organization_and_more.py new file mode 100644 index 0000000..54d05db --- /dev/null +++ b/apps/pos_device/migrations/0050_deviceassignment_organization_and_more.py @@ -0,0 +1,26 @@ +# Generated by Django 5.0 on 2025-08-10 09:08 + +import datetime +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authentication', '0032_organization_has_pos'), + ('pos_device', '0049_remove_deviceassignment_organization_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='deviceassignment', + name='organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='device_assignments', to='authentication.organization'), + ), + migrations.AlterField( + model_name='deviceactivationcode', + name='expires_at', + field=models.DateTimeField(default=datetime.datetime(2025, 8, 10, 12, 38, 57, 311541)), + ), + ] diff --git a/apps/pos_device/migrations/0051_stakeholders_device_and_more.py b/apps/pos_device/migrations/0051_stakeholders_device_and_more.py new file mode 100644 index 0000000..54668b0 --- /dev/null +++ b/apps/pos_device/migrations/0051_stakeholders_device_and_more.py @@ -0,0 +1,25 @@ +# Generated by Django 5.0 on 2025-08-10 10:46 + +import datetime +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pos_device', '0050_deviceassignment_organization_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='stakeholders', + name='device', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stake_holders', to='pos_device.device'), + ), + migrations.AlterField( + model_name='deviceactivationcode', + name='expires_at', + field=models.DateTimeField(default=datetime.datetime(2025, 8, 10, 14, 16, 11, 423281)), + ), + ] diff --git a/apps/pos_device/migrations/0052_alter_deviceactivationcode_expires_at.py b/apps/pos_device/migrations/0052_alter_deviceactivationcode_expires_at.py new file mode 100644 index 0000000..ab3eda1 --- /dev/null +++ b/apps/pos_device/migrations/0052_alter_deviceactivationcode_expires_at.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0 on 2025-08-11 06:53 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pos_device', '0051_stakeholders_device_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='deviceactivationcode', + name='expires_at', + field=models.DateTimeField(default=datetime.datetime(2025, 8, 11, 10, 23, 16, 940447)), + ), + ] diff --git a/apps/pos_device/models.py b/apps/pos_device/models.py index fadca48..d112e41 100644 --- a/apps/pos_device/models.py +++ b/apps/pos_device/models.py @@ -243,6 +243,12 @@ class StakeHolders(BaseModel): related_name='stake_holders', null=True ) + device = models.ForeignKey( + Device, + on_delete=models.CASCADE, + related_name='stake_holders', + null=True + ) organization = models.ForeignKey( Organization, on_delete=models.CASCADE, diff --git a/apps/pos_device/web/api/v1/urls.py b/apps/pos_device/web/api/v1/urls.py index 00e9433..10717bb 100644 --- a/apps/pos_device/web/api/v1/urls.py +++ b/apps/pos_device/web/api/v1/urls.py @@ -9,6 +9,7 @@ router.register(r'attributes', client_views.POSClientAttributeViewSet, basename= router.register(r'provider', device_views.ProviderCompanyViewSet, basename='provider') 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') urlpatterns = [ path('v1/pos/', include(router.urls)) diff --git a/apps/pos_device/web/api/v1/viewsets/device.py b/apps/pos_device/web/api/v1/viewsets/device.py index 6d2b044..ca6776d 100644 --- a/apps/pos_device/web/api/v1/viewsets/device.py +++ b/apps/pos_device/web/api/v1/viewsets/device.py @@ -2,7 +2,13 @@ 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.pos_device.web.api.v1.viewsets.client import POSClientViewSet +from apps.authentication.api.v1.api import ( + UserViewSet, + Organization, + OrganizationSerializer +) +from apps.core.mixins.search_mixin import DynamicSearchMixin from apps.authorization.models import UserRelations from common.helpers import get_organization_by_user from rest_framework.exceptions import APIException @@ -105,6 +111,25 @@ class DeviceViewSet(viewsets.ModelViewSet): elif device.is_activated: raise APIException('device is activated', code=403) + @action( + methods=['get'], + detail=False, + url_name='psp_organizations', + url_path='psp_organizations', + name='psp_organizations' + ) + @transaction.atomic + def psp_organizations(self, request): + """ list of psp organizations """ + + organizations = Organization.objects.filter(type__key='PSP') + + # paginate devices + page = self.paginate_queryset(organizations) + if page is not None: + serializer = OrganizationSerializer(page, many=True) + return self.get_paginated_response(serializer.data) + class DeviceVersionViewSet(viewsets.ModelViewSet): queryset = pos_models.DeviceVersion.objects.all() @@ -135,6 +160,14 @@ class DeviceAssignmentViewSet(viewsets.ModelViewSet): organization = get_organization_by_user(request.user) request.data.update({'organization': organization.id}) + if 'client_data' in request.data.keys(): + client = CustomOperations().custom_create( + request=request, + view=POSClientViewSet(), + data=request.data['client_data'] + ) + request.data.update({'client': client['id']}) + # create assignment serializer = self.serializer_class(data=request.data) if serializer.is_valid(): @@ -158,12 +191,10 @@ class DeviceAssignmentViewSet(viewsets.ModelViewSet): """ list of company device assignment to clients """ try: - company = pos_models.ProviderCompany.objects.get( - user_relation__user=request.user - ) + organization = get_organization_by_user(request.user) # get device assignment - assignments = self.queryset.filter(company=company) + assignments = self.queryset.filter(organization=organization) serializer = self.serializer_class(assignments, many=True) return Response(serializer.data, status=status.HTTP_200_OK) @@ -171,6 +202,39 @@ class DeviceAssignmentViewSet(viewsets.ModelViewSet): raise APIException('Non Object Error', code=403) -class StakeHoldersViewSet(viewsets.ModelViewSet): +class StakeHoldersViewSet(viewsets.ModelViewSet, DynamicSearchMixin): queryset = pos_models.StakeHolders.objects.all() serializer_class = device_serializer.StakeHoldersSerializer + + @transaction.atomic + def create(self, request, *args, **kwargs): + """ create shares amount of stakeholders """ + + stakeholders_data = [] + for stakeholder in request.data['stakeholders']: + serializer = self.serializer_class(data=stakeholder) + if serializer.is_valid(): + serializer.save() + stakeholders_data.append(serializer.data) + + return Response(stakeholders_data, status=status.HTTP_201_CREATED) + + @action( + methods=['get'], + detail=True, + url_name='list_by_device', + url_path='list_by_device', + name='list_by_device', + ) + @transaction.atomic + def list_by_device(self, request, pk=None): + """ list of stakeholders by device """ + device = pos_models.Device.objects.get(id=pk) + stakeholders = device.stake_holders.all() + query = self.filter_query(stakeholders) + + # paginate stakeholders + page = self.paginate_queryset(query) + if page is not None: + serializer = self.get_serializer(page, many=True) + return self.get_paginated_response(serializer.data)