diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py index 3f0b97b4b3232596c737e0544c97bc5ac8769a4b..b811501bfb4d79e5e6a6f7ed4c8d856f15b17196 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 5d0f20c0650343e10285f8aa8953e63fe6089a84..705fe86c6fa499b4150c8c6782fb295cc5fa26ab 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)