Add one command to create moderator group and add users to the group

3 files changed, 48 insertions, 67 deletions

diff --git a/yaksh/management/commands/add_moderator.py b/yaksh/management/commands/add_moderator.py
deleted file mode 100644
index 5e63285..0000000
--- a/yaksh/management/commands/add_moderator.py
+++ /dev/null
@@ -1,37 +0,0 @@
-'''
-   This command adds users to the moderator group with permissions to add, change and delete
-   the objects in the exam app.
-'''
-
-# django imports
-from django.core.management.base import BaseCommand, CommandError
-from django.contrib.auth.models import User, Group, Permission
-from django.contrib.contenttypes.models import ContentType
-from django.db.utils import IntegrityError
-
-# Yaksh imports
-from yaksh.models import Profile
-
-class Command(BaseCommand):
-    help = 'Adds users to the moderator group'
-
-    def add_arguments(self, parser):
-        # Positional arguments
-        parser.add_argument('usernames', nargs='+', type=str)
-
-    def handle(self, *args, **options):
-        try:
-            group = Group.objects.get(name='moderator')
-        except Group.DoesNotExist:
-            raise CommandError('Moderator Group does not exist')
-
-        for uname in options['usernames']:
-            try:
-                user = User.objects.get(username=uname)
-            except User.DoesNotExist:
-                raise CommandError('User "{0}" does not exist'.format(uname))
-            if user in group.user_set.all():
-                self.stdout.write('User "{0}" is already a Moderator'.format(uname))
-            else:
-                group.user_set.add(user)
-                self.stdout.write('Successfully added User "{0}" to Moderator group'.format(uname))
diff --git a/yaksh/management/commands/create_mod_group.py b/yaksh/management/commands/create_mod_group.py
deleted file mode 100644
index 0bf08df..0000000
--- a/yaksh/management/commands/create_mod_group.py
+++ /dev/null
@@ -1,30 +0,0 @@
-'''
-   This command creates a moderator group with permissions to add, change and delete
-   the objects in the exam app.
-'''
-
-# django imports
-from django.core.management.base import BaseCommand, CommandError
-from django.contrib.auth.models import Group, Permission
-from django.contrib.contenttypes.models import ContentType
-from django.db.utils import IntegrityError
-
-class Command(BaseCommand):
-    help = 'Adds the moderator group'
-
-    def handle(self, *args, **options):
-        app_label = 'yaksh'
-        group = Group(name='moderator')
-        try:
-            group.save()
-        except IntegrityError:
-            raise CommandError("The group already exits")
-        else:
-            # Get the models for the given app
-            content_types = ContentType.objects.filter(app_label=app_label)
-            # Get list of permissions for the models
-            permission_list = Permission.objects.filter(content_type__in=content_types)
-            group.permissions.add(*permission_list)
-            group.save()
-
-        self.stdout.write('Moderator group added successfully')
diff --git a/yaksh/management/commands/create_moderator.py b/yaksh/management/commands/create_moderator.py
new file mode 100644
index 0000000..3bbe462
--- /dev/null
+++ b/yaksh/management/commands/create_moderator.py
@@ -0,0 +1,48 @@
+'''
+   This command creates a moderator group and adds users to the moderator group with permissions to add, change and delete
+   the objects in the exam app.
+'''
+
+# django imports
+from django.core.management.base import BaseCommand, CommandError
+from django.contrib.auth.models import User, Group, Permission
+from django.contrib.contenttypes.models import ContentType
+from django.db.utils import IntegrityError
+
+# Yaksh imports
+from yaksh.models import Profile
+
+class Command(BaseCommand):
+    help = 'Adds users to the moderator group'
+
+    def add_arguments(self, parser):
+        # Positional arguments
+        parser.add_argument('usernames', nargs='*', type=str)
+
+    def handle(self, *args, **options):
+        app_label = 'yaksh'
+
+        try:
+            group = Group.objects.get(name='moderator')
+        except Group.DoesNotExist:
+            group = Group(name='moderator')
+            group.save()
+            # Get the models for the given app
+            content_types = ContentType.objects.filter(app_label=app_label)
+            # Get list of permissions for the models
+            permission_list = Permission.objects.filter(content_type__in=content_types)
+            group.permissions.add(*permission_list)
+            group.save()
+            self.stdout.write('Moderator group added successfully')
+
+        if options['usernames']:
+            for uname in options['usernames']:
+                try:
+                    user = User.objects.get(username=uname)
+                except User.DoesNotExist:
+                    raise CommandError('User "{0}" does not exist'.format(uname))
+                if user in group.user_set.all():
+                    self.stdout.write('User "{0}" is already a Moderator'.format(uname))
+                else:
+                    group.user_set.add(user)
+                    self.stdout.write('Successfully added User "{0}" to Moderator group'.format(uname))