Merge pull request #2422 from laws-africa/activity-deadlock

filter out dead activities from list

Author: longhotsummer

indigo_api/views/documents.py

@@ -1,3 +1,4 @@
+import datetime
 import logging
 import copy
 
@@ -286,6 +287,11 @@ class DocumentActivityViewSet(DocumentResourceView,
     def get_queryset(self):
         return self.document.activities.prefetch_related('user').all()
 
+    def filter_queryset(self, queryset):
+        # only return entries that aren't stale
+        threshold = timezone.now() - datetime.timedelta(seconds=DocumentActivity.DEAD_SECS)
+        return queryset.filter(updated_at__gt=threshold)
+
     def create(self, request, *args, **kwargs):
         # if they've provided additional finished nonces, clear those out
         if request.data.get('finished_nonces'):