diff --git a/apps/herd/services/rancher_service.py b/apps/herd/services/rancher_service.py index 7b4c0ba..1f4a57a 100644 --- a/apps/herd/services/rancher_service.py +++ b/apps/herd/services/rancher_service.py @@ -4,10 +4,11 @@ from django.db.models import Sum, functions, Value class RancherService: @staticmethod - def get_total_used_weight(rancher, sale_item): + def get_total_used_weight(rancher, sale_item, distribution): return sale_item.objects.filter( transaction__rancher=rancher, - transaction__transaction_status='success' + transaction__transaction_status='success', + quota_distribution=distribution, ).aggregate( total_weight=functions.Coalesce(Sum('weight'), Value(0)) )['total_weight'] diff --git a/apps/herd/services/services.py b/apps/herd/services/services.py index e6fbe30..8d0cf56 100644 --- a/apps/herd/services/services.py +++ b/apps/herd/services/services.py @@ -152,7 +152,7 @@ def rancher_quota_weight( total_weight += rancher_plan_weight print(total_weight) # get rancher remaining usage of quota for purchase - rancher_remaining_usage = RancherService.get_total_used_weight(rancher, InventoryQuotaSaleItem) + rancher_remaining_usage = RancherService.get_total_used_weight(rancher, InventoryQuotaSaleItem, distribution) if total_weight - rancher_remaining_usage < 0: remaining_weight = 0