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

query userRoles

Browse Source
This commit is contained in:
knst-kotov
2021-11-24 12:09:47 +03:00
parent 7dea19495c
commit 0f3ba29fea
4 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orm/__init__.py
View File

@@ -1,6 +1,6 @@
from orm.rbac import Operation, Resource, Permission, Role
from orm.community import Community
from orm.user import User, UserRating
from orm.user import User, UserRating, UserRole
from orm.message import Message
from orm.topic import Topic, TopicSubscription
from orm.notification import Notification

13
orm/user.py
View File

@@ -25,11 +25,12 @@ class UserRating(Base):
user_id = Column(ForeignKey('user.id'), primary_key = True)
value = Column(Integer)
UserRoles = Table("user_roles",
Base.metadata,
Column('user_id', Integer, ForeignKey('user.id'), primary_key = True),
Column('role_id', Integer, ForeignKey('role.id'), primary_key = True)
)
class UserRole(Base):
__tablename__ = "user_role"
id = None
user_id = Column(ForeignKey('user.id'), primary_key = True)
role_id = Column(ForeignKey('role.id'), primary_key = True)
UserTopics = Table("user_topics",
Base.metadata,
@@ -56,7 +57,7 @@ class User(Base):
oauth: str = Column(String, nullable=True)
notifications = relationship(lambda: UserNotifications)
ratings = relationship(UserRating, foreign_keys=UserRating.user_id)
roles = relationship(lambda: Role, secondary=UserRoles)
roles = relationship(lambda: Role, secondary=UserRole.__tablename__)
topics = relationship(lambda: Topic, secondary=UserTopics)
old_id: str = Column(String, nullable = True)