From 92382d0ad1078dd8298cc0c25df786ee3b1ecfd0 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Sun, 15 Jun 2025 09:08:19 +0330 Subject: [PATCH] fix organization pagination - quota distribution --- apps/authentication/api/v1/api.py | 17 +- .../0019_product_product_id_and_more.py | 23 +++ ...sterer_organization_alter_quota_product.py | 25 +++ .../0021_quotalivestockagelimitation.py | 36 ++++ ...alance_quota_quota_distributed_and_more.py | 33 ++++ .../migrations/0023_alter_quota_quota_id.py | 18 ++ .../0024_quota_assigned_organizations.py | 19 ++ apps/product/migrations/0025_broker_name.py | 18 ++ .../migrations/0026_quotadistribution.py | 42 ++++ ...quotadistribution_assigner_organization.py | 20 ++ apps/product/models.py | 112 ++++++++++- .../web/api/v1/{api.py => product_api.py} | 180 +++++++++++++++++- ...{serializers.py => product_serializers.py} | 14 +- .../web/api/v1/quota_distribution_api.py | 66 +++++++ .../api/v1/quota_distribution_serializers.py | 23 +++ apps/product/web/api/v1/urls.py | 5 +- common/tools.py | 20 +- 17 files changed, 647 insertions(+), 24 deletions(-) create mode 100644 apps/product/migrations/0019_product_product_id_and_more.py create mode 100644 apps/product/migrations/0020_quota_registerer_organization_alter_quota_product.py create mode 100644 apps/product/migrations/0021_quotalivestockagelimitation.py create mode 100644 apps/product/migrations/0022_quota_quota_balance_quota_quota_distributed_and_more.py create mode 100644 apps/product/migrations/0023_alter_quota_quota_id.py create mode 100644 apps/product/migrations/0024_quota_assigned_organizations.py create mode 100644 apps/product/migrations/0025_broker_name.py create mode 100644 apps/product/migrations/0026_quotadistribution.py create mode 100644 apps/product/migrations/0027_alter_quotadistribution_assigner_organization.py rename apps/product/web/api/v1/{api.py => product_api.py} (66%) rename apps/product/web/api/v1/{serializers.py => product_serializers.py} (89%) create mode 100644 apps/product/web/api/v1/quota_distribution_api.py create mode 100644 apps/product/web/api/v1/quota_distribution_serializers.py diff --git a/apps/authentication/api/v1/api.py b/apps/authentication/api/v1/api.py index 6a459c5..d545dbd 100644 --- a/apps/authentication/api/v1/api.py +++ b/apps/authentication/api/v1/api.py @@ -12,6 +12,7 @@ from apps.authentication.api.v1.serializers.serializer import ( BankAccountSerializer, ) from rest_framework_simplejwt.views import TokenObtainPairView +from apps.core.pagination import CustomPageNumberPagination from apps.authorization.api.v1 import api as authorize_view from rest_framework.permissions import IsAuthenticated from apps.authentication.tools import get_token_jti @@ -221,17 +222,21 @@ class OrganizationViewSet(ModelViewSet): detail=False, url_path='organizations_by_province', url_name='organizations_by_province', - name='organizations_by_province' + name='organizations_by_province', ) @transaction.atomic def get_organizations_by_province(self, request): """ list of organizations by province """ - serializer = self.serializer_class( - self.queryset.filter( - province=int(request.GET['province'])), - many=True - ) + queryset = self.queryset.filter(province=int(request.GET['province'])) + + page = self.paginate_queryset(queryset) # paginate queryset + + if page is not None: + serializer = self.serializer_class(page, many=True) + return self.get_paginated_response(serializer.data) + + serializer = self.serializer_class(queryset, many=True) return Response(serializer.data, status=status.HTTP_200_OK) diff --git a/apps/product/migrations/0019_product_product_id_and_more.py b/apps/product/migrations/0019_product_product_id_and_more.py new file mode 100644 index 0000000..aae646f --- /dev/null +++ b/apps/product/migrations/0019_product_product_id_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 5.0 on 2025-06-10 11:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0018_alter_quota_distribution_mode_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='product_id', + field=models.BigIntegerField(default=0), + ), + migrations.AlterField( + model_name='quotalivestockallocation', + name='livestock_group', + field=models.CharField(choices=[('rural', 'روستایی'), ('industrial', 'صنعتی'), ('nomadic', 'عشایری')], max_length=20), + ), + ] diff --git a/apps/product/migrations/0020_quota_registerer_organization_alter_quota_product.py b/apps/product/migrations/0020_quota_registerer_organization_alter_quota_product.py new file mode 100644 index 0000000..ed497e2 --- /dev/null +++ b/apps/product/migrations/0020_quota_registerer_organization_alter_quota_product.py @@ -0,0 +1,25 @@ +# Generated by Django 5.0 on 2025-06-10 12:10 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authorization', '0017_alter_permissions_name'), + ('product', '0019_product_product_id_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='quota', + name='registerer_organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='quotas', to='authorization.userrelations'), + ), + migrations.AlterField( + model_name='quota', + name='product', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='quotas', to='product.product'), + ), + ] diff --git a/apps/product/migrations/0021_quotalivestockagelimitation.py b/apps/product/migrations/0021_quotalivestockagelimitation.py new file mode 100644 index 0000000..b002cd2 --- /dev/null +++ b/apps/product/migrations/0021_quotalivestockagelimitation.py @@ -0,0 +1,36 @@ +# Generated by Django 5.0 on 2025-06-11 08:03 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0020_quota_registerer_organization_alter_quota_product'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='QuotaLiveStockAgeLimitation', + 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)), + ('livestock_type', models.CharField(choices=[('light', 'سبک'), ('heavy', 'سنگین')], max_length=20)), + ('livestock_subtype', models.CharField(choices=[('milking', 'شیری'), ('fattening', 'پرواری')], max_length=20)), + ('age_month', models.PositiveIntegerField(default=0)), + ('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)), + ('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)), + ('quota', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='livestock_age_limitations', to='product.quota')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/apps/product/migrations/0022_quota_quota_balance_quota_quota_distributed_and_more.py b/apps/product/migrations/0022_quota_quota_balance_quota_quota_distributed_and_more.py new file mode 100644 index 0000000..60a84fc --- /dev/null +++ b/apps/product/migrations/0022_quota_quota_balance_quota_quota_distributed_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 5.0 on 2025-06-11 09:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0021_quotalivestockagelimitation'), + ] + + operations = [ + migrations.AddField( + model_name='quota', + name='quota_balance', + field=models.PositiveIntegerField(default=0), + ), + migrations.AddField( + model_name='quota', + name='quota_distributed', + field=models.PositiveIntegerField(default=0), + ), + migrations.AddField( + model_name='quota', + name='quota_weight', + field=models.PositiveIntegerField(default=0), + ), + migrations.AlterField( + model_name='quota', + name='quota_id', + field=models.CharField(max_length=15, null=True, unique=True), + ), + ] diff --git a/apps/product/migrations/0023_alter_quota_quota_id.py b/apps/product/migrations/0023_alter_quota_quota_id.py new file mode 100644 index 0000000..d7b3bcf --- /dev/null +++ b/apps/product/migrations/0023_alter_quota_quota_id.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0 on 2025-06-11 10:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0022_quota_quota_balance_quota_quota_distributed_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='quota', + name='quota_id', + field=models.PositiveBigIntegerField(blank=True, null=True), + ), + ] diff --git a/apps/product/migrations/0024_quota_assigned_organizations.py b/apps/product/migrations/0024_quota_assigned_organizations.py new file mode 100644 index 0000000..6e6fd53 --- /dev/null +++ b/apps/product/migrations/0024_quota_assigned_organizations.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0 on 2025-06-11 10:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authorization', '0017_alter_permissions_name'), + ('product', '0023_alter_quota_quota_id'), + ] + + operations = [ + migrations.AddField( + model_name='quota', + name='assigned_organizations', + field=models.ManyToManyField(blank=True, related_name='assigned_quotas', to='authorization.userrelations'), + ), + ] diff --git a/apps/product/migrations/0025_broker_name.py b/apps/product/migrations/0025_broker_name.py new file mode 100644 index 0000000..85191af --- /dev/null +++ b/apps/product/migrations/0025_broker_name.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0 on 2025-06-11 11:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0024_quota_assigned_organizations'), + ] + + operations = [ + migrations.AddField( + model_name='broker', + name='name', + field=models.CharField(max_length=255, null=True), + ), + ] diff --git a/apps/product/migrations/0026_quotadistribution.py b/apps/product/migrations/0026_quotadistribution.py new file mode 100644 index 0000000..58ba9e3 --- /dev/null +++ b/apps/product/migrations/0026_quotadistribution.py @@ -0,0 +1,42 @@ +# Generated by Django 5.0 on 2025-06-11 12:29 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authorization', '0017_alter_permissions_name'), + ('product', '0025_broker_name'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='QuotaDistribution', + 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)), + ('description', models.TextField(max_length=1000, null=True)), + ('distribution_id', models.CharField(max_length=20, null=True)), + ('weight', models.PositiveBigIntegerField(default=0)), + ('warehouse_entry', models.PositiveBigIntegerField(default=0)), + ('warehouse_balance', models.PositiveBigIntegerField(default=0)), + ('been_sold', models.PositiveBigIntegerField(default=0)), + ('assigned_organization', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='distributions', to='authorization.userrelations')), + ('assigner_organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='distributions_assigner', to='authorization.userrelations')), + ('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)), + ('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)), + ('quota', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='distributions_assigned', to='product.quota')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/apps/product/migrations/0027_alter_quotadistribution_assigner_organization.py b/apps/product/migrations/0027_alter_quotadistribution_assigner_organization.py new file mode 100644 index 0000000..4d786f7 --- /dev/null +++ b/apps/product/migrations/0027_alter_quotadistribution_assigner_organization.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0 on 2025-06-11 13:11 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('authorization', '0017_alter_permissions_name'), + ('product', '0026_quotadistribution'), + ] + + operations = [ + migrations.AlterField( + model_name='quotadistribution', + name='assigner_organization', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='distributions_assigner', to='authorization.userrelations'), + ), + ] diff --git a/apps/product/models.py b/apps/product/models.py index 40cc290..070571f 100644 --- a/apps/product/models.py +++ b/apps/product/models.py @@ -5,9 +5,9 @@ from django.contrib.postgres.fields import ArrayField class LivestockGroup(models.TextChoices): - ROOSTAEI = "roostaei", "روستایی" # noqa - SANATI = "sanati", "صنعتی" # noqa - ASHAYERI = "ashayeri", "عشایری" # noqa + ROOSTAEI = "rural", "روستایی" # noqa + SANATI = "industrial", "صنعتی" # noqa + ASHAYERI = "nomadic", "عشایری" # noqa class LivestockType(models.TextChoices): @@ -48,7 +48,9 @@ class ProductCategory(BaseModel): class Product(BaseModel): """ Child of reference product - like: brown rice """ + name = models.CharField(max_length=250, default='empty') # noqa + product_id = models.BigIntegerField(default=0) type_choices = ( ('free', 'FREE'), # free product ('gov', 'GOVERNMENTAL') # government product @@ -138,6 +140,7 @@ class Broker(BaseModel): ('public', 'PUBLIC'), ('exclusive', 'EXCLUSIVE') ) + name = models.CharField(max_length=255, null=True) product = models.ForeignKey( Product, on_delete=models.CASCADE, @@ -150,7 +153,6 @@ class Broker(BaseModel): related_name='product_organization', null=True ) - calculation_strategy = models.CharField( max_length=3, choices=CALCULATION_CHOICES, @@ -230,12 +232,27 @@ class IncentivePlan(BaseModel): class Quota(BaseModel): """ quota for product with some conditions """ - quota_id = models.CharField(max_length=15, null=True) + registerer_organization = models.ForeignKey( + UserRelations, + on_delete=models.CASCADE, + related_name='quotas', + null=True + ) + assigned_organizations = models.ManyToManyField( + UserRelations, + related_name='assigned_quotas', + blank=True + ) + quota_id = models.PositiveBigIntegerField(null=True, blank=True) quota_code = models.CharField(max_length=15, null=True) + quota_weight = models.PositiveIntegerField(default=0) + quota_distributed = models.PositiveIntegerField(default=0) + quota_balance = models.PositiveIntegerField(default=0) product = models.ForeignKey( Product, on_delete=models.CASCADE, - related_name='quota' + related_name='quotas', + null=True ) sale_type = models.CharField(max_length=50, choices=[("free", "آزاد"), ("gov", "دولتی")]) # noqa month_choices = ArrayField(base_field=models.IntegerField(), null=True) @@ -253,7 +270,36 @@ class Quota(BaseModel): def __str__(self): return f"Quota ({self.id}) for {self.product.name}" - def save(self, *args, **kwargs): + def generate_quota_id(self): # noqa + """ generate id for quota from 1001 """ + + last = Quota.objects.filter(quota_id__gte=1001, quota_id__lte=1999).order_by('-quota_id').first() + if last: + next_code = last.quota_id + 1 + else: + next_code = 1001 + return next_code + + def calculate_final_price(self): + """ calculate final price of quota """ + + factor_total = sum([ + f.value for f in self.attribute_values.all() + ]) + broker_total = sum([ + b.value for b in self.broker_values.all() + ]) + coop = self.base_price_cooperative or 0 + factory = self.base_price_factory or 0 + + return factor_total + broker_total + coop + factory + + def save(self, calculate_final_price=None, *args, **kwargs): + if not self.quota_id: + self.quota_id = self.generate_quota_id() + if calculate_final_price: + if not self.final_price: + self.final_price = self.calculate_final_price() return super(Quota, self).save(*args, **kwargs) @@ -327,3 +373,55 @@ class QuotaLivestockAllocation(BaseModel): def save(self, *args, **kwargs): return super(QuotaLivestockAllocation, self).save(*args, **kwargs) + + +class QuotaLiveStockAgeLimitation(BaseModel): + quota = models.ForeignKey( + Quota, + on_delete=models.CASCADE, + related_name='livestock_age_limitations', + null=True + ) + livestock_type = models.CharField(max_length=20, choices=LivestockType.choices) + livestock_subtype = models.CharField(max_length=20, choices=LivestockSubtype.choices) + age_month = models.PositiveIntegerField(default=0) + + def __str__(self): + return f"{self.livestock_type}/{self.livestock_subtype}: {self.age_month} month" + + def save(self, *args, **kwargs): + return super(QuotaLiveStockAgeLimitation, self).save(*args, **kwargs) + + +class QuotaDistribution(BaseModel): + assigner_organization = models.ForeignKey( + UserRelations, + on_delete=models.CASCADE, + related_name='distributions_assigner', + null=True + ) + description = models.TextField(max_length=1000, null=True) + distribution_id = models.CharField(max_length=20, null=True) + quota = models.ForeignKey( + Quota, + on_delete=models.CASCADE, + related_name='distributions_assigned', + null=True + ) + assigned_organization = models.ForeignKey( + UserRelations, + on_delete=models.CASCADE, + related_name='distributions', + null=True + ) + weight = models.PositiveBigIntegerField(default=0) + warehouse_entry = models.PositiveBigIntegerField(default=0) + warehouse_balance = models.PositiveBigIntegerField(default=0) + been_sold = models.PositiveBigIntegerField(default=0) + + def __str__(self): + return f"{self.distribution_id}-{self.assigned_organization.organization.name}" + + def save(self, *args, **kwargs): + return super(QuotaDistribution, self).save(*args, **kwargs) + diff --git a/apps/product/web/api/v1/api.py b/apps/product/web/api/v1/product_api.py similarity index 66% rename from apps/product/web/api/v1/api.py rename to apps/product/web/api/v1/product_api.py index 0f1bcf4..2c2dfe4 100644 --- a/apps/product/web/api/v1/api.py +++ b/apps/product/web/api/v1/product_api.py @@ -1,11 +1,15 @@ -from apps.product.web.api.v1 import serializers as product_serializers +import datetime + +from apps.product.web.api.v1 import product_serializers as product_serializers from rest_framework.exceptions import APIException from apps.product import models as product_models from rest_framework.response import Response from rest_framework.decorators import action +from common.tools import CustomOperations from rest_framework import viewsets from rest_framework import status from django.db import transaction +from django.db.models import Q def trash(queryset, pk): # noqa @@ -275,6 +279,27 @@ class IncentivePlanViewSet(viewsets.ModelViewSet): # noqa serializer = self.serializer_class(incentive_plans, many=True) return Response(serializer.data, status=status.HTTP_200_OK) + @action( + methods=['get'], + detail=False, + url_path='active_plans', + url_name='active_plans', + name='active_plans' + ) + @transaction.atomic + def active_plans(self, request): + """ return active incentive plans """ + + today = datetime.datetime.now().date() + user_relations = product_models.UserRelations.objects.filter(user=request.user).first() + incentive_plans = user_relations.incentive_plans.filter( + Q(is_time_unlimited=False) | + Q(start_date_limit__lte=today, end_date_limit__gte=today) + ) + + serializer = self.serializer_class(incentive_plans, many=True) + return Response(serializer.data, status=status.HTTP_200_OK) + @action( methods=['put'], detail=True, @@ -315,7 +340,122 @@ class QuotaViewSet(viewsets.ModelViewSet): # noqa @transaction.atomic def create(self, request, *args, **kwargs): - pass + """ custom create quota """ + + # get user relations data like organization + user_relation = request.user.user_relation.all().first() + + # add user relation to data + request.data['registerer_organization'] = user_relation.id + + # create quota + serializer = self.serializer_class(data=request.data) + if serializer.is_valid(): + quota = serializer.save() + + # create incentive plan + if 'incentive_plan_data' in request.data.keys(): + incentive_plan = CustomOperations().custom_create( + request=request, + view=QuotaIncentiveAssignmentViewSet(), + data_key='incentive_plan_data', + additional_data={'quota': quota.id} + ) + else: + incentive_plan = {} + + # create product price attributes for quota + attributes_value_list = [] + if 'price_attributes_data' in request.data.keys(): + for attr in request.data['price_attributes_data']: + attr.update({'quota': quota.id}) + attributes = CustomOperations().custom_create( + request=request, + view=AttributeValueViewSet(), + data=attr + ) + attributes_value_list.append(attributes) + + # create product broker values for quota + broker_data_list = [] + if 'broker_data' in request.data.keys(): + for broker in request.data['broker_data']: + broker.update({'quota': quota.id}) + broker_value = CustomOperations().custom_create( + request=request, + view=QuotaBrokerValueViewSet(), + data=broker + ) + broker_data_list.append(broker_value) + + # create livestock allocations to quota + allocations_list = [] + if 'livestock_allocation_data' in request.data.keys(): + for ls_alloc in request.data['livestock_allocation_data']: + ls_alloc.update({'quota': quota.id}) + allocations = CustomOperations().custom_create( + request=request, + view=QuotaLiveStockAllocationViewSet(), + data=ls_alloc + ) + allocations_list.append(allocations) + + # create livestock age limits for quota + livestock_age_limits = [] + if 'livestock_age_limitations' in request.data.keys(): + for age_limit in request.data['livestock_age_limitations']: + age_limit.update({'quota': quota.id}) + age_limit_creation_object = CustomOperations().custom_create( + request=request, + view=QuotaLiveStockAgeLimitation(), + data=age_limit + ) + livestock_age_limits.append(age_limit_creation_object) + + data = { + 'quota': serializer.data, + 'incentive_plan': incentive_plan, + 'attribute_values': attributes_value_list, + 'broker_values': broker_data_list, + 'live_stock_allocations': allocations_list, + 'livestock_age_limitations': livestock_age_limits + } + # call save method to generate id & calculate quota final price + quota.save(calculate_final_price=True) + return Response(data, status=status.HTTP_201_CREATED) + + @action( + methods=['get'], + detail=False, + url_name='list_for_assigner', + url_path='list_for_assigner', + name='list_for_assigner' + ) + def quotas_list_for_assigner(self, request): + """ list of quotas for creator """ + assigner = product_models.UserRelations.objects.filter(user=request.user).first() + serializers = self.serializer_class( + self.queryset.filter(registerer_organization=assigner), + many=True + ).data + return Response(serializers.data, status=status.HTTP_200_OK) + + @action( + methods=['get'], + detail=False, + url_name='list_for_assigned', + url_path='list_for_assigned', + name='list_for_assigned' + ) + def quotas_list_for_assigned(self, request): + """ list of quotas for assigned organizations """ + assigned = product_models.UserRelations.objects.filter(user=request.user).first() + serializer = self.serializer_class( + self.queryset.filter(assigned_organizations=assigned), + many=True + ) + + return Response(serializer.data, status=status.HTTP_200_OK) @action( methods=['put'], @@ -461,3 +601,39 @@ class QuotaLiveStockAllocationViewSet(viewsets.ModelViewSet): return Response(status=status.HTTP_200_OK) except APIException as e: return Response(e, status=status.HTTP_204_NO_CONTENT) + + +class QuotaLiveStockAgeLimitation(viewsets.ModelViewSet): + queryset = product_models.QuotaLiveStockAgeLimitation.objects.all() # noqa + serializer_class = product_serializers.QuotaLiveStockAgeLimitationSerializer + + @action( + methods=['put'], + detail=True, + url_path='trash', + url_name='trash', + name='trash', + ) + @transaction.atomic + def trash(self, request, pk=None): + """ Sent quota livestock age limitation to trash """ + try: + trash(self.queryset, pk) + except APIException as e: + return Response(e, status.HTTP_204_NO_CONTENT) + + @action( + methods=['post'], + detail=True, + url_name='delete', + url_path='delete', + name='delete' + ) + @transaction.atomic + def delete(self, request, pk=None): + """ Full delete of quota livestock age limitation object """ + try: + delete(self.queryset, pk) + return Response(status=status.HTTP_200_OK) + except APIException as e: + return Response(e, status=status.HTTP_204_NO_CONTENT) diff --git a/apps/product/web/api/v1/serializers.py b/apps/product/web/api/v1/product_serializers.py similarity index 89% rename from apps/product/web/api/v1/serializers.py rename to apps/product/web/api/v1/product_serializers.py index 8927da2..5110cef 100644 --- a/apps/product/web/api/v1/serializers.py +++ b/apps/product/web/api/v1/product_serializers.py @@ -57,8 +57,8 @@ class AttributeValueSerializer(serializers.ModelSerializer): """ Custom output """ representation = super().to_representation(instance) - if instance.product: - representation['product'] = ProductSerializer(instance.product).data + if instance.quota: + representation['quota'] = QuotaSerializer(instance.quota).data if instance.attribute: representation['attribute'] = AttributeSerializer(instance.attribute).data @@ -99,7 +99,7 @@ class SaleUnitSerializer(serializers.ModelSerializer): return representation -class IncentivePlanSerializer(serializers.ModelSerializer): +class IncentivePlanSerializer(serializers.ModelSerializer): # noqa class Meta: model = product_models.IncentivePlan fields = '__all__' @@ -117,7 +117,7 @@ class QuotaIncentiveAssignmentSerializer(serializers.ModelSerializer): fields = '__all__' -class QuotaBrokerValueSerializer(serializers.ModelSerializer): +class QuotaBrokerValueSerializer(serializers.ModelSerializer): # noqa class Meta: model = product_models.QuotaBrokerValue fields = '__all__' @@ -127,3 +127,9 @@ class QuotaLiveStockAllocationSerializer(serializers.ModelSerializer): class Meta: model = product_models.QuotaLivestockAllocation fields = '__all__' + + +class QuotaLiveStockAgeLimitationSerializer(serializers.ModelSerializer): + class Meta: + model = product_models.QuotaLiveStockAgeLimitation + fields = '__all__' diff --git a/apps/product/web/api/v1/quota_distribution_api.py b/apps/product/web/api/v1/quota_distribution_api.py new file mode 100644 index 0000000..ec01353 --- /dev/null +++ b/apps/product/web/api/v1/quota_distribution_api.py @@ -0,0 +1,66 @@ +from apps.product.web.api.v1 import quota_distribution_serializers as distribution_serializers +from apps.product.web.api.v1 import product_serializers as product_serializers +from rest_framework.exceptions import APIException +from apps.product import models as product_models +from rest_framework.response import Response +from rest_framework.decorators import action +from common.tools import CustomOperations +from rest_framework import viewsets +from rest_framework import status +from django.db import transaction +from django.db.models import Q + + +def trash(queryset, pk): # noqa + """ sent object to trash """ + obj = queryset.get(id=pk) + obj.trash = True + obj.save() + + +def delete(queryset, pk): + """ full delete object """ + obj = queryset.get(id=pk) + obj.delete() + + +class QuotaDistributionViewSet(viewsets.ModelViewSet): + queryset = product_models.QuotaDistribution.objects.all() + serializer_class = distribution_serializers.QuotaDistributionSerializer + + @transaction.atomic + def create(self, request, *args, **kwargs): + pass + + @action( + methods=['put'], + detail=True, + url_path='trash', + url_name='trash', + name='trash', + ) + @transaction.atomic + def trash(self, request, pk=None): + """ Sent quota distribution to trash """ + try: + trash(self.queryset, pk) + except APIException as e: + return Response(e, status.HTTP_204_NO_CONTENT) + + @action( + methods=['post'], + detail=True, + url_name='delete', + url_path='delete', + name='delete' + ) + @transaction.atomic + def delete(self, request, pk=None): + """ Full delete of quota distribution object """ + try: + delete(self.queryset, pk) + return Response(status=status.HTTP_200_OK) + except APIException as e: + return Response(e, status=status.HTTP_204_NO_CONTENT) + + diff --git a/apps/product/web/api/v1/quota_distribution_serializers.py b/apps/product/web/api/v1/quota_distribution_serializers.py new file mode 100644 index 0000000..85ecbc9 --- /dev/null +++ b/apps/product/web/api/v1/quota_distribution_serializers.py @@ -0,0 +1,23 @@ +from rest_framework import serializers +from apps.product import models as product_models +from apps.product.web.api.v1.product_serializers import QuotaSerializer + + +class QuotaDistributionSerializer(serializers.ModelSerializer): + class Meta: + model = product_models.QuotaDistribution + fields = '__all__' + extra_kwargs = { + 'assigner_organization': { + 'required': False + } + } + + def to_representation(self, instance): + """ Custom output of serializer """ + + representation = super().to_representation(instance) + if instance.quota: + representation['quota'] = QuotaSerializer(instance.quota).data + + return representation diff --git a/apps/product/web/api/v1/urls.py b/apps/product/web/api/v1/urls.py index 8eea23c..264537b 100644 --- a/apps/product/web/api/v1/urls.py +++ b/apps/product/web/api/v1/urls.py @@ -1,4 +1,5 @@ -from apps.product.web.api.v1 import api as api_views +from apps.product.web.api.v1 import quota_distribution_api as distribution_apis +from apps.product.web.api.v1 import product_api as api_views from rest_framework.routers import DefaultRouter from django.urls import path, include @@ -10,6 +11,8 @@ router.register(r'attribute_value', api_views.AttributeValueViewSet, basename='a router.register(r'broker', api_views.BrokerViewSet, basename='broker') router.register(r'sale_unit', api_views.SaleUnitViewSet, basename='sale_unit') router.register(r'incentive_plan', api_views.IncentivePlanViewSet, basename='incentive_plan') +router.register(r'quota', api_views.QuotaViewSet, basename='quota') +router.register(r'quota_distribution', distribution_apis.QuotaDistributionViewSet, basename='quota_distribution') urlpatterns = [ path('v1/', include(router.urls)) diff --git a/common/tools.py b/common/tools.py index 535752e..da6fb85 100644 --- a/common/tools.py +++ b/common/tools.py @@ -12,6 +12,7 @@ class CustomOperations: request: object = None, view: object = None, data_key: str = None, + data: dict = None, additional_data: dict = None ) -> typing.Any: """ @@ -25,9 +26,16 @@ class CustomOperations: view_data[data_key].update({'user': user.id}) # noqa if additional_data: view_data[data_key].update(additional_data) - serializer = view.serializer_class(data=view_data[data_key]) # noqa - serializer.is_valid(raise_exception=True) + + # if we have data_key for dictionary data get value + # if not, just put additional data in serializer + if data_key: + serializer = view.serializer_class(data=view_data[data_key]) # noqa + if data: + serializer = view.serializer_class(data=data) # noqa + serializer.is_valid(raise_exception=True) # noqa view.perform_create(serializer) # noqa + headers = view.get_success_headers(serializer.data) # noqa return serializer.data @@ -38,6 +46,7 @@ class CustomOperations: obj_id: object = None, view: object = None, data_key: str = None, + data: dict = None, additional_data: dict = None ) -> typing.Any: view_data = request.data # included needed data for view set # noqa @@ -45,8 +54,11 @@ class CustomOperations: view_data[data_key].update({'user': user.id}) # noqa if additional_data: view_data[data_key].update(additional_data) - serializer = view.serializer_class(data=view_data[data_key]) # noqa - serializer.is_valid(raise_exception=True) + if data_key: + serializer = view.serializer_class(data=view_data[data_key]) # noqa + if data: + serializer = view.serializer_class(data=data) # noqa + serializer.is_valid(raise_exception=True) # noqa serializer.update(view.queryset.get(id=obj_id), view_data[data_key]) # noqa # view.perform_update(serializer) # noqa headers = view.get_success_headers(serializer.data) # noqa