self/ruz-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix time

Browse Source
This commit is contained in:
Administrator 2022-10-22 20:53:55 +03:00
parent 7b8168e297
commit 4c4fc87647
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helpers/answer.py
View File

@ -20,9 +20,6 @@ class BaseAnswer:
user = User(chat_id=message.chat.id) user = User(chat_id=message.chat.id)
mongo.users_collection.insert_one(UserSchema().dump(user)) mongo.users_collection.insert_one(UserSchema().dump(user))
else: else:
# что-то со временем в маршмеллоу происходит, не знаю как решить
if 'next_daily_notify_time' in user:
user['next_daily_notify_time'] = str(user['next_daily_notify_time'])
user = UserSchema().load(user) user = UserSchema().load(user)
attr = getattr(self, "handle_state_" + user.state, None) attr = getattr(self, "handle_state_" + user.state, None)
if attr is None: if attr is None:

13
helpers/models.py
View File

@ -3,7 +3,7 @@ from dataclasses import dataclass
from typing import Optional from typing import Optional
import marshmallow_dataclass import marshmallow_dataclass
from marshmallow import EXCLUDE from marshmallow import EXCLUDE, post_load
@dataclass @dataclass
@ -27,4 +27,13 @@ class Lesson:
UserSchema = marshmallow_dataclass.class_schema(User) USchema = marshmallow_dataclass.class_schema(User)
class UserSchema(USchema):
@post_load
def stringify_time(self, in_data, **kwargs):
if 'next_daily_notify_time' in in_data:
in_data['next_daily_notify_time'] = str(in_data['next_daily_notify_time'])
return in_data