reacted-storage-removed

resolvers/zine/load.py

@@ -29,7 +29,10 @@ def calc_reactions(q):
                 (Reaction.body.is_not(None), 1),
                 else_=0
             )
-        ).label('commented')
+        ).label('commented'),
+        sa.func.sum(
+            Reaction.id
+        ).label('reacted')
     )
 
 
@@ -72,7 +75,7 @@ async def load_shout(_, info, slug):
             Shout.deletedAt.is_(None)
         ).group_by(Shout.id)
 
-        [shout, rating, commented] = session.execute(q).unique().one()
+        [shout, rating, commented, reacted] = session.execute(q).unique().one()
         for a in shout.authors:
             a.caption = await ShoutAuthorStorage.get_author_caption(shout.slug, a.slug)
         viewed = await ViewedStorage.get_shout(shout.slug)
@@ -80,7 +83,7 @@ async def load_shout(_, info, slug):
             "rating": rating,
             "viewed": viewed,
             "commented": commented,
-            # "reacted": reacted
+            "reacted": reacted
         }
 
         return shout
@@ -146,12 +149,12 @@ async def load_shouts_by(_, info, options):
 
     shouts = []
     with local_session() as session:
-        for [shout, rating, commented] in session.execute(q).unique():
+        for [shout, rating, commented, reacted] in session.execute(q).unique():
             shout.stat = {
                 "rating": rating,
                 "viewed": await ViewedStorage.get_shout(shout.slug),
                 "commented": commented,
-                # "reacted": reacted
+                "reacted": reacted
             }
             # NOTE: no need authors captions in arrays
             # for author in shout.authors:

resolvers/zine/reactions.py

@@ -8,16 +8,8 @@ from base.resolvers import mutation, query
 from orm.reaction import Reaction, ReactionKind
 from orm.shout import Shout, ShoutReactionsFollower
 from orm.user import User
-from services.stat.reacted import ReactedStorage
-
-
-async def get_reaction_stat(reaction_id):
-    return {
-        # "viewed": await ViewedStorage.get_reaction(reaction_id),
-        "reacted": len(await ReactedStorage.get_reaction(reaction_id)),
-        "rating": await ReactedStorage.get_reaction_rating(reaction_id),
-        "commented": len(await ReactedStorage.get_reaction_comments(reaction_id)),
-    }
+# from services.stat.reacted import ReactedStorage
+from resolvers.zine.load import calc_reactions
 
 
 def reactions_follow(user: User, slug: str, auto=False):
@@ -142,13 +134,17 @@ async def create_reaction(_, info, inp):
         elif check_to_publish(session, user, reaction):
             set_published(session, reaction.shout, reaction.createdBy)
 
-    ReactedStorage.react(reaction)
+    # ReactedStorage.react(reaction)
     try:
         reactions_follow(user, inp["shout"], True)
     except Exception as e:
         print(f"[resolvers.reactions] error on reactions autofollowing: {e}")
 
-    reaction.stat = await get_reaction_stat(reaction.id)
+    reaction.stat = {
+        "commented": 0,
+        "reacted": 0,
+        "rating": 0
+    }
     return {"reaction": reaction}
 
 
@@ -160,11 +156,16 @@ async def update_reaction(_, info, inp):
 
     with local_session() as session:
         user = session.query(User).where(User.id == user_id).first()
-        reaction = session.query(Reaction).filter(Reaction.id == inp.id).first()
+        q = select(Reaction).filter(Reaction.id == inp.id)
+        q = calc_reactions(q)
+
+        [reaction, rating, commented, reacted] = session.execute(q).unique().one()
+
         if not reaction:
             return {"error": "invalid reaction id"}
         if reaction.createdBy != user.slug:
             return {"error": "access denied"}
+
         reaction.body = inp["body"]
         reaction.updatedAt = datetime.now(tz=timezone.utc)
         if reaction.kind != inp["kind"]:
@@ -173,8 +174,11 @@ async def update_reaction(_, info, inp):
         if inp.get("range"):
             reaction.range = inp.get("range")
         session.commit()
-
-        reaction.stat = await get_reaction_stat(reaction.id)
+        reaction.stat = {
+            "commented": commented,
+            "reacted": reacted,
+            "rating": rating
+        }
 
     return {"reaction": reaction}
 
@@ -198,6 +202,7 @@ async def delete_reaction(_, info, rid):
 
 def map_result_item(result_item):
     [user, shout, reaction] = result_item
+    print(reaction)
     reaction.createdBy = user
     reaction.shout = shout
     reaction.replyTo = reaction
@@ -254,16 +259,24 @@ async def load_reactions_by(_, _info, by, limit=50, offset=0):
     ).order_by(
         order_way(order_field)
     )
-
+    q = calc_reactions(q)
     q = q.where(Reaction.deletedAt.is_(None))
     q = q.limit(limit).offset(offset)
-
+    reactions = []
     with local_session() as session:
-        reactions = list(map(map_result_item, session.execute(q)))
-        for reaction in reactions:
-            reaction.stat = await get_reaction_stat(reaction.id)
+        for [
+            [reaction, rating, commented, reacted], shout, reply
+        ] in list(map(map_result_item, session.execute(q))):
+            reaction.shout = shout
+            reaction.replyTo = reply
+            reaction.stat = {
+                "rating": rating,
+                "commented": commented,
+                "reacted": reacted
+            }
+            reactions.append(reaction)
 
-        if by.get("stat"):
-            reactions.sort(lambda r: r.stat.get(by["stat"]) or r.createdAt)
+    if by.get("stat"):
+        reactions.sort(lambda r: r.stat.get(by["stat"]) or r.createdAt)
 
     return reactions