From 4eaf9d89f3e5de2fa87cd53071a6f8d2694259df Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Wed, 25 Jul 2012 23:25:18 -0700 Subject: [PATCH] Excluded task user from reviewer stats and logs (bug 775900) --- apps/devhub/models.py | 5 ++++- mkt/reviewers/tests/test_views.py | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/devhub/models.py b/apps/devhub/models.py index 308d1e9eee2..6bd826755e7 100644 --- a/apps/devhub/models.py +++ b/apps/devhub/models.py @@ -194,13 +194,15 @@ def editor_events(self): def review_queue(self, webapp=False): qs = self._by_type(webapp) - return qs.filter(action__in=amo.LOG_REVIEW_QUEUE) + return (qs.filter(action__in=amo.LOG_REVIEW_QUEUE) + .exclude(user__id=settings.TASK_USER_ID)) def total_reviews(self, webapp=False): qs = self._by_type(webapp) """Return the top users, and their # of reviews.""" return (qs.values('user', 'user__display_name', 'user__username') .filter(action__in=amo.LOG_REVIEW_QUEUE) + .exclude(user__id=settings.TASK_USER_ID) .annotate(approval_count=models.Count('id')) .order_by('-approval_count')) @@ -212,6 +214,7 @@ def monthly_reviews(self, webapp=False): return (qs.values('user', 'user__display_name', 'user__username') .filter(created__gte=created_date, action__in=amo.LOG_REVIEW_QUEUE) + .exclude(user__id=settings.TASK_USER_ID) .annotate(approval_count=models.Count('id')) .order_by('-approval_count')) diff --git a/mkt/reviewers/tests/test_views.py b/mkt/reviewers/tests/test_views.py index 179a46cce59..95838dc6f80 100644 --- a/mkt/reviewers/tests/test_views.py +++ b/mkt/reviewers/tests/test_views.py @@ -923,6 +923,12 @@ def setUp(self): status=amo.WEBAPPS_UNREVIEWED_STATUS)] self.url = reverse('reviewers.apps.logs') + self.task_user = UserProfile.objects.get(email='admin@mozilla.com') + patcher = mock.patch.object(settings, 'TASK_USER_ID', + self.task_user.id) + patcher.start() + self.addCleanup(patcher.stop) + def get_user(self): return UserProfile.objects.all()[0] @@ -930,6 +936,9 @@ def make_approvals(self): for app in self.apps: amo.log(amo.LOG.REJECT_VERSION, app, app.current_version, user=self.get_user(), details={'comments': 'youwin'}) + # Throw in a few tasks logs that shouldn't get queried. + amo.log(amo.LOG.REREVIEW_MANIFEST_CHANGE, app, app.current_version, + user=self.task_user, details={'comments': 'foo'}) def make_an_approval(self, action, comment='youwin', username=None, app=None):