Skip to content

The open alternative to Salesforce, designed for AI.

Consolidate the two workspace ORM exception types (#24798)

Charles Bochet297712a01ae8
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts
index 94e4f7eb92d..23d45a175eb 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-28/__tests__/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command.spec.ts
@@ -1,9 +1,9 @@
import { type DataSource, type QueryRunner } from 'typeorm';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
import { RepairOrphanCoreWorkflowVersionsCommand } from 'src/database/commands/upgrade-version-command/2-28/2-28-workspace-command-1785600000000-repair-orphan-core-workflow-versions.command';
@@ -55,9 +55,9 @@ const setup = ({
const count = objectMissing
? jest.fn().mockRejectedValue(
- new TwentyOrmV2Exception(
+ new TwentyOrmException(
'Object "workflowVersion" does not exist in this workspace',
- TwentyOrmV2ExceptionCode.UNKNOWN_OBJECT,
+ TwentyOrmExceptionCode.UNKNOWN_OBJECT,
),
)
: jest.fn().mockResolvedValue(0);
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts
index fcf1294c154..3e5d7edf329 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/utils/is-workspace-object-not-found-error.util.ts
@@ -1,15 +1,15 @@
import { EntityMetadataNotFoundError } from 'typeorm/error/EntityMetadataNotFoundError';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
// A workspace object can be absent when upgrading from a version that predates it.
// The v1 GlobalWorkspaceDataSource throws EntityMetadataNotFoundError, while the v2
-// datasource throws TwentyOrmV2Exception(UNKNOWN_OBJECT). Backfill commands must treat
+// datasource throws TwentyOrmException(UNKNOWN_OBJECT). Backfill commands must treat
// both as "object not provisioned yet" and skip rather than fail the upgrade.
export const isWorkspaceObjectNotFoundError = (error: unknown): boolean =>
error instanceof EntityMetadataNotFoundError ||
- (error instanceof TwentyOrmV2Exception &&
- error.code === TwentyOrmV2ExceptionCode.UNKNOWN_OBJECT);
+ (error instanceof TwentyOrmException &&
+ error.code === TwentyOrmExceptionCode.UNKNOWN_OBJECT);
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts
index 88cfbe68108..75dd7d86f6f 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util.ts
@@ -18,11 +18,8 @@ import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.
import { throttlerToGraphqlApiExceptionHandler } from 'src/engine/core-modules/throttler/utils/throttler-to-graphql-api-exception-handler.util';
import { PermissionsException } from 'src/engine/metadata-modules/permissions/permissions.exception';
import { permissionGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/permissions/utils/permission-graphql-api-exception-handler.util';
-import { TwentyORMException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
-import { twentyORMGraphqlApiExceptionHandler } from 'src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
-import { isTwentyOrmV2UserInputError } from 'src/engine/twenty-orm/utils/twenty-orm-v2-to-user-input-error.util';
-import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
+import { twentyOrmGraphqlApiExceptionHandler } from 'src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util';
import { WorkflowQueryValidationException } from 'src/modules/workflow/common/exceptions/workflow-query-validation.exception';
import { workflowQueryValidationGraphqlApiExceptionHandler } from 'src/modules/workflow/common/utils/workflow-query-validation-graphql-api-exception-handler.util';
@@ -42,13 +39,8 @@ export const workspaceQueryRunnerGraphqlApiExceptionHandler = (
return workspaceExceptionHandler(error);
case error instanceof GraphqlQueryRunnerException:
return graphqlQueryRunnerExceptionHandler(error);
- case error instanceof TwentyORMException:
- return twentyORMGraphqlApiExceptionHandler(error);
- case error instanceof TwentyOrmV2Exception &&
- isTwentyOrmV2UserInputError(error):
- throw new UserInputError(error.message, {
- userFriendlyMessage: error.userFriendlyMessage,
- });
+ case error instanceof TwentyOrmException:
+ return twentyOrmGraphqlApiExceptionHandler(error);
case error instanceof CommonQueryRunnerException:
return commonQueryRunnerToGraphqlApiExceptionHandler(error);
case error instanceof AuthException:
diff --git a/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts b/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts
index 7097fa9094d..b4c29d35d72 100644
--- a/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/utils/workspace-query-runner-rest-api-exception-handler.util.ts
@@ -7,12 +7,8 @@ import { commonQueryRunnerToRestApiExceptionHandler } from 'src/engine/api/commo
import { RestInputRequestParserException } from 'src/engine/api/rest/input-request-parsers/rest-input-request-parser.exception';
import { ThrottlerException } from 'src/engine/core-modules/throttler/throttler.exception';
import { throttlerToRestApiExceptionHandler } from 'src/engine/core-modules/throttler/utils/throttler-to-rest-api-exception-handler.util';
-import {
- TwentyORMException,
- TwentyORMExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
-import { isTwentyOrmV2UserInputError } from 'src/engine/twenty-orm/utils/twenty-orm-v2-to-user-input-error.util';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
+import { isTwentyOrmUserInputError } from 'src/engine/twenty-orm/utils/is-twenty-orm-user-input-error.util';
interface QueryFailedErrorWithCode extends QueryFailedError {
code: string;
@@ -28,11 +24,8 @@ export const workspaceQueryRunnerRestApiExceptionHandler = (
throw new BadRequestException(error.message);
case error instanceof ThrottlerException:
return throttlerToRestApiExceptionHandler(error);
- case error instanceof TwentyORMException &&
- error.code === TwentyORMExceptionCode.INVALID_INPUT:
- throw new BadRequestException(error.message);
- case error instanceof TwentyOrmV2Exception &&
- isTwentyOrmV2UserInputError(error):
+ case error instanceof TwentyOrmException &&
+ isTwentyOrmUserInputError(error):
throw new BadRequestException(error.message);
default:
throw error;
diff --git a/packages/twenty-server/src/engine/core-modules/exception-handler/http-exception-handler.service.ts b/packages/twenty-server/src/engine/core-modules/exception-handler/http-exception-handler.service.ts
index ce30f9bcaf1..602d4f7b0d0 100644
--- a/packages/twenty-server/src/engine/core-modules/exception-handler/http-exception-handler.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/exception-handler/http-exception-handler.service.ts
@@ -18,10 +18,8 @@ import { CustomError } from 'twenty-shared/utils';
import { PostgresException } from 'src/engine/api/graphql/workspace-query-runner/utils/postgres-exception';
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
-import {
- TwentyORMException,
- TwentyORMExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
+import { isTwentyOrmUserInputError } from 'src/engine/twenty-orm/utils/is-twenty-orm-user-input-error.util';
import { handleException } from 'src/engine/utils/global-exception-handler.util';
interface RequestAndParams {
@@ -97,14 +95,8 @@ export class HttpExceptionHandlerService {
}
if (
- exception instanceof TwentyORMException &&
- [
- TwentyORMExceptionCode.INVALID_INPUT,
- TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED,
- TwentyORMExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
- TwentyORMExceptionCode.CONNECT_NOT_ALLOWED,
- TwentyORMExceptionCode.CONNECT_RECORD_NOT_FOUND,
- ].includes(exception.code)
+ exception instanceof TwentyOrmException &&
+ isTwentyOrmUserInputError(exception)
) {
exception = new BadRequestException(exception.message);
statusCode = 400;
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/controllers/workflow-trigger.controller.ts b/packages/twenty-server/src/engine/core-modules/workflow/controllers/workflow-trigger.controller.ts
index f7815ad3a43..a091e03e123 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/controllers/workflow-trigger.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/controllers/workflow-trigger.controller.ts
@@ -21,8 +21,8 @@ import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';
import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import {
@@ -186,10 +186,10 @@ export class WorkflowTriggerController {
workspaceId: string,
): never {
if (
- error instanceof TwentyORMException &&
+ error instanceof TwentyOrmException &&
[
- TwentyORMExceptionCode.WORKSPACE_NOT_FOUND,
- TwentyORMExceptionCode.WORKSPACE_SCHEMA_NOT_FOUND,
+ TwentyOrmExceptionCode.WORKSPACE_NOT_FOUND,
+ TwentyOrmExceptionCode.WORKSPACE_SCHEMA_NOT_FOUND,
].includes(error.code)
) {
throw new WorkflowTriggerException(
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
index 92faa262586..9c8a5dafcd2 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.service.ts
@@ -19,9 +19,9 @@ import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/
import { getWorkspaceContext } from 'src/engine/twenty-orm/storage/orm-workspace-context.storage';
import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace-data-source';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
// node-postgres parses a `date` column into a JS Date (which serializes with a
@@ -89,9 +89,9 @@ export class WorkspaceDataSourceService
: this.primaryPool;
if (!isDefined(pool)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'WorkspaceDataSourceService has not been initialized. Make sure the module has been initialized.',
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
index 224519e5d85..41016d46e15 100644
--- a/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/datasource/workspace-data-source.ts
@@ -16,9 +16,9 @@ import { ClientQueryExecutor } from 'src/engine/twenty-orm/executor/client-query
import { PoolQueryExecutor } from 'src/engine/twenty-orm/executor/pool-query-executor';
import { type QueryExecutor } from 'src/engine/twenty-orm/executor/types/query-executor.type';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { runInRollbackSafeTransaction } from 'src/engine/twenty-orm/datasource/utils/run-in-rollback-safe-transaction.util';
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
@@ -117,9 +117,9 @@ export class WorkspaceDataSource {
this.internalContext.objectIdByNameSingular[nameSingular];
if (!isDefined(objectMetadataId)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Object "${nameSingular}" does not exist in this workspace`,
- TwentyOrmV2ExceptionCode.UNKNOWN_OBJECT,
+ TwentyOrmExceptionCode.UNKNOWN_OBJECT,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.util.spec.ts
index 90768388e87..573ac6db861 100644
--- a/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.util.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/error-handling/__tests__/compute-twenty-orm-exception.util.spec.ts
@@ -2,9 +2,9 @@ import { POSTGRESQL_ERROR_CODES } from 'src/engine/api/graphql/workspace-query-r
import { PostgresException } from 'src/engine/api/graphql/workspace-query-runner/utils/postgres-exception';
import { computeTwentyOrmException } from 'src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.util';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
const buildPostgresError = (message: string, code: string): Error =>
Object.assign(new Error(message), { code });
@@ -15,9 +15,9 @@ describe('computeTwentyOrmException', () => {
const result = computeTwentyOrmException(error);
- expect(result).toBeInstanceOf(TwentyOrmV2Exception);
- expect((result as TwentyOrmV2Exception).code).toBe(
- TwentyOrmV2ExceptionCode.QUERY_READ_TIMEOUT,
+ expect(result).toBeInstanceOf(TwentyOrmException);
+ expect((result as TwentyOrmException).code).toBe(
+ TwentyOrmExceptionCode.QUERY_READ_TIMEOUT,
);
expect(result.message).toBe('Query read timeout');
});
@@ -30,9 +30,9 @@ describe('computeTwentyOrmException', () => {
const result = computeTwentyOrmException(error);
- expect(result).toBeInstanceOf(TwentyOrmV2Exception);
- expect((result as TwentyOrmV2Exception).code).toBe(
- TwentyOrmV2ExceptionCode.DUPLICATE_ENTRY_DETECTED,
+ expect(result).toBeInstanceOf(TwentyOrmException);
+ expect((result as TwentyOrmException).code).toBe(
+ TwentyOrmExceptionCode.DUPLICATE_ENTRY_DETECTED,
);
});
@@ -44,9 +44,9 @@ describe('computeTwentyOrmException', () => {
const result = computeTwentyOrmException(error);
- expect(result).toBeInstanceOf(TwentyOrmV2Exception);
- expect((result as TwentyOrmV2Exception).code).toBe(
- TwentyOrmV2ExceptionCode.INVALID_INPUT,
+ expect(result).toBeInstanceOf(TwentyOrmException);
+ expect((result as TwentyOrmException).code).toBe(
+ TwentyOrmExceptionCode.INVALID_INPUT,
);
expect(result.message).toBe(
'invalid input syntax for type uuid: "not-a-uuid"',
@@ -62,9 +62,9 @@ describe('computeTwentyOrmException', () => {
buildPostgresError('constraint violation', code),
);
- expect(result).toBeInstanceOf(TwentyOrmV2Exception);
- expect((result as TwentyOrmV2Exception).code).toBe(
- TwentyOrmV2ExceptionCode.INVALID_INPUT,
+ expect(result).toBeInstanceOf(TwentyOrmException);
+ expect((result as TwentyOrmException).code).toBe(
+ TwentyOrmExceptionCode.INVALID_INPUT,
);
});
@@ -96,9 +96,9 @@ describe('computeTwentyOrmException', () => {
});
it('should leave an exception the query builder already computed untouched', () => {
- const error = new TwentyOrmV2Exception(
+ const error = new TwentyOrmException(
'Join path "person.tasks" is to-many',
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
expect(computeTwentyOrmException(error)).toBe(error);
diff --git a/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.util.ts b/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.util.ts
index a95937ab5e9..3c59af5d966 100644
--- a/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.util.ts
@@ -11,9 +11,9 @@ import {
} from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-messages.constants';
import { PostgresException } from 'src/engine/api/graphql/workspace-query-runner/utils/postgres-exception';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { CustomException } from 'src/utils/custom-exception';
const KNOWN_POSTGRES_ERROR_CODES: string[] = Object.values(
@@ -43,10 +43,10 @@ export const computeTwentyOrmException = (error: unknown): Error => {
if (error.message.includes(QUERY_READ_TIMEOUT_MESSAGE)) {
return withCause(
- new TwentyOrmV2Exception(
+ new TwentyOrmException(
QUERY_READ_TIMEOUT_MESSAGE,
- TwentyOrmV2ExceptionCode.QUERY_READ_TIMEOUT,
- QUERY_READ_TIMEOUT_USER_FRIENDLY_MESSAGE,
+ TwentyOrmExceptionCode.QUERY_READ_TIMEOUT,
+ { userFriendlyMessage: QUERY_READ_TIMEOUT_USER_FRIENDLY_MESSAGE },
),
error,
);
@@ -60,10 +60,10 @@ export const computeTwentyOrmException = (error: unknown): Error => {
if (errorCode === POSTGRESQL_ERROR_CODES.UNIQUE_VIOLATION) {
return withCause(
- new TwentyOrmV2Exception(
+ new TwentyOrmException(
DUPLICATE_ENTRY_DETECTED_MESSAGE,
- TwentyOrmV2ExceptionCode.DUPLICATE_ENTRY_DETECTED,
- DUPLICATE_ENTRY_USER_FRIENDLY_MESSAGE,
+ TwentyOrmExceptionCode.DUPLICATE_ENTRY_DETECTED,
+ { userFriendlyMessage: DUPLICATE_ENTRY_USER_FRIENDLY_MESSAGE },
),
error,
);
@@ -71,10 +71,10 @@ export const computeTwentyOrmException = (error: unknown): Error => {
if (errorCode === POSTGRESQL_ERROR_CODES.INVALID_TEXT_REPRESENTATION) {
return withCause(
- new TwentyOrmV2Exception(
+ new TwentyOrmException(
error.message,
- TwentyOrmV2ExceptionCode.INVALID_INPUT,
- INVALID_INPUT_USER_FRIENDLY_MESSAGE,
+ TwentyOrmExceptionCode.INVALID_INPUT,
+ { userFriendlyMessage: INVALID_INPUT_USER_FRIENDLY_MESSAGE },
),
error,
);
@@ -85,10 +85,10 @@ export const computeTwentyOrmException = (error: unknown): Error => {
if (isDefined(constraintViolationMessage)) {
return withCause(
- new TwentyOrmV2Exception(
+ new TwentyOrmException(
error.message,
- TwentyOrmV2ExceptionCode.INVALID_INPUT,
- constraintViolationMessage,
+ TwentyOrmExceptionCode.INVALID_INPUT,
+ { userFriendlyMessage: constraintViolationMessage },
),
error,
);
diff --git a/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm-v2.exception.ts b/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm-v2.exception.ts
deleted file mode 100644
index 6f3b41f12b3..00000000000
--- a/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm-v2.exception.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { type MessageDescriptor } from '@lingui/core';
-
-import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
-import { CustomException } from 'src/utils/custom-exception';
-
-export enum TwentyOrmV2ExceptionCode {
- MISSING_PARAMETER = 'MISSING_PARAMETER',
- INVALID_PARAMETER = 'INVALID_PARAMETER',
- MALFORMED_SQL = 'MALFORMED_SQL',
- UNKNOWN_OBJECT = 'UNKNOWN_OBJECT',
- UNKNOWN_COLUMN = 'UNKNOWN_COLUMN',
- UNKNOWN_RELATION = 'UNKNOWN_RELATION',
- UNSUPPORTED_OPERATION = 'UNSUPPORTED_OPERATION',
- MISSING_ALIAS = 'MISSING_ALIAS',
- INVALID_QUERY = 'INVALID_QUERY',
- TOO_MANY_RECORDS_TO_UPDATE = 'TOO_MANY_RECORDS_TO_UPDATE',
- ENTITY_NOT_FOUND = 'ENTITY_NOT_FOUND',
- QUERY_READ_TIMEOUT = 'QUERY_READ_TIMEOUT',
- DUPLICATE_ENTRY_DETECTED = 'DUPLICATE_ENTRY_DETECTED',
- INVALID_INPUT = 'INVALID_INPUT',
-}
-
-export class TwentyOrmV2Exception extends CustomException<TwentyOrmV2ExceptionCode> {
- constructor(
- message: string,
- code: TwentyOrmV2ExceptionCode,
- userFriendlyMessage: MessageDescriptor = STANDARD_ERROR_MESSAGE,
- ) {
- super(message, code, { userFriendlyMessage });
- }
-}
diff --git a/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm.exception.ts b/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm.exception.ts
index 1785b837903..d382f24826c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm.exception.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/exceptions/twenty-orm.exception.ts
@@ -6,7 +6,7 @@ import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runne
import { INVALID_INPUT_USER_FRIENDLY_MESSAGE } from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-messages.constants';
import { CustomException } from 'src/utils/custom-exception';
-export enum TwentyORMExceptionCode {
+export enum TwentyOrmExceptionCode {
WORKSPACE_SCHEMA_NOT_FOUND = 'WORKSPACE_SCHEMA_NOT_FOUND',
ROLES_PERMISSIONS_VERSION_NOT_FOUND = 'ROLES_PERMISSIONS_VERSION_NOT_FOUND',
FEATURE_FLAG_MAP_VERSION_NOT_FOUND = 'FEATURE_FLAG_MAP_VERSION_NOT_FOUND',
@@ -27,65 +27,85 @@ export enum TwentyORMExceptionCode {
ORM_EVENT_DATA_CORRUPTED = 'ORM_EVENT_DATA_CORRUPTED',
RLS_VALIDATION_FAILED = 'RLS_VALIDATION_FAILED',
NO_ROLE_FOUND_FOR_USER_WORKSPACE = 'NO_ROLE_FOUND_FOR_USER_WORKSPACE',
+ MISSING_PARAMETER = 'MISSING_PARAMETER',
+ INVALID_PARAMETER = 'INVALID_PARAMETER',
+ MALFORMED_SQL = 'MALFORMED_SQL',
+ UNKNOWN_OBJECT = 'UNKNOWN_OBJECT',
+ UNKNOWN_COLUMN = 'UNKNOWN_COLUMN',
+ UNKNOWN_RELATION = 'UNKNOWN_RELATION',
+ UNSUPPORTED_OPERATION = 'UNSUPPORTED_OPERATION',
+ MISSING_ALIAS = 'MISSING_ALIAS',
+ INVALID_QUERY = 'INVALID_QUERY',
+ ENTITY_NOT_FOUND = 'ENTITY_NOT_FOUND',
}
-const getTwentyORMExceptionUserFriendlyMessage = (
- code: TwentyORMExceptionCode,
+const getTwentyOrmExceptionUserFriendlyMessage = (
+ code: TwentyOrmExceptionCode,
) => {
switch (code) {
- case TwentyORMExceptionCode.WORKSPACE_SCHEMA_NOT_FOUND:
+ case TwentyOrmExceptionCode.WORKSPACE_SCHEMA_NOT_FOUND:
return msg`Workspace schema not found.`;
- case TwentyORMExceptionCode.ROLES_PERMISSIONS_VERSION_NOT_FOUND:
+ case TwentyOrmExceptionCode.ROLES_PERMISSIONS_VERSION_NOT_FOUND:
return msg`Roles and permissions configuration not found.`;
- case TwentyORMExceptionCode.FEATURE_FLAG_MAP_VERSION_NOT_FOUND:
+ case TwentyOrmExceptionCode.FEATURE_FLAG_MAP_VERSION_NOT_FOUND:
return msg`Feature configuration not found.`;
- case TwentyORMExceptionCode.USER_WORKSPACE_ROLE_MAP_VERSION_NOT_FOUND:
+ case TwentyOrmExceptionCode.USER_WORKSPACE_ROLE_MAP_VERSION_NOT_FOUND:
return msg`User workspace role configuration not found.`;
- case TwentyORMExceptionCode.API_KEY_ROLE_MAP_VERSION_NOT_FOUND:
+ case TwentyOrmExceptionCode.API_KEY_ROLE_MAP_VERSION_NOT_FOUND:
return msg`API key role configuration not found.`;
- case TwentyORMExceptionCode.MALFORMED_METADATA:
+ case TwentyOrmExceptionCode.MALFORMED_METADATA:
return msg`Data structure is invalid.`;
- case TwentyORMExceptionCode.WORKSPACE_NOT_FOUND:
+ case TwentyOrmExceptionCode.WORKSPACE_NOT_FOUND:
return msg`Workspace not found.`;
- case TwentyORMExceptionCode.CONNECT_RECORD_NOT_FOUND:
+ case TwentyOrmExceptionCode.CONNECT_RECORD_NOT_FOUND:
return msg`Related record not found.`;
- case TwentyORMExceptionCode.CONNECT_NOT_ALLOWED:
+ case TwentyOrmExceptionCode.CONNECT_NOT_ALLOWED:
return msg`This connection is not allowed.`;
- case TwentyORMExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR:
+ case TwentyOrmExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR:
return msg`A record with this relationship already exists.`;
- case TwentyORMExceptionCode.MISSING_MAIN_ALIAS_TARGET:
+ case TwentyOrmExceptionCode.MISSING_MAIN_ALIAS_TARGET:
return msg`Missing main alias target.`;
- case TwentyORMExceptionCode.METHOD_NOT_ALLOWED:
+ case TwentyOrmExceptionCode.METHOD_NOT_ALLOWED:
return msg`This operation is not allowed.`;
- case TwentyORMExceptionCode.QUERY_READ_TIMEOUT:
+ case TwentyOrmExceptionCode.QUERY_READ_TIMEOUT:
return msg`Query timed out. Please try again.`;
- case TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED:
+ case TwentyOrmExceptionCode.DUPLICATE_ENTRY_DETECTED:
return msg`A duplicate entry was detected.`;
- case TwentyORMExceptionCode.TOO_MANY_RECORDS_TO_UPDATE:
+ case TwentyOrmExceptionCode.TOO_MANY_RECORDS_TO_UPDATE:
return msg`Too many records to update at once.`;
- case TwentyORMExceptionCode.INVALID_INPUT:
+ case TwentyOrmExceptionCode.INVALID_INPUT:
return INVALID_INPUT_USER_FRIENDLY_MESSAGE;
- case TwentyORMExceptionCode.RLS_VALIDATION_FAILED:
+ case TwentyOrmExceptionCode.RLS_VALIDATION_FAILED:
return msg`Record does not satisfy security constraints.`;
- case TwentyORMExceptionCode.ENUM_TYPE_NAME_NOT_FOUND:
- case TwentyORMExceptionCode.ORM_EVENT_DATA_CORRUPTED:
- return STANDARD_ERROR_MESSAGE;
- case TwentyORMExceptionCode.NO_ROLE_FOUND_FOR_USER_WORKSPACE:
+ case TwentyOrmExceptionCode.NO_ROLE_FOUND_FOR_USER_WORKSPACE:
return msg`No role found for user.`;
+ case TwentyOrmExceptionCode.ENUM_TYPE_NAME_NOT_FOUND:
+ case TwentyOrmExceptionCode.ORM_EVENT_DATA_CORRUPTED:
+ case TwentyOrmExceptionCode.MISSING_PARAMETER:
+ case TwentyOrmExceptionCode.INVALID_PARAMETER:
+ case TwentyOrmExceptionCode.MALFORMED_SQL:
+ case TwentyOrmExceptionCode.UNKNOWN_OBJECT:
+ case TwentyOrmExceptionCode.UNKNOWN_COLUMN:
+ case TwentyOrmExceptionCode.UNKNOWN_RELATION:
+ case TwentyOrmExceptionCode.UNSUPPORTED_OPERATION:
+ case TwentyOrmExceptionCode.MISSING_ALIAS:
+ case TwentyOrmExceptionCode.INVALID_QUERY:
+ case TwentyOrmExceptionCode.ENTITY_NOT_FOUND:
+ return STANDARD_ERROR_MESSAGE;
default:
assertUnreachable(code);
}
};
-export class TwentyORMException extends CustomException<TwentyORMExceptionCode> {
+export class TwentyOrmException extends CustomException<TwentyOrmExceptionCode> {
constructor(
message: string,
- code: TwentyORMExceptionCode,
+ code: TwentyOrmExceptionCode,
{ userFriendlyMessage }: { userFriendlyMessage?: MessageDescriptor } = {},
) {
super(message, code, {
userFriendlyMessage:
- userFriendlyMessage ?? getTwentyORMExceptionUserFriendlyMessage(code),
+ userFriendlyMessage ?? getTwentyOrmExceptionUserFriendlyMessage(code),
});
}
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
index 2690fcf004d..1917d2d8166 100644
--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/files-field-sync/files-field-sync.ts
@@ -23,8 +23,8 @@ import { FILE_STATUS } from 'src/engine/core-modules/file/types/file-status.type
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { getObjectMetadataFromEntityTarget } from 'src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util';
@@ -144,9 +144,9 @@ export class FilesFieldSync {
}
if (existingRecords.length !== 1) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Cannot update multiple records with files field at once`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
{
userFriendlyMessage: msg`You can only update one record with files field at once.`,
},
@@ -276,9 +276,9 @@ export class FilesFieldSync {
).maxNumberOfValues;
if (newFilesValue.length > filesFieldMaxNumberOfValues) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Max number of files is ${filesFieldMaxNumberOfValues}`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
{
userFriendlyMessage: msg`Max number of files is ${filesFieldMaxNumberOfValues}`,
},
@@ -298,9 +298,9 @@ export class FilesFieldSync {
isDefined(expectedUniversalIdentifier) &&
!fileEntity.path.includes(expectedUniversalIdentifier)
) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`File ${fileId} was not uploaded for this field`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
{
userFriendlyMessage: msg`File ${fileId} was not uploaded for this field. Please re-upload the file.`,
},
@@ -500,9 +500,9 @@ export class FilesFieldSync {
const fileEntity = existingFileMap.get(file.fileId);
if (!fileEntity) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`File not found: ${file.fileId}`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
);
}
@@ -515,9 +515,9 @@ export class FilesFieldSync {
if (!fileEntity.settings?.isTemporaryFile) {
const fileId = file.fileId;
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`File ${fileId} is already associated with a permanent files field`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
{
userFriendlyMessage: msg`File ${fileId} is already associated with a permanent files field. Please re-upload the file.`,
},
@@ -530,9 +530,9 @@ export class FilesFieldSync {
if (fileEntity.status !== FILE_STATUS.UPLOADED) {
const fileId = file.fileId;
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`File ${fileId} upload has not been completed`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
{
userFriendlyMessage: msg`File ${fileId} upload has not been completed. Please retry the upload.`,
},
@@ -546,9 +546,9 @@ export class FilesFieldSync {
const fileEntity = existingFileMap.get(file.fileId);
if (!fileEntity) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`File not found: ${file.fileId}`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
);
}
@@ -559,9 +559,9 @@ export class FilesFieldSync {
);
if (fileEntity.settings?.isTemporaryFile) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`File ${file.fileId} to update should not be a temporary file`,
- TwentyORMExceptionCode.INVALID_INPUT,
+ TwentyOrmExceptionCode.INVALID_INPUT,
{
userFriendlyMessage: STANDARD_ERROR_MESSAGE,
},
diff --git a/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts b/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts
index 7497245e9c5..8bebda90eea 100644
--- a/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/field-operations/relation-nested-queries/relation-nested-queries.ts
@@ -12,8 +12,8 @@ import {
type RelationDisconnectQueryFieldsByEntityIndex,
} from 'src/engine/twenty-orm/entity-manager/types/relation-nested-query-fields-by-entity-index.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { formatConnectRecordNotFoundErrorMessage } from 'src/engine/twenty-orm/field-operations/relation-nested-queries/utils/formatConnectRecordNotFoundErrorMessage.util';
import { computeRelationConnectQueryConfigs } from 'src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util';
@@ -204,9 +204,9 @@ export class RelationNestedQueries {
connectQueryConfig.recordToConnectConditionByEntityIndex[index],
);
- throw new TwentyORMException(
+ throw new TwentyOrmException(
errorMessage,
- TwentyORMExceptionCode.CONNECT_RECORD_NOT_FOUND,
+ TwentyOrmExceptionCode.CONNECT_RECORD_NOT_FOUND,
{
userFriendlyMessage,
},
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts
index 4ff0d26b5ea..18277061074 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-mutation-query-builder.spec.ts
@@ -1,7 +1,7 @@
import { FieldMetadataType } from 'twenty-shared/types';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type CompiledStatement } from 'src/engine/twenty-orm/sql/utils/compile-named-parameters.util';
import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
@@ -236,7 +236,7 @@ describe('WorkspaceMutationQueryBuilder', () => {
.softDelete()
.returning(['id'])
.getQuery(),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('should reject setting a column that does not exist', () => {
@@ -249,7 +249,7 @@ describe('WorkspaceMutationQueryBuilder', () => {
.set({ missingColumn: 'x' })
.returning(['id'])
.getQuery(),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('should bump only updatedAt for an update carrying no columns', () => {
@@ -294,7 +294,7 @@ describe('WorkspaceMutationQueryBuilder', () => {
.update()
.returning(['id'])
.getQuery(),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('should refuse to morph a query that carries a relation join', () => {
@@ -302,6 +302,6 @@ describe('WorkspaceMutationQueryBuilder', () => {
selectQueryBuilder.leftJoin('person.company', 'company');
- expect(() => selectQueryBuilder.softDelete()).toThrow(TwentyOrmV2Exception);
+ expect(() => selectQueryBuilder.softDelete()).toThrow(TwentyOrmException);
});
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-hydration.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-hydration.spec.ts
index 5c15ce40d33..7b08c7ea81c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-hydration.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-hydration.spec.ts
@@ -1,4 +1,4 @@
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import {
SCHEMA_NAME,
buildQueryBuilder,
@@ -130,7 +130,7 @@ describe('WorkspaceSelectQueryBuilder joined hydration', () => {
queryBuilder.leftJoin('person.company', 'company');
queryBuilder.addSelect('unknown.name');
- expect(() => queryBuilder.getQuery()).toThrow(TwentyOrmV2Exception);
+ expect(() => queryBuilder.getQuery()).toThrow(TwentyOrmException);
});
it('should keep the v1 permission surface for joinAndSelect projections', () => {
@@ -151,7 +151,7 @@ describe('WorkspaceSelectQueryBuilder joined hydration', () => {
queryBuilder.setFindOptions({ select: { id: true } });
queryBuilder.leftJoinAndSelect('person.people', 'people');
- await expect(queryBuilder.getMany()).rejects.toThrow(TwentyOrmV2Exception);
+ await expect(queryBuilder.getMany()).rejects.toThrow(TwentyOrmException);
});
it('should render an added join condition on a selected inner join', () => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-joins.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-joins.spec.ts
index ddb476a3d6a..4ae9bc7fda4 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-joins.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-joins.spec.ts
@@ -1,4 +1,4 @@
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import {
SCHEMA_NAME,
buildQueryBuilder,
@@ -46,7 +46,7 @@ describe('WorkspaceSelectQueryBuilder joins', () => {
const { queryBuilder } = buildQueryBuilder();
expect(() => queryBuilder.leftJoin('unknown.company', 'company')).toThrow(
- TwentyOrmV2Exception,
+ TwentyOrmException,
);
});
@@ -54,7 +54,7 @@ describe('WorkspaceSelectQueryBuilder joins', () => {
const { queryBuilder } = buildQueryBuilder();
expect(() => queryBuilder.leftJoin('person.company', 'person')).toThrow(
- TwentyOrmV2Exception,
+ TwentyOrmException,
);
});
@@ -70,7 +70,7 @@ describe('WorkspaceSelectQueryBuilder joins', () => {
relation: { isOneToMany: true, isManyToMany: false },
},
]);
- expect(() => queryBuilder.getQuery()).toThrow(TwentyOrmV2Exception);
+ expect(() => queryBuilder.getQuery()).toThrow(TwentyOrmException);
});
it('should render a deduped to-many join on the inverse foreign key when the caller opts in', () => {
@@ -126,8 +126,8 @@ describe('WorkspaceSelectQueryBuilder joins', () => {
queryBuilder.setFindOptions({ select: { id: true } });
queryBuilder.leftJoin('person.people', 'people');
- await expect(queryBuilder.getMany()).rejects.toThrow(TwentyOrmV2Exception);
- await expect(queryBuilder.getOne()).rejects.toThrow(TwentyOrmV2Exception);
+ await expect(queryBuilder.getMany()).rejects.toThrow(TwentyOrmException);
+ await expect(queryBuilder.getOne()).rejects.toThrow(TwentyOrmException);
});
it('should reject a to-many join with an explicit condition for an entity-hydrating read', async () => {
@@ -140,7 +140,7 @@ describe('WorkspaceSelectQueryBuilder joins', () => {
'"people"."personId" = "person"."id"',
);
- await expect(queryBuilder.getMany()).rejects.toThrow(TwentyOrmV2Exception);
+ await expect(queryBuilder.getMany()).rejects.toThrow(TwentyOrmException);
queryBuilder.select([]);
queryBuilder.addSelect('person.id', 'id');
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts
index 65b80c5d511..ee6a60d49ad 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts
@@ -2,7 +2,7 @@ import { Any, Equal } from 'typeorm';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { applyFindOptionsToQueryBuilder } from 'src/engine/twenty-orm/query-builder/utils/apply-find-options.util';
import { buildQueryBuilder } from 'src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-test-shapes.util';
@@ -181,7 +181,7 @@ describe('WorkspaceSelectQueryBuilder relation-keyed where', () => {
expect(() =>
queryBuilder.where({ orphans: { name: Equal('Twenty') } }),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('should carry relation filters into a builder that copies the where clauses', () => {
@@ -207,6 +207,6 @@ describe('WorkspaceSelectQueryBuilder relation-keyed where', () => {
queryBuilder.where({ people: { name: Equal('Twenty') } });
- expect(() => queryBuilder.delete()).toThrow(TwentyOrmV2Exception);
+ expect(() => queryBuilder.delete()).toThrow(TwentyOrmException);
});
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-selection.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-selection.spec.ts
index 01feba42806..e7921407f33 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-selection.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-selection.spec.ts
@@ -7,7 +7,7 @@ import {
personTableShape,
} from 'src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-test-shapes.util';
import { buildColumnResultAlias } from 'src/engine/twenty-orm/sql/utils/build-column-result-alias.util';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
describe('WorkspaceSelectQueryBuilder selection', () => {
it('should select the requested columns with alias-prefixed output names', () => {
@@ -56,7 +56,7 @@ describe('WorkspaceSelectQueryBuilder selection', () => {
queryBuilder.setFindOptions({ select: { nonExistent: true } });
- expect(() => queryBuilder.getQuery()).toThrow(TwentyOrmV2Exception);
+ expect(() => queryBuilder.getQuery()).toThrow(TwentyOrmException);
});
it('should select only aggregate expressions after select([])', () => {
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-where.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-where.spec.ts
index a9f338931e8..a917468e1d7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-where.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-where.spec.ts
@@ -1,6 +1,6 @@
import { And, Equal, In, LessThan, Not } from 'typeorm';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { buildQueryBuilder } from 'src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-test-shapes.util';
describe('WorkspaceSelectQueryBuilder where', () => {
@@ -96,7 +96,7 @@ describe('WorkspaceSelectQueryBuilder where', () => {
expect(() =>
queryBuilder.andWhere('"person"."id" = :ormLimit', { ormLimit: 1 }),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('should render an object-literal where with In as a bound IN clause', () => {
@@ -129,7 +129,7 @@ describe('WorkspaceSelectQueryBuilder where', () => {
const { queryBuilder } = buildQueryBuilder();
expect(() => queryBuilder.where({ missing: In(['x']) })).toThrow(
- TwentyOrmV2Exception,
+ TwentyOrmException,
);
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/__tests__/apply-mutation-criteria.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/__tests__/apply-mutation-criteria.util.spec.ts
index 691f82c3c3c..c45f4570cd7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/__tests__/apply-mutation-criteria.util.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/__tests__/apply-mutation-criteria.util.spec.ts
@@ -1,6 +1,6 @@
import { FieldMetadataType } from 'twenty-shared/types';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { applyMutationCriteriaToQueryBuilder } from 'src/engine/twenty-orm/query-builder/utils/apply-mutation-criteria.util';
import { WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
@@ -82,12 +82,12 @@ describe('applyMutationCriteriaToQueryBuilder', () => {
it('throws on an empty criteria array', () => {
expect(() =>
applyMutationCriteriaToQueryBuilder(buildQueryBuilder(), []),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('throws on an empty-string id criterion', () => {
expect(() =>
applyMutationCriteriaToQueryBuilder(buildQueryBuilder(), ''),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/apply-mutation-criteria.util.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/apply-mutation-criteria.util.ts
index 7a6618ccaf0..31762785585 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/apply-mutation-criteria.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/utils/apply-mutation-criteria.util.ts
@@ -1,9 +1,9 @@
import { In } from 'typeorm';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';
import { type ObjectWhereLike } from 'src/engine/twenty-orm/query-builder/types/query-builder.type';
@@ -24,9 +24,9 @@ export const applyMutationCriteriaToQueryBuilder = (
): WorkspaceSelectQueryBuilder => {
if (typeof criteria === 'string') {
if (criteria.length === 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'A mutation criteria id cannot be an empty string',
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
@@ -37,9 +37,9 @@ export const applyMutationCriteriaToQueryBuilder = (
if (Array.isArray(criteria)) {
if (criteria.length === 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'A mutation criteria array cannot be empty',
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
@@ -50,9 +50,9 @@ export const applyMutationCriteriaToQueryBuilder = (
}
if (!criteria.every(isPlainObject)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'A mutation criteria array must be all ids or all where objects',
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-mutation-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-mutation-query-builder.ts
index 2d00a807a2d..76657f3298c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-mutation-query-builder.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-mutation-query-builder.ts
@@ -1,9 +1,9 @@
import { isDefined } from 'twenty-shared/utils';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type QueryExecutor } from 'src/engine/twenty-orm/executor/types/query-executor.type';
import {
buildColumnNameByResultAlias,
@@ -157,9 +157,9 @@ export class WorkspaceMutationQueryBuilder {
this.assertColumnExists(columnName);
if (typeof value === 'function') {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Function-valued updates are not supported on "${columnName}"`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
@@ -206,18 +206,18 @@ export class WorkspaceMutationQueryBuilder {
private assertDeletedAtColumnExists(): void {
if (!this.tableShape.hasDeletedAtColumn) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`"${this.tableShape.nameSingular}" has no "${DELETED_AT_COLUMN_NAME}" column, so it cannot be soft-deleted or restored`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
}
private assertColumnExists(columnName: string): void {
if (!isDefined(this.tableShape.columnShapeByColumnName[columnName])) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${columnName}" does not exist on "${this.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts
index 5a8f7605790..0c220e90f97 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts
@@ -5,9 +5,9 @@ import { FindOperator, type ObjectLiteral } from 'typeorm';
import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type QueryExecutor } from 'src/engine/twenty-orm/executor/types/query-executor.type';
import {
type ExpressionMapLike,
@@ -197,9 +197,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
setParameters(parameters: Record<string, unknown>): this {
for (const parameterName of Object.keys(parameters)) {
if (RESERVED_PARAMETER_NAMES.includes(parameterName)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Parameter name "${parameterName}" is reserved for pagination`,
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
}
@@ -372,16 +372,16 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
const [parentAlias, relationFieldName] = relationPath.split('.');
if (!isDefined(relationFieldName)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Join path "${relationPath}" must be of the form "<alias>.<relationField>"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
if (alias === this.alias) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Join alias "${alias}" collides with the main query alias`,
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
@@ -392,9 +392,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
const parentTableShape = this.getTableShapeForAlias(parentAlias);
if (!isDefined(parentTableShape)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Join path "${relationPath}" references "${parentAlias}", which is neither the main alias nor a joined alias`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -402,9 +402,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
parentTableShape.relationShapeByFieldName[relationFieldName];
if (!isDefined(relationShape)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Relation "${relationFieldName}" does not exist on "${parentTableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -469,16 +469,16 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
const tableShape = this.getTableShapeForAlias(alias);
if (!isDefined(tableShape)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Selection "${expression}" references "${alias}", which is neither the main alias nor a joined alias`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
if (!isDefined(tableShape.columnShapeByColumnName[columnName])) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${columnName}" does not exist on "${tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
@@ -751,18 +751,18 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
kind: MutationKind,
): WorkspaceMutationQueryBuilder {
if (this.joinClauses.length > 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`A mutation cannot carry a relation join; rewrite the filter as an "id IN (subquery)" predicate first`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
// Row-level permission predicates are injected on the select path only, so an
// EXISTS rendered here would filter the related table with no predicate at all.
if (this.existsFilterClauses.length > 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`A mutation cannot carry a relation filter; rewrite the filter as an "id IN (subquery)" predicate first`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
@@ -894,9 +894,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
this.tableShape.columnShapeByColumnName[compositeColumnName],
)
) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${compositeColumnName}" does not exist on "${this.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
@@ -913,9 +913,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
continue;
}
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${columnName}" does not exist on "${this.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
@@ -949,9 +949,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
})?.condition;
if (!isDefined(correlationCondition)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Relation "${relationFieldName}" on "${this.tableShape.nameSingular}" cannot be filtered on because its inverse foreign key could not be resolved`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -1102,9 +1102,9 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
return rawSql;
}
default:
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Object where does not support the "${value.type}" operator on "${columnName}"`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
index 81f1a4c3dc5..ba61ddc446e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts
@@ -31,9 +31,9 @@ import { renderRowLevelPermissionFilterToSql } from 'src/engine/twenty-orm/utils
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';
import { validateRLSPredicatesForRecords } from 'src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type QueryExecutor } from 'src/engine/twenty-orm/executor/types/query-executor.type';
import {
buildInsertStatement,
@@ -240,9 +240,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
async findOne(options?: WorkspaceFindOptions): Promise<TEntity | null> {
if (!isDefined(options?.where)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'findOne requires a "where" condition',
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
@@ -274,9 +274,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
const record = await this.findOne(options);
if (!isDefined(record)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`No "${this.options.tableShape.nameSingular}" record matches the given criteria`,
- TwentyOrmV2ExceptionCode.ENTITY_NOT_FOUND,
+ TwentyOrmExceptionCode.ENTITY_NOT_FOUND,
);
}
@@ -354,9 +354,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
if (
!isDefined(this.options.tableShape.columnShapeByColumnName[columnName])
) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${columnName}" does not exist on "${this.options.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
@@ -399,9 +399,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
this.options.tableShape.relationShapeByFieldName[fieldName];
if (!isDefined(relationShape)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Relation "${fieldName}" does not exist on "${this.options.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -429,9 +429,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
order: orderByRelationFieldName[fieldName],
});
} else {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Loading "${relationShape.relationType}" relations through find is not supported yet`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
}
@@ -451,9 +451,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
nestedRelations?: WorkspaceFindOptionsRelations;
}): Promise<void> {
if (!isDefined(joinColumnName)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Relation "${fieldName}" has no join column to resolve`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -531,9 +531,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
);
if (!isDefined(inverseRelationShape?.joinColumnName)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Could not resolve the inverse foreign key for a to-many relation on "${this.options.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -585,10 +585,12 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
inputs: { criteria: string; partialEntity: Partial<ObjectRecord> }[],
): Promise<UpdateResult> {
if (inputs.length > QUERY_MAX_RECORDS) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Cannot update more than ${QUERY_MAX_RECORDS} records at once`,
- TwentyOrmV2ExceptionCode.TOO_MANY_RECORDS_TO_UPDATE,
- msg`You can only update up to ${QUERY_MAX_RECORDS} records at once.`,
+ TwentyOrmExceptionCode.TOO_MANY_RECORDS_TO_UPDATE,
+ {
+ userFriendlyMessage: msg`You can only update up to ${QUERY_MAX_RECORDS} records at once.`,
+ },
);
}
@@ -781,9 +783,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
: conflictPathsOrOptions.conflictPaths;
if (conflictPaths.length === 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'upsert requires at least one conflict path',
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
@@ -858,9 +860,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
typeof value === 'object' &&
value !== null
) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Writing nested relation "${key}" through the ORM v2 repository is not supported yet`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
}
@@ -1091,9 +1093,9 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
this.options.tableShape.columnShapeByColumnName[columnName],
)
) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${columnName}" does not exist on "${this.options.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
columnNameSet.add(columnName);
@@ -1220,10 +1222,12 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {
});
if (kind === 'update' && recordsBefore.length > QUERY_MAX_RECORDS) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Cannot update more than ${QUERY_MAX_RECORDS} records at once`,
- TwentyOrmV2ExceptionCode.TOO_MANY_RECORDS_TO_UPDATE,
- msg`You can only update up to ${QUERY_MAX_RECORDS} records at once.`,
+ TwentyOrmExceptionCode.TOO_MANY_RECORDS_TO_UPDATE,
+ {
+ userFriendlyMessage: msg`You can only update up to ${QUERY_MAX_RECORDS} records at once.`,
+ },
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/build-insert-statement.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/build-insert-statement.util.spec.ts
index 4909240a722..d2713761d2e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/build-insert-statement.util.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/build-insert-statement.util.spec.ts
@@ -1,6 +1,6 @@
import { FieldMetadataType } from 'twenty-shared/types';
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { buildInsertStatement } from 'src/engine/twenty-orm/sql/utils/build-insert-statement.util';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
@@ -94,6 +94,6 @@ describe('buildInsertStatement', () => {
rows: [],
returningColumns: ['id'],
}),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/compile-named-parameters.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/compile-named-parameters.util.spec.ts
index b91a93af745..94ccb87c8d3 100644
--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/compile-named-parameters.util.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/__tests__/compile-named-parameters.util.spec.ts
@@ -1,4 +1,4 @@
-import { TwentyOrmV2Exception } from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+import { TwentyOrmException } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { compileNamedParameters } from 'src/engine/twenty-orm/sql/utils/compile-named-parameters.util';
describe('compileNamedParameters', () => {
@@ -69,7 +69,7 @@ describe('compileNamedParameters', () => {
it('should throw when a referenced parameter was not provided', () => {
expect(() => compileNamedParameters('"id" = :missing', {})).toThrow(
- TwentyOrmV2Exception,
+ TwentyOrmException,
);
});
@@ -93,12 +93,12 @@ describe('compileNamedParameters', () => {
it('should throw when a spread parameter is not an array', () => {
expect(() =>
compileNamedParameters('"id" IN (:...ids)', { ids: 'a' }),
- ).toThrow(TwentyOrmV2Exception);
+ ).toThrow(TwentyOrmException);
});
it('should throw on an unterminated string literal', () => {
expect(() => compileNamedParameters(`"a" = 'unterminated`, {})).toThrow(
- TwentyOrmV2Exception,
+ TwentyOrmException,
);
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-insert-statement.util.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-insert-statement.util.ts
index e37facacaee..bcf2ca94ccb 100644
--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-insert-statement.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-insert-statement.util.ts
@@ -1,8 +1,8 @@
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
export type InsertRowValue =
@@ -30,9 +30,9 @@ const buildReturningClause = (returningColumns: string[]): string => {
export const buildInsertStatement = (state: InsertStatementState): string => {
if (state.columnNames.length === 0 || state.rows.length === 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`An INSERT on "${state.tableShape.nameSingular}" needs at least one column and one row`,
- TwentyOrmV2ExceptionCode.INVALID_QUERY,
+ TwentyOrmExceptionCode.INVALID_QUERY,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-mutation-statement.util.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-mutation-statement.util.ts
index 3332169665a..77499e016e9 100644
--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-mutation-statement.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-mutation-statement.util.ts
@@ -1,8 +1,8 @@
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { buildColumnResultAlias } from 'src/engine/twenty-orm/sql/utils/build-column-result-alias.util';
import {
quoteColumn,
@@ -72,9 +72,9 @@ export const buildMutationStatement = (
}
if (state.setClauses.length === 0) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`An UPDATE on "${state.tableShape.nameSingular}" needs at least one column to set`,
- TwentyOrmV2ExceptionCode.INVALID_QUERY,
+ TwentyOrmExceptionCode.INVALID_QUERY,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-select-statement.util.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-select-statement.util.ts
index cde173b0571..864a0edb172 100644
--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-select-statement.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/build-select-statement.util.ts
@@ -6,9 +6,9 @@ import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfa
import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
import { buildColumnResultAlias } from 'src/engine/twenty-orm/sql/utils/build-column-result-alias.util';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type FindOptionsLike } from 'src/engine/twenty-orm/query-builder/types/query-builder.type';
import { type WorkspaceTableShape } from 'src/engine/twenty-orm/table-shape/types/workspace-table-shape.type';
@@ -155,9 +155,9 @@ const buildJoinPropertyPath = (
);
if (!isDefined(joinClause)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Alias "${currentAlias}" does not belong to this statement`,
- TwentyOrmV2ExceptionCode.UNKNOWN_RELATION,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
);
}
@@ -227,9 +227,9 @@ export const buildProjection = (
for (const columnName of selectedColumnNames) {
if (!isDefined(state.tableShape.columnShapeByColumnName[columnName])) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Column "${columnName}" does not exist on "${state.tableShape.nameSingular}"`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
}
@@ -433,9 +433,9 @@ export const buildJoinClause = (state: SelectStatementState): string =>
: undefined);
if (!isDefined(condition)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Only to-one relations can be joined; "${joinClause.alias}" is to-many and must be loaded as a separate query`,
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/sql/utils/compile-named-parameters.util.ts b/packages/twenty-server/src/engine/twenty-orm/sql/utils/compile-named-parameters.util.ts
index e4681a94452..85ec8e182eb 100644
--- a/packages/twenty-server/src/engine/twenty-orm/sql/utils/compile-named-parameters.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/sql/utils/compile-named-parameters.util.ts
@@ -1,7 +1,7 @@
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
export type NamedParameters = Record<string, unknown>;
@@ -81,9 +81,9 @@ export const compileNamedParameters = (
const parameterName = sql.slice(nameStartIndex, nameEndIndex);
if (!(parameterName in parameters)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Parameter ":${parameterName}" is referenced by the query but was never provided`,
- TwentyOrmV2ExceptionCode.MISSING_PARAMETER,
+ TwentyOrmExceptionCode.MISSING_PARAMETER,
);
}
@@ -91,9 +91,9 @@ export const compileNamedParameters = (
if (isSpread) {
if (!Array.isArray(parameterValue)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Parameter ":...${parameterName}" expects an array`,
- TwentyOrmV2ExceptionCode.INVALID_PARAMETER,
+ TwentyOrmExceptionCode.INVALID_PARAMETER,
);
}
@@ -137,8 +137,8 @@ const findClosingQuoteIndex = (
return index;
}
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Unterminated ${quote === "'" ? 'string literal' : 'quoted identifier'} in SQL`,
- TwentyOrmV2ExceptionCode.MALFORMED_SQL,
+ TwentyOrmExceptionCode.MALFORMED_SQL,
);
};
diff --git a/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts b/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts
index cb517962c54..b640e6e34f9 100644
--- a/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/table-shape/utils/build-workspace-table-shape.util.ts
@@ -11,9 +11,9 @@ import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-m
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import {
@@ -83,9 +83,9 @@ export const buildWorkspaceTableShape = ({
);
if (!isDefined(compositeType)) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
`Composite type "${flatFieldMetadata.type}" has no definition, so the columns for field "${flatFieldMetadata.name}" cannot be derived`,
- TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN,
+ TwentyOrmExceptionCode.UNKNOWN_COLUMN,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts
index 56dd7d3fd91..8f75c608b68 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts
@@ -6,8 +6,8 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
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';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { formatTwentyOrmEventToDatabaseBatchEvent } from 'src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util';
@@ -85,7 +85,7 @@ describe('formatTwentyOrmEventToDatabaseBatchEvent', () => {
} as any;
describe('UPDATED action', () => {
- it('should throw TwentyORMException when no matching before entity is found in array of beforeEntities', () => {
+ it('should throw TwentyOrmException when no matching before entity is found in array of beforeEntities', () => {
const afterEntities = [
{
id: 'record-1',
@@ -119,11 +119,11 @@ describe('formatTwentyOrmEventToDatabaseBatchEvent', () => {
recordsBefore: beforeEntities,
});
} catch (error) {
- expect(error).toBeInstanceOf(TwentyORMException);
- expect((error as TwentyORMException).code).toBe(
- TwentyORMExceptionCode.ORM_EVENT_DATA_CORRUPTED,
+ expect(error).toBeInstanceOf(TwentyOrmException);
+ expect((error as TwentyOrmException).code).toBe(
+ TwentyOrmExceptionCode.ORM_EVENT_DATA_CORRUPTED,
);
- expect((error as TwentyORMException).message).toBe(
+ expect((error as TwentyOrmException).message).toBe(
'Record mismatch detected while computing event data for UPDATED action',
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts
index 044e07fcb81..23f58e9915e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/compute-relation-connect-query-configs.util.ts
@@ -27,8 +27,8 @@ import {
} from 'src/engine/twenty-orm/entity-manager/types/relation-connect-query-config.type';
import { type RelationConnectQueryFieldsByEntityIndex } from 'src/engine/twenty-orm/entity-manager/types/relation-nested-query-fields-by-entity-index.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { formatCompositeField } from 'src/engine/twenty-orm/utils/format-data.util';
import { getAssociatedRelationFieldName } from 'src/engine/twenty-orm/utils/get-associated-relation-field-name.util';
@@ -165,9 +165,9 @@ const computeRecordToConnectCondition = (
) {
const objectMetadataNameSingular = flatObjectMetadata.nameSingular;
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Connect is not allowed for ${connectFieldName} on ${flatObjectMetadata.nameSingular}`,
- TwentyORMExceptionCode.CONNECT_NOT_ALLOWED,
+ TwentyOrmExceptionCode.CONNECT_NOT_ALLOWED,
{
userFriendlyMessage: msg`Connect is not allowed for ${connectFieldName} on ${objectMetadataNameSingular}`,
},
@@ -183,9 +183,9 @@ const computeRecordToConnectCondition = (
: undefined;
if (!isDefined(targetObjectMetadata)) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Target object metadata not found for ${connectFieldName}`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
{
userFriendlyMessage: msg`Target object metadata not found for ${connectFieldName}`,
},
@@ -254,9 +254,9 @@ const checkUniqueConstraintFullyPopulated = (
);
if (!hasUniqueConstraintFieldFullyPopulated) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Missing required fields: at least one unique constraint have to be fully populated for '${connectFieldName}'.`,
- TwentyORMExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
+ TwentyOrmExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
{
userFriendlyMessage: msg`Missing required fields: at least one unique constraint have to be fully populated for '${connectFieldName}'.`,
},
@@ -269,9 +269,9 @@ const checkUniqueConstraintFullyPopulated = (
.find((uniqueConstraintField) => uniqueConstraintField.name === key);
if (!isDefined(field)) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Field ${key} is not a unique constraint field for '${connectFieldName}'.`,
- TwentyORMExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
+ TwentyOrmExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
);
}
@@ -287,9 +287,9 @@ const checkNoRelationFieldConflictOrThrow = (
isDefined(entity[fieldName]) && isDefined(entity[`${fieldName}Id`]);
if (hasRelationFieldConflict) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`${fieldName} and ${fieldName}Id cannot be both provided.`,
- TwentyORMExceptionCode.CONNECT_NOT_ALLOWED,
+ TwentyOrmExceptionCode.CONNECT_NOT_ALLOWED,
{
userFriendlyMessage: msg`${fieldName} and ${fieldName}Id cannot be both provided.`,
},
@@ -336,9 +336,9 @@ const checkUniqueConstraintsAreSameOrThrow = (
) {
const connectFieldName = relationConnectQueryConfig.connectFieldName;
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Expected the same constraint fields to be used consistently across all operations for ${relationConnectQueryConfig.connectFieldName}.`,
- TwentyORMExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
+ TwentyOrmExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR,
{
userFriendlyMessage: msg`Expected the same constraint fields to be used consistently across all operations for ${connectFieldName}.`,
},
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/extract-nested-relation-fields-by-entity-index.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/extract-nested-relation-fields-by-entity-index.util.ts
index 6adccdeec5d..4af15ced2af 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/extract-nested-relation-fields-by-entity-index.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/extract-nested-relation-fields-by-entity-index.util.ts
@@ -10,8 +10,8 @@ import {
type RelationDisconnectQueryFieldsByEntityIndex,
} from 'src/engine/twenty-orm/entity-manager/types/relation-nested-query-fields-by-entity-index.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
const hasRelationConnect = (value: unknown): value is ConnectObject => {
@@ -100,9 +100,9 @@ export const extractNestedRelationFieldsByEntityIndex = (
const hasDisconnect = hasRelationDisconnect(value);
if (hasConnect && hasDisconnect) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Cannot have both connect and disconnect for the same field on ${entity.key}.`,
- TwentyORMExceptionCode.CONNECT_NOT_ALLOWED,
+ TwentyOrmExceptionCode.CONNECT_NOT_ALLOWED,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts
index 6a0c1b75804..aa0cc2bc20e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-twenty-orm-event-to-database-batch-event.util.ts
@@ -25,8 +25,8 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
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';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type DatabaseBatchEventInput } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
@@ -118,9 +118,9 @@ export const formatTwentyOrmEventToDatabaseBatchEvent = <
);
if (!isDefined(correspondingRecordBefore)) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Record mismatch detected while computing event data for ${action.toUpperCase()} action`,
- TwentyORMExceptionCode.ORM_EVENT_DATA_CORRUPTED,
+ TwentyOrmExceptionCode.ORM_EVENT_DATA_CORRUPTED,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util.ts
index 44c1e69b628..e75a540454e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-object-metadata-from-entity-target.util.ts
@@ -5,8 +5,8 @@ import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
export const getObjectMetadataFromEntityTarget = <T extends ObjectLiteral>(
@@ -14,9 +14,9 @@ export const getObjectMetadataFromEntityTarget = <T extends ObjectLiteral>(
internalContext: WorkspaceInternalContext,
): FlatObjectMetadata => {
if (typeof entityTarget !== 'string') {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
'Entity target must be a string',
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
@@ -26,13 +26,13 @@ export const getObjectMetadataFromEntityTarget = <T extends ObjectLiteral>(
internalContext.objectIdByNameSingular[objectMetadataName];
if (!objectMetadataId) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Object metadata for object "${objectMetadataName}" is missing ` +
`in workspace "${internalContext.workspaceId}" ` +
`with object metadata collection length: ${
Object.keys(internalContext.objectIdByNameSingular).length
}`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
@@ -42,9 +42,9 @@ export const getObjectMetadataFromEntityTarget = <T extends ObjectLiteral>(
});
if (!objectMetadata) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Object metadata for object "${objectMetadataName}" (id: ${objectMetadataId}) is missing`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/is-twenty-orm-user-input-error.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/is-twenty-orm-user-input-error.util.ts
new file mode 100644
index 00000000000..9d79bd1acf2
--- /dev/null
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/is-twenty-orm-user-input-error.util.ts
@@ -0,0 +1,29 @@
+import {
+ type TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
+
+// Codes that describe a problem with the caller's input rather than a server
+// fault; the API layers surface them as user input errors (400) instead of 500
+export const isTwentyOrmUserInputError = (
+ error: TwentyOrmException,
+): boolean => {
+ switch (error.code) {
+ case TwentyOrmExceptionCode.INVALID_INPUT:
+ case TwentyOrmExceptionCode.INVALID_PARAMETER:
+ case TwentyOrmExceptionCode.UNKNOWN_OBJECT:
+ case TwentyOrmExceptionCode.UNKNOWN_COLUMN:
+ case TwentyOrmExceptionCode.UNKNOWN_RELATION:
+ case TwentyOrmExceptionCode.UNSUPPORTED_OPERATION:
+ case TwentyOrmExceptionCode.TOO_MANY_RECORDS_TO_UPDATE:
+ case TwentyOrmExceptionCode.ENTITY_NOT_FOUND:
+ case TwentyOrmExceptionCode.DUPLICATE_ENTRY_DETECTED:
+ case TwentyOrmExceptionCode.CONNECT_RECORD_NOT_FOUND:
+ case TwentyOrmExceptionCode.CONNECT_NOT_ALLOWED:
+ case TwentyOrmExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR:
+ case TwentyOrmExceptionCode.RLS_VALIDATION_FAILED:
+ return true;
+ default:
+ return false;
+ }
+};
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
index 56ddcd3e4ee..c31c30d46c7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/render-row-level-permission-filter-to-sql.util.ts
@@ -19,8 +19,8 @@ import { buildFieldMapsFromFlatObjectMetadata } from 'src/engine/metadata-module
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
const ALWAYS_TRUE_CONDITION = '1=1';
@@ -175,9 +175,9 @@ const renderFieldCondition = (
});
if (!isDefined(fieldMetadata)) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Cannot render row level permission predicate: field "${fieldNameOrJoinColumnName}" does not exist on object "${tableAlias}"`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
@@ -185,9 +185,9 @@ const renderFieldCondition = (
isReferencedByFieldName &&
isMorphOrRelationFlatFieldMetadata(fieldMetadata)
) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Cannot render row level permission predicate on relation "${fieldNameOrJoinColumnName}": traversing a relation requires an additional join, which a join condition cannot express`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
@@ -230,9 +230,9 @@ const renderCompositeFieldCondition = (
);
if (!isDefined(compositeType)) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Cannot render row level permission predicate: composite type definition not found for type "${fieldMetadata.type}"`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
@@ -244,9 +244,9 @@ const renderCompositeFieldCondition = (
);
if (!isKnownSubField) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`Cannot render row level permission predicate: "${subFieldName}" is not a sub field of composite type "${fieldMetadata.type}"`,
- TwentyORMExceptionCode.MALFORMED_METADATA,
+ TwentyOrmExceptionCode.MALFORMED_METADATA,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
index 9761ea1386b..f383716821f 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-object-records-permissions.util.ts
@@ -6,9 +6,9 @@ import { isDefined } from 'twenty-shared/utils';
import { computePermissionIntersection } from 'src/engine/twenty-orm/utils/compute-permission-intersection.util';
import {
- TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
+} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';
export const resolveObjectRecordsPermissions = ({
@@ -38,9 +38,9 @@ export const resolveObjectRecordsPermissions = ({
if ('unionOf' in rolePermissionConfig) {
if (rolePermissionConfig.unionOf.length !== 1) {
- throw new TwentyOrmV2Exception(
+ throw new TwentyOrmException(
'Union permission logic for multiple roles not yet implemented',
- TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION,
+ TwentyOrmExceptionCode.UNSUPPORTED_OPERATION,
);
}
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util.ts
index 3e1e312dae5..2f39c587d51 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-graphql-api-exception-handler.util.ts
@@ -2,20 +2,21 @@ import { isDefined } from 'twenty-shared/utils';
import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import {
- type TwentyORMException,
- TwentyORMExceptionCode,
+ type TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
+import { isTwentyOrmUserInputError } from 'src/engine/twenty-orm/utils/is-twenty-orm-user-input-error.util';
-interface DuplicateKeyErrorWithMetadata extends TwentyORMException {
+interface DuplicateKeyErrorWithMetadata extends TwentyOrmException {
conflictingRecordId?: string;
conflictingObjectNameSingular?: string;
}
-export const twentyORMGraphqlApiExceptionHandler = (
- error: TwentyORMException,
+export const twentyOrmGraphqlApiExceptionHandler = (
+ error: TwentyOrmException,
) => {
- switch (error.code) {
- case TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED: {
+ switch (true) {
+ case error.code === TwentyOrmExceptionCode.DUPLICATE_ENTRY_DETECTED: {
const duplicateKeyError: DuplicateKeyErrorWithMetadata = error;
const extensions: Record<string, unknown> = {
@@ -33,12 +34,7 @@ export const twentyORMGraphqlApiExceptionHandler = (
throw new UserInputError(error.message, extensions);
}
- case TwentyORMExceptionCode.INVALID_INPUT:
- case TwentyORMExceptionCode.CONNECT_RECORD_NOT_FOUND:
- case TwentyORMExceptionCode.CONNECT_NOT_ALLOWED:
- case TwentyORMExceptionCode.CONNECT_UNIQUE_CONSTRAINT_ERROR:
- case TwentyORMExceptionCode.RLS_VALIDATION_FAILED:
- case TwentyORMExceptionCode.TOO_MANY_RECORDS_TO_UPDATE:
+ case isTwentyOrmUserInputError(error):
throw new UserInputError(error.message, {
userFriendlyMessage: error.userFriendlyMessage,
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-v2-to-user-input-error.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-v2-to-user-input-error.util.ts
deleted file mode 100644
index c46b30d0fd9..00000000000
--- a/packages/twenty-server/src/engine/twenty-orm/utils/twenty-orm-v2-to-user-input-error.util.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {
- type TwentyOrmV2Exception,
- TwentyOrmV2ExceptionCode,
-} from 'src/engine/twenty-orm/exceptions/twenty-orm-v2.exception';
-
-export const isTwentyOrmV2UserInputError = (
- error: TwentyOrmV2Exception,
-): boolean => {
- switch (error.code) {
- case TwentyOrmV2ExceptionCode.INVALID_PARAMETER:
- case TwentyOrmV2ExceptionCode.UNKNOWN_OBJECT:
- case TwentyOrmV2ExceptionCode.UNKNOWN_COLUMN:
- case TwentyOrmV2ExceptionCode.UNKNOWN_RELATION:
- case TwentyOrmV2ExceptionCode.UNSUPPORTED_OPERATION:
- case TwentyOrmV2ExceptionCode.TOO_MANY_RECORDS_TO_UPDATE:
- case TwentyOrmV2ExceptionCode.ENTITY_NOT_FOUND:
- case TwentyOrmV2ExceptionCode.DUPLICATE_ENTRY_DETECTED:
- case TwentyOrmV2ExceptionCode.INVALID_INPUT:
- return true;
- default:
- return false;
- }
-};
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
index cce4a1d4bcc..0df499aec9c 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/validate-rls-predicates-for-records.util.ts
@@ -9,8 +9,8 @@ import { type WorkspaceInternalContext } from 'src/engine/twenty-orm/interfaces/
import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twenty-orm/utils/is-record-matching-rls-row-level-permission-predicate.util';
import { resolveRowLevelPermissionRecordFilter } from 'src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util';
@@ -55,9 +55,9 @@ export const validateRLSPredicatesForRecords = <T extends ObjectLiteral>({
});
if (!matchesRLS) {
- throw new TwentyORMException(
+ throw new TwentyOrmException(
errorMessage,
- TwentyORMExceptionCode.RLS_VALIDATION_FAILED,
+ TwentyOrmExceptionCode.RLS_VALIDATION_FAILED,
);
}
}
diff --git a/packages/twenty-server/src/engine/workspace-cache-storage/services/get-data-from-cache-with-recompute.service.ts b/packages/twenty-server/src/engine/workspace-cache-storage/services/get-data-from-cache-with-recompute.service.ts
index 4a06d820d73..5c93cde05bf 100644
--- a/packages/twenty-server/src/engine/workspace-cache-storage/services/get-data-from-cache-with-recompute.service.ts
+++ b/packages/twenty-server/src/engine/workspace-cache-storage/services/get-data-from-cache-with-recompute.service.ts
@@ -4,8 +4,8 @@ import { logger } from '@sentry/node';
import { isDefined } from 'twenty-shared/utils';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
type CacheResult<T, U> = {
@@ -33,7 +33,7 @@ export class GetDataFromCacheWithRecomputeService<T, U> {
getCacheVersion: (workspaceId: string) => Promise<T | undefined>;
recomputeCache: (params: { workspaceId: string }) => Promise<void>;
cachedEntityName: string;
- exceptionCode: TwentyORMExceptionCode;
+ exceptionCode: TwentyOrmExceptionCode;
}): Promise<CacheResult<T, U>> => {
let cachedVersion: T | undefined;
let cachedData: U | undefined;
@@ -72,7 +72,7 @@ export class GetDataFromCacheWithRecomputeService<T, U> {
cachedData,
},
);
- throw new TwentyORMException(
+ throw new TwentyOrmException(
`${cachedEntityName} not found after recompute for workspace ${workspaceId} (missingData: ${!isDefined(cachedData)}, missingVersion: ${!isDefined(cachedVersion)})`,
exceptionCode,
);
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-event-import-exception-handler.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-event-import-exception-handler.service.ts
index 5176809fcea..24347b5df97 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-event-import-exception-handler.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-event-import-exception-handler.service.ts
@@ -7,8 +7,8 @@ import {
ConnectedAccountRefreshAccessTokenExceptionCode,
} from 'src/engine/metadata-modules/connected-account/exceptions/connected-account-refresh-tokens.exception';
import {
- type TwentyORMException,
- TwentyORMExceptionCode,
+ type TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@@ -42,7 +42,7 @@ export class CalendarEventImportErrorHandlerService {
public async handleDriverException(
exception:
| CalendarEventImportDriverException
- | TwentyORMException
+ | TwentyOrmException
| ConnectedAccountRefreshAccessTokenException,
syncStep: CalendarEventImportSyncStep,
calendarChannel: Pick<CalendarChannelEntity, 'id' | 'throttleFailureCount'>,
@@ -56,7 +56,7 @@ export class CalendarEventImportErrorHandlerService {
workspaceId,
);
break;
- case TwentyORMExceptionCode.QUERY_READ_TIMEOUT:
+ case TwentyOrmExceptionCode.QUERY_READ_TIMEOUT:
case CalendarEventImportDriverExceptionCode.TEMPORARY_ERROR:
case ConnectedAccountRefreshAccessTokenExceptionCode.TEMPORARY_NETWORK_ERROR:
await this.handleTemporaryException(
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
index 6f4efc01ee9..d297248ef09 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/services/create-company-and-contact.service.ts
@@ -18,8 +18,8 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import {
- TwentyORMException,
- TwentyORMExceptionCode,
+ TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
@@ -38,8 +38,8 @@ import { computeDisplayName } from 'src/utils/compute-display-name';
import { isWorkDomain, isWorkEmail } from 'src/utils/is-work-email';
const isDuplicateEntryError = (error: unknown) =>
- error instanceof TwentyORMException &&
- error.code === TwentyORMExceptionCode.DUPLICATE_ENTRY_DETECTED;
+ error instanceof TwentyOrmException &&
+ error.code === TwentyOrmExceptionCode.DUPLICATE_ENTRY_DETECTED;
@Injectable()
export class CreateCompanyAndPersonService {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-import-exception-handler.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-import-exception-handler.service.ts
index 893b9b207ba..fed6378b95d 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-import-exception-handler.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-import-exception-handler.service.ts
@@ -10,8 +10,8 @@ import {
ConnectedAccountRefreshAccessTokenExceptionCode,
} from 'src/engine/metadata-modules/connected-account/exceptions/connected-account-refresh-tokens.exception';
import {
- type TwentyORMException,
- TwentyORMExceptionCode,
+ type TwentyOrmException,
+ TwentyOrmExceptionCode,
} from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
@@ -44,7 +44,7 @@ export class MessageImportExceptionHandlerService {
exception:
| MessageImportDriverException
| Error
- | TwentyORMException
+ | TwentyOrmException
| ConnectedAccountRefreshAccessTokenException,
syncStep: MessageImportSyncStep,
messageChannel: Pick<
@@ -71,7 +71,7 @@ export class MessageImportExceptionHandlerService {
workspaceId,
);
break;
- case TwentyORMExceptionCode.QUERY_READ_TIMEOUT:
+ case TwentyOrmExceptionCode.QUERY_READ_TIMEOUT:
case MessageImportDriverExceptionCode.TEMPORARY_ERROR:
case ConnectedAccountRefreshAccessTokenExceptionCode.TEMPORARY_NETWORK_ERROR:
case MessageNetworkExceptionCode.ECONNABORTED: