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

id suffix removed from database relation fields

Browse Source
This commit is contained in:
Igor Lobanov
2022-11-30 18:21:15 +01:00
parent 084d50ac57
commit 479b2230d6
19 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orm/collection.py
View File

@@ -9,8 +9,8 @@ class ShoutCollection(Base):
__tablename__ = "shout_collection"
id = None # type: ignore
shoutId = Column(ForeignKey("shout.id"), primary_key=True)
collectionId = Column(ForeignKey("collection.id"), primary_key=True)
shout = Column(ForeignKey("shout.id"), primary_key=True)
collection = Column(ForeignKey("collection.id"), primary_key=True)
class Collection(Base):

4
orm/community.py
View File

@@ -8,8 +8,8 @@ class CommunityFollower(Base):
__tablename__ = "community_followers"
id = None # type: ignore
followerId = Column(ForeignKey("user.id"), primary_key=True)
communityId = Column(ForeignKey("community.id"), primary_key=True)
follower = Column(ForeignKey("user.id"), primary_key=True)
community = Column(ForeignKey("community.id"), primary_key=True)
joinedAt = Column(
DateTime, nullable=False, default=datetime.now, comment="Created at"
)

18
orm/rbac.py
View File

@@ -142,19 +142,19 @@ class Resource(Base):
class Permission(Base):
__tablename__ = "permission"
__table_args__ = (
UniqueConstraint("roleId", "operationId", "resourceId"),
UniqueConstraint("role", "operation", "resource"),
{"extend_existing": True},
)
roleId = Column(
role = Column(
ForeignKey("role.id", ondelete="CASCADE"), nullable=False, comment="Role"
)
operationId = Column(
operation = Column(
ForeignKey("operation.id", ondelete="CASCADE"),
nullable=False,
comment="Operation",
)
resourceId = Column(
resource = Column(
ForeignKey("resource.id", ondelete="CASCADE"),
nullable=False,
comment="Resource",
@@ -164,11 +164,11 @@ class Permission(Base):
if __name__ == "__main__":
Base.metadata.create_all(engine)
ops = [
Permission(roleId=1, operationId=1, resourceId=1),
Permission(roleId=1, operationId=2, resourceId=1),
Permission(roleId=1, operationId=3, resourceId=1),
Permission(roleId=1, operationId=4, resourceId=1),
Permission(roleId=2, operationId=4, resourceId=1),
Permission(role=1, operation=1, resource=1),
Permission(role=1, operation=2, resource=1),
Permission(role=1, operation=3, resource=1),
Permission(role=1, operation=4, resource=1),
Permission(role=2, operation=4, resource=1),
]
global_session.add_all(ops)
global_session.commit()

2
orm/reaction.py
View File

@@ -33,7 +33,7 @@ class Reaction(Base):
updatedBy = Column(ForeignKey("user.id"), nullable=True, index=True, comment="Last Editor")
deletedAt = Column(DateTime, nullable=True, comment="Deleted at")
deletedBy = Column(ForeignKey("user.id"), nullable=True, index=True, comment="Deleted by")
shoutId = Column(ForeignKey("shout.id"), nullable=False, index=True)
shout = Column(ForeignKey("shout.id"), nullable=False, index=True)
replyTo = Column(
ForeignKey("reaction.id"), nullable=True, comment="Reply to reaction ID"
)

12
orm/shout.py
View File

@@ -13,16 +13,16 @@ class ShoutTopic(Base):
__tablename__ = "shout_topic"
id = None # type: ignore
shoutId = Column(ForeignKey("shout.id"), primary_key=True, index=True)
topicId = Column(ForeignKey("topic.id"), primary_key=True, index=True)
shout = Column(ForeignKey("shout.id"), primary_key=True, index=True)
topic = Column(ForeignKey("topic.id"), primary_key=True, index=True)
class ShoutReactionsFollower(Base):
__tablename__ = "shout_reactions_followers"
id = None # type: ignore
followerId = Column(ForeignKey("user.id"), primary_key=True, index=True)
shoutId = Column(ForeignKey("shout.id"), primary_key=True, index=True)
follower = Column(ForeignKey("user.id"), primary_key=True, index=True)
shout = Column(ForeignKey("shout.id"), primary_key=True, index=True)
auto = Column(Boolean, nullable=False, default=False)
createdAt = Column(
DateTime, nullable=False, default=datetime.now, comment="Created at"
@@ -34,8 +34,8 @@ class ShoutAuthor(Base):
__tablename__ = "shout_author"
id = None # type: ignore
shoutId = Column(ForeignKey("shout.id"), primary_key=True, index=True)
userId = Column(ForeignKey("user.id"), primary_key=True, index=True)
shout = Column(ForeignKey("shout.id"), primary_key=True, index=True)
user = Column(ForeignKey("user.id"), primary_key=True, index=True)
caption = Column(String, nullable=True, default="")

4
orm/topic.py
View File

@@ -9,8 +9,8 @@ class TopicFollower(Base):
__tablename__ = "topic_followers"
id = None # type: ignore
followerId = Column(ForeignKey("user.id"), primary_key=True, index=True)
topicId = Column(ForeignKey("topic.id"), primary_key=True, index=True)
follower = Column(ForeignKey("user.id"), primary_key=True, index=True)
topic = Column(ForeignKey("topic.id"), primary_key=True, index=True)
createdAt = Column(
DateTime, nullable=False, default=datetime.now, comment="Created at"
)

22
orm/user.py
View File

@@ -11,7 +11,7 @@ from orm.rbac import Role
class UserNotifications(Base):
__tablename__ = "user_notifications"
# id auto
userId = Column(Integer, ForeignKey("user.id"))
user = Column(Integer, ForeignKey("user.id"))
kind = Column(String, ForeignKey("notification.kind"))
values = Column(JSONType, nullable=True) # [ <var1>, .. ]
@@ -20,8 +20,8 @@ class UserRating(Base):
__tablename__ = "user_rating"
id = None # type: ignore
raterId = Column(ForeignKey("user.id"), primary_key=True, index=True)
userId = Column(ForeignKey("user.id"), primary_key=True, index=True)
rater = Column(ForeignKey("user.id"), primary_key=True, index=True)
user = Column(ForeignKey("user.id"), primary_key=True, index=True)
value = Column(Integer)
@staticmethod
@@ -33,16 +33,16 @@ class UserRole(Base):
__tablename__ = "user_role"
id = None # type: ignore
userId = Column(ForeignKey("user.id"), primary_key=True, index=True)
roleId = Column(ForeignKey("role.id"), primary_key=True, index=True)
user = Column(ForeignKey("user.id"), primary_key=True, index=True)
role = Column(ForeignKey("role.id"), primary_key=True, index=True)
class AuthorFollower(Base):
__tablename__ = "author_follower"
id = None # type: ignore
followerId = Column(ForeignKey("user.id"), primary_key=True, index=True)
authorId = Column(ForeignKey("user.id"), primary_key=True, index=True)
follower = Column(ForeignKey("user.id"), primary_key=True, index=True)
author = Column(ForeignKey("user.id"), primary_key=True, index=True)
createdAt = Column(
DateTime, nullable=False, default=datetime.now, comment="Created at"
)
@@ -72,7 +72,7 @@ class User(Base):
links = Column(JSONType, nullable=True, comment="Links")
oauth = Column(String, nullable=True)
notifications = relationship(lambda: UserNotifications)
ratings = relationship(UserRating, foreign_keys=UserRating.userId)
ratings = relationship(UserRating, foreign_keys=UserRating.user)
roles = relationship(lambda: Role, secondary=UserRole.__tablename__)
oid = Column(String, nullable=True)
@@ -104,9 +104,9 @@ class User(Base):
scope = {}
for role in self.roles:
for p in role.permissions:
if p.resourceId not in scope:
scope[p.resourceId] = set()
scope[p.resourceId].add(p.operationId)
if p.resource not in scope:
scope[p.resource] = set()
scope[p.resource].add(p.operation)
return scope

4
orm/viewed.py
View File

@@ -6,8 +6,8 @@ from base.orm import Base, local_session
class ViewedEntry(Base):
__tablename__ = "viewed"
viewerId = Column(ForeignKey("user.id"), index=True, default=1)
shoutId = Column(ForeignKey("shout.id"), index=True, default=1)
viewer = Column(ForeignKey("user.id"), index=True, default=1)
shout = Column(ForeignKey("shout.id"), index=True, default=1)
amount = Column(Integer, default=1)
createdAt = Column(
DateTime, nullable=False, default=datetime.now, comment="Created at"