define a unseeding forums permissions and call into it from delete_cours...

cms/djangoapps/contentstore/management/commands/delete_course.py

@@ -7,6 +7,7 @@
 from xmodule.contentstore.django import contentstore
 from xmodule.course_module import CourseDescriptor
 from .prompt import query_yes_no
+from django_comment_common.utils import unseed_permissions_roles
 
 from auth.authz import _delete_course_group
 
@@ -40,6 +41,9 @@ def handle(self, *args, **options):
             if query_yes_no("Are you sure. This action cannot be undone!", default="no"):
                 loc = CourseDescriptor.id_to_location(course_id)
                 if delete_course(ms, cs, loc, commit):
+                    print 'removing forums permissions and roles...'
+                    unseed_permissions_roles(course_id)
+
                     print 'removing User permissions from course....'
                     # in the django layer, we need to remove all the user permissions groups associated with this course
                     if commit:

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -55,6 +55,8 @@
 from pymongo import MongoClient
 from student.models import CourseEnrollment
 
+from django_comment_common.utils import unseed_permissions_roles
+
 TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)
 TEST_DATA_CONTENTSTORE['OPTIONS']['db'] = 'test_xcontent_%s' % uuid4().hex
 
@@ -1292,6 +1294,37 @@ def test_create_course_check_forum_seeding(self):
         test_course_data = self.assert_created_course(number_suffix=uuid4().hex)
         self.assertTrue(are_permissions_roles_seeded(self._get_course_id(test_course_data)))
 
+    def test_forum_unseeding(self):
+        """Test new course creation and verify forum seeding """
+        test_course_data = self.assert_created_course(number_suffix=uuid4().hex)
+        course_id = self._get_course_id(test_course_data)
+        unseed_permissions_roles(course_id)
+        self.assertFalse(are_permissions_roles_seeded(course_id))
+
+    def test_forum_unseeding_with_different_casing(self):
+        """Test new course creation and verify forum unseeding """
+        test_course_data = self.assert_created_course(number_suffix=uuid4().hex)
+        # make sure we don't delete a forum permissions set with different casing
+        # than the passed in course_id. This is because Mongo and MySQL are using different collations
+        course_id = self._get_course_id(test_course_data)
+        unseed_permissions_roles(course_id.upper())
+        # permissions should still be there!
+        self.assertTrue(are_permissions_roles_seeded(course_id))
+
+    def test_forum_unseeding_with_multiple_courses(self):
+        """Test new course creation and verify forum unseeding when there are multiple courses"""
+        test_course_data = self.assert_created_course(number_suffix=uuid4().hex)
+        second_course_data = self.assert_created_course(number_suffix=uuid4().hex)
+
+        # unseed the forums for the first course
+        course_id = self._get_course_id(test_course_data)
+        unseed_permissions_roles(course_id)
+        self.assertFalse(are_permissions_roles_seeded(course_id))
+
+        second_course_id = self._get_course_id(second_course_data)
+        # permissions should still be there for the other course
+        self.assertTrue(are_permissions_roles_seeded(second_course_id))
+
     def _get_course_id(self, test_course_data):
         """Returns the course ID (org/number/run)."""
         return "{org}/{number}/{run}".format(**test_course_data)

common/djangoapps/django_comment_common/utils.py

@@ -32,8 +32,44 @@ def seed_permissions_roles(course_id):
     administrator_role.inherit_permissions(moderator_role)
 
 
-def are_permissions_roles_seeded(course_id):
+def unseed_permissions_roles(course_id):
+    """
+    A utility method to clean up all forum related permissions and roles
+    """
+    try:
+        administrator_role = Role.objects.get(name="Administrator", course_id=course_id)
+        if administrator_role.course_id == course_id:
+            administrator_role.delete()
+    except Role.DoesNotExist:
+        pass
 
+    try:
+        moderator_role = Role.objects.get(name="Moderator", course_id=course_id)
+        if moderator_role.course_id == course_id:
+            moderator_role.delete()
+    except Role.DoesNotExist:
+        pass
+
+    try:
+        community_ta_role = Role.objects.get(name="Community TA", course_id=course_id)
+        if community_ta_role.course_id == course_id:
+            community_ta_role.delete()
+    except Role.DoesNotExist:
+        pass
+
+    try:
+        student_role = Role.objects.get(name="Student", course_id=course_id)
+        if student_role.course_id == course_id:
+            student_role.delete()
+    except Role.DoesNotExist:
+        pass
+
+
+def are_permissions_roles_seeded(course_id):
+    """
+    Returns whether the forums permissions for a course have been provisioned in
+    the database
+    """
     try:
         administrator_role = Role.objects.get(name="Administrator", course_id=course_id)
         moderator_role = Role.objects.get(name="Moderator", course_id=course_id)