MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix - remove child_total / not self.instanceto validate in distribution serializer

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-12 14:05:24 +03:30
parent 4663422d69
commit 3a9534e3e5
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/product/web/api/v1/serializers/quota_distribution_serializers.py
View File

@@ -61,14 +61,12 @@ class QuotaDistributionSerializer(serializers.ModelSerializer):
# if parent distribution is none compare with main quota weight # if parent distribution is none compare with main quota weight
# else compare with parent distribution weight # else compare with parent distribution weight
if not self.instance:
if not parent_distribution: if not parent_distribution:
if total + amount > quota.quota_weight: if total + amount > quota.quota_weight:
raise QuotaWeightException() raise QuotaWeightException()
else: else:
children_total = parent_distribution.children.all().aggregate( if parent_distribution.remaining_weight + amount > parent_distribution.remaining_weight:
total=models.Sum('weight')
)['total'] or 0
if children_total + amount > parent_distribution.weight:
raise QuotaWeightException() raise QuotaWeightException()
if self.instance: if self.instance:
@@ -81,15 +79,16 @@ class QuotaDistributionSerializer(serializers.ModelSerializer):
if total_entry > self.instance.weight: if total_entry > self.instance.weight:
raise APIException("وزن وارد شده کمتر از وزن ورودی به انبار است", code=403) # noqa raise APIException("وزن وارد شده کمتر از وزن ورودی به انبار است", code=403) # noqa
if self.instance.parent_distribution:
if self.instance.parent_distribution.remaining_weight + amount > self.instance.parent_distribution.remaining_weight:
raise QuotaWeightException()
# if weight is more than distribution remaining weight # if weight is more than distribution remaining weight
if not self.instance.parent_distribution: if not self.instance.parent_distribution:
if amount + total > self.instance.quota.quota_weight: if amount + total > self.instance.quota.quota_weight:
raise APIException("وزن وارد شده بیشتر از وزن باقیمانده است", code=403) # noqa raise APIException("وزن وارد شده بیشتر از وزن باقیمانده است", code=403) # noqa
else: else:
children_total = self.instance.parent_distribution.children.all().aggregate( if self.instance.parent_distribution.remaining_weight + amount > self.instance.parent_distribution.remaining_weight:
total=models.Sum('weight')
)['total'] or 0
if children_total + amount > self.instance.parent_distribution.weight:
raise QuotaWeightException() raise QuotaWeightException()
return data return data