Skip to content

The open alternative to Salesforce, designed for AI.

Rename 7 server files to the singular suffix in src/engine/api/utils (#28364)

twenty-pr-author[bot]49f2a625ddc6
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
index 2a449443e5f..a8d568aa90b 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/common-create-many-query-runner.service.ts
@@ -37,7 +37,7 @@ import { type NestedRelationsReadPathOptions } from 'src/engine/api/common/types
import { buildColumnsToReturn } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return';
import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';
import { assertIsValidUuid } from 'src/engine/api/graphql/workspace-query-runner/utils/assert-is-valid-uuid.util';
-import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.utils';
+import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.util';
import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
index f111dd344bd..4c2d82d4098 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts
@@ -30,7 +30,7 @@ import { CommonSelectedFieldsResult } from 'src/engine/api/common/types/common-s
import { getPageInfo } from 'src/engine/api/common/utils/get-page-info.util';
import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';
import { buildDuplicateSourceColumnsToSelect } from 'src/engine/api/common/common-query-runners/utils/build-duplicate-source-columns-to-select.util';
-import { buildDuplicateConditions } from 'src/engine/api/utils/build-duplicate-conditions.utils';
+import { buildDuplicateConditions } from 'src/engine/api/utils/build-duplicate-conditions.util';
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/build-field-maps-from-flat-object-metadata.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
index c855e2f9448..1b6d844de6a 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
@@ -42,7 +42,7 @@ import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runne
import { buildOrderByColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-order-by-columns-to-select';
import { getCursor } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';
import { buildOrderByValuesByRecordId } from 'src/engine/api/utils/build-order-by-values-by-record-id.util';
-import { computeCursorArgFilter } from 'src/engine/api/utils/compute-cursor-arg-filter.utils';
+import { computeCursorArgFilter } from 'src/engine/api/utils/compute-cursor-arg-filter.util';
import {
buildOrderByFromLeaves,
resolveOrderByLeaves,
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
index 6b12b24aae9..5fa9cd35fe9 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts
@@ -33,7 +33,7 @@ import {
CommonQueryNames,
MergeManyQueryArgs,
} from 'src/engine/api/common/types/common-query-args.type';
-import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.utils';
+import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.util';
import { buildColumnsToReturn } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-return';
import { hasRecordFieldValue } from 'src/engine/api/graphql/graphql-query-runner/utils/has-record-field-value.util';
import { mergeFieldValues } from 'src/engine/api/graphql/graphql-query-runner/utils/merge-field-values.util';
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-duplicate-source-columns-to-select.util.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-duplicate-source-columns-to-select.util.ts
index c58086e868b..21111cf9f03 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-duplicate-source-columns-to-select.util.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/utils/build-duplicate-source-columns-to-select.util.ts
@@ -1,6 +1,6 @@
import { type RestrictedFieldsPermissions } from 'twenty-shared/types';
-import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.utils';
+import { getAllSelectableColumnNames } from 'src/engine/api/utils/get-all-selectable-column-names.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/convert-order-by-to-find-options-order.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/convert-order-by-to-find-options-order.ts
index 67c33e0e63a..31b2e1f33f1 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/convert-order-by-to-find-options-order.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/convert-order-by-to-find-options-order.ts
@@ -7,7 +7,7 @@ import {
} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
import { isOrderByDirection } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/utils/is-order-by-direction.util';
import { type OrderByClause } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order.parser';
-import { getEffectiveScanOrder } from 'src/engine/api/utils/get-effective-scan-order.utils';
+import { getEffectiveScanOrder } from 'src/engine/api/utils/get-effective-scan-order.util';
// Same scan-order primitive as the keyset cursor conditions, so ORDER BY and the WHERE continuation cannot disagree
export const convertOrderByToFindOptionsOrder = (
diff --git a/packages/twenty-server/src/engine/api/utils/__tests__/build-duplicate-conditions.utils.spec.ts b/packages/twenty-server/src/engine/api/utils/__tests__/build-duplicate-conditions.utils.spec.ts
index 4bdc6bb3c1d..b92de973818 100644
--- a/packages/twenty-server/src/engine/api/utils/__tests__/build-duplicate-conditions.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/utils/__tests__/build-duplicate-conditions.utils.spec.ts
@@ -4,7 +4,7 @@ import {
mockPersonFlatObjectMetadataMaps,
} from 'src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata';
import { mockPersonRecords } from 'src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonRecords';
-import { buildDuplicateConditions } from 'src/engine/api/utils/build-duplicate-conditions.utils';
+import { buildDuplicateConditions } from 'src/engine/api/utils/build-duplicate-conditions.util';
describe('buildDuplicateConditions', () => {
it('should build conditions based on duplicate criteria from composite field', () => {
diff --git a/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts b/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts
index 0239c124daf..f85e6d48114 100644
--- a/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts
@@ -10,7 +10,7 @@ import {
} from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { GraphqlQueryRunnerException } from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
-import { computeCursorArgFilter } from 'src/engine/api/utils/compute-cursor-arg-filter.utils';
+import { computeCursorArgFilter } from 'src/engine/api/utils/compute-cursor-arg-filter.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
diff --git a/packages/twenty-server/src/engine/api/utils/build-cursor-keyset-condition.utils.ts b/packages/twenty-server/src/engine/api/utils/build-cursor-keyset-condition.util.ts
similarity index 98%
rename from packages/twenty-server/src/engine/api/utils/build-cursor-keyset-condition.utils.ts
rename to packages/twenty-server/src/engine/api/utils/build-cursor-keyset-condition.util.ts
index 34e078b0064..b3155b88f82 100644
--- a/packages/twenty-server/src/engine/api/utils/build-cursor-keyset-condition.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/build-cursor-keyset-condition.util.ts
@@ -1,6 +1,6 @@
import { type OrderByDirection } from 'twenty-shared/types';
-import { getEffectiveScanOrder } from 'src/engine/api/utils/get-effective-scan-order.utils';
+import { getEffectiveScanOrder } from 'src/engine/api/utils/get-effective-scan-order.util';
type BuildCursorKeysetConditionParams = {
cursorValue: unknown;
diff --git a/packages/twenty-server/src/engine/api/utils/build-cursor-leaf-where-condition.utils.ts b/packages/twenty-server/src/engine/api/utils/build-cursor-leaf-where-condition.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/api/utils/build-cursor-leaf-where-condition.utils.ts
rename to packages/twenty-server/src/engine/api/utils/build-cursor-leaf-where-condition.util.ts
index a50868eee52..a0ae706e903 100644
--- a/packages/twenty-server/src/engine/api/utils/build-cursor-leaf-where-condition.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/build-cursor-leaf-where-condition.util.ts
@@ -1,4 +1,4 @@
-import { buildCursorKeysetCondition } from 'src/engine/api/utils/build-cursor-keyset-condition.utils';
+import { buildCursorKeysetCondition } from 'src/engine/api/utils/build-cursor-keyset-condition.util';
import { type OrderByLeaf } from 'src/engine/api/utils/resolve-order-by-leaves.utils';
// Any nullable column can hold NULL whatever its type (empty text is stored as NULL).
diff --git a/packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.utils.ts b/packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.utils.ts
rename to packages/twenty-server/src/engine/api/utils/build-duplicate-conditions.util.ts
diff --git a/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts b/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.util.ts
similarity index 98%
rename from packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts
rename to packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.util.ts
index a24128bbf62..fad2e910c4a 100644
--- a/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/compute-cursor-arg-filter.util.ts
@@ -11,7 +11,7 @@ import {
GraphqlQueryRunnerException,
GraphqlQueryRunnerExceptionCode,
} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
-import { buildCursorLeafWhereCondition } from 'src/engine/api/utils/build-cursor-leaf-where-condition.utils';
+import { buildCursorLeafWhereCondition } from 'src/engine/api/utils/build-cursor-leaf-where-condition.util';
import {
checkIfLeafCanCarryCursorValue,
getCursorValueForLeaf,
diff --git a/packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.utils.ts b/packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.utils.ts
rename to packages/twenty-server/src/engine/api/utils/get-all-selectable-column-names.util.ts
diff --git a/packages/twenty-server/src/engine/api/utils/get-effective-scan-order.utils.ts b/packages/twenty-server/src/engine/api/utils/get-effective-scan-order.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/api/utils/get-effective-scan-order.utils.ts
rename to packages/twenty-server/src/engine/api/utils/get-effective-scan-order.util.ts
index 5ff2f5b5f07..218d1469ea0 100644
--- a/packages/twenty-server/src/engine/api/utils/get-effective-scan-order.utils.ts
+++ b/packages/twenty-server/src/engine/api/utils/get-effective-scan-order.util.ts
@@ -1,6 +1,6 @@
import { OrderByDirection } from 'twenty-shared/types';
-import { isAscendingOrder } from 'src/engine/api/utils/is-ascending-order.utils';
+import { isAscendingOrder } from 'src/engine/api/utils/is-ascending-order.util';
export type EffectiveScanOrder = {
isAscending: boolean;
diff --git a/packages/twenty-server/src/engine/api/utils/is-ascending-order.utils.ts b/packages/twenty-server/src/engine/api/utils/is-ascending-order.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/api/utils/is-ascending-order.utils.ts
rename to packages/twenty-server/src/engine/api/utils/is-ascending-order.util.ts