Default role value, and new role methods

hitier
1 parent 3423bf9d
Showing 3 changed files with 27 additions and 13 deletions Show diff stats
app/auth/models.py
app/commands/commands.py
tests/backend_tests.py
-from flask_login import UserMixin
+from pprint import pprint
+
+from flask_login import UserMixin, current_user
 from app.models import db
 #
 # Roles
 #
-ADMIN = 40
+ADMIN = 50
+PROJECT = 40
 SERVICE = 30
 AGENT = 10
 PUBLIC = 0
 _roleToName = {
     ADMIN: 'ADMIN',
+    PROJECT: 'PROJECT',
     SERVICE: 'SERVICE',
     AGENT: 'AGENT',
     PUBLIC: 'PUBLIC',
 }
 _nameToRole = {
     'ADMIN': ADMIN,
+    'PROJECT': PROJECT,
     'SERVICE': SERVICE,
     'AGENT': AGENT,
     'PUBLIC': PUBLIC,
@@ -43,14 +48,23 @@ class User(UserMixin, db.Model):
     name = db.Column(db.String(100))
     login = db.Column(db.String(100), unique=True)
     password = db.Column(db.String(100))
-    role = db.Column(db.Integer)
+    role = db.Column(db.Integer, default=0)
     def __repr__(self):
         return "i: {}, n: {}, e: {}, l: {}".format(self.id, self.name, self.email, self.login)
-    def setRole(self, role):
+    # Set role at construction time
+    def __init__(self, **kwargs):
+        super(User, self).__init__(**kwargs)
+        self.set_role(kwargs['role'])
+
+    def set_role(self, role):
         self.role = _checkRole(role)
-    def hasRole(self, role):
+    def has_role(self, role):
+        role = _checkRole(role)
+        return self.role == role
+
+    def has_role_or_higher(self, role):
         role = _checkRole(role)
-        return role == self.role
+        return self.role and (self.role >= role)
@@ -123,7 +123,7 @@ def user_delete(user_id):
 def create_db():
     """ Create the database structure."""
     db.create_all()
-    admin = User(email='admin@nowhere.org', name='admin', login='admin', password='admin')
+    admin = User(email='admin@nowhere.org', name='admin', login='admin', password='admin', role='admin')
     db.session.add(admin)
     db.session.commit()
@@ -11,7 +11,7 @@ class BaseTestCase(unittest.TestCase):
         self.app_context = self.app.app_context()
         self.app_context.push()
         db.create_all()
-        admin = User(email='admin@nowhere.org', name='admin', login='admin', password='admin')
+        admin = User(email='admin@nowhere.org', name='admin', login='admin', password='admin', role='admin')
         db.session.add(admin)
         db.session.commit()
@@ -38,14 +38,14 @@ class AuthModelTestCase(BaseTestCase):
     def test_setrole(self):
         admin = User.query.filter(User.name == 'admin').one_or_none()
-        admin.setRole("ADMIN")
+        admin.set_role("ADMIN")
         db.session.commit()
         admin = User.query.filter(User.name == 'admin').one_or_none()
         self.assertTrue(admin is not None)
-        self.assertTrue(admin.hasRole("ADMIN"))
-        self.assertFalse(admin.hasRole("SERVICE"))
+        self.assertTrue(admin.has_role("ADMIN"))
+        self.assertFalse(admin.has_role("SERVICE"))
     def test_setrole_valueerror(self):
-        admin = User(email='me@nowhere.org', name='me', login='me', password='me')
+        admin = User(email='me@nowhere.org', name='me', login='me', password='me', role='admin')
         with self.assertRaises(ValueError) as ve:
-            admin.setRole("NOSUCHROLE")
+            admin.set_role("NOSUCHROLE")