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

old naming

Browse Source
This commit is contained in:
tonyrewin
2022-11-30 09:27:12 +03:00
parent 8209cc744c
commit 44bd4f6ede
18 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orm/collab.py
View File

@@ -11,7 +11,7 @@ class CollabAuthor(Base):
id = None # type: ignore
collab = Column(ForeignKey("collab.id"), primary_key=True)
authorId = Column(ForeignKey("user.id"), primary_key=True)
author = Column(ForeignKey("user.id"), primary_key=True)
accepted = Column(Boolean, default=False)

2
orm/collection.py
View File

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

2
orm/community.py
View File

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

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"
)

12
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>, .. ]
@@ -21,7 +21,7 @@ class UserRating(Base):
id = None # type: ignore
raterId = Column(ForeignKey("user.id"), primary_key=True, index=True)
userId = Column(ForeignKey("user.id"), primary_key=True, index=True)
user = Column(ForeignKey("user.id"), primary_key=True, index=True)
value = Column(Integer)
@staticmethod
@@ -33,7 +33,7 @@ class UserRole(Base):
__tablename__ = "user_role"
id = None # type: ignore
userId = Column(ForeignKey("user.id"), primary_key=True, index=True)
user = Column(ForeignKey("user.id"), primary_key=True, index=True)
roleId = Column(ForeignKey("role.id"), primary_key=True, index=True)
@@ -41,8 +41,8 @@ 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)

2
orm/viewed.py
View File

@@ -7,7 +7,7 @@ class ViewedEntry(Base):
__tablename__ = "viewed"
viewerId = Column(ForeignKey("user.id"), index=True, default=1)
shoutId = Column(ForeignKey("shout.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"