diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index ab0f5c7e..4bc033fb 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -39,6 +39,7 @@ jobs: uses: dokku/github-action@master with: branch: 'dev' + force: true git_remote_url: 'ssh://dokku@staging.discours.io:22/core' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/resolvers/reader.py b/resolvers/reader.py index 9396350a..d71e168a 100644 --- a/resolvers/reader.py +++ b/resolvers/reader.py @@ -1,5 +1,6 @@ from sqlalchemy.orm import aliased from sqlalchemy.sql.expression import ( + selectinload, and_, asc, case, @@ -94,7 +95,10 @@ def get_shouts_with_stats(q, limit, offset=0, author_id=None): :return: Список публикаций с включенной статистикой. """ # Основной запрос для получения публикаций и объединения их с подзапросами - q = q.limit(limit).offset(offset) + q = q.options( + selectinload(Shout.authors), # Eagerly load authors + selectinload(Shout.topics) # Eagerly load topics + ).limit(limit).offset(offset) # Выполнение запроса и обработка результатов with local_session() as session: