Merge pull request doccano#230 from vinayaugustine/per-user-filter

Feature/Filter the progress bar & document list by a user's own annotations

Author: Hironsan

app/server/api.py

@@ -79,7 +79,8 @@ def progress(self, project):
         docs = project.documents
         annotation_class = project.get_annotation_class()
         total = docs.count()
-        done = annotation_class.objects.filter(document_id__in=docs.all()).\
+        done = annotation_class.objects.filter(document_id__in=docs.all(),
+            user_id=self.request.user).\
             aggregate(Count('document', distinct=True))['document__count']
         remaining = total - done
         return {'total': total, 'remaining': remaining}

app/server/filters.py

@@ -1,4 +1,4 @@
-from django.db.models import Count
+from django.db.models import Count, Q
 from django_filters.rest_framework import FilterSet, BooleanFilter
 from .models import Document
 
@@ -9,7 +9,9 @@ class DocumentFilter(FilterSet):
     seq2seq_annotations__isnull = BooleanFilter(field_name='seq2seq_annotations', method='filter_annotations')
 
     def filter_annotations(self, queryset, field_name, value):
-        queryset = queryset.annotate(num_annotations=Count(field_name))
+        queryset = queryset.annotate(num_annotations=
+            Count(field_name, filter=
+                Q(**{ f"{field_name}__user": self.request.user})))
 
         should_have_annotations = not value
         if should_have_annotations:

app/server/tests/test_api.py

@@ -1039,7 +1039,7 @@ def setUpTestData(cls):
         main_project = mommy.make('server.TextClassificationProject', users=[super_user])
         doc1 = mommy.make('server.Document', project=main_project)
         doc2 = mommy.make('server.Document', project=main_project)
-        mommy.make('DocumentAnnotation', document=doc1)
+        mommy.make('DocumentAnnotation', document=doc1, user=super_user)
         cls.url = reverse(viewname='statistics', args=[main_project.id])
         cls.doc = Document.objects.filter(project=main_project)