consolidate delete role logic

common/djangoapps/django_comment_common/utils.py

@@ -32,37 +32,23 @@ def seed_permissions_roles(course_id):
     administrator_role.inherit_permissions(moderator_role)
 
 
-def unseed_permissions_roles(course_id):
-    """
-    A utility method to clean up all forum related permissions and roles
-    """
+def _remove_permission_role(course_id, name):
     try:
-        administrator_role = Role.objects.get(name="Administrator", course_id=course_id)
-        if administrator_role.course_id == course_id:
-            administrator_role.delete()
+        role = Role.objects.get(name=name, course_id=course_id)
+        if role.course_id == course_id:
+            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 unseed_permissions_roles(course_id):
+    """
+    A utility method to clean up all forum related permissions and roles
+    """
+    _remove_permission_role(name="Administrator", course_id=course_id)
+    _remove_permission_role(name="Moderator", course_id=course_id)
+    _remove_permission_role(name="Community TA", course_id=course_id)
+    _remove_permission_role(name="Student", course_id=course_id)
 
 
 def are_permissions_roles_seeded(course_id):