From d5c2c7b942fcbe0fe849d381f2ef39b7ea17ecc1 Mon Sep 17 00:00:00 2001 From: Mario Raciti <mario.raciti@inaf.it> Date: Tue, 8 Jun 2021 16:03:28 +0200 Subject: [PATCH] TMSS-610: Update get_cycles_report API --- SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py | 2 +- SAS/TMSS/backend/src/tmss/tmssapp/views.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py index 3f0b97b4b32..b811501bfb4 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py +++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py @@ -161,7 +161,7 @@ def _get_data_ingested_per_site_and_type(request: Request, cycle: models.Cycle) # archive_info = models.DataproductArchiveInfo.objects.filter(dataproduct__producer__subtask__task_blueprints__draft__scheduling_unit_draft__scheduling_set__project__cycles=cycle.pk) # dataproducts = [ai.dataproduct for ai in archive_info] - # Get DataProducts related to the cycle + # Get DataProducts related to the cycle dataproducts = models.Dataproduct.objects.filter(producer__subtask__task_blueprints__draft__scheduling_unit_draft__scheduling_set__project__cycles=cycle.pk) # Combine and filter DataPrducts accordingly diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/views.py b/SAS/TMSS/backend/src/tmss/tmssapp/views.py index 5d0f20c0650..705fe86c6fa 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/views.py +++ b/SAS/TMSS/backend/src/tmss/tmssapp/views.py @@ -280,19 +280,16 @@ def get_target_rise_and_set(request): return JsonResponse(rise_set_dict) -# TODO: Change method to POST, add other responses and change 'in_=body'. @swagger_auto_schema(method='GET', responses={200: 'A JSON object with cycles information for reporting.'}, manual_parameters=[Parameter(name='cycles', required=True, type='array', in_='query', items={'type': 'string'}, description="Cycles' primary keys.")]) @api_view(['GET']) def get_cycles_report(request): - # TODO: Sanitise inputs cycles = str(request.GET.get('cycles')).split(',') results = {} for c_pk in cycles: c = get_object_or_404(models.Cycle, pk=c_pk) - info = create_cycle_report(request, c) - results[c_pk] = info + results[c_pk] = create_cycle_report(request, c) return JsonResponse(results) -- GitLab