Aggregate queries - Fix empty / not empty operations on composite fie…

…lds and array fields (#9644) as per title closes #9353
twentyhq · Jan 15, 2025 · 585212b · 585212b
1 parent b5c5bee
commit 585212b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/...ty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts b/...ty-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/...gine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts b/...gine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts
diff --git a/...s/twenty-server/src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util.ts b/...s/twenty-server/src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util.ts
@@ -27,7 +27,7 @@ export const getSubfieldsForAggregateOperation = (
       case FieldMetadataType.LINKS:
         return ['primaryLinkUrl'];
       case FieldMetadataType.ACTOR:
-        return ['workspaceMemberId'];
+        return ['workspaceMemberId', 'source'];
       case FieldMetadataType.EMAILS:
         return ['primaryEmail'];
       case FieldMetadataType.PHONES: