Move logic to mark live submission to submission model

Author: Jakoma02

contentcuration/contentcuration/models.py

@@ -2605,6 +2605,21 @@ def save(self, *args, **kwargs):
 
         super().save(*args, **kwargs)
 
+    def mark_live(self):
+        """
+        Marks this submission as the live submission for the channel,
+        and marks any previously live submissions as approved but not live.
+        """
+        CommunityLibrarySubmission.objects.filter(
+            channel=self.channel,
+            status=community_library_submission.STATUS_LIVE,
+        ).update(
+            status=community_library_submission.STATUS_APPROVED,
+        )
+
+        self.status = community_library_submission.STATUS_LIVE
+        self.save()
+
     @classmethod
     def filter_view_queryset(cls, queryset, user):
         if user.is_anonymous:

contentcuration/contentcuration/tests/test_models.py

@@ -689,6 +689,42 @@ def test_filter_edit_queryset__admin(self):
         )
         self.assertQuerysetContains(queryset, pk=submission_a.id)
 
+    def test_mark_live(self):
+        submission_a = testdata.community_library_submission()
+        submission_b = testdata.community_library_submission()
+
+        channel = submission_a.channel
+        channel.version = 2
+        submission_b.channel = channel
+
+        submission_a.channel_version = 1
+        submission_a.status = community_library_submission.STATUS_LIVE
+        submission_a.save()
+
+        submission_b.channel_version = 2
+        submission_b.author = submission_a.author
+        submission_b.status = community_library_submission.STATUS_APPROVED
+        submission_b.save()
+
+        submission_other_channel = testdata.community_library_submission()
+        submission_other_channel.status = community_library_submission.STATUS_LIVE
+        submission_other_channel.save()
+
+        submission_b.mark_live()
+
+        submission_a.refresh_from_db()
+        submission_b.refresh_from_db()
+        submission_other_channel.refresh_from_db()
+
+        self.assertEqual(
+            submission_a.status, community_library_submission.STATUS_APPROVED
+        )
+        self.assertEqual(submission_b.status, community_library_submission.STATUS_LIVE)
+        self.assertEqual(
+            submission_other_channel.status,
+            community_library_submission.STATUS_LIVE,
+        )
+
 
 class AssessmentItemTestCase(PermissionQuerysetTestCase):
     @property

contentcuration/contentcuration/viewsets/channel.py

@@ -828,22 +828,12 @@ def add_to_community_library(
             countries=countries,
         )
 
-        # Mark the submission corresponding to the channel version
-        # as the only live submission for the channel
-        CommunityLibrarySubmission.objects.filter(
-            channel_id=channel_id,
-            status=community_library_submission_constants.STATUS_LIVE,
-        ).update(
-            status=community_library_submission_constants.STATUS_APPROVED,
-        )
-
         new_live_submission = CommunityLibrarySubmission.objects.get(
             channel_id=channel_id,
             channel_version=channel_version,
             status=community_library_submission_constants.STATUS_APPROVED,
         )
-        new_live_submission.status = community_library_submission_constants.STATUS_LIVE
-        new_live_submission.save()
+        new_live_submission.mark_live()
 
     @action(
         detail=True,