Run subquery modify prior to applying pagination

IlyaSemenov · Dec 10, 2024 · 8d7c54c · 8d7c54c
1 parent 0813552
commit 8d7c54c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/clean-hounds-unite.md b/.changeset/clean-hounds-unite.md
@@ -0,0 +1,6 @@
+---
+"objection-graphql-resolver": patch
+"orchid-graphql": patch
+---
+
+Run subquery modify prior to applying pagination.
diff --git a/packages/base/src/resolvers/page.ts b/packages/base/src/resolvers/page.ts
@@ -19,12 +19,13 @@ export function definePageResolver<Orm extends OrmAdapter, Context>(
 			relation: tableField || field,
 			as: field,
 			modify(subquery) {
+				subquery = modify ? modify(subquery, context) : subquery
 				subquery = graph._resolve_page(subquery, paginator, context)
 				subquery = graph.orm.modify_subquery_pagination(
 					subquery,
 					pagination_context,
 				)
-				return modify ? modify(subquery, context) : subquery
+				return subquery
 			},
 		})
 		query = graph.orm.finish_query_pagination(query, field, pagination_context)