import - quota dashboard & some changes in product quota stat

This commit is contained in:
2025-12-07 15:50:35 +03:30
parent 3a768e8b13
commit 6491c53306
6 changed files with 224 additions and 128 deletions

View File

@@ -14,7 +14,6 @@ from common.helpers import get_organization_by_user
from .models import (
QuotaDistribution,
Quota,
Product,
ProductStats,
QuotaStats, OrganizationQuotaStats
)
@@ -75,144 +74,150 @@ def update_quota_remaining(sender, instance, **kwargs):
remaining_distribution_weight(instance)
def update_product_stats(instance: Product, distribution: QuotaDistribution = None):
def update_product_stats(instance: OrganizationQuotaStats):
""" update all stats of product """
user = get_current_user() # get user object
if not isinstance(user, AnonymousUser):
organization = get_organization_by_user(user)
QuotaStatsValidator.validate_assigner_has_enough(
organization,
distribution.quota,
distribution.weight,
allow_zero=True
# QuotaStatsValidator.validate_assigner_has_enough(
# organization,
# distribution.quota,
# distribution.weight,
# allow_zero=True
# )
stat, created = ProductStats.objects.get_or_create(
organization=organization,
product=instance,
sale_unit=instance.quota.sale_unit.unit
)
if ProductStats.objects.filter(
organization=organization,
product=instance,
sale_unit=distribution.quota.sale_unit.unit
):
stat = instance.stats.get(
organization=organization,
product=instance,
sale_unit=distribution.quota.sale_unit.unit
)
else:
stat = ProductStats.objects.create(
product=instance,
organization=organization,
sale_unit=distribution.quota.sale_unit.unit
)
# number of quotas
quota = Quota.objects.filter(
Q(
distributions_assigned__in=QuotaDistribution.objects.filter(
Q(assigned_organization=organization) |
Q(assigner_organization=organization) &
Q(parent_distribution__isnull=True)
)
) |
Q(registerer_organization=organization),
product=instance
).distinct()
quotas_count = quota.count() # noqa
total_quotas_weight = quota.aggregate( # noqa
total=models.Sum('quota_weight')
)['total'] or 0
# total weight of product that assigned in quota
active_quotas_weight = quota.filter(is_closed=False).aggregate(
total=models.Sum('quota_weight')
)['total'] or 0
closed_quotas_weight = quota.filter(is_closed=True).aggregate( # noqa
total=models.Sum('quota_weight')
)['total'] or 0
# total remaining weight of product quotas
total_remaining_quotas_weight = quota.filter(is_closed=False).aggregate( # noqa
total=models.Sum('remaining_weight')
)['total'] or 0
received_distribution_weight = QuotaDistribution.objects.filter(
quota__product_id=instance.id,
quota__is_closed=False,
quota__sale_unit=distribution.quota.sale_unit,
assigned_organization=organization,
parent_distribution__isnull=True
org_quota_stat = OrganizationQuotaStats.objects.filter(
organization=organization,
quota__product=instance.quota.product,
)
received_distribution_number = received_distribution_weight.count()
quotas_count = org_quota_stat.count() # noqa
received_distribution_weight = received_distribution_weight.aggregate(
total_weight=models.Sum('weight')
)['total_weight'] or 0
# product total distributed weight from quota
given_distribution_weight = QuotaDistribution.objects.filter(
quota__product_id=instance.id,
quota__is_closed=False,
quota__sale_unit=distribution.quota.sale_unit,
assigner_organization=organization,
parent_distribution__isnull=True
product_stat_data = org_quota_stat.aggregate(
total_quotas_weight=models.Sum('total_amount'),
active_quotas_weight=models.Sum('active_quotas_weight', filter=Q(quota__is_closed=False)),
closed_quotas_weight=models.Sum('closed_quotas_weight', filter=Q(quota__is_closed=True)),
total_remaining_quotas_weight=models.Sum('remaining_amount'),
total_distributed=models.Sum('quota_distributed'),
total_inventory_in=models.Sum('total_inventory_in'),
total_sold=models.Sum('total_sold'),
)
# quota = Quota.objects.filter(
# Q(
# distributions_assigned__in=QuotaDistribution.objects.filter(
# Q(assigned_organization=organization) |
# Q(assigner_organization=organization) &
# Q(parent_distribution__isnull=True)
#
# )
# ) |
# Q(registerer_organization=organization),
# product=instance
# ).distinct()
#
# quotas_count = quota.count() # noqa
#
# total_quotas_weight = quota.aggregate( # noqa
# total=models.Sum('quota_weight')
# )['total'] or 0
#
# # total weight of product that assigned in quota
# active_quotas_weight = quota.filter(is_closed=False).aggregate(
# total=models.Sum('quota_weight')
# )['total'] or 0
#
# closed_quotas_weight = quota.filter(is_closed=True).aggregate( # noqa
# total=models.Sum('quota_weight')
# )['total'] or 0
#
# # total remaining weight of product quotas
# total_remaining_quotas_weight = quota.filter(is_closed=False).aggregate( # noqa
# total=models.Sum('remaining_weight')
# )['total'] or 0
#
# received_distribution_weight = QuotaDistribution.objects.filter(
# quota__product_id=instance.id,
# quota__is_closed=False,
# quota__sale_unit=distribution.quota.sale_unit,
# assigned_organization=organization,
# parent_distribution__isnull=True
# )
#
# received_distribution_number = received_distribution_weight.count()
#
# received_distribution_weight = received_distribution_weight.aggregate(
# total_weight=models.Sum('weight')
# )['total_weight'] or 0
#
# # product total distributed weight from quota
# given_distribution_weight = QuotaDistribution.objects.filter(
# quota__product_id=instance.id,
# quota__is_closed=False,
# quota__sale_unit=distribution.quota.sale_unit,
# assigner_organization=organization,
# parent_distribution__isnull=True
# )
#
# given_distribution_number = given_distribution_weight.count()
# given_distribution_weight = given_distribution_weight.aggregate(
# total_weight=models.Sum('weight')
# )['total_weight'] or 0
#
# if received_distribution_weight > 0:
# distribution_weight_balance = received_distribution_weight - given_distribution_weight
# else:
# distribution_weight_balance = given_distribution_weight
#
# # total sold of product from quota
# total_sold = QuotaDistribution.objects.filter(
# quota__product_id=instance.id,
# quota__is_closed=False,
# quota__sale_unit=distribution.quota.sale_unit,
# assigned_organization=organization
# ).aggregate(total_sold=models.Sum('been_sold'))['total_sold'] or 0
#
# # total entry from product to inventory
# total_warehouse_entry = QuotaDistribution.objects.filter(
# quota__product_id=instance.id,
# quota__is_closed=False,
# quota__sale_unit=distribution.quota.sale_unit,
# assigned_organization=organization
# ).aggregate(total_entry=models.Sum('warehouse_entry'))['total_entry'] or 0
given_distribution_number = given_distribution_weight.count()
given_distribution_weight = given_distribution_weight.aggregate(
total_weight=models.Sum('weight')
)['total_weight'] or 0
if received_distribution_weight > 0:
distribution_weight_balance = received_distribution_weight - given_distribution_weight
else:
distribution_weight_balance = given_distribution_weight
# total sold of product from quota
total_sold = QuotaDistribution.objects.filter(
quota__product_id=instance.id,
quota__is_closed=False,
quota__sale_unit=distribution.quota.sale_unit,
assigned_organization=organization
).aggregate(total_sold=models.Sum('been_sold'))['total_sold'] or 0
# total entry from product to inventory
total_warehouse_entry = QuotaDistribution.objects.filter(
quota__product_id=instance.id,
quota__is_closed=False,
quota__sale_unit=distribution.quota.sale_unit,
assigned_organization=organization
).aggregate(total_entry=models.Sum('warehouse_entry'))['total_entry'] or 0
stat.quotas_number = quotas_count
stat.active_quotas_weight = active_quotas_weight
stat.closed_quotas_weight = closed_quotas_weight
stat.total_quota_weight = total_quotas_weight
stat.total_quota_remaining = total_remaining_quotas_weight
stat.total_remaining_distribution_weight = distribution_weight_balance
stat.received_distribution_weight = received_distribution_weight
stat.given_distribution_weight = given_distribution_weight
stat.received_distribution_number = received_distribution_number
stat.given_distribution_number = given_distribution_number
stat.total_warehouse_entry = total_warehouse_entry
stat.total_sold = total_sold
stat.save(update_fields=[
"quotas_number",
"active_quotas_weight",
"closed_quotas_weight",
"total_quota_weight",
"total_quota_remaining",
"total_remaining_distribution_weight",
"received_distribution_weight",
"given_distribution_weight",
"received_distribution_number",
"total_warehouse_entry",
"total_sold",
])
# stat.quotas_number = quotas_count
# stat.active_quotas_weight = active_quotas_weight
# stat.closed_quotas_weight = closed_quotas_weight
# stat.total_quota_weight = total_quotas_weight
# stat.total_quota_remaining = total_remaining_quotas_weight
# stat.total_remaining_distribution_weight = distribution_weight_balance
# stat.received_distribution_weight = received_distribution_weight
# stat.given_distribution_weight = given_distribution_weight
# stat.received_distribution_number = received_distribution_number
# stat.given_distribution_number = given_distribution_number
# stat.total_warehouse_entry = total_warehouse_entry
# stat.total_sold = total_sold
# stat.save(update_fields=[
# "quotas_number",
# "active_quotas_weight",
# "closed_quotas_weight",
# "total_quota_weight",
# "total_quota_remaining",
# "total_remaining_distribution_weight",
# "received_distribution_weight",
# "given_distribution_weight",
# "received_distribution_number",
# "total_warehouse_entry",
# "total_sold",
# ])
def update_quota_stats(instance: Quota):
@@ -254,7 +259,7 @@ def update_quota_stats(instance: Quota):
@receiver([post_save, post_delete], sender=InventoryQuotaSaleTransaction)
def update_stats_on_change(sender, instance, **kwargs):
if sender == QuotaDistribution:
update_product_stats(instance.quota.product, instance)
# update_product_stats(instance.quota.product, instance)
update_quota_stats(instance.quota)
# if _from_signal=True prevent from maximum recursion loop