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

fix - product filtering on distribuition dashboard

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-09 13:46:15 +03:30
parent 9aef4967c7
commit 1205a64812
2 changed files with 74 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/product/services/quota_dashboard_service.py
View File

@@ -14,28 +14,36 @@ class QuotaDashboardService:
@staticmethod
def get_dashboard(self, org: Organization, start_date: str = None, end_date: str = None,
search_fields: list[str] = None, quota_is_closed: bool = False, query_string: str = None):
search_fields: list[str] = None, quota_is_closed: bool = False, query_string: str = None,
product_id: int = None,
):
distribution_number = 0
base_filter = {} # filter queries
if product_id:
base_filter['quota__product_id'] = product_id
if quota_is_closed:
base_filter['quota__is_closed'] = quota_is_closed
if org.type.key == 'ADM':
org_quota_stats = OrganizationQuotaStats.objects.filter(
stat_type='quota',
quota__is_closed=quota_is_closed
**base_filter
)
dist_org_quota_stats = OrganizationQuotaStats.objects.filter(
stat_type='distribution',
quota__is_closed=quota_is_closed
**base_filter
)
else:
org_quota_stats = OrganizationQuotaStats.objects.filter(
organization=org,
quota__is_closed=quota_is_closed,
**base_filter
)
dist_org_quota_stats = OrganizationQuotaStats.objects.filter(
stat_type='distribution',
organization=org,
quota__is_closed=quota_is_closed
**base_filter
)
# filter queryset (transactions & items) by date
@@ -49,18 +57,18 @@ class QuotaDashboardService:
query_string=query_string
).apply()
for stat in org_quota_stats.distinct('quota'):
if org.type.key == 'ADM':
distribution_number += QuotaDistribution.objects.select_related('quota').filter(
quota=stat.quota,
quota__is_closed=False
).count()
else:
distribution_number += QuotaDistribution.objects.filter(
Q(assigner_organization=org),
quota=stat.quota,
quota__is_closed=False
).count()
quota_ids = org_quota_stats.values_list("quota_id", flat=True)
if org.type.key == 'ADM':
distribution_number += QuotaDistribution.objects.select_related('quota').filter(
quota_id__in=quota_ids,
quota__is_closed=False
).count()
else:
distribution_number += QuotaDistribution.objects.filter(
Q(assigner_organization=org),
quota_id__in=quota_ids,
quota__is_closed=False
).count()
org_quota_stats = org_quota_stats.aggregate(
total_quotas=Count("quota", distinct=True),