technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-10 07:42:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch '14-day-stat' into 'marietje-zuid'"

Browse Source 
This reverts merge request !24
This commit is contained in:
Gerdriaan Mulder
2019-03-05 18:09:45 +01:00
parent 289e93755b
commit 83b0cdf790
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
marietje/stats/utils.py
View File

@ -1,3 +1,5 @@
from datetime import datetime, timedelta
from django.core.cache import caches
from django.conf import settings
from django.db.models import Count, Q, Sum
@ -61,7 +63,7 @@ def adding_list_item(most_requested_list, requests):
def compute_stats():
# We want to grab the time now, because otherwise we would be reporting a minute too late
last_updated = timezone.now()
last_updated = datetime.now()
stats = {}
stats['total_uploads'] = Song.objects.filter(deleted=False).exclude(
@ -104,7 +106,7 @@ def compute_stats():
stats['most_played_songs_14_days'] = PlaylistSong.objects.filter(
state=2, played_at__gte=timezone.now() -
timezone.timedelta(days=14)).exclude(user_id=None).values(
timedelta(days=14)).exclude(user_id=None).values(
'song__artist',
'song__title').annotate(total=Count('id')).order_by(
'-total', 'song__artist')[:settings.STATS_TOP_COUNT]
@ -172,7 +174,7 @@ def compute_stats():
def user_stats(request):
last_updated = timezone.now()
last_updated = datetime.now()
total_uploads = Song.objects.filter(
user__id=request, deleted=False).count()