virtual-score-column-fix-2

resolvers/reader.py

@@ -82,7 +82,9 @@ async def get_shout(_, _info, slug=None, shout_id=None):
                     'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
                 }
 
-                for author_caption in session.query(ShoutAuthor).join(Shout).where(Shout.slug == slug):
+                for author_caption in (
+                    session.query(ShoutAuthor).join(Shout).where(Shout.slug == slug)
+                ):
                     for author in shout.authors:
                         if author.id == author_caption.author:
                             author.caption = author_caption.caption
@@ -103,7 +105,9 @@ async def get_shout(_, _info, slug=None, shout_id=None):
                     shout.main_topic = main_topic[0]
                 return shout
         except Exception:
-            raise HTTPException(status_code=404, detail=f'shout {slug or shout_id} not found')
+            raise HTTPException(
+                status_code=404, detail=f'shout {slug or shout_id} not found'
+            )
 
 
 @query.field('load_shouts_by')
@@ -149,7 +153,9 @@ async def load_shouts_by(_, _info, options):
 
     # order
     order_by = options.get('order_by', Shout.published_at)
-    query_order_by = desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
+    query_order_by = (
+        desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
+    )
     q = q.order_by(nulls_last(query_order_by))
 
     # limit offset
@@ -242,15 +248,20 @@ async def load_shouts_feed(_, info, options):
     with local_session() as session:
         reader = session.query(Author).filter(Author.user == user_id).first()
         if reader:
-            reader_followed_authors = select(AuthorFollower.author).where(AuthorFollower.follower == reader.id)
-            reader_followed_topics = select(TopicFollower.topic).where(TopicFollower.follower == reader.id)
+            reader_followed_authors = select(AuthorFollower.author).where(
+                AuthorFollower.follower == reader.id
+            )
+            reader_followed_topics = select(TopicFollower.topic).where(
+                TopicFollower.follower == reader.id
+            )
 
             subquery = (
                 select(Shout.id)
                 .where(Shout.id == ShoutAuthor.shout)
                 .where(Shout.id == ShoutTopic.shout)
                 .where(
-                    (ShoutAuthor.author.in_(reader_followed_authors)) | (ShoutTopic.topic.in_(reader_followed_topics))
+                    (ShoutAuthor.author.in_(reader_followed_authors))
+                    | (ShoutTopic.topic.in_(reader_followed_topics))
                 )
             )
 
@@ -275,15 +286,24 @@ async def load_shouts_feed(_, info, options):
 
             order_by = options.get('order_by', Shout.published_at)
 
-            query_order_by = desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
+            query_order_by = (
+                desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
+            )
             offset = options.get('offset', 0)
             limit = options.get('limit', 10)
 
-            q = q.group_by(Shout.id).order_by(nulls_last(query_order_by)).limit(limit).offset(offset)
+            q = (
+                q.group_by(Shout.id)
+                .order_by(nulls_last(query_order_by))
+                .limit(limit)
+                .offset(offset)
+            )
 
             # 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, _last_comment] in session.execute(
+                q
+            ).unique():
                 main_topic = (
                     session.query(Topic.slug)
                     .join(
@@ -317,7 +337,9 @@ async def load_shouts_search(_, _info, text, limit=50, offset=0):
         found_keys = list(results_dict.keys())
         with local_session() as session:
             # Define a virtual column 'score' using column_property
-            Shout.score = column_property(literal_column(f"({results_dict.get(Shout.slug, {}).get('score', 0)})"))
+            Shout.score = column_property(
+                literal_column(f"({results_dict.get(Shout.slug, {}).get('score', 0)})")
+            )
 
             results = (
                 session.query(Shout)
@@ -332,9 +354,9 @@ async def load_shouts_search(_, _info, text, limit=50, offset=0):
                         Shout.slug.in_(found_keys),
                     )
                 )
+                .order_by(desc(Shout.score))  # Order by the virtual 'score' column
                 .limit(limit)
                 .offset(offset)
-                .order_by(desc(Shout.score))  # Order by the virtual 'score' column
                 .all()
             )
 
@@ -358,7 +380,9 @@ async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0):
             and_(
                 Reaction.shout == Shout.id,
                 Reaction.replyTo.is_(None),
-                Reaction.kind.in_([ReactionKind.LIKE.value, ReactionKind.DISLIKE.value]),
+                Reaction.kind.in_(
+                    [ReactionKind.LIKE.value, ReactionKind.DISLIKE.value]
+                ),
             ),
         )
         .outerjoin(Author, Author.user == bindparam('user_id'))
@@ -427,7 +451,9 @@ async def load_shouts_random_top(_, _info, options):
 
     aliased_reaction = aliased(Reaction)
 
-    subquery = select(Shout.id).outerjoin(aliased_reaction).where(Shout.deleted_at.is_(None))
+    subquery = (
+        select(Shout.id).outerjoin(aliased_reaction).where(Shout.deleted_at.is_(None))
+    )
 
     subquery = apply_filters(subquery, options.get('filters', {}))
     subquery = subquery.group_by(Shout.id).order_by(