From 801bf7c016e6c033dc735be024107d88a381deab Mon Sep 17 00:00:00 2001 From: Guillim Date: Tue, 24 Dec 2024 11:49:50 +0100 Subject: [PATCH] quick fix for positionInViewFilterGroup (#9223) fix 9206 In the future, we should have a look at the column naming "positionInViewFilterGroup" because it breaks the SQL queries in `record-position-query.factory.ts` for viewFilter tablenames --- .../__tests__/query-runner-args.factory.spec.ts | 12 ++++++------ .../factories/query-runner-args.factory.ts | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts index 7a6898d33..04e7b650d 100644 --- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts +++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts @@ -22,34 +22,34 @@ describe('QueryRunnerArgsFactory', () => { { type: FieldMetadataType.POSITION, isCustom: true, - nameSingular: 'position', + name: 'position', }, { type: FieldMetadataType.NUMBER, isCustom: true, - nameSingular: 'testNumber', + name: 'testNumber', }, { type: FieldMetadataType.TEXT, isCustom: true, - nameSingular: 'otherField', + name: 'otherField', }, ], fieldsByName: { position: { type: FieldMetadataType.POSITION, isCustom: true, - nameSingular: 'position', + name: 'position', }, testNumber: { type: FieldMetadataType.NUMBER, isCustom: true, - nameSingular: 'testNumber', + name: 'testNumber', }, otherField: { type: FieldMetadataType.TEXT, isCustom: true, - nameSingular: 'otherField', + name: 'otherField', }, } as unknown as FieldMetadataMap, }, diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts index 163dfcc3c..6fae9cb18 100644 --- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts +++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts @@ -40,7 +40,9 @@ export class QueryRunnerArgsFactory { const shouldBackfillPosition = options.objectMetadataItemWithFieldMaps.fields.some( - (field) => field.type === FieldMetadataType.POSITION, + (field) => + field.type === FieldMetadataType.POSITION && + field.name === 'position', ); switch (resolverArgsType) {