Merge pull request #91 from NETHINKS/bugfix/NET-641_no-admin-initialized

[NET-641] Fix user management insert convertion

cmdb/__setup__.py

@@ -16,6 +16,8 @@
 
 import logging
 from enum import Enum
+
+from cmdb.user_management import UserGroupModel
 from cmdb.utils.system_config import SystemConfigReader
 from cmdb.data_storage.database_manager import DatabaseManagerMongo
 
@@ -158,9 +160,10 @@ def __create_user_management(self):
         admin_user = UserModel(
             public_id=1,
             user_name=admin_name,
-            password=scm.generate_hmac(admin_pass),
+            active=True,
             group_id=__FIXED_GROUPS__[0].get_public_id(),
-            registration_time=datetime.datetime.utcnow()
+            registration_time=datetime.datetime.utcnow(),
+            password=scm.generate_hmac(admin_pass),
         )
         user_manager.insert(admin_user)
         return True

cmdb/user_management/models/group.py

@@ -78,16 +78,15 @@ def from_data(cls, data: dict, rights: List[BaseRight] = None) -> "UserGroupMode
 
     @classmethod
     def to_data(cls, instance: "UserGroupModel"):
-        return dumps({
+        return {
             'public_id': instance.public_id,
             'name': instance.name,
             'label': instance.label,
-            'rights': [BaseRight.to_dict(right) for right in instance.rights]
-        }, default=default)
+            'rights': [right.name for right in instance.rights]
+        }
 
     @classmethod
     def to_dict(cls, instance: "UserGroupModel") -> dict:
-
         return {
             'public_id': instance.public_id,
             'name': instance.name,

cmdb/user_management/models/user.py

@@ -138,8 +138,8 @@ def from_data(cls, data: dict) -> "UserModel":
         )
 
     @classmethod
-    def to_data(cls, instance: "UserModel") -> str:
-        return dumps(cls.to_dict(instance), default=default)
+    def to_data(cls, instance: "UserModel") -> dict:
+        return cls.to_dict(instance)
 
     @classmethod
     def to_dict(cls, instance: "UserModel") -> dict: