From f4a6da8956e3197bc88c42431a2896e3b66edf53 Mon Sep 17 00:00:00 2001 From: Ihsan Ullah Date: Sat, 24 Jun 2023 19:33:44 +0500 Subject: [PATCH] analytics download fixed --- src/apps/api/views/analytics.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/apps/api/views/analytics.py b/src/apps/api/views/analytics.py index f2cafabf7..084b042e7 100644 --- a/src/apps/api/views/analytics.py +++ b/src/apps/api/views/analytics.py @@ -113,22 +113,22 @@ def get(self, request): time_unit = request.query_params.get('time_unit') csv = request.query_params.get('format') == 'csv' - start_date = datetime.datetime.strptime(start_date, '%Y-%m-%d').replace(tzinfo=pytz.UTC) - end_date = datetime.datetime.strptime(end_date, '%Y-%m-%d').replace(hour=11, minute=59, second=59, tzinfo=pytz.UTC) + _start_date = datetime.datetime.strptime(start_date, '%Y-%m-%d').replace(tzinfo=pytz.UTC) + _end_date = datetime.datetime.strptime(end_date, '%Y-%m-%d').replace(hour=11, minute=59, second=59, tzinfo=pytz.UTC) - users = build_request_object(User, 'date_joined', time_unit, start_date, end_date, csv, 'users_data_date', 'users_data_count') - competitions = build_request_object(Competition, 'created_when', time_unit, start_date, end_date, csv, 'competitions_data_date', 'competitions_data_count') - submissions = build_request_object(Submission, 'created_when', time_unit, start_date, end_date, csv, 'submissions_data_date', 'submissions_data_count') + users = build_request_object(User, 'date_joined', time_unit, _start_date, _end_date, csv, 'users_data_date', 'users_data_count') + competitions = build_request_object(Competition, 'created_when', time_unit, _start_date, _end_date, csv, 'competitions_data_date', 'competitions_data_count') + submissions = build_request_object(Submission, 'created_when', time_unit, _start_date, _end_date, csv, 'submissions_data_date', 'submissions_data_count') if csv: ob = [{ 'start_date': start_date, 'end_date': end_date, 'time_unit': time_unit, - 'registered_user_count': User.objects.filter(date_joined__range=[start_date, end_date]).count(), - 'competition_count': Competition.objects.filter(created_when__range=[start_date, end_date]).count(), - 'competitions_published_count': Competition.objects.filter(published=True, created_when__range=[start_date, end_date]).count(), - 'submissions_made_count': Submission.objects.filter(created_when__range=[start_date, end_date]).count(), + 'registered_user_count': User.objects.filter(date_joined__range=[_start_date, _end_date]).count(), + 'competition_count': Competition.objects.filter(created_when__range=[_start_date, _end_date]).count(), + 'competitions_published_count': Competition.objects.filter(published=True, created_when__range=[_start_date, _end_date]).count(), + 'submissions_made_count': Submission.objects.filter(created_when__range=[_start_date, _end_date]).count(), }] max_len = max(len(users), len(competitions), len(submissions))