From 92073936f51e3a8cf41e3e95dd27b7cab2d6f1c4 Mon Sep 17 00:00:00 2001 From: Marie Stoppa Date: Wed, 15 Jan 2025 17:23:30 +0100 Subject: [PATCH] Fix --- .../helpers/process-aggregate.helper.ts | 10 ++-------- .../constants/fieldMetadataTypesToTextColumnType.ts | 12 ------------ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts index 4b22f5d4d51e..c737ceb6a034 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts @@ -2,7 +2,6 @@ import { SelectQueryBuilder } from 'typeorm'; import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { AggregationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util'; -import { FIELD_METADATA_TYPES_TO_TEXT_COLUMN_TYPE } from 'src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType'; import { formatColumnNamesFromCompositeFieldAndSubfields } from 'src/engine/twenty-orm/utils/format-column-names-from-composite-field-and-subfield.util'; import { isDefined } from 'src/utils/is-defined'; @@ -50,14 +49,9 @@ export class ProcessAggregateHelper { const concatenatedColumns = columnNames .map((col) => `"${col}"`) - .join(", ' ', "); + .join(','); - const columnExpression = - FIELD_METADATA_TYPES_TO_TEXT_COLUMN_TYPE.includes( - aggregatedField.fromFieldType, - ) - ? `NULLIF(CONCAT(${concatenatedColumns}), '')` - : `CONCAT(${concatenatedColumns})`; + const columnExpression = `NULLIF(CONCAT(${concatenatedColumns}), '')`; switch (aggregatedField.aggregateOperation) { case AGGREGATE_OPERATIONS.countEmpty: diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts deleted file mode 100644 index 5b67310b9712..000000000000 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { FieldMetadataType } from 'twenty-shared'; - -export const FIELD_METADATA_TYPES_TO_TEXT_COLUMN_TYPE = [ - FieldMetadataType.TEXT, - FieldMetadataType.RICH_TEXT, - FieldMetadataType.ARRAY, - FieldMetadataType.ADDRESS, - FieldMetadataType.LINKS, - FieldMetadataType.FULL_NAME, - FieldMetadataType.PHONES, - FieldMetadataType.EMAILS, -];