From fa4f5c15c886be04687764877a9e8f9e296143c1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 10 Sep 2010 18:27:18 -0500 Subject: Restore flagged package count by maintainer in dashboard We need to do a little dropping into SQL to accomplish this, but it isn't all that bad to actually do and we can do the whole thing in one query. Signed-off-by: Dan McGee --- devel/utils.py | 37 +++++++++++++++++++++++++++++++++++++ devel/views.py | 5 +++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 devel/utils.py (limited to 'devel') diff --git a/devel/utils.py b/devel/utils.py new file mode 100644 index 0000000..abfdabe --- /dev/null +++ b/devel/utils.py @@ -0,0 +1,37 @@ +from django.contrib.auth.models import User +from django.db import connection + +from main.utils import cache_function +from packages.models import PackageRelation + +@cache_function(300) +def get_annotated_maintainers(): + maintainers = User.objects.filter(is_active=True).order_by( + 'first_name', 'last_name') + + # annotate the maintainers with # of maintained and flagged packages + pkg_count_sql = """ +SELECT pr.user_id, COUNT(*), COUNT(p.flag_date) + FROM packages_packagerelation pr + JOIN packages p + ON pr.pkgbase = p.pkgbase + WHERE pr.type = %s + GROUP BY pr.user_id +""" + cursor = connection.cursor() + cursor.execute(pkg_count_sql, [PackageRelation.MAINTAINER]) + results = cursor.fetchall() + + pkg_count = {} + flag_count = {} + for k, total, flagged in results: + pkg_count[k] = total + flag_count[k] = flagged + + for m in maintainers: + m.package_count = pkg_count.get(m.id, 0) + m.flagged_count = flag_count.get(m.id, 0) + + return maintainers + +# vim: set ts=4 sw=4 et: diff --git a/devel/views.py b/devel/views.py index eea90e3..3703767 100644 --- a/devel/views.py +++ b/devel/views.py @@ -12,6 +12,7 @@ from main.models import Arch, Repo from main.models import UserProfile from mirrors.models import Mirror from packages.models import PackageRelation +from .utils import get_annotated_maintainers import random from string import ascii_letters, digits @@ -28,8 +29,8 @@ def index(request): 'pkg', 'pkg__arch', 'pkg__repo').filter(complete=False) todopkgs = todopkgs.filter(pkg__pkgbase__in=inner_q).order_by( 'list__name', 'pkg__pkgname') - maintainers = User.objects.filter(is_active=True).order_by( - 'first_name', 'last_name') + + maintainers = get_annotated_maintainers() page_dict = { 'todos': Todolist.objects.incomplete().order_by('-date_added'), -- cgit v1.2.3-24-g4f1b