Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

[Models] Fixed optional detection

This commit is contained in:
Ferdinand Thiessen 2021-03-19 18:17:59 +01:00
parent d6475604e9
commit cb342c07e8
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flaschengeist/models/__init__.py
View File

@ -14,10 +14,8 @@ class ModelSerializeMixin:
return False return False
import typing import typing
hint = typing.get_type_hints(self.__class__)[param]
if typing.get_origin(self.__class__.__annotations__[param]) is typing.Union and typing.get_args( if typing.get_origin(hint) is typing.Union and len(typing.get_args(hint)) == 2 and typing.get_args(hint)[1] is type(None):
self.__class__.__annotations__[param]
)[1] is type(None):
return getattr(self, param) is None return getattr(self, param) is None
def serialize(self): def serialize(self):

2
flaschengeist/plugins/schedule/models.py
View File

@ -80,7 +80,7 @@ class Event(db.Model, ModelSerializeMixin):
id: int = db.Column(db.Integer, primary_key=True) id: int = db.Column(db.Integer, primary_key=True)
start: datetime = db.Column(UtcDateTime, nullable=False) start: datetime = db.Column(UtcDateTime, nullable=False)
end: datetime = db.Column(UtcDateTime) end: Optional[datetime] = db.Column(UtcDateTime)
description: Optional[str] = db.Column(db.String(255)) description: Optional[str] = db.Column(db.String(255))
type: EventType = db.relationship("EventType") type: EventType = db.relationship("EventType")
jobs: list[Job] = db.relationship( jobs: list[Job] = db.relationship(