Add calculation delay to ricecooker bulk endpoint, update tests

Author: bjester

contentcuration/contentcuration/decorators.py

@@ -76,6 +76,10 @@ class DelayUserStorageCalculation(ContextDecorator):
     def is_active(self):
         return self.depth > 0
 
+    def add(self, user_id):
+        if user_id not in self.queue:
+            self.queue.append(user_id)
+
     def __enter__(self):
         self.depth += 1
 

contentcuration/contentcuration/tests/test_decorators.py

@@ -2,17 +2,22 @@
 
 from contentcuration.decorators import delay_user_storage_calculation
 from contentcuration.tests.base import StudioTestCase
+from contentcuration.tests.base import testdata
 from contentcuration.utils.user import calculate_user_storage
 
 
 class DecoratorsTestCase(StudioTestCase):
+    def setUp(self):
+        super(DecoratorsTestCase, self).setUp()
+        self.user = testdata.user()
+
     @mock.patch("contentcuration.utils.user.calculate_user_storage_task")
     def test_delay_storage_calculation(self, mock_task):
         @delay_user_storage_calculation
         def do_test():
-            calculate_user_storage(self.admin_user.id)
-            calculate_user_storage(self.admin_user.id)
+            calculate_user_storage(self.user.id)
+            calculate_user_storage(self.user.id)
             mock_task.fetch_or_enqueue.assert_not_called()
 
         do_test()
-        mock_task.fetch_or_enqueue.assert_called_once_with(self.admin_user, user_id=self.admin_user.id)
+        mock_task.fetch_or_enqueue.assert_called_once_with(self.user, user_id=self.user.id)

contentcuration/contentcuration/utils/user.py

@@ -9,7 +9,7 @@ def calculate_user_storage(user_id):
     from contentcuration.decorators import delay_user_storage_calculation
 
     if delay_user_storage_calculation.is_active:
-        delay_user_storage_calculation.queue.append(user_id)
+        delay_user_storage_calculation.add(user_id)
         return
 
     try:

contentcuration/contentcuration/views/internal.py

@@ -37,6 +37,7 @@
 from contentcuration.api import activate_channel
 from contentcuration.api import write_file_to_storage
 from contentcuration.constants import completion_criteria
+from contentcuration.decorators import delay_user_storage_calculation
 from contentcuration.models import AssessmentItem
 from contentcuration.models import Change
 from contentcuration.models import Channel
@@ -54,7 +55,6 @@
 from contentcuration.utils.nodes import map_files_to_node
 from contentcuration.utils.nodes import map_files_to_slideshow_slide_item
 from contentcuration.utils.sentry import report_exception
-from contentcuration.utils.tracing import trace
 from contentcuration.viewsets.sync.constants import CHANNEL
 from contentcuration.viewsets.sync.utils import generate_publish_event
 from contentcuration.viewsets.sync.utils import generate_update_event
@@ -565,7 +565,7 @@ def __init__(self, node, errors):
         super(IncompleteNodeError, self).__init__(self.message)
 
 
-@trace
+@delay_user_storage_calculation
 def convert_data_to_nodes(user, content_data, parent_node):
     """ Parse dict and create nodes accordingly """
     try: