Skip to content

The open alternative to Salesforce, designed for AI.

Move the validation error formatter next to its exception (#29135)

Félix Malfaitb4abb12ea80a
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/utils/to-application-lifecycle-job-error.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/utils/to-application-lifecycle-job-error.util.ts
index fd80c0d2e4a..59aa1108f95 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-install/utils/to-application-lifecycle-job-error.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/utils/to-application-lifecycle-job-error.util.ts
@@ -1,4 +1,4 @@
-import { formatValidationErrors } from 'src/engine/core-modules/tool-provider/utils/format-validation-errors.util';
+import { formatValidationErrors } from 'src/engine/workspace-manager/workspace-migration/utils/format-validation-errors.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
// The job's failedReason is the error message, the only text the CLI and the front show
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts
index e53c381d6fa..a6d1eb103d5 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts
@@ -24,7 +24,7 @@ import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decora
import { type MessageQueueJobProgressContext } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { formatValidationErrors } from 'src/engine/core-modules/tool-provider/utils/format-validation-errors.util';
+import { formatValidationErrors } from 'src/engine/workspace-manager/workspace-migration/utils/format-validation-errors.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
import { WorkspaceVersionService } from 'src/engine/workspace-manager/workspace-version/services/workspace-version.service';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/jobs/trigger-upgrade-application.job.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/jobs/trigger-upgrade-application.job.ts
index 0b35336696a..27be6b936eb 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/jobs/trigger-upgrade-application.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/jobs/trigger-upgrade-application.job.ts
@@ -1,5 +1,4 @@
import { ApplicationUpgradeService } from 'src/engine/core-modules/application/application-upgrade/application-upgrade.service';
-import { toApplicationLifecycleJobError } from 'src/engine/core-modules/application/application-install/utils/to-application-lifecycle-job-error.util';
import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
import { type MessageQueueJobProgressContext } from 'src/engine/core-modules/message-queue/interfaces/message-queue-job.interface';
@@ -22,15 +21,11 @@ export class TriggerUpgradeApplicationJob {
data: TriggerUpgradeApplicationJobData,
{ updateProgress }: MessageQueueJobProgressContext,
): Promise<void> {
- try {
- await this.applicationUpgradeService.upgradeApplication({
- appRegistrationId: data.applicationRegistrationId,
- targetVersion: data.targetVersion,
- workspaceId: data.workspaceId,
- updateProgress,
- });
- } catch (error) {
- throw toApplicationLifecycleJobError(error);
- }
+ await this.applicationUpgradeService.upgradeApplication({
+ appRegistrationId: data.applicationRegistrationId,
+ targetVersion: data.targetVersion,
+ workspaceId: data.workspaceId,
+ updateProgress,
+ });
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-tool-execution-failure.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-tool-execution-failure.util.ts
index 3439f3d303c..6d7286e6c0a 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-tool-execution-failure.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/utils/build-tool-execution-failure.util.ts
@@ -1,4 +1,4 @@
-import { formatValidationErrors } from 'src/engine/core-modules/tool-provider/utils/format-validation-errors.util';
+import { formatValidationErrors } from 'src/engine/workspace-manager/workspace-migration/utils/format-validation-errors.util';
import { isUserFacingToolExecutionError } from 'src/engine/core-modules/tool-provider/utils/is-user-facing-tool-execution-error.util';
import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';
import { shouldCaptureException } from 'src/engine/utils/global-exception-handler.util';
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/format-validation-errors.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/format-validation-errors.util.spec.ts
similarity index 98%
rename from packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/format-validation-errors.util.spec.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/format-validation-errors.util.spec.ts
index f639a0bcf49..cfdf919ac26 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/__tests__/format-validation-errors.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/__tests__/format-validation-errors.util.spec.ts
@@ -1,4 +1,4 @@
-import { formatValidationErrors } from 'src/engine/core-modules/tool-provider/utils/format-validation-errors.util';
+import { formatValidationErrors } from 'src/engine/workspace-manager/workspace-migration/utils/format-validation-errors.util';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
const buildException = (
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/utils/format-validation-errors.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/format-validation-errors.util.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/tool-provider/utils/format-validation-errors.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/workspace-migration/utils/format-validation-errors.util.ts