From 034ef28e542882e43c7ac956e0055b9fcd6e2279 Mon Sep 17 00:00:00 2001
From: Mario Raciti <mario.raciti@inaf.it>
Date: Wed, 31 Mar 2021 15:50:24 +0200
Subject: [PATCH] TMSS-692: Fix quota result
---
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
index 6b088f6667c..58f7584329e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
@@ -40,10 +40,10 @@ def create_project_report(request: Request, project: models.Project) -> {}:
project_pk = project.pk
result = {'project': project_pk} # Object to be returned
- # Add project_quota to result
- project_quota = models.ProjectQuota.objects.get(project=project_pk)
- project_quota_data = serializers.ProjectQuotaSerializer(project_quota, context={'request': request}).data
- result['quota'] = [{k: project_quota_data[k] for k in ('id', 'resource_type_id', 'value')}, ]
+ # Add project_quota(s) to result
+ project_quotas = models.ProjectQuota.objects.filter(project=project_pk)
+ project_quotas_data = [serializers.ProjectQuotaSerializer(pq, context={'request': request}).data for pq in project_quotas]
+ result['quota'] = [{k: pqd[k] for k in ('id', 'resource_type_id', 'value')} for pqd in project_quotas_data]
# Add durations to result
result['durations'] = _get_subs_and_durations_from_project(project_pk)
--
GitLab