Rename the event to PUBLISHED_NEXT

Author: taoerman

contentcuration/contentcuration/tests/viewsets/base.py

@@ -15,7 +15,7 @@
 from contentcuration.viewsets.sync.utils import generate_publish_event as base_generate_publish_event
 from contentcuration.viewsets.sync.utils import generate_update_event as base_generate_update_event
 from contentcuration.viewsets.sync.utils import generate_update_descendants_event as base_generate_update_descendants_event
-from contentcuration.viewsets.sync.utils import generate_publish_staging_tree_event as base_generate_publish_staging_tree_event
+from contentcuration.viewsets.sync.utils import generate_publish_next_event as base_generate_publish_next_event
 
 
 def generate_copy_event(*args, **kwargs):
@@ -67,8 +67,8 @@ def generate_publish_channel_event(channel_id):
     event["rev"] = random.randint(1, 10000000)
     return event
 
-def generate_publish_staging_tree_event(channel_id):
-    event = base_generate_publish_staging_tree_event(channel_id)
+def generate_publish_next_event(channel_id):
+    event = base_generate_publish_next_event(channel_id)
     event["rev"] = random.randint(1, 10000000)
     return event
 

contentcuration/contentcuration/tests/viewsets/test_channel.py

@@ -17,7 +17,7 @@
 from contentcuration.tests.viewsets.base import generate_delete_event
 from contentcuration.tests.viewsets.base import generate_deploy_channel_event
 from contentcuration.tests.viewsets.base import generate_publish_channel_event
-from contentcuration.tests.viewsets.base import generate_publish_staging_tree_event
+from contentcuration.tests.viewsets.base import generate_publish_next_event
 from contentcuration.tests.viewsets.base import generate_sync_channel_event
 from contentcuration.tests.viewsets.base import generate_update_event
 from contentcuration.tests.viewsets.base import SyncTestMixin
@@ -403,7 +403,7 @@ def test_publish_does_not_make_publishable(self):
 
         self.assertEqual(_unpublished_changes_query(channel).count(), 0)
 
-    def test_publish_staging_tree(self):
+    def test_publish_next(self):
         channel = testdata.channel()
         user = testdata.user()
         channel.editors.add(user)
@@ -423,15 +423,15 @@ def test_publish_staging_tree(self):
 
         response = self.sync_changes(
                     [
-                        generate_publish_staging_tree_event(channel.id)
+                        generate_publish_next_event(channel.id)
                     ]
                 )
 
         self.assertEqual(response.status_code, 200)
         modified_channel = models.Channel.objects.get(id=channel.id)
         self.assertEqual(modified_channel.staging_tree.published, True)
 
-    def test_publish_staging_tree_incomplete(self):
+    def test_publish_next_with_incomplete_staging_tree(self):
         channel = testdata.channel()
         user = testdata.user()
         channel.editors.add(user)
@@ -448,7 +448,7 @@ def test_publish_staging_tree_incomplete(self):
 
         response = self.sync_changes(
                     [
-                        generate_publish_staging_tree_event(channel.id)
+                        generate_publish_next_event(channel.id)
                     ]
                 )
 

contentcuration/contentcuration/viewsets/channel.py

@@ -560,18 +560,18 @@ def publish(self, pk, version_notes="", language=None):
                 ], applied=True, unpublishable=True)
                 raise
 
-    def publish_staging_tree_from_changes(self, changes):
+    def publish_next_from_changes(self, changes):
         errors = []
         for publish in changes:
             try:
-                self.publish_staging_tree(publish["key"])
+                self.publish_next(publish["key"])
             except Exception as e:
                 log_sync_exception(e, user=self.request.user, change=publish)
                 publish["errors"] = [str(e)]
                 errors.append(publish)
         return errors
 
-    def publish_staging_tree(self, pk):
+    def publish_next(self, pk):
         logging.debug("Entering the publish staging channel endpoint")
 
         channel = self.get_edit_queryset().get(pk=pk)

contentcuration/contentcuration/viewsets/sync/base.py

@@ -24,7 +24,7 @@
 from contentcuration.viewsets.sync.constants import DELETED
 from contentcuration.viewsets.sync.constants import DEPLOYED
 from contentcuration.viewsets.sync.constants import UPDATED_DESCENDANTS
-from contentcuration.viewsets.sync.constants import STAGING_TREE_PUBLISHED
+from contentcuration.viewsets.sync.constants import PUBLISHED_NEXT
 from contentcuration.viewsets.sync.constants import EDITOR_M2M
 from contentcuration.viewsets.sync.constants import FILE
 from contentcuration.viewsets.sync.constants import INVITATION
@@ -97,7 +97,7 @@ def get_change_type(obj):
     SYNCED: "sync_from_changes",
     DEPLOYED: "deploy_from_changes",
     UPDATED_DESCENDANTS: "update_descendants_from_changes",
-    STAGING_TREE_PUBLISHED: "publish_staging_tree_from_changes"
+    PUBLISHED_NEXT: "publish_next_from_changes"
 }
 
 

contentcuration/contentcuration/viewsets/sync/constants.py

@@ -8,7 +8,7 @@
 SYNCED = 7
 DEPLOYED = 8
 UPDATED_DESCENDANTS = 9
-STAGING_TREE_PUBLISHED = 10
+PUBLISHED_NEXT = 10
 
 
 ALL_CHANGES = set([
@@ -21,7 +21,7 @@
     SYNCED,
     DEPLOYED,
     UPDATED_DESCENDANTS,
-    STAGING_TREE_PUBLISHED,
+    PUBLISHED_NEXT,
 ])
 
 # Client-side table constants

contentcuration/contentcuration/viewsets/sync/utils.py

@@ -14,7 +14,7 @@
 from contentcuration.viewsets.sync.constants import PUBLISHED
 from contentcuration.viewsets.sync.constants import UPDATED
 from contentcuration.viewsets.sync.constants import UPDATED_DESCENDANTS
-from contentcuration.viewsets.sync.constants import STAGING_TREE_PUBLISHED
+from contentcuration.viewsets.sync.constants import PUBLISHED_NEXT
 
 
 def validate_table(table):
@@ -89,8 +89,8 @@ def generate_update_descendants_event(key, mods, channel_id=None, user_id=None):
     event["mods"] = mods
     return event
 
-def generate_publish_staging_tree_event(key, version_notes="", language=None):
-    event = _generate_event(key, CHANNEL, STAGING_TREE_PUBLISHED, key, None)
+def generate_publish_next_event(key, version_notes="", language=None):
+    event = _generate_event(key, CHANNEL, PUBLISHED_NEXT, key, None)
     event["version_notes"] = version_notes
     event["language"] = language
     return event