diff --git a/model/user.py b/model/user.py index ad41017..fcf8e0a 100644 --- a/model/user.py +++ b/model/user.py @@ -9,14 +9,12 @@ class user: role: str token: str - @classmethod - def initialize(cls, email:str, passwd:str): + def __init__(self, email: str, passwd: str): #us = getUsModel() #возвращает словарь - id = 1#us['id'] - name = 'Bob'#us['name'] - role = 'Backend'#us['role'] - token = generateKey(email, passwd) - return cls(id=id, name=name, role=role, token=token) + self.id = 1#us['id'] + self.name = 'Bob'#us['name'] + self.role = 'Backend'#us['role'] + self.token = generateKey(email, passwd) - def toJSON(self): - return json.dumps({"token": f'{self.token}', "user": {"id": self.id, "role": f'{self.role}', "name": f'{self.name}'}}) + def toDictionary(self): + return {"user": {"id": self.id, "name": self.name, "role": self.role}, "token": self.token}