Skip to content

Commit

Permalink
fixed stats ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
vabene1111 committed Aug 14, 2023
1 parent 041ae34 commit 2440046
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions api.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,17 @@ def list(self, request):
},
}

food_stats_total = OpenDataFood.objects.all().values('created_by__username').annotate(total=Count('created_by')).order_by('total')[:3]
conversion_stats_total = OpenDataConversion.objects.all().values('created_by__username').annotate(total=Count('created_by')).order_by('total')[:3]
food_stats_total = OpenDataFood.objects.all().values('created_by__username').annotate(total=Count('created_by')).order_by('-total')[:3]
conversion_stats_total = OpenDataConversion.objects.all().values('created_by__username').annotate(total=Count('created_by')).order_by('-total')[:3]

for f in food_stats_total:
stats['food_stats_total'].append({'username': f['created_by__username'], 'count': f['total']})

for f in conversion_stats_total:
stats['conversion_stats_total'].append({'username': f['created_by__username'], 'count': f['total']})

food_stats_last_30 = OpenDataFood.objects.filter(created_at__gt=datetime.datetime.today()-datetime.timedelta(days=30)).all().values('created_by__username').annotate(total=Count('created_by')).order_by('total')[:3]
conversion_stats_last_30 = OpenDataConversion.objects.filter(created_at__gt=datetime.datetime.today()-datetime.timedelta(days=30)).all().values('created_by__username').annotate(total=Count('created_by')).order_by('total')[:3]
food_stats_last_30 = OpenDataFood.objects.filter(created_at__gt=datetime.datetime.today()-datetime.timedelta(days=30)).all().values('created_by__username').annotate(total=Count('created_by')).order_by('-total')[:3]
conversion_stats_last_30 = OpenDataConversion.objects.filter(created_at__gt=datetime.datetime.today()-datetime.timedelta(days=30)).all().values('created_by__username').annotate(total=Count('created_by')).order_by('-total')[:3]

for f in food_stats_last_30:
stats['food_stats_last_30'].append({'username': f['created_by__username'], 'count': f['total']})
Expand Down

0 comments on commit 2440046

Please sign in to comment.