discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

Merge

Browse Source
This commit is contained in:
Untone
2021-08-26 18:48:48 +03:00
parent 698de9114c 512e73b3b6
commit b1dd4c52b5
12 changed files with 142 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orm/rbac.py
View File

@@ -56,7 +56,7 @@ class Operation(Base):
class Resource(Base):
__tablename__ = "resource"
resource_class: Type[Base] = Column(ClassType, nullable=False, unique=True, comment="Resource class")
resource_class: str = Column(String, nullable=False, unique=True, comment="Resource class")
name: str = Column(String, nullable=False, unique=True, comment="Resource name")
@staticmethod

5
orm/user.py
View File

@@ -1,4 +1,5 @@
from typing import List
from datetime import datetime
from sqlalchemy import Table, Column, Integer, String, ForeignKey, Boolean, DateTime, JSON as JSONType
from sqlalchemy.orm import relationship
@@ -42,8 +43,8 @@ class User(Base):
slug: str = Column(String, unique=True, comment="User's slug")
muted: bool = Column(Boolean, default=False)
emailConfirmed: bool = Column(Boolean, default=False)
createdAt: DateTime = Column(DateTime, nullable=False, comment="Created at")
wasOnlineAt: DateTime = Column(DateTime, nullable=False, comment="Was online at")
createdAt: DateTime = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
wasOnlineAt: DateTime = Column(DateTime, nullable=False, default = datetime.now, comment="Was online at")
links: JSONType = Column(JSONType, nullable=True, comment="Links")
oauth: str = Column(String, nullable=True)
notifications = relationship(lambda: UserNotifications)