format and lint orm
This commit is contained in:
@@ -12,9 +12,19 @@ from services.auth.users import UserStorage
|
||||
from services.stat.viewed import ViewedStorage
|
||||
from base.orm import Base, engine, local_session
|
||||
|
||||
__all__ = ["User", "Role", "Operation", "Permission", \
|
||||
"Community", "Shout", "Topic", "TopicFollower", \
|
||||
"Notification", "Reaction", "UserRating"]
|
||||
__all__ = [
|
||||
"User",
|
||||
"Role",
|
||||
"Operation",
|
||||
"Permission",
|
||||
"Community",
|
||||
"Shout",
|
||||
"Topic",
|
||||
"TopicFollower",
|
||||
"Notification",
|
||||
"Reaction",
|
||||
"UserRating",
|
||||
]
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
Operation.init_table()
|
||||
@@ -24,8 +34,8 @@ Community.init_table()
|
||||
Role.init_table()
|
||||
|
||||
with local_session() as session:
|
||||
ViewedStorage.init(session)
|
||||
ReactedStorage.init(session)
|
||||
RoleStorage.init(session)
|
||||
UserStorage.init(session)
|
||||
TopicStorage.init(session)
|
||||
ViewedStorage.init(session)
|
||||
ReactedStorage.init(session)
|
||||
RoleStorage.init(session)
|
||||
UserStorage.init(session)
|
||||
TopicStorage.init(session)
|
||||
|
@@ -2,21 +2,22 @@ from datetime import datetime
|
||||
from sqlalchemy import Boolean, Column, String, ForeignKey, DateTime
|
||||
from base.orm import Base
|
||||
|
||||
class CollabAuthor(Base):
|
||||
__tablename__ = 'collab_author'
|
||||
|
||||
id = None
|
||||
collab = Column(ForeignKey('collab.id'), primary_key = True)
|
||||
author = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
accepted = Column(Boolean, default=False)
|
||||
class CollabAuthor(Base):
|
||||
__tablename__ = "collab_author"
|
||||
|
||||
id = None # type: ignore
|
||||
collab = Column(ForeignKey("collab.id"), primary_key=True)
|
||||
author = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
accepted = Column(Boolean, default=False)
|
||||
|
||||
|
||||
class Collab(Base):
|
||||
__tablename__ = 'collab'
|
||||
|
||||
authors = Column()
|
||||
title: str = Column(String, nullable=True, comment="Title")
|
||||
body: str = Column(String, nullable=True, comment="Body")
|
||||
pic: str = Column(String, nullable=True, comment="Picture")
|
||||
createdAt: datetime = Column(DateTime, default=datetime.now, comment="Created At")
|
||||
createdBy: str = Column(ForeignKey('user.id'), comment="Created By")
|
||||
__tablename__ = "collab"
|
||||
|
||||
authors = Column()
|
||||
title = Column(String, nullable=True, comment="Title")
|
||||
body = Column(String, nullable=True, comment="Body")
|
||||
pic = Column(String, nullable=True, comment="Picture")
|
||||
createdAt = Column(DateTime, default=datetime.now, comment="Created At")
|
||||
createdBy = Column(ForeignKey("user.id"), comment="Created By")
|
||||
|
@@ -1,22 +1,23 @@
|
||||
from datetime import datetime
|
||||
from sqlalchemy import Column, String, ForeignKey, DateTime, JSON as JSONType
|
||||
from sqlalchemy import Column, String, ForeignKey, DateTime
|
||||
from base.orm import Base
|
||||
|
||||
|
||||
class ShoutCollection(Base):
|
||||
__tablename__ = 'shout_collection'
|
||||
|
||||
id = None
|
||||
shout = Column(ForeignKey('shout.slug'), primary_key = True)
|
||||
collection = Column(ForeignKey('collection.slug'), primary_key = True)
|
||||
|
||||
__tablename__ = "shout_collection"
|
||||
|
||||
id = None # type: ignore
|
||||
shout = Column(ForeignKey("shout.slug"), primary_key=True)
|
||||
collection = Column(ForeignKey("collection.slug"), primary_key=True)
|
||||
|
||||
|
||||
class Collection(Base):
|
||||
__tablename__ = 'collection'
|
||||
|
||||
id = None
|
||||
slug: str = Column(String, primary_key = True)
|
||||
title: str = Column(String, nullable=False, comment="Title")
|
||||
body: str = Column(String, nullable=True, comment="Body")
|
||||
pic: str = Column(String, nullable=True, comment="Picture")
|
||||
createdAt: datetime = Column(DateTime, default=datetime.now, comment="Created At")
|
||||
createdBy: str = Column(ForeignKey('user.id'), comment="Created By")
|
||||
__tablename__ = "collection"
|
||||
|
||||
id = None # type: ignore
|
||||
slug = Column(String, primary_key=True)
|
||||
title = Column(String, nullable=False, comment="Title")
|
||||
body = Column(String, nullable=True, comment="Body")
|
||||
pic = Column(String, nullable=True, comment="Picture")
|
||||
createdAt = Column(DateTime, default=datetime.now, comment="Created At")
|
||||
createdBy = Column(ForeignKey("user.id"), comment="Created By")
|
||||
|
@@ -2,34 +2,39 @@ from datetime import datetime
|
||||
from sqlalchemy import Column, String, ForeignKey, DateTime
|
||||
from base.orm import Base, local_session
|
||||
|
||||
class CommunityFollower(Base):
|
||||
__tablename__ = 'community_followers'
|
||||
|
||||
id = None
|
||||
follower = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
community = Column(ForeignKey('community.slug'), primary_key = True)
|
||||
createdAt: str = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
class CommunityFollower(Base):
|
||||
__tablename__ = "community_followers"
|
||||
|
||||
id = None # type: ignore
|
||||
follower = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
community = Column(ForeignKey("community.slug"), primary_key=True)
|
||||
createdAt = Column(
|
||||
DateTime, nullable=False, default=datetime.now, comment="Created at"
|
||||
)
|
||||
|
||||
|
||||
class Community(Base):
|
||||
__tablename__ = 'community'
|
||||
__tablename__ = "community"
|
||||
|
||||
name: str = Column(String, nullable=False, comment="Name")
|
||||
slug: str = Column(String, nullable = False, unique=True, comment="Slug")
|
||||
desc: str = Column(String, nullable=False, default='')
|
||||
pic: str = Column(String, nullable=False, default='')
|
||||
createdAt: str = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
createdBy: str = Column(ForeignKey("user.slug"), nullable=False, comment="Author")
|
||||
name = Column(String, nullable=False, comment="Name")
|
||||
slug = Column(String, nullable=False, unique=True, comment="Slug")
|
||||
desc = Column(String, nullable=False, default="")
|
||||
pic = Column(String, nullable=False, default="")
|
||||
createdAt = Column(
|
||||
DateTime, nullable=False, default=datetime.now, comment="Created at"
|
||||
)
|
||||
createdBy = Column(ForeignKey("user.slug"), nullable=False, comment="Author")
|
||||
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
default = session.query(Community).filter(Community.slug == "discours").first()
|
||||
if not default:
|
||||
default = Community.create(
|
||||
name = "Дискурс",
|
||||
slug = "discours",
|
||||
createdBy = "discours"
|
||||
)
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
default = (
|
||||
session.query(Community).filter(Community.slug == "discours").first()
|
||||
)
|
||||
if not default:
|
||||
default = Community.create(
|
||||
name="Дискурс", slug="discours", createdBy="discours"
|
||||
)
|
||||
|
||||
Community.default_community = default
|
||||
Community.default_community = default
|
||||
|
@@ -1,11 +1,12 @@
|
||||
from sqlalchemy import Column, String, JSON as JSONType
|
||||
from base.orm import Base
|
||||
|
||||
|
||||
class Notification(Base):
|
||||
__tablename__ = 'notification'
|
||||
__tablename__ = "notification"
|
||||
|
||||
kind: str = Column(String, unique = True, primary_key = True)
|
||||
template: str = Column(String, nullable = False)
|
||||
variables: JSONType = Column(JSONType, nullable = True) # [ <var1>, .. ]
|
||||
kind = Column(String, unique=True, primary_key=True)
|
||||
template = Column(String, nullable=False)
|
||||
variables = Column(JSONType, nullable=True) # [ <var1>, .. ]
|
||||
|
||||
# looks like frontend code
|
||||
# looks like frontend code
|
||||
|
153
orm/rbac.py
153
orm/rbac.py
@@ -6,92 +6,113 @@ from orm.community import Community
|
||||
|
||||
|
||||
class ClassType(TypeDecorator):
|
||||
impl = String
|
||||
impl = String
|
||||
|
||||
@property
|
||||
def python_type(self):
|
||||
return NotImplemented
|
||||
@property
|
||||
def python_type(self):
|
||||
return NotImplemented
|
||||
|
||||
def process_literal_param(self, value, dialect):
|
||||
return NotImplemented
|
||||
def process_literal_param(self, value, dialect):
|
||||
return NotImplemented
|
||||
|
||||
def process_bind_param(self, value, dialect):
|
||||
return value.__name__ if isinstance(value, type) else str(value)
|
||||
def process_bind_param(self, value, dialect):
|
||||
return value.__name__ if isinstance(value, type) else str(value)
|
||||
|
||||
def process_result_value(self, value, dialect):
|
||||
class_ = REGISTRY.get(value)
|
||||
if class_ is None:
|
||||
warnings.warn(f"Can't find class <{value}>,find it yourself!", stacklevel=2)
|
||||
return class_
|
||||
|
||||
def process_result_value(self, value, dialect):
|
||||
class_ = REGISTRY.get(value)
|
||||
if class_ is None:
|
||||
warnings.warn(f"Can't find class <{value}>,find it yourself!", stacklevel=2)
|
||||
return class_
|
||||
|
||||
class Role(Base):
|
||||
__tablename__ = 'role'
|
||||
__tablename__ = "role"
|
||||
|
||||
name: str = Column(String, nullable=False, comment="Role Name")
|
||||
desc: str = Column(String, nullable=True, comment="Role Description")
|
||||
community: int = Column(ForeignKey("community.id", ondelete="CASCADE"), nullable=False, comment="Community")
|
||||
permissions = relationship(lambda: Permission)
|
||||
name = Column(String, nullable=False, comment="Role Name")
|
||||
desc = Column(String, nullable=True, comment="Role Description")
|
||||
community = Column(
|
||||
ForeignKey("community.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="Community",
|
||||
)
|
||||
permissions = relationship(lambda: Permission)
|
||||
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
default = session.query(Role).filter(Role.name == "author").first()
|
||||
if default:
|
||||
Role.default_role = default
|
||||
return
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
default = session.query(Role).filter(Role.name == "author").first()
|
||||
if default:
|
||||
Role.default_role = default
|
||||
return
|
||||
|
||||
default = Role.create(
|
||||
name = "author",
|
||||
desc = "Role for author",
|
||||
community = Community.default_community.id
|
||||
)
|
||||
default = Role.create(
|
||||
name="author",
|
||||
desc="Role for author",
|
||||
community=Community.default_community.id,
|
||||
)
|
||||
|
||||
Role.default_role = default
|
||||
|
||||
Role.default_role = default
|
||||
|
||||
class Operation(Base):
|
||||
__tablename__ = 'operation'
|
||||
name: str = Column(String, nullable=False, unique=True, comment="Operation Name")
|
||||
__tablename__ = "operation"
|
||||
name = Column(String, nullable=False, unique=True, comment="Operation Name")
|
||||
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
edit_op = session.query(Operation).filter(Operation.name == "edit").first()
|
||||
if not edit_op:
|
||||
edit_op = Operation.create(name = "edit")
|
||||
Operation.edit_id = edit_op.id
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
edit_op = session.query(Operation).filter(Operation.name == "edit").first()
|
||||
if not edit_op:
|
||||
edit_op = Operation.create(name="edit")
|
||||
Operation.edit_id = edit_op.id # type: ignore
|
||||
|
||||
|
||||
class Resource(Base):
|
||||
__tablename__ = "resource"
|
||||
resource_class: str = Column(String, nullable=False, unique=True, comment="Resource class")
|
||||
name: str = Column(String, nullable=False, unique=True, comment="Resource name")
|
||||
__tablename__ = "resource"
|
||||
resource_class = Column(
|
||||
String, nullable=False, unique=True, comment="Resource class"
|
||||
)
|
||||
name = Column(String, nullable=False, unique=True, comment="Resource name")
|
||||
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
shout_res = session.query(Resource).filter(Resource.name == "shout").first()
|
||||
if not shout_res:
|
||||
shout_res = Resource.create(name = "shout", resource_class = "shout")
|
||||
Resource.shout_id = shout_res.id
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
shout_res = session.query(Resource).filter(Resource.name == "shout").first()
|
||||
if not shout_res:
|
||||
shout_res = Resource.create(name="shout", resource_class="shout")
|
||||
Resource.shout_id = shout_res.id # type: ignore
|
||||
|
||||
|
||||
class Permission(Base):
|
||||
__tablename__ = "permission"
|
||||
__table_args__ = (UniqueConstraint("role_id", "operation_id", "resource_id"), {"extend_existing": True})
|
||||
__tablename__ = "permission"
|
||||
__table_args__ = (
|
||||
UniqueConstraint("role_id", "operation_id", "resource_id"),
|
||||
{"extend_existing": True},
|
||||
)
|
||||
|
||||
role_id: int = Column(ForeignKey("role.id", ondelete="CASCADE"), nullable=False, comment="Role")
|
||||
operation_id: int = Column(ForeignKey("operation.id", ondelete="CASCADE"), nullable=False, comment="Operation")
|
||||
resource_id: int = Column(ForeignKey("resource.id", ondelete="CASCADE"), nullable=False, comment="Resource")
|
||||
role_id = Column(
|
||||
ForeignKey("role.id", ondelete="CASCADE"), nullable=False, comment="Role"
|
||||
)
|
||||
operation_id = Column(
|
||||
ForeignKey("operation.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="Operation",
|
||||
)
|
||||
resource_id = Column(
|
||||
ForeignKey("resource.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="Resource",
|
||||
)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
Base.metadata.create_all(engine)
|
||||
ops = [
|
||||
Permission(role_id=1, operation_id=1, resource_id=1),
|
||||
Permission(role_id=1, operation_id=2, resource_id=1),
|
||||
Permission(role_id=1, operation_id=3, resource_id=1),
|
||||
Permission(role_id=1, operation_id=4, resource_id=1),
|
||||
Permission(role_id=2, operation_id=4, resource_id=1)
|
||||
]
|
||||
global_session.add_all(ops)
|
||||
global_session.commit()
|
||||
if __name__ == "__main__":
|
||||
Base.metadata.create_all(engine)
|
||||
ops = [
|
||||
Permission(role_id=1, operation_id=1, resource_id=1),
|
||||
Permission(role_id=1, operation_id=2, resource_id=1),
|
||||
Permission(role_id=1, operation_id=3, resource_id=1),
|
||||
Permission(role_id=1, operation_id=4, resource_id=1),
|
||||
Permission(role_id=2, operation_id=4, resource_id=1),
|
||||
]
|
||||
global_session.add_all(ops)
|
||||
global_session.commit()
|
||||
|
@@ -5,27 +5,34 @@ from sqlalchemy import Enum
|
||||
from services.stat.reacted import ReactedStorage, ReactionKind
|
||||
from services.stat.viewed import ViewedStorage
|
||||
|
||||
class Reaction(Base):
|
||||
__tablename__ = 'reaction'
|
||||
body: str = Column(String, nullable=True, comment="Reaction Body")
|
||||
createdAt = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
createdBy: str = Column(ForeignKey("user.slug"), nullable=False, comment="Sender")
|
||||
updatedAt = Column(DateTime, nullable=True, comment="Updated at")
|
||||
updatedBy = Column(ForeignKey("user.slug"), nullable=True, comment="Last Editor")
|
||||
deletedAt = Column(DateTime, nullable=True, comment="Deleted at")
|
||||
deletedBy = Column(ForeignKey("user.slug"), nullable=True, comment="Deleted by")
|
||||
shout = Column(ForeignKey("shout.slug"), nullable=False)
|
||||
replyTo: int = Column(ForeignKey("reaction.id"), nullable=True, comment="Reply to reaction ID")
|
||||
range: str = Column(String, nullable=True, comment="Range in format <start index>:<end>")
|
||||
kind: int = Column(Enum(ReactionKind), nullable=False, comment="Reaction kind")
|
||||
oid: str = Column(String, nullable=True, comment="Old ID")
|
||||
|
||||
@property
|
||||
async def stat(self):
|
||||
return {
|
||||
"viewed": await ViewedStorage.get_reaction(self.id),
|
||||
"reacted": len(await ReactedStorage.get_reaction(self.id)),
|
||||
# TODO: "replied"
|
||||
"rating": await ReactedStorage.get_reaction_rating(self.id),
|
||||
"commented": len(await ReactedStorage.get_reaction_comments(self.id))
|
||||
}
|
||||
class Reaction(Base):
|
||||
__tablename__ = "reaction"
|
||||
body = Column(String, nullable=True, comment="Reaction Body")
|
||||
createdAt = Column(
|
||||
DateTime, nullable=False, default=datetime.now, comment="Created at"
|
||||
)
|
||||
createdBy = Column(ForeignKey("user.slug"), nullable=False, comment="Sender")
|
||||
updatedAt = Column(DateTime, nullable=True, comment="Updated at")
|
||||
updatedBy = Column(ForeignKey("user.slug"), nullable=True, comment="Last Editor")
|
||||
deletedAt = Column(DateTime, nullable=True, comment="Deleted at")
|
||||
deletedBy = Column(ForeignKey("user.slug"), nullable=True, comment="Deleted by")
|
||||
shout = Column(ForeignKey("shout.slug"), nullable=False)
|
||||
replyTo = Column(
|
||||
ForeignKey("reaction.id"), nullable=True, comment="Reply to reaction ID"
|
||||
)
|
||||
range = Column(
|
||||
String, nullable=True, comment="Range in format <start index>:<end>"
|
||||
)
|
||||
kind = Column(Enum(ReactionKind), nullable=False, comment="Reaction kind")
|
||||
oid = Column(String, nullable=True, comment="Old ID")
|
||||
|
||||
@property
|
||||
async def stat(self):
|
||||
return {
|
||||
"viewed": await ViewedStorage.get_reaction(self.id),
|
||||
"reacted": len(await ReactedStorage.get_reaction(self.id)),
|
||||
# TODO: "replied"
|
||||
"rating": await ReactedStorage.get_reaction_rating(self.id),
|
||||
"commented": len(await ReactedStorage.get_reaction_comments(self.id)),
|
||||
}
|
||||
|
80
orm/shout.py
80
orm/shout.py
@@ -4,62 +4,64 @@ from sqlalchemy.orm import relationship
|
||||
from orm.user import User
|
||||
from orm.topic import Topic, ShoutTopic
|
||||
from orm.reaction import Reaction
|
||||
from services.stat.reacted import ReactedStorage, ReactionKind
|
||||
from services.stat.reacted import ReactedStorage
|
||||
from services.stat.viewed import ViewedStorage
|
||||
from base.orm import Base
|
||||
|
||||
|
||||
class ShoutReactionsFollower(Base):
|
||||
__tablename__ = "shout_reactions_followers"
|
||||
|
||||
id = None
|
||||
follower = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
shout = Column(ForeignKey('shout.slug'), primary_key = True)
|
||||
auto = Column(Boolean, nullable=False, default = False)
|
||||
createdAt: str = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
deletedAt: str = Column(DateTime, nullable=True)
|
||||
|
||||
id = None # type: ignore
|
||||
follower = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
shout = Column(ForeignKey("shout.slug"), primary_key=True)
|
||||
auto = Column(Boolean, nullable=False, default=False)
|
||||
createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
|
||||
deletedAt = Column(DateTime, nullable=True)
|
||||
|
||||
|
||||
class ShoutAuthor(Base):
|
||||
__tablename__ = "shout_author"
|
||||
|
||||
id = None
|
||||
shout = Column(ForeignKey('shout.slug'), primary_key = True)
|
||||
user = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
caption: str = Column(String, nullable = True, default = "")
|
||||
|
||||
|
||||
id = None # type: ignore
|
||||
shout = Column(ForeignKey("shout.slug"), primary_key=True)
|
||||
user = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
caption = Column(String, nullable=True, default="")
|
||||
|
||||
|
||||
class ShoutAllowed(Base):
|
||||
__tablename__ = "shout_allowed"
|
||||
|
||||
id = None
|
||||
shout = Column(ForeignKey('shout.slug'), primary_key = True)
|
||||
user = Column(ForeignKey('user.id'), primary_key = True)
|
||||
|
||||
id = None # type: ignore
|
||||
shout = Column(ForeignKey("shout.slug"), primary_key=True)
|
||||
user = Column(ForeignKey("user.id"), primary_key=True)
|
||||
|
||||
|
||||
class Shout(Base):
|
||||
__tablename__ = 'shout'
|
||||
__tablename__ = "shout"
|
||||
|
||||
id = None
|
||||
|
||||
slug: str = Column(String, primary_key=True)
|
||||
community: str = Column(Integer, ForeignKey("community.id"), nullable=False, comment="Community")
|
||||
body: str = Column(String, nullable=False, comment="Body")
|
||||
createdAt: str = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
updatedAt: str = Column(DateTime, nullable=True, comment="Updated at")
|
||||
replyTo: int = Column(ForeignKey("shout.slug"), nullable=True)
|
||||
versionOf: int = Column(ForeignKey("shout.slug"), nullable=True)
|
||||
tags: str = Column(String, nullable=True)
|
||||
publishedBy: int = Column(ForeignKey("user.id"), nullable=True)
|
||||
publishedAt: str = Column(DateTime, nullable=True)
|
||||
cover: str = Column(String, nullable = True)
|
||||
title: str = Column(String, nullable = True)
|
||||
subtitle: str = Column(String, nullable = True)
|
||||
layout: str = Column(String, nullable = True)
|
||||
id = None # type: ignore
|
||||
slug = Column(String, primary_key=True)
|
||||
community = Column(Integer, ForeignKey("community.id"), nullable=False, comment="Community")
|
||||
body = Column(String, nullable=False, comment="Body")
|
||||
createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
|
||||
updatedAt = Column(DateTime, nullable=True, comment="Updated at")
|
||||
replyTo = Column(ForeignKey("shout.slug"), nullable=True)
|
||||
versionOf = Column(ForeignKey("shout.slug"), nullable=True)
|
||||
tags = Column(String, nullable=True)
|
||||
publishedBy = Column(ForeignKey("user.id"), nullable=True)
|
||||
publishedAt = Column(DateTime, nullable=True)
|
||||
cover = Column(String, nullable=True)
|
||||
title = Column(String, nullable=True)
|
||||
subtitle = Column(String, nullable=True)
|
||||
layout = Column(String, nullable=True)
|
||||
reactions = relationship(lambda: Reaction)
|
||||
authors = relationship(lambda: User, secondary=ShoutAuthor.__tablename__)
|
||||
topics = relationship(lambda: Topic, secondary=ShoutTopic.__tablename__)
|
||||
mainTopic = Column(ForeignKey("topic.slug"), nullable=True)
|
||||
visibleFor = relationship(lambda: User, secondary=ShoutAllowed.__tablename__)
|
||||
draft: bool = Column(Boolean, default=True)
|
||||
oid: str = Column(String, nullable=True)
|
||||
draft = Column(Boolean, default=True)
|
||||
oid = Column(String, nullable=True)
|
||||
|
||||
@property
|
||||
async def stat(self):
|
||||
@@ -67,5 +69,5 @@ class Shout(Base):
|
||||
"viewed": await ViewedStorage.get_shout(self.slug),
|
||||
"reacted": len(await ReactedStorage.get_shout(self.slug)),
|
||||
"commented": len(await ReactedStorage.get_comments(self.slug)),
|
||||
"rating": await ReactedStorage.get_rating(self.slug)
|
||||
}
|
||||
"rating": await ReactedStorage.get_rating(self.slug),
|
||||
}
|
||||
|
46
orm/topic.py
46
orm/topic.py
@@ -2,30 +2,32 @@ from datetime import datetime
|
||||
from sqlalchemy import Column, String, ForeignKey, DateTime, JSON as JSONType
|
||||
from base.orm import Base
|
||||
|
||||
|
||||
class ShoutTopic(Base):
|
||||
__tablename__ = 'shout_topic'
|
||||
|
||||
id = None
|
||||
shout = Column(ForeignKey('shout.slug'), primary_key = True)
|
||||
topic = Column(ForeignKey('topic.slug'), primary_key = True)
|
||||
__tablename__ = "shout_topic"
|
||||
|
||||
id = None # type: ignore
|
||||
shout = Column(ForeignKey("shout.slug"), primary_key=True)
|
||||
topic = Column(ForeignKey("topic.slug"), primary_key=True)
|
||||
|
||||
|
||||
class TopicFollower(Base):
|
||||
__tablename__ = "topic_followers"
|
||||
|
||||
id = None
|
||||
follower = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
topic = Column(ForeignKey('topic.slug'), primary_key = True)
|
||||
createdAt: str = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
__tablename__ = "topic_followers"
|
||||
|
||||
id = None # type: ignore
|
||||
follower = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
topic = Column(ForeignKey("topic.slug"), primary_key=True)
|
||||
createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
|
||||
|
||||
|
||||
class Topic(Base):
|
||||
__tablename__ = 'topic'
|
||||
|
||||
id = None
|
||||
|
||||
slug: str = Column(String, primary_key = True)
|
||||
title: str = Column(String, nullable=False, comment="Title")
|
||||
body: str = Column(String, nullable=True, comment="Body")
|
||||
pic: str = Column(String, nullable=True, comment="Picture")
|
||||
children = Column(JSONType, nullable=True, default = [], comment="list of children topics")
|
||||
community = Column(ForeignKey("community.slug"), nullable=False, comment="Community")
|
||||
oid: str = Column(String, nullable=True, comment="Old ID")
|
||||
__tablename__ = "topic"
|
||||
|
||||
id = None # type: ignore
|
||||
slug = Column(String, primary_key=True)
|
||||
title = Column(String, nullable=False, comment="Title")
|
||||
body = Column(String, nullable=True, comment="Body")
|
||||
pic = Column(String, nullable=True, comment="Picture")
|
||||
children = Column(JSONType, nullable=True, default=[], comment="list of children topics")
|
||||
community = Column(ForeignKey("community.slug"), nullable=False, comment="Community")
|
||||
oid = Column(String, nullable=True, comment="Old ID")
|
||||
|
144
orm/user.py
144
orm/user.py
@@ -1,89 +1,101 @@
|
||||
from datetime import datetime
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey, Boolean, DateTime, JSON as JSONType
|
||||
from sqlalchemy import (
|
||||
Column,
|
||||
Integer,
|
||||
String,
|
||||
ForeignKey,
|
||||
Boolean,
|
||||
DateTime,
|
||||
JSON as JSONType,
|
||||
)
|
||||
from sqlalchemy.orm import relationship
|
||||
from base.orm import Base, local_session
|
||||
from orm.rbac import Role
|
||||
from services.auth.roles import RoleStorage
|
||||
|
||||
class UserNotifications(Base):
|
||||
__tablename__ = 'user_notifications'
|
||||
|
||||
id: int = Column(Integer, primary_key = True)
|
||||
user_id: int = Column(Integer, ForeignKey("user.id"))
|
||||
kind: str = Column(String, ForeignKey("notification.kind"))
|
||||
values: JSONType = Column(JSONType, nullable = True) # [ <var1>, .. ]
|
||||
class UserNotifications(Base):
|
||||
__tablename__ = "user_notifications"
|
||||
# id auto
|
||||
user_id = Column(Integer, ForeignKey("user.id"))
|
||||
kind = Column(String, ForeignKey("notification.kind"))
|
||||
values = Column(JSONType, nullable=True) # [ <var1>, .. ]
|
||||
|
||||
|
||||
class UserRating(Base):
|
||||
__tablename__ = "user_rating"
|
||||
__tablename__ = "user_rating"
|
||||
|
||||
id = None # type: ignore
|
||||
rater = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
user = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
value = Column(Integer)
|
||||
|
||||
id = None
|
||||
rater = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
user = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
value = Column(Integer)
|
||||
|
||||
class UserRole(Base):
|
||||
__tablename__ = "user_role"
|
||||
__tablename__ = "user_role"
|
||||
|
||||
id = None # type: ignore
|
||||
user_id = Column(ForeignKey("user.id"), primary_key=True)
|
||||
role_id = Column(ForeignKey("role.id"), primary_key=True)
|
||||
|
||||
id = None
|
||||
user_id = Column(ForeignKey('user.id'), primary_key = True)
|
||||
role_id = Column(ForeignKey('role.id'), primary_key = True)
|
||||
|
||||
class AuthorFollower(Base):
|
||||
__tablename__ = "author_follower"
|
||||
|
||||
id = None
|
||||
follower = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
author = Column(ForeignKey('user.slug'), primary_key = True)
|
||||
createdAt = Column(DateTime, nullable=False, default = datetime.now, comment="Created at")
|
||||
__tablename__ = "author_follower"
|
||||
|
||||
id = None # type: ignore
|
||||
follower = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
author = Column(ForeignKey("user.slug"), primary_key=True)
|
||||
createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
|
||||
|
||||
|
||||
class User(Base):
|
||||
__tablename__ = "user"
|
||||
__tablename__ = "user"
|
||||
|
||||
email: str = Column(String, unique=True, nullable=False, comment="Email")
|
||||
username: str = Column(String, nullable=False, comment="Login")
|
||||
password: str = Column(String, nullable=True, comment="Password")
|
||||
bio: str = Column(String, nullable=True, comment="Bio")
|
||||
userpic: str = Column(String, nullable=True, comment="Userpic")
|
||||
name: str = Column(String, nullable=True, comment="Display name")
|
||||
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, default = datetime.now, comment="Created at")
|
||||
wasOnlineAt: DateTime = Column(DateTime, nullable=False, default = datetime.now, comment="Was online at")
|
||||
deletedAt: DateTime = Column(DateTime, nullable=True, comment="Deleted at")
|
||||
links: JSONType = Column(JSONType, nullable=True, comment="Links")
|
||||
oauth: str = Column(String, nullable=True)
|
||||
notifications = relationship(lambda: UserNotifications)
|
||||
ratings = relationship(UserRating, foreign_keys=UserRating.user)
|
||||
roles = relationship(lambda: Role, secondary=UserRole.__tablename__)
|
||||
oid: str = Column(String, nullable = True)
|
||||
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
default = session.query(User).filter(User.slug == "discours").first()
|
||||
if not default:
|
||||
default = User.create(
|
||||
id = 0,
|
||||
email = "welcome@discours.io",
|
||||
username = "welcome@discours.io",
|
||||
name = "Дискурс",
|
||||
slug = "discours",
|
||||
userpic = 'https://discours.io/images/logo-mini.svg',
|
||||
)
|
||||
email = Column(String, unique=True, nullable=False, comment="Email")
|
||||
username = Column(String, nullable=False, comment="Login")
|
||||
password = Column(String, nullable=True, comment="Password")
|
||||
bio = Column(String, nullable=True, comment="Bio")
|
||||
userpic = Column(String, nullable=True, comment="Userpic")
|
||||
name = Column(String, nullable=True, comment="Display name")
|
||||
slug = Column(String, unique=True, comment="User's slug")
|
||||
muted = Column(Boolean, default=False)
|
||||
emailConfirmed = Column(Boolean, default=False)
|
||||
createdAt = Column(DateTime, nullable=False, default=datetime.now, comment="Created at")
|
||||
wasOnlineAt = Column(DateTime, nullable=False, default=datetime.now, comment="Was online at")
|
||||
deletedAt = Column(DateTime, nullable=True, comment="Deleted at")
|
||||
links = Column(JSONType, nullable=True, comment="Links")
|
||||
oauth = Column(String, nullable=True)
|
||||
notifications = relationship(lambda: UserNotifications)
|
||||
ratings = relationship(UserRating, foreign_keys=UserRating.user)
|
||||
roles = relationship(lambda: Role, secondary=UserRole.__tablename__)
|
||||
oid = Column(String, nullable=True)
|
||||
|
||||
User.default_user = default
|
||||
@staticmethod
|
||||
def init_table():
|
||||
with local_session() as session:
|
||||
default = session.query(User).filter(User.slug == "discours").first()
|
||||
if not default:
|
||||
default = User.create(
|
||||
id=0,
|
||||
email="welcome@discours.io",
|
||||
username="welcome@discours.io",
|
||||
name="Дискурс",
|
||||
slug="discours",
|
||||
userpic="https://discours.io/images/logo-mini.svg",
|
||||
)
|
||||
|
||||
async def get_permission(self):
|
||||
scope = {}
|
||||
for user_role in self.roles:
|
||||
role = await RoleStorage.get_role(user_role.id)
|
||||
for p in role.permissions:
|
||||
if not p.resource_id in scope:
|
||||
scope[p.resource_id] = set()
|
||||
scope[p.resource_id].add(p.operation_id)
|
||||
return scope
|
||||
User.default_user = default
|
||||
|
||||
async def get_permission(self):
|
||||
scope = {}
|
||||
for user_role in self.roles:
|
||||
role: Role = await RoleStorage.get_role(user_role.id) # type: ignore
|
||||
for p in role.permissions:
|
||||
if p.resource_id not in scope:
|
||||
scope[p.resource_id] = set()
|
||||
scope[p.resource_id].add(p.operation_id)
|
||||
return scope
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
print(User.get_permission(user_id=1))
|
||||
print(User.get_permission(user_id=1)) # type: ignore
|
||||
|
Reference in New Issue
Block a user