Merge remote-tracking branch 'origin/main' into storages-to-queries

This commit is contained in:
Igor Lobanov
2022-11-30 18:06:23 +01:00
5 changed files with 123 additions and 79 deletions

View File

@@ -1,6 +1,6 @@
from datetime import datetime
from sqlalchemy import Boolean, Column, String, ForeignKey, DateTime
from sqlalchemy import Column, ForeignKey, DateTime, String
from sqlalchemy.orm import relationship
from base.orm import Base
from orm.user import User
@@ -11,16 +11,24 @@ class CollabAuthor(Base):
id = None # type: ignore
collab = Column(ForeignKey("collab.id"), primary_key=True)
authorId = Column(ForeignKey("user.id"), primary_key=True)
accepted = Column(Boolean, default=False)
author = Column(ForeignKey("user.id"), primary_key=True)
invitedBy = Column(ForeignKey("user.id"))
class CollabInvited(Base):
__tablename__ = "collab_invited"
id = None # type: ignore
collab = Column(ForeignKey("collab.id"), primary_key=True)
author = Column(ForeignKey("user.id"), primary_key=True)
invitedBy = Column(ForeignKey("user.id"))
class Collab(Base):
__tablename__ = "collab"
title = Column(String, nullable=True, comment="Title")
body = Column(String, nullable=True, comment="Body")
pic = Column(String, nullable=True, comment="Picture")
shout = Column(ForeignKey("shout.id"), primary_key=True)
authors = relationship(lambda: User, secondary=CollabAuthor.__tablename__)
invites = relationship(lambda: User, secondary=CollabInvited.__tablename__)
createdAt = Column(DateTime, default=datetime.now, comment="Created At")
createdBy = Column(ForeignKey("user.id"), comment="Created By")
chat = Column(String, unique=True, nullable=False)