Merge pull request #58 from chopdgd/pyup-scheduled-update-2018-10-29

Scheduled weekly dependency update for week 43

Author: genomics-geek

requirements_test.txt

@@ -1,13 +1,13 @@
 coverage==4.5.1
 mock==2.0.0
-flake8==3.5.0
-tox==3.5.2
+flake8==3.6.0
+tox==3.5.3
 codecov==2.0.15
 
 
 # Additional test requirements go here
 
-pytest==3.9.1
+pytest==3.9.3
 pytest-cov==2.6.0
 pytest-django==3.4.3
 pytest-sugar==0.9.1

user_activities/managers.py

@@ -9,18 +9,24 @@ def fast(self):
         return self.select_related('user').all()
 
     def aggregate_counts(self, content_type, object_id, active=True):
-        return self.fast().filter(
-            Q(content_type=content_type) &
-            Q(object_id=object_id) &
-            Q(active=True)
-        ).values('activity_type').annotate(total=Count('activity_type'))
+        counts_filter = Q(content_type=content_type)
+        counts_filter &= Q(object_id=object_id)
+        counts_filter &= Q(active=True)
+
+        return self.fast()\
+            .filter(counts_filter) \
+            .values('activity_type') \
+            .annotate(total=Count('activity_type'))
 
     def user_actions(self, user, content_type, object_id):
-        return self.fast().filter(
-            Q(user__id=user.id) &
-            Q(content_type=content_type) &
-            Q(object_id=object_id)
-        ).values('id', 'active', 'activity_type').distinct()
+        actions_filter = Q(user__id=user.id)
+        actions_filter &= Q(content_type=content_type)
+        actions_filter &= Q(object_id=object_id)
+
+        return self.fast() \
+            .filter(actions_filter) \
+            .values('id', 'active', 'activity_type') \
+            .distinct()
 
 
 class CommentQuerySet(models.QuerySet):