Merge pull request doccano#390 from CatalystCode/enhancement/improve-annotation-creation-performance

Enhancement/Improve annotation creation performance

Author: Hironsan

app/api/tests/test_api.py

@@ -1351,6 +1351,12 @@ def test_returns_label_count(self):
         self.assertIn('user', response.data)
         self.assertIsInstance(response.data['user'], dict)
 
+    def test_returns_partial_response(self):
+        self.client.login(username=self.super_user_name,
+                          password=self.super_user_pass)
+        response = self.client.get(f'{self.url}?include=user', format='json')
+        self.assertEqual(list(response.data.keys()), ['user'])
+
 
 class TestUserAPI(APITestCase):
 
@@ -1527,4 +1533,4 @@ def test_disallows_project_member_to_delete_mapping(self):
         self.client.login(username=self.project_member_name,
                           password=self.project_member_pass)
         response = self.client.delete(self.url, format='json')
-        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)

app/api/views.py

@@ -68,12 +68,22 @@ class StatisticsAPI(APIView):
 
     def get(self, request, *args, **kwargs):
         p = get_object_or_404(Project, pk=self.kwargs['project_id'])
-        label_count, user_count = self.label_per_data(p)
-        progress = self.progress(project=p)
-        response = dict()
-        response['label'] = label_count
-        response['user'] = user_count
-        response.update(progress)
+
+        include = set(request.GET.getlist('include'))
+        response = {}
+
+        if not include or 'label' in include or 'user' in include:
+            label_count, user_count = self.label_per_data(p)
+            response['label'] = label_count
+            response['user'] = user_count
+
+        if not include or 'total' in include or 'remaining' in include:
+            progress = self.progress(project=p)
+            response.update(progress)
+
+        if include:
+            response = {key: value for (key, value) in response.items() if key in include}
+
         return Response(response)
 
     def progress(self, project):
@@ -177,8 +187,7 @@ def create(self, request, *args, **kwargs):
         return super().create(request, args, kwargs)
 
     def perform_create(self, serializer):
-        doc = get_object_or_404(Document, pk=self.kwargs['doc_id'])
-        serializer.save(document=doc, user=self.request.user)
+        serializer.save(document_id=self.kwargs['doc_id'], user=self.request.user)
 
 
 class AnnotationDetail(generics.RetrieveUpdateDestroyAPIView):

app/server/static/components/annotationMixin.js

@@ -242,7 +242,7 @@ export default {
 
     annotations() {
       // fetch progress info.
-      HTTP.get('statistics').then((response) => {
+      HTTP.get('statistics?include=total&include=remaining').then((response) => {
         this.total = response.data.total;
         this.remaining = response.data.remaining;
       });