bookmarked not count, migation fixed

services/stat/reacted.py

@@ -1,7 +1,7 @@
 import asyncio
 from datetime import datetime
 from sqlalchemy.types import Enum
-from sqlalchemy import Column, DateTime, ForeignKey
+from sqlalchemy import Column, DateTime, ForeignKey, Boolean
 # from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy import Enum
 import enum
@@ -37,6 +37,7 @@ def kind_to_rate(kind) -> int:
 		ReactionKind.REJECT
 	]: return -1
 	else: return 0
+ 
 class ReactedByDay(Base):
 	__tablename__ = "reacted_by_day"
 
@@ -46,6 +47,8 @@ class ReactedByDay(Base):
 	replyTo = Column(ForeignKey('reaction.id'), nullable=True)
 	kind: int = Column(Enum(ReactionKind), nullable=False, comment="Reaction kind")
 	day = Column(DateTime, primary_key=True, default=datetime.now)
+	comment = Column(Boolean, nullable=True)
+	
 
 class ReactedStorage:
 	reacted = {
@@ -63,34 +66,6 @@ class ReactedStorage:
 	period = 30*60  # sec
 	lock = asyncio.Lock()
 
-	@staticmethod
-	def init(session):
-		self = ReactedStorage
-		all_reactions = session.query(ReactedByDay).all()
-		print('[stat.reacted] %d reactions total' % len(all_reactions))
-		for reaction in all_reactions:
-			shout = reaction.shout
-			topics = session.query(ShoutTopic.topic).where(ShoutTopic.shout == shout).all()
-			kind = reaction.kind
-   
-			self.reacted['shouts'][shout] = self.reacted['shouts'].get(shout, [])
-			self.reacted['shouts'][shout].append(reaction)
-			self.rating['shouts'][shout] = self.rating['shouts'].get(shout, 0) + kind_to_rate(kind)
-   
-			for t in topics:
-				self.reacted['topics'][t] = self.reacted['topics'].get(t, [])
-				self.reacted['topics'][t].append(reaction)
-				self.rating['topics'][t] = self.rating['topics'].get(t, 0) + kind_to_rate(kind) # rating
-	
-			if reaction.replyTo:
-				self.reacted['reactions'][reaction.replyTo] = self.reacted['reactions'].get(reaction.replyTo, [])
-				self.reacted['reactions'][reaction.replyTo].append(reaction)
-				self.rating['reactions'][reaction.replyTo] = self.rating['reactions'].get(reaction.replyTo, 0) + kind_to_rate(reaction.kind)
-		ttt = self.reacted['topics'].values()
-		print('[stat.reacted] %d topics reacted' % len(ttt))
-		print('[stat.reacted] %d shouts reacted' % len(self.reacted['shouts']))
-		print('[stat.reacted] %d reactions reacted' % len(self.reacted['reactions']))
-
 	@staticmethod
 	async def get_shout(shout_slug):
 		self = ReactedStorage
@@ -103,6 +78,24 @@ class ReactedStorage:
 		async with self.lock:
 			return self.reacted['topics'].get(topic_slug, [])
 
+	@staticmethod
+	async def get_comments(shout_slug):
+		self = ReactedStorage
+		async with self.lock:
+			return list(filter(lambda r: r.comment, self.reacted['shouts'].get(shout_slug, [])))
+
+	@staticmethod
+	async def get_topic_comments(topic_slug):
+		self = ReactedStorage
+		async with self.lock:
+			return list(filter(lambda r: r.comment, self.reacted['topics'].get(topic_slug, [])))
+
+	@staticmethod
+	async def get_reaction_comments(reaction_id):
+		self = ReactedStorage
+		async with self.lock:
+			return list(filter(lambda r: r.comment, self.reacted['reactions'].get(reaction_id)))
+
 	@staticmethod
 	async def get_reaction(reaction_id):
 		self = ReactedStorage
@@ -137,17 +130,52 @@ class ReactedStorage:
 		return rating
 
 	@staticmethod
-	async def increment(shout_slug, kind, reply_id = None):
+	async def increment(reaction):
 		self = ReactedStorage
-		reaction: ReactedByDay = None
 		async with self.lock:
 			with local_session() as session:
-				reaction = ReactedByDay.create(shout=shout_slug, kind=kind, reply=reply_id)
-				self.reacted['shouts'][shout_slug] = self.reacted['shouts'].get(shout_slug, [])
-				self.reacted['shouts'][shout_slug].append(reaction)
-				if reply_id:
-					self.reacted['reaction'][reply_id] = self.reacted['reactions'].get(shout_slug, [])
-					self.reacted['reaction'][reply_id].append(reaction)
-					self.rating['reactions'][reply_id] = self.rating['reactions'].get(reply_id, 0) + kind_to_rate(kind)
+				r = {
+					"day": datetime.now().replace(hour=0, minute=0, second=0, microsecond=0),
+					"reaction": reaction.id,
+					"kind": reaction.kind,
+					"shout": reaction.shout
+				}
+				if reaction.replyTo: r['replyTo'] = reaction.replyTo
+				if reaction.body: r['comment'] = True
+				reaction = ReactedByDay.create(**r)
+				self.reacted['shouts'][reaction.shout] = self.reacted['shouts'].get(reaction.shout, [])
+				self.reacted['shouts'][reaction.shout].append(reaction)
+				if reaction.replyTo:
+					self.reacted['reaction'][reaction.replyTo] = self.reacted['reactions'].get(reaction.shout, [])
+					self.reacted['reaction'][reaction.replyTo].append(reaction)
+					self.rating['reactions'][reaction.replyTo] = self.rating['reactions'].get(reaction.replyTo, 0) + kind_to_rate(reaction.kind)
 				else:
-					self.rating['shouts'][shout_slug] = self.rating['shouts'].get(shout_slug, 0) + kind_to_rate(kind)
+					self.rating['shouts'][reaction.replyTo] = self.rating['shouts'].get(reaction.shout, 0) + kind_to_rate(reaction.kind)
+
+	@staticmethod
+	def init(session):
+		self = ReactedStorage
+		all_reactions = session.query(ReactedByDay).all()
+		print('[stat.reacted] %d reactions total' % len(all_reactions))
+		for reaction in all_reactions:
+			shout = reaction.shout
+			topics = session.query(ShoutTopic.topic).where(ShoutTopic.shout == shout).all()
+			kind = reaction.kind
+   
+			self.reacted['shouts'][shout] = self.reacted['shouts'].get(shout, [])
+			self.reacted['shouts'][shout].append(reaction)
+			self.rating['shouts'][shout] = self.rating['shouts'].get(shout, 0) + kind_to_rate(kind)
+   
+			for t in topics:
+				self.reacted['topics'][t] = self.reacted['topics'].get(t, [])
+				self.reacted['topics'][t].append(reaction)
+				self.rating['topics'][t] = self.rating['topics'].get(t, 0) + kind_to_rate(kind) # rating
+	
+			if reaction.replyTo:
+				self.reacted['reactions'][reaction.replyTo] = self.reacted['reactions'].get(reaction.replyTo, [])
+				self.reacted['reactions'][reaction.replyTo].append(reaction)
+				self.rating['reactions'][reaction.replyTo] = self.rating['reactions'].get(reaction.replyTo, 0) + kind_to_rate(reaction.kind)
+		ttt = self.reacted['topics'].values()
+		print('[stat.reacted] %d topics reacted' % len(ttt))
+		print('[stat.reacted] %d shouts reacted' % len(self.reacted['shouts']))
+		print('[stat.reacted] %d reactions reacted' % len(self.reacted['reactions']))