-reactions.storage, +collectionShouts.query, fixes

2022-08-13 12:48:07 +03:00
parent 5859a4db40
commit f0b625af53
19 changed files with 277 additions and 381 deletions
--- a/orm/init.py
+++ b/orm/init.py
@@ -6,6 +6,7 @@ from orm.topic import Topic, TopicFollower
 from orm.notification import Notification
 from orm.shout import Shout
 from orm.reaction import Reaction
+from services.stat.reacted import ReactedStorage
 from services.zine.topics import TopicStorage
 from services.auth.users import UserStorage
 from services.stat.viewed import ViewedStorage
@@ -24,6 +25,7 @@ Role.init_table()

 with local_session() as session:
 	ViewedStorage.init(session)
+	ReactedStorage.init(session)
 	RoleStorage.init(session)
 	UserStorage.init(session)
 	TopicStorage.init(session)
--- a/orm/reaction.py
+++ b/orm/reaction.py
@@ -10,16 +10,42 @@ class ReactionKind(enum.Enum):
 	DISAGREE = 2 # -1
 	PROOF 	= 3	# +1
 	DISPROOF = 4 # -1
-	ASK		= 5 # +0
+	ASK		= 5 # +0 bookmark
 	PROPOSE	= 6 # +0
-	QUOTE	= 7 # +0
+	QUOTE	= 7 # +0 bookmark
 	COMMENT	= 8 # +0
 	ACCEPT	= 9 # +1
 	REJECT	= 0 # -1
 	LIKE	= 11 # +1
 	DISLIKE	= 12 # -1
-	# TYPE = <reaction index> # rating change guess
+	# TYPE = <reaction index> # rating diff

+def kind_to_rate(kind) -> int:
+	if kind in [
+		ReactionKind.AGREE,
+		ReactionKind.LIKE,
+		ReactionKind.PROOF,
+		ReactionKind.ACCEPT
+	]: return 1
+	elif kind in [
+		ReactionKind.DISAGREE,
+		ReactionKind.DISLIKE,
+		ReactionKind.DISPROOF,
+		ReactionKind.REJECT
+	]: return -1
+	else: return 0
+
+def get_bookmarked(reactions):
+    c = 0
+    for r in reactions:
+        c += 1 if r.kind in [ ReactionKind.QUOTE, ReactionKind.ASK] else 0
+    return c
+
+def get_rating(reactions):
+    rating = 0
+    for r in reactions:
+        rating += kind_to_rate(r.kind)
+    return rating

 class Reaction(Base):
 	__tablename__ = 'reaction'
@@ -38,13 +64,15 @@ class Reaction(Base):

 	@property
 	async def stat(self):
-		reacted = 0
+		reacted = []
 		try:
 			with local_session() as session:
-				reacted = session.query(Reaction).filter(Reaction.replyTo == self.id).count()
+				reacted = session.query(Reaction).filter(Reaction.replyTo == self.id).all()
 		except Exception as e:
 			print(e)
 		return {
-			"viewed": await ViewedStorage.get_reaction(self.slug),
-			"reacted": reacted
+			"viewed": await ViewedStorage.get_reaction(self.id),
+			"reacted": reacted.count(),
+			"rating": get_rating(reacted),
+			"bookmarked": get_bookmarked(reacted)
 		}
--- a/orm/shout.py
+++ b/orm/shout.py
@@ -3,67 +3,75 @@ from sqlalchemy import Column, Integer, String, ForeignKey, DateTime, Boolean
 from sqlalchemy.orm import relationship
 from orm.user import User
 from orm.topic import Topic, ShoutTopic
-from orm.reaction import Reaction
-from services.zine.reactions import ReactionsStorage
+from orm.reaction import Reaction, get_bookmarked
+from services.stat.reacted import ReactedStorage
 from services.stat.viewed import ViewedStorage
-from base.orm import Base
+from base.orm import Base, local_session


 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)
+    __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)

 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 = "")
-	
+    __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 = "")
+    
 class ShoutAllowed(Base):
-	__tablename__ = "shout_allowed"
-	
-	id = None
-	shout = Column(ForeignKey('shout.slug'), primary_key = True)
-	user = Column(ForeignKey('user.id'), primary_key = True)
+    __tablename__ = "shout_allowed"
+    
+    id = None
+    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
+    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)
-	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)
+    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)
+    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)

-	@property
-	async def stat(self):
-		return {
-			"viewed": await ViewedStorage.get_shout(self.slug),
-			"reacted": await ReactionsStorage.by_shout(self.slug)
-		}
+    @property
+    async def stat(self):
+        reacted = []
+        try:
+            with local_session() as session:
+                reacted = session.query(Reaction).where(Reaction.shout == self.slug).all()
+        except Exception as e:
+            print(e)
+        return {
+                "viewed": await ViewedStorage.get_shout(self.slug),
+                "reacted": await ReactedStorage.get_shout(self.slug),
+                "rating": await ReactedStorage.get_rating(self.slug),
+                "bookmarked": get_bookmarked(reacted)
+            }