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

joined-createdby-fix

Browse Source
This commit is contained in:
Untone 2023-11-30 14:04:55 +03:00
parent e2f2dff755
commit ecf0727631
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resolvers/editor.py
View File

@ -22,11 +22,11 @@ async def get_shouts_drafts(_, info):
q = ( q = (
select(Shout) select(Shout)
.options( .options(
joinedload(Shout.created_by, Author.id == Shout.created_by), # joinedload(Shout.created_by, Author.id == Shout.created_by),
joinedload(Shout.authors), joinedload(Shout.authors),
joinedload(Shout.topics), joinedload(Shout.topics),
) )
.where(and_(Shout.deleted_at.is_(None), Shout.created_by == author.id)) .filter(and_(Shout.deleted_at.is_(None), Shout.created_by == author.id))
) )
q = q.group_by(Shout.id) q = q.group_by(Shout.id)
shouts = [] shouts = []
@ -88,7 +88,7 @@ async def update_shout(_, info, shout_id, shout_input=None, publish=False):
shout = ( shout = (
session.query(Shout) session.query(Shout)
.options( .options(
joinedload(Shout.created_by, Author.id == Shout.created_by), # joinedload(Shout.created_by, Author.id == Shout.created_by),
joinedload(Shout.authors), joinedload(Shout.authors),
joinedload(Shout.topics), joinedload(Shout.topics),
) )

8
resolvers/reader.py
View File

@ -72,7 +72,7 @@ def apply_filters(q, filters, author_id=None):
async def get_shout(_, _info, slug=None, shout_id=None): async def get_shout(_, _info, slug=None, shout_id=None):
with local_session() as session: with local_session() as session:
q = select(Shout).options( q = select(Shout).options(
joinedload(Shout.created_by), # joinedload(Shout.created_by),
joinedload(Shout.authors), joinedload(Shout.authors),
joinedload(Shout.topics), joinedload(Shout.topics),
) )
@ -142,7 +142,7 @@ async def load_shouts_by(_, info, options):
q = ( q = (
select(Shout) select(Shout)
.options( .options(
joinedload(Shout.created_by, Author.id == Shout.created_by), # joinedload(Shout.created_by, Author.id == Shout.created_by),
joinedload(Shout.authors), joinedload(Shout.authors),
joinedload(Shout.topics), joinedload(Shout.topics),
) )
@ -203,13 +203,13 @@ async def load_shouts_feed(_, info, options):
q = ( q = (
select(Shout) select(Shout)
.options( .options(
joinedload(Shout.created_by, Author.id == Shout.created_by), # joinedload(Shout.created_by, Author.id == Shout.created_by),
joinedload(Shout.authors), joinedload(Shout.authors),
joinedload(Shout.topics), joinedload(Shout.topics),
) )
.where( .where(
and_( and_(
Shout.published_at != None, Shout.published_at.is_not(None),
Shout.deleted_at.is_(None), Shout.deleted_at.is_(None),
Shout.id.in_(subquery), Shout.id.in_(subquery),
) )