前后端全面升级

cmdb-api/api/lib/perm/acl/user.py

@@ -9,13 +9,17 @@ from flask import abort
 from flask import g
 
 from api.extensions import db
+from api.lib.perm.acl.audit import AuditCRUD, AuditOperateType, AuditScope
 from api.lib.perm.acl.cache import UserCache
+from api.lib.perm.acl.resp_format import ErrFormat
 from api.lib.perm.acl.role import RoleCRUD
 from api.models.acl import Role
 from api.models.acl import User
 
 
 class UserCRUD(object):
+    cls = User
+
     @staticmethod
     def search(q, page=1, page_size=None):
         query = db.session.query(User).filter(User.deleted.is_(False))
@@ -27,7 +31,7 @@ class UserCRUD(object):
         return numfound, query.offset((page - 1) * page_size).limit(page_size)
 
     @staticmethod
-    def _gen_key_secret():
+    def gen_key_secret():
         key = uuid.uuid4().hex
         secret = ''.join(random.sample(string.ascii_letters + string.digits + '~!@#$%^&*?', 32))
 
@@ -36,62 +40,76 @@ class UserCRUD(object):
     @classmethod
     def add(cls, **kwargs):
         existed = User.get_by(username=kwargs['username'], email=kwargs['email'])
-        existed and abort(400, "User <{0}> is already existed".format(kwargs['username']))
+        existed and abort(400, ErrFormat.user_exists.format(kwargs['username']))
 
-        is_admin = kwargs.pop('is_admin', False)
         kwargs['nickname'] = kwargs.get('nickname') or kwargs['username']
         kwargs['block'] = 0
-        kwargs['key'], kwargs['secret'] = cls._gen_key_secret()
+        kwargs['key'], kwargs['secret'] = cls.gen_key_secret()
 
+        user_employee = db.session.query(User).filter(User.deleted.is_(False)).order_by(
+            User.employee_id.desc()).first()
+
+        biggest_employee_id = int(float(user_employee.employee_id)) \
+            if user_employee is not None else 0
+
+        kwargs['employee_id'] = '{0:04d}'.format(biggest_employee_id + 1)
         user = User.create(**kwargs)
 
-        role = RoleCRUD.add_role(user.username, uid=user.uid)
-
-        if is_admin:
-            from api.lib.perm.acl.cache import AppCache
-            from api.lib.perm.acl.role import RoleRelationCRUD
-            admin_r = Role.get_by(name='admin', first=True, to_dict=False) or \
-                      RoleCRUD.add_role('admin', AppCache.get('cmdb').id, True)
-
-            RoleRelationCRUD.add(admin_r.id, role.id)
+        RoleCRUD.add_role(user.username, uid=user.uid)
+        AuditCRUD.add_role_log(None, AuditOperateType.create,
+                               AuditScope.user, user.uid, {}, user.to_dict(), {}, {}
+                               )
 
         return user
 
     @staticmethod
     def update(uid, **kwargs):
-        user = User.get_by(uid=uid, to_dict=False, first=True) or abort(404, "User <{0}> does not exist".format(uid))
+        user = User.get_by(uid=uid, to_dict=False, first=True) or abort(
+            404, ErrFormat.user_not_found.format("uid={}".format(uid)))
 
         if kwargs.get("username"):
             other = User.get_by(username=kwargs['username'], first=True, to_dict=False)
             if other is not None and other.uid != user.uid:
-                return abort(400, "User <{0}> cannot be duplicated".format(kwargs['username']))
+                return abort(400, ErrFormat.user_exists.format(kwargs['username']))
 
         UserCache.clean(user)
-
+        origin = user.to_dict()
         if kwargs.get("username") and kwargs['username'] != user.username:
             role = Role.get_by(name=user.username, first=True, to_dict=False)
             if role is not None:
-                RoleCRUD.update_role(role.id, **dict(name=kwargs['name']))
+                RoleCRUD.update_role(role.id, **dict(name=kwargs['username']))
 
-        return user.update(**kwargs)
+        user = user.update(**kwargs)
+
+        AuditCRUD.add_role_log(None, AuditOperateType.update,
+                               AuditScope.user, user.uid, origin, user.to_dict(), {}, {}
+                               )
+
+        return user
 
     @classmethod
     def reset_key_secret(cls):
-        key, secret = cls._gen_key_secret()
+        key, secret = cls.gen_key_secret()
         g.user.update(key=key, secret=secret)
 
+        UserCache.clean(g.user)
+
         return key, secret
 
     @classmethod
     def delete(cls, uid):
-        if hasattr(g, 'user') and uid == g.user.uid:
-            return abort(400, "You cannot delete yourself")
+        user = User.get_by(uid=uid, to_dict=False, first=True) or abort(
+            404, ErrFormat.user_not_found.format("uid={}".format(uid)))
 
-        user = User.get_by(uid=uid, to_dict=False, first=True) or abort(404, "User <{0}> does not exist".format(uid))
+        origin = user.to_dict()
+
+        user.soft_delete()
 
         UserCache.clean(user)
 
-        for i in Role.get_by(uid=uid, to_dict=False):
-            i.delete()
+        AuditCRUD.add_role_log(None, AuditOperateType.delete,
+                               AuditScope.user, user.uid, origin, {}, {}, {})
 
-        user.delete()
+    @staticmethod
+    def get_employees():
+        return User.get_by(__func_isnot__key_employee_id=None, to_dict=True)