diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py index b74e1cd1e8d4ca58343151843add8c710cf4dbc6..43a699ad5c8e4529d3e711cc46248132dba3cb13 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py +++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py @@ -57,14 +57,14 @@ def _get_subs_and_durations_from_project(project_pk: int) -> {}: return durations -def _get_lta_dataproducts(project_name: str) -> int: +def _get_lta_dataproducts(project_name: str) -> {}: """ Help function to retrieve the sum of the LTA dataproducts sizes. """ # Query dataproducts from Subtasks of type 'ingest' within 'finished' status return models.Dataproduct.objects.filter(producer__subtask__specifications_template__type='ingest') \ .filter(producer__subtask__state__value='finished') \ - .filter(producer__subtask__task_blueprint__draft__scheduling_unit_draft__scheduling_set__project__name=project_name) \ + .filter(producer__subtask__task_blueprints__draft__scheduling_unit_draft__scheduling_set__project__name=project_name) \ .aggregate(Sum('size')) diff --git a/SAS/TMSS/backend/test/t_adapter.py b/SAS/TMSS/backend/test/t_adapter.py index 259e47f8704065acb10aa663f206b7ef52a76b9f..4048a2e8120983cf846ede4dfdf17da6529bbcb0 100755 --- a/SAS/TMSS/backend/test/t_adapter.py +++ b/SAS/TMSS/backend/test/t_adapter.py @@ -533,7 +533,8 @@ class ProjectReportTest(unittest.TestCase): tb = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(task_draft=self.task_draft, scheduling_unit_blueprint=sub)) # Create Subtask of type 'ingest' subtask_template = models.SubtaskTemplate.objects.create(**SubtaskTemplate_test_data(subtask_type_value='ingest')) - subtask = models.Subtask.objects.create(**Subtask_test_data(task_blueprint=tb, subtask_template=subtask_template)) + subtask = models.Subtask.objects.create(**Subtask_test_data(subtask_template=subtask_template)) + subtask.task_blueprints.set([tb]) if status: # Set Subtask status to 'cancelled' with tmss_test_env.create_tmss_client() as client: