Merge pull request #274 from grant-project/develop

0.4.1

backend/README.md

@@ -85,14 +85,18 @@ For a full migration command reference, run `flask db --help`.
 
 ## Commands
 
-To create a proposal, run
+To create a proposal
 
     flask create-proposal "FUNDING_REQUIRED" 1 123 "My Awesome Proposal" "### Hi! I have a great proposal"
 
-To seed many proposals, run
+To seed many proposal
 
     flask create-proposals <number_of_proposals:int>
 
+To set a user to admin
+
+    flask set-admin <email|id>
+
 
 ## S3 Storage Setup
 

backend/grant/app.py

@@ -88,5 +88,5 @@ def register_commands(app):
 
     app.cli.add_command(proposal.commands.create_proposal)
     app.cli.add_command(proposal.commands.create_proposals)
-    app.cli.add_command(user.commands.delete_user)
+    app.cli.add_command(user.commands.set_admin)
     app.cli.add_command(task.commands.create_task)

backend/grant/user/commands.py

@@ -4,22 +4,42 @@ from flask.cli import with_appcontext
 from .models import User, db
 
 
+# @click.command()
+# @click.argument('identity')
+# @with_appcontext
+# def delete_user(identity):
+#     print(identity)
+#     if str.isdigit(identity):
+#         user = User.get_by_id(identity)
+#     else:
+#         user = User.get_by_email(identity)
+#
+#     if user:
+#         db.session.delete(user)
+#         db.session.commit()
+#         click.echo(f'Succesfully deleted {user.display_name} (uid {user.id})')
+#     else:
+#         raise click.BadParameter('Invalid user identity. Must be a userid, ' \
+#                                  'account address, or email address of an ' \
+#                                  'existing user.')
+
+
 @click.command()
 @click.argument('identity')
 @with_appcontext
-def delete_user(identity):
-    print(identity)
-    user = None
+def set_admin(identity):
+    print("Setting admin to user with identity: " + identity)
     if str.isdigit(identity):
         user = User.get_by_id(identity)
     else:
         user = User.get_by_email(identity)
 
     if user:
-        db.session.delete(user)
+        user.set_admin(True)
+        db.session.add(user)
         db.session.commit()
-        click.echo(f'Succesfully deleted {user.display_name} (uid {user.id})')
+        click.echo(f'Successfully set {user.display_name} (uid {user.id}) to admin')
     else:
-        raise click.BadParameter('Invalid user identity. Must be a userid, ' \
-                                 'account address, or email address of an ' \
-                                 'existing user.')
+        raise click.BadParameter('''Invalid user identity. Must be a userid, 
+                                 'account address, or email address of an  
+                                 'existing user.''')