discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

comments-sort-order-fix

Browse Source
This commit is contained in:
Untone 2024-02-29 15:10:59 +03:00
parent fc3bb52431
commit 0437052280
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resolvers/reaction.py
View File

@ -1,7 +1,7 @@
import time import time
from typing import List from typing import List
from sqlalchemy import and_, case, desc, func, select, text from sqlalchemy import and_, case, desc, func, select, text, asc
from sqlalchemy.orm import aliased, joinedload from sqlalchemy.orm import aliased, joinedload
from sqlalchemy.sql import union from sqlalchemy.sql import union
@ -348,7 +348,7 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
:search - to search by reactions' body :search - to search by reactions' body
:comment - true if body.length > 0 :comment - true if body.length > 0
:after - amount of time ago :after - amount of time ago
:sort - a fieldname to sort desc by default :sort - a fieldname to sort desc by default, 'like' | 'dislike' | 'rating'
} }
:param limit: int amount of shouts :param limit: int amount of shouts
:param offset: int offset in this order :param offset: int offset in this order
@ -374,7 +374,10 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
q = q.group_by(Reaction.id, Author.id, Shout.id, aliased_reaction.id) q = q.group_by(Reaction.id, Author.id, Shout.id, aliased_reaction.id)
# order by # order by
q = q.order_by(desc(Reaction.created_at)) order_stat = by.get('sort', '') # 'like' | 'dislike' | 'rating'
order_fn = asc if order_stat.startswith('-') else desc
order_field = Reaction.created_at if not order_stat else f'{order_stat}s_stat'
q = q.order_by(order_fn(order_field))
# pagination # pagination
q = q.limit(limit).offset(offset) q = q.limit(limit).offset(offset)
@ -401,13 +404,6 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
} }
reactions.add(reaction) # Используем список для хранения реакций reactions.add(reaction) # Используем список для хранения реакций
# sort
reactions = sorted(
list(reactions),
key=lambda r: r.stat.get(by.get('stat')) or r.created_at,
reverse=by.get('stat', '').startswith('-'),
)
return reactions return reactions