From e4d7284681194b7ffe3eb32b76700452406a5e94 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Mon, 29 Jan 2024 15:20:28 +0300
Subject: [PATCH] reacted-stat-restore

---
 resolvers/reaction.py |  8 +++++++-
 resolvers/reader.py   | 13 ++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/resolvers/reaction.py b/resolvers/reaction.py
index e99f988c..cf5c7453 100644
--- a/resolvers/reaction.py
+++ b/resolvers/reaction.py
@@ -22,6 +22,7 @@ logger.setLevel(logging.DEBUG)
 
 def add_stat_columns(q, aliased_reaction):
     q = q.outerjoin(aliased_reaction).add_columns(
+        func.sum(aliased_reaction.id).label('reacted_stat'),
         func.sum(case((aliased_reaction.kind == ReactionKind.COMMENT.value, 1), else_=0)).label('comments_stat'),
         func.sum(case((aliased_reaction.kind == ReactionKind.LIKE.value, 1), else_=0)).label('likes_stat'),
         func.sum(case((aliased_reaction.kind == ReactionKind.DISLIKE.value, 1), else_=0)).label('dislikes_stat'),
@@ -291,7 +292,7 @@ async def update_reaction(_, info, rid, reaction):
         q = add_stat_columns(q, aliased_reaction)
         q = q.group_by(Reaction.id)
 
-        [r, commented_stat, likes_stat, dislikes_stat, _l] = session.execute(q).unique().one()
+        [r, reacted_stat, commented_stat, likes_stat, dislikes_stat, _l] = session.execute(q).unique().first()
 
         if not r:
             return {'error': 'invalid reaction id'}
@@ -309,6 +310,7 @@ async def update_reaction(_, info, rid, reaction):
 
             session.commit()
             r.stat = {
+                'reacted': reacted_stat,
                 'commented': commented_stat,
                 'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
             }
@@ -420,6 +422,7 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
             reaction,
             author,
             shout,
+            reacted_stat,
             commented_stat,
             likes_stat,
             dislikes_stat,
@@ -429,6 +432,7 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
             reaction.shout = shout
             reaction.stat = {
                 'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
+                'reacted': reacted_stat,
                 'commented': commented_stat,
             }
             reactions.append(reaction)
@@ -482,6 +486,7 @@ async def reacted_shouts_updates(follower_id: int, limit=50, offset=0) -> List[S
             with local_session() as session:
                 for [
                     shout,
+                    reacted_stat,
                     commented_stat,
                     likes_stat,
                     dislikes_stat,
@@ -490,6 +495,7 @@ async def reacted_shouts_updates(follower_id: int, limit=50, offset=0) -> List[S
                     shout.stat = {
                         'viewed': await ViewedStorage.get_shout(shout.slug),
                         'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
+                        'reacted': reacted_stat,
                         'commented': commented_stat,
                         'last_comment': last_comment,
                     }
diff --git a/resolvers/reader.py b/resolvers/reader.py
index 0eaa6879..67d6f197 100644
--- a/resolvers/reader.py
+++ b/resolvers/reader.py
@@ -69,6 +69,7 @@ async def get_shout(_, _info, slug=None, shout_id=None):
             if results:
                 [
                     shout,
+                    reacted_stat,
                     commented_stat,
                     likes_stat,
                     dislikes_stat,
@@ -77,7 +78,7 @@ async def get_shout(_, _info, slug=None, shout_id=None):
 
                 shout.stat = {
                     'viewed': await ViewedStorage.get_shout(shout.slug),
-                    # "reacted": reacted_stat,
+                    'reacted': reacted_stat,
                     'commented': commented_stat,
                     'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
                 }
@@ -161,6 +162,7 @@ async def load_shouts_by(_, _info, options):
     with local_session() as session:
         for [
             shout,
+            reacted_stat,
             commented_stat,
             likes_stat,
             dislikes_stat,
@@ -183,6 +185,7 @@ async def load_shouts_by(_, _info, options):
                 shout.main_topic = main_topic[0]
             shout.stat = {
                 'viewed': await ViewedStorage.get_shout(shout.slug),
+                'reacted': reacted_stat,
                 'commented': commented_stat,
                 'rating': int(likes_stat) - int(dislikes_stat),
             }
@@ -283,7 +286,7 @@ async def load_shouts_feed(_, info, options):
 
             # print(q.compile(compile_kwargs={"literal_binds": True}))
 
-            for [shout, reacted_stat, commented_stat, _last_comment] in session.execute(q).unique():
+            for [shout, reacted_stat, commented_stat, likes_stat, dislikes_stat, _last_comment] in session.execute(q).unique():
                 main_topic = (
                     session.query(Topic.slug)
                     .join(
@@ -303,6 +306,7 @@ async def load_shouts_feed(_, info, options):
                     'viewed': await ViewedStorage.get_shout(shout.slug),
                     'reacted': reacted_stat,
                     'commented': commented_stat,
+                    'rating': likes_stat - dislikes_stat
                 }
                 shouts.append(shout)
 
@@ -367,16 +371,19 @@ async def get_shouts_from_query(q, author_id=None):
     with local_session() as session:
         for [
             shout,
+            reacted_stat,
             commented_stat,
             likes_stat,
             dislikes_stat,
-            _last_comment,
+            last_comment,
         ] in session.execute(q, {'author_id': author_id}).unique():
             shouts.append(shout)
             shout.stat = {
                 'viewed': await ViewedStorage.get_shout(shout_slug=shout.slug),
+                'reacted': reacted_stat,
                 'commented': commented_stat,
                 'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
+                'last_comment': last_comment
             }
 
     return shouts