loadShouts fix
This commit is contained in:
parent
57bc4982e6
commit
6d3f2463cf
|
@ -31,36 +31,6 @@ def apply_filters(q, filters, user=None):
|
||||||
q = q.filter(Shout.createdAt > before)
|
q = q.filter(Shout.createdAt > before)
|
||||||
return q
|
return q
|
||||||
|
|
||||||
|
|
||||||
def extract_order(o, q):
|
|
||||||
if o:
|
|
||||||
q = q.add_columns(sa.func.count(Reaction.id).label(o))
|
|
||||||
if o == 'comments':
|
|
||||||
q = q.join(Reaction, Shout.slug == Reaction.shout)
|
|
||||||
q = q.filter(Reaction.body.is_not(None))
|
|
||||||
elif o == 'reacted':
|
|
||||||
q = q.join(
|
|
||||||
Reaction
|
|
||||||
).add_columns(
|
|
||||||
sa.func.max(Reaction.createdAt).label(o)
|
|
||||||
)
|
|
||||||
elif o == "rating":
|
|
||||||
q = q.join(Reaction).add_columns(sa.func.sum(case(
|
|
||||||
(Reaction.kind == ReactionKind.AGREE, 1),
|
|
||||||
(Reaction.kind == ReactionKind.DISAGREE, -1),
|
|
||||||
(Reaction.kind == ReactionKind.PROOF, 1),
|
|
||||||
(Reaction.kind == ReactionKind.DISPROOF, -1),
|
|
||||||
(Reaction.kind == ReactionKind.ACCEPT, 1),
|
|
||||||
(Reaction.kind == ReactionKind.REJECT, -1),
|
|
||||||
(Reaction.kind == ReactionKind.LIKE, 1),
|
|
||||||
(Reaction.kind == ReactionKind.DISLIKE, -1),
|
|
||||||
else_=0
|
|
||||||
)).label(o))
|
|
||||||
return o
|
|
||||||
else:
|
|
||||||
return 'createdAt'
|
|
||||||
|
|
||||||
|
|
||||||
@query.field("loadShout")
|
@query.field("loadShout")
|
||||||
async def load_shout(_, info, slug):
|
async def load_shout(_, info, slug):
|
||||||
with local_session() as session:
|
with local_session() as session:
|
||||||
|
@ -109,7 +79,33 @@ async def load_shouts_by(_, info, options):
|
||||||
user = info.context["request"].user
|
user = info.context["request"].user
|
||||||
q = apply_filters(q, options.get("filters"), user)
|
q = apply_filters(q, options.get("filters"), user)
|
||||||
|
|
||||||
order_by = extract_order(options.get("order_by"), q)
|
o = options.get("order_by")
|
||||||
|
if o:
|
||||||
|
q = q.add_columns(sa.func.count(Reaction.id).label(o))
|
||||||
|
if o == 'comments':
|
||||||
|
q = q.join(Reaction, Shout.slug == Reaction.shout)
|
||||||
|
q = q.filter(Reaction.body.is_not(None))
|
||||||
|
elif o == 'reacted':
|
||||||
|
q = q.join(
|
||||||
|
Reaction
|
||||||
|
).add_columns(
|
||||||
|
sa.func.max(Reaction.createdAt).label(o)
|
||||||
|
)
|
||||||
|
elif o == "rating":
|
||||||
|
q = q.join(Reaction).add_columns(sa.func.sum(case(
|
||||||
|
(Reaction.kind == ReactionKind.AGREE, 1),
|
||||||
|
(Reaction.kind == ReactionKind.DISAGREE, -1),
|
||||||
|
(Reaction.kind == ReactionKind.PROOF, 1),
|
||||||
|
(Reaction.kind == ReactionKind.DISPROOF, -1),
|
||||||
|
(Reaction.kind == ReactionKind.ACCEPT, 1),
|
||||||
|
(Reaction.kind == ReactionKind.REJECT, -1),
|
||||||
|
(Reaction.kind == ReactionKind.LIKE, 1),
|
||||||
|
(Reaction.kind == ReactionKind.DISLIKE, -1),
|
||||||
|
else_=0
|
||||||
|
)).label(o))
|
||||||
|
order_by = o
|
||||||
|
else:
|
||||||
|
order_by = 'createdAt'
|
||||||
|
|
||||||
order_by_desc = True if options.get('order_by_desc') is None else options.get('order_by_desc')
|
order_by_desc = True if options.get('order_by_desc') is None else options.get('order_by_desc')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user