The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(metadata): nestjs-query batched relation queries truncate results across parents (#21455)
Charles Bochetd75685b8dca4
diff --git a/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch b/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patchnew file mode 100644index 00000000000..dbc4836af75--- /dev/null+++ b/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch@@ -0,0 +1,47 @@+diff --git a/src/query/relation-query.builder.js b/src/query/relation-query.builder.js+index 36deb6bd2758539241262e386da6ebed3b6cc838..d204807419cd641daf5cdf1ba408d48fd87a1cb2 100644+--- a/src/query/relation-query.builder.js++++ b/src/query/relation-query.builder.js+@@ -38,7 +38,20 @@ class RelationQueryBuilder {+ qb = this.filterQueryBuilder.applyRelationJoinsRecursive(qb, this.filterQueryBuilder.getReferencedRelationsWithAliasRecursive(this.relationRepo.metadata, query.filter, query.relations), query.relations);+ qb = this.filterQueryBuilder.applyFilter(qb, query.filter, qb.alias);+ qb = this.filterQueryBuilder.applySorting(qb, query.sorting, qb.alias);+- qb = this.filterQueryBuilder.applyPaging(qb, query.paging);++ // Paging is per-parent, but this query is batched across all parents:++ // applying LIMIT here truncates the combined result set (and with no++ // ORDER BY, arbitrary parents silently lose rows). Only apply it when++ // the batch has a single parent; multi-parent batches are paged++ // per-parent in batchQueryRelations after mapRelations. The fetch++ // stays bounded with parents * (offset + limit) — the upper bound a++ // correct per-parent pager can need; a SQL-side per-parent quota++ // (ROW_NUMBER() OVER (PARTITION BY parent)) belongs upstream.++ if (entities.length === 1) {++ qb = this.filterQueryBuilder.applyPaging(qb, query.paging);++ }++ else if (query.paging?.limit !== undefined) {++ qb = qb.limit(entities.length * ((query.paging.offset ?? 0) + query.paging.limit));++ }+ if (this.relationRepo.metadata.deleteDateColumn?.propertyName && !withDeleted) {+ qb = qb.andWhere(`${qb.alias}.${this.relationRepo.metadata.deleteDateColumn.propertyName} IS NULL`);+ }+diff --git a/src/services/relation-query.service.js b/src/services/relation-query.service.js+index 91f7b4a83a5e0cdcd1b23b52fdf2fe6c587f7035..d36b7c3c06d5d76f86ba5fdd42b3be49a9dc4b8a 100644+--- a/src/services/relation-query.service.js++++ b/src/services/relation-query.service.js+@@ -167,7 +167,15 @@ class RelationQueryService {+ const results = new Map();+ for (const entity of entities) {+ const relations = relationQueryBuilder.relationMeta.mapRelations(entity, entityRelations.entities, entityRelations.raw);+- results.set(entity, await assembler.convertToDTOs(relations));++ // batchSelect skips LIMIT/OFFSET for multi-parent batches (a global++ // limit truncates arbitrary parents), so enforce paging per-parent.++ const paging = convertedQuery.paging;++ const pagedRelations = paging && entities.length > 1++ ? relations.slice(paging.offset ?? 0, paging.limit !== undefined++ ? (paging.offset ?? 0) + paging.limit++ : undefined)++ : relations;++ results.set(entity, await assembler.convertToDTOs(pagedRelations));+ }+ return results;+ }diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.jsonindex cccf69930ab..58e2a26c75f 100644--- a/packages/twenty-server/package.json+++ b/packages/twenty-server/package.json@@ -69,7 +69,7 @@"@opentelemetry/sdk-metrics": "^2.0.0","@ptc-org/nestjs-query-core": "^9.4.0","@ptc-org/nestjs-query-graphql": "patch:@ptc-org/nestjs-query-graphql@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch",- "@ptc-org/nestjs-query-typeorm": "^9.4.0",+ "@ptc-org/nestjs-query-typeorm": "patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch","@react-email/render": "^1.2.3","@sentry/nestjs": "^10.51.0","@sentry/node": "^10.51.0",diff --git a/yarn.lock b/yarn.lockindex 6af6c46d7ee..4f1784228c7 100644--- a/yarn.lock+++ b/yarn.lock@@ -16626,7 +16626,7 @@ __metadata:languageName: nodelinkType: hard-"@ptc-org/nestjs-query-typeorm@npm:^9.4.0":+"@ptc-org/nestjs-query-typeorm@npm:9.4.0":version: 9.4.0resolution: "@ptc-org/nestjs-query-typeorm@npm:9.4.0"dependencies:@@ -16647,6 +16647,27 @@ __metadata:languageName: nodelinkType: hard+"@ptc-org/nestjs-query-typeorm@patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch":+ version: 9.4.0+ resolution: "@ptc-org/nestjs-query-typeorm@patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch::version=9.4.0&hash=c30501"+ dependencies:+ "@ptc-org/nestjs-query-core": "npm:9.4.0"+ camel-case: "npm:^4.1.2"+ lodash.filter: "npm:^4.6.0"+ lodash.merge: "npm:^4.6.2"+ lodash.omit: "npm:^4.5.0"+ reflect-metadata: "npm:0.2.2"+ tslib: "npm:^2.8.1"+ uuid: "npm:^10.0.0"+ peerDependencies:+ "@nestjs/common": ^9.0.0 || ^10.0.0 || ^11.0.0+ "@nestjs/typeorm": ^9.0.0 || ^10.0.0 || ^11.0.0+ class-transformer: ^0.5+ typeorm: ^0.3.15+ checksum: 10c0/93c81d7a787992a227be643ee03d211fabda9ecd30ffb0116c4d60244cde666c096ad7330d8969e1390d24f876e51ee11545033ea6e8b41cf656defe94c28899+ languageName: node+ linkType: hard+"@puppeteer/browsers@npm:2.3.0":version: 2.3.0resolution: "@puppeteer/browsers@npm:2.3.0"@@ -55079,7 +55100,7 @@ __metadata:"@opentelemetry/sdk-metrics": "npm:^2.0.0""@ptc-org/nestjs-query-core": "npm:^9.4.0""@ptc-org/nestjs-query-graphql": "patch:@ptc-org/nestjs-query-graphql@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch"- "@ptc-org/nestjs-query-typeorm": "npm:^9.4.0"+ "@ptc-org/nestjs-query-typeorm": "patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch""@react-email/render": "npm:^1.2.3""@sentry/nestjs": "npm:^10.51.0""@sentry/node": "npm:^10.51.0"