From 533d7fe49af1b50d04842013707d0c0c253f09b5 Mon Sep 17 00:00:00 2001 From: Weiko Date: Wed, 27 Aug 2025 20:09:54 +0200 Subject: [PATCH] Deprecate legacy core datasource token (#14096) --- .../__tests__/upgrade.command-runner.spec.ts | 4 +- .../command-runners/upgrade.command-runner.ts | 2 +- .../commands/database-command.module.ts | 2 +- .../0-54-clean-not-found-files.command.ts | 2 +- .../0-54-created-by-default-value.command.ts | 4 +- ...standard-select-fields-position.command.ts | 4 +- ...case-user-and-invitation-emails.command.ts | 6 +- ...lt-avatar-url-to-user-workspace.command.ts | 4 +- .../0-54-upgrade-version-command.module.ts | 10 +--- ...0-55-deduplicate-indexed-fields.command.ts | 2 +- .../0-55-upgrade-version-command.module.ts | 19 +++---- ...enqueued-status-to-workflow-run.command.ts | 4 +- .../1-1/1-1-fix-schema-array-type.command.ts | 4 +- ...field-is-label-synced-with-name.command.ts | 4 +- .../1-1-migrate-workflow-run-state.command.ts | 2 +- .../1-1/1-1-upgrade-version-command.module.ts | 23 ++++---- ...ueued-status-to-workflow-run-v2.command.ts | 6 +- ...ds-to-workflow-version-triggers.command.ts | 2 +- ...ove-workflow-runs-without-state.command.ts | 2 +- .../1-2/1-2-upgrade-version-command.module.ts | 9 +-- ...ep-ids-to-workflow-runs-trigger.command.ts | 2 +- ...sign-roles-to-existing-api-keys.command.ts | 10 ++-- ...column-type-in-workspace-schema.command.ts | 4 +- .../1-3/1-3-upgrade-version-command.module.ts | 19 +++---- ...flow-versions-and-workflow-runs.command.ts | 16 +++--- ...5-remove-favorite-view-relation.command.ts | 4 +- .../1-5/1-5-upgrade-version-command.module.ts | 9 +-- .../upgrade-version-command.module.ts | 2 +- .../upgrade.command.ts | 4 +- .../migrate-views-to-core.command.ts | 4 +- .../src/database/typeorm/typeorm.module.ts | 12 +--- .../graphql-query-runner.module.ts | 2 +- .../workspace-query-runner.module.ts | 2 +- .../src/engine/api/mcp/mcp.module.ts | 2 +- .../engine/core-modules/actor/actor.module.ts | 2 +- ...eated-by-from-auth-context.service.spec.ts | 2 +- .../created-by-from-auth-context.service.ts | 2 +- .../__tests__/admin-panel.service.spec.ts | 2 +- .../admin-panel/admin-panel.module.ts | 2 +- .../admin-panel/admin-panel.service.ts | 2 +- .../src/engine/core-modules/ai/ai.module.ts | 2 +- .../ai/services/__tests__/mcp.service.spec.ts | 2 +- .../core-modules/ai/services/mcp.service.ts | 2 +- .../api-key/api-key-role.service.spec.ts | 10 ++-- .../api-key/api-key-role.service.ts | 8 +-- .../core-modules/api-key/api-key.module.ts | 10 ++-- .../api-key/api-key.service.spec.ts | 6 +- .../core-modules/api-key/api-key.service.ts | 4 +- .../app-token/app-token.module.ts | 2 +- .../approved-access-domain.module.ts | 2 +- .../approved-access-domain.service.ts | 2 +- .../services/approved-access-domain.spec.ts | 4 +- .../engine/core-modules/auth/auth.module.ts | 27 ++++----- .../core-modules/auth/auth.resolver.spec.ts | 4 +- .../engine/core-modules/auth/auth.resolver.ts | 4 +- .../google-apis-auth.controller.ts | 2 +- .../microsoft-apis-auth.controller.ts | 2 +- .../auth/controllers/sso-auth.controller.ts | 4 +- ...pis-oauth-exchange-code-for-token.guard.ts | 2 +- .../google-apis-oauth-request-code.guard.ts | 2 +- .../auth/guards/google-oauth.guard.ts | 2 +- ...microsoft-apis-oauth-request-code.guard.ts | 2 +- .../auth/guards/microsoft-oauth.guard.ts | 2 +- .../auth/services/auth-sso.service.ts | 2 +- .../auth/services/auth-sso.spec.ts | 4 +- .../auth/services/auth.service.spec.ts | 12 ++-- .../auth/services/auth.service.ts | 6 +- .../auth/services/google-apis.service.spec.ts | 2 +- .../services/microsoft-apis.service.spec.ts | 2 +- .../auth/services/oauth.service.ts | 4 +- .../services/reset-password.service.spec.ts | 16 +++--- .../auth/services/reset-password.service.ts | 6 +- .../auth/services/sign-in-up.service.spec.ts | 8 +-- .../auth/services/sign-in-up.service.ts | 4 +- .../auth/strategies/jwt.auth.strategy.ts | 8 +-- .../services/access-token.service.spec.ts | 16 +++--- .../token/services/access-token.service.ts | 6 +- .../email-verification-token.service.spec.ts | 10 ++-- .../email-verification-token.service.ts | 4 +- .../services/refresh-token.service.spec.ts | 10 ++-- .../token/services/refresh-token.service.ts | 4 +- .../services/renew-token.service.spec.ts | 4 +- .../token/services/renew-token.service.ts | 2 +- .../workspace-agnostic-token.service.spec.ts | 6 +- .../workspace-agnostic-token.service.ts | 2 +- .../core-modules/auth/token/token.module.ts | 11 ++-- .../billing-webhook/billing-webhook.module.ts | 27 ++++----- .../services/billing-webhook-alert.service.ts | 6 +- .../billing-webhook-customer.service.ts | 2 +- .../billing-webhook-entitlement.service.ts | 4 +- .../billing-webhook-invoice.service.ts | 2 +- .../services/billing-webhook-price.service.ts | 6 +- .../billing-webhook-product.service.ts | 2 +- .../billing-webhook-subscription.service.ts | 8 +-- .../core-modules/billing/billing.module.ts | 27 ++++----- ...-add-workflow-subscription-item.command.ts | 6 +- .../billing-sync-customer-data.command.ts | 4 +- .../billing-sync-plans-data.command.ts | 6 +- ...lling-update-subscription-price.command.ts | 4 +- .../billing/services/billing-plan.service.ts | 2 +- .../billing-portal.workspace-service.ts | 8 +-- .../billing-subscription-item.service.ts | 2 +- .../services/billing-subscription.service.ts | 6 +- .../billing/services/billing-usage.service.ts | 2 +- .../billing/services/billing.service.ts | 2 +- .../services/stripe-customer.service.ts | 2 +- .../billing/stripe/stripe.module.ts | 2 +- .../controllers/cloudflare.controller.ts | 2 +- .../controllers/cloudflare.spec.ts | 4 +- ...ck-custom-domain-valid-records.cron.job.ts | 2 +- .../domain-manager/domain-manager.module.ts | 2 +- .../services/custom-domain.service.spec.ts | 2 +- .../services/custom-domain.service.ts | 2 +- .../services/domain-manager.service.spec.ts | 2 +- .../services/domain-manager.service.ts | 2 +- .../email-verification.module.ts | 2 +- .../services/email-verification.service.ts | 2 +- .../feature-flag/feature-flag.module.ts | 2 +- .../__tests__/feature-flag.service.spec.ts | 2 +- .../services/feature-flag.service.ts | 2 +- .../jobs/cleanup-orphaned-files.cron.job.ts | 4 +- .../engine/core-modules/file/file.module.ts | 2 +- .../file/services/file-metadata.service.ts | 2 +- .../core-modules/health/health.module.ts | 2 +- .../indicators/__tests__/app.health.spec.ts | 2 +- .../__tests__/database.health.spec.ts | 3 +- .../health/indicators/app.health.ts | 2 +- .../health/indicators/database.health.ts | 2 +- .../key-value-pair/key-value-pair.module.ts | 2 +- .../key-value-pair/key-value-pair.service.ts | 2 +- .../core-modules/message-queue/jobs.module.ts | 2 +- .../page-layout/page-layout.module.ts | 9 +-- .../postgres-credentials.module.ts | 2 +- .../postgres-credentials.service.ts | 2 +- .../sso/services/sso.service.spec.ts | 4 +- .../core-modules/sso/services/sso.service.ts | 2 +- .../src/engine/core-modules/sso/sso.module.ts | 10 ++-- .../drivers/database-config.module.ts | 2 +- .../__tests__/config-storage.service.spec.ts | 4 +- .../storage/config-storage.service.ts | 2 +- .../two-factor-authentication.module.ts | 9 +-- ...two-factor-authentication.resolver.spec.ts | 6 +- .../two-factor-authentication.resolver.ts | 2 +- .../two-factor-authentication.service.spec.ts | 6 +- .../two-factor-authentication.service.ts | 2 +- .../user-workspace/user-workspace.module.ts | 7 +-- .../user-workspace.service.spec.ts | 12 ++-- .../user-workspace/user-workspace.service.ts | 4 +- .../user/services/user.service.ts | 2 +- .../engine/core-modules/user/user.module.ts | 6 +- .../engine/core-modules/user/user.resolver.ts | 4 +- .../services/tests/view-field.service.spec.ts | 4 +- .../tests/view-filter-group.service.spec.ts | 4 +- .../tests/view-filter.service.spec.ts | 4 +- .../services/tests/view-group.service.spec.ts | 4 +- .../services/tests/view-sort.service.spec.ts | 4 +- .../view/services/tests/view.service.spec.ts | 4 +- .../view/services/view-field.service.ts | 2 +- .../services/view-filter-group.service.ts | 2 +- .../view/services/view-filter.service.ts | 2 +- .../view/services/view-group.service.ts | 2 +- .../view/services/view-sort.service.ts | 2 +- .../view/services/view.service.ts | 2 +- .../engine/core-modules/view/view.module.ts | 19 +++---- .../core-modules/webhook/webhook.module.ts | 2 +- .../webhook/webhook.service.spec.ts | 2 +- .../core-modules/webhook/webhook.service.ts | 2 +- .../workspace-invitation.service.spec.ts | 10 ++-- .../services/workspace-invitation.service.ts | 4 +- .../workspace-invitation.module.ts | 5 +- .../__tests__/workspace.service.spec.ts | 14 ++--- .../workspace/services/workspace.service.ts | 6 +- .../workspace/workspace.module.ts | 7 +-- .../workspace/workspace.resolver.ts | 2 +- .../agent-role/agent-role.module.ts | 5 +- .../agent-role/agent-role.service.spec.ts | 12 ++-- .../agent-role/agent-role.service.ts | 6 +- .../agent/agent-chat.service.ts | 6 +- .../agent/agent-execution.service.ts | 5 +- .../agent/agent-handoff-executor.service.ts | 2 +- .../agent/agent-handoff.service.ts | 4 +- .../agent/agent-streaming.service.ts | 2 +- .../agent/agent-tool-generator.service.ts | 2 +- .../metadata-modules/agent/agent.module.ts | 32 +++++------ .../metadata-modules/agent/agent.resolver.ts | 2 +- .../metadata-modules/agent/agent.service.ts | 4 +- .../data-source/data-source.module.ts | 2 +- .../data-source/data-source.service.ts | 2 +- .../field-metadata/field-metadata.module.ts | 8 +-- .../services/field-metadata.service-v2.ts | 2 +- .../services/field-metadata.service.ts | 4 +- ...-field-metadata-default-value.validator.ts | 2 +- .../is-field-metadata-options.validator.ts | 2 +- .../index-metadata/index-metadata.module.ts | 10 ++-- .../index-metadata/index-metadata.service.ts | 2 +- .../before-update-one-object.hook.spec.ts | 4 +- .../object-metadata-v2.service.ts | 2 +- .../object-metadata/object-metadata.module.ts | 10 ++-- .../object-metadata.service.ts | 2 +- .../object-metadata-field-relation.service.ts | 4 +- .../object-metadata-migration.service.ts | 2 +- .../object-permission.service.spec.ts | 10 ++-- .../field-permissions.service.spec.ts | 12 ++-- .../field-permission.service.ts | 6 +- .../object-permission.module.ts | 17 +++--- .../object-permission.service.ts | 6 +- .../permission-flag/permission-flag.module.ts | 2 +- .../permission-flag.service.ts | 4 +- .../permissions/permissions.module.ts | 12 ++-- .../permissions/permissions.service.ts | 2 +- .../remote-server/remote-server.module.ts | 4 +- .../remote-server/remote-server.service.ts | 6 +- .../distant-table/distant-table.module.ts | 2 +- .../remote-table-relations.module.ts | 5 +- .../remote-table-relations.service.ts | 4 +- .../remote-table/remote-table.module.ts | 2 +- .../remote-table/remote-table.service.ts | 4 +- .../metadata-modules/role/role.module.ts | 4 +- .../metadata-modules/role/role.service.ts | 4 +- .../search-vector/search-vector.module.ts | 8 +-- .../search-vector/search-vector.service.ts | 4 +- .../serverless-function.module.ts | 4 +- .../serverless-function.resolver.ts | 2 +- .../serverless-function.service.ts | 2 +- .../user-role/user-role.module.ts | 4 +- .../user-role/user-role.service.ts | 6 +- ...orkspace-feature-flags-map-cache.module.ts | 2 +- ...rkspace-feature-flags-map-cache.service.ts | 2 +- .../workspace-metadata-cache.service.ts | 6 +- .../workspace-metadata-cache.module.ts | 9 +-- .../workspace-metadata-version.service.ts | 2 +- .../workspace-metadata-version.module.ts | 2 +- .../workspace-migration.module.ts | 2 +- .../workspace-migration.service.ts | 2 +- .../workspace-permissions-cache.module.ts | 11 ++-- .../workspace-permissions-cache.service.ts | 6 +- .../factories/workspace-datasource.factory.ts | 2 +- .../engine/twenty-orm/twenty-orm.manager.ts | 2 +- .../engine/twenty-orm/twenty-orm.module.ts | 9 +-- .../workspace-manager.service.spec.ts | 26 ++++----- .../dev-seeder-permissions.service.ts | 4 +- .../dev-seeder/dev-seeder.module.ts | 2 +- .../clean-onboarding-workspaces.command.ts | 2 +- .../clean-suspended-workspaces.command.ts | 2 +- .../commands/delete-workspaces.command.ts | 2 +- .../crons/clean-onboarding-workspaces.job.ts | 2 +- .../crons/clean-suspended-workspaces.job.ts | 2 +- ...orkspace-deletion-warning-user-vars.job.ts | 2 +- .../services/cleaner.workspace-service.ts | 6 +- .../workspace-cleaner.module.ts | 5 +- .../workspace-health.service.ts | 2 +- .../workspace-manager.module.ts | 11 ++-- .../workspace-manager.service.ts | 10 ++-- .../workspace-migration-runner-v2.service.ts | 2 +- .../sync-workspace-metadata.command.ts | 2 +- ...workspace-sync-metadata-commands.module.ts | 2 +- .../workspace-sync-metadata.module.ts | 11 ++-- .../workspace-sync-metadata.service.ts | 2 +- .../calendar-event-import-manager.module.ts | 5 +- .../calendar-event-list-fetch.cron.job.ts | 2 +- .../jobs/calendar-events-import.cron.job.ts | 2 +- .../jobs/calendar-ongoing-stale.cron.job.ts | 2 +- ...lendar-event-participant-manager.module.ts | 7 +-- ...event-participant-match-participant.job.ts | 2 +- .../calendar-event-participant.listener.ts | 2 +- .../calendar/common/calendar-common.module.ts | 2 +- .../imap-api/imap-apis.module.ts | 2 +- ...ected-account-delete-one.pre-query.hook.ts | 2 +- .../connected-account-query-hook.module.ts | 4 +- .../contact-creation-manager.module.ts | 7 +-- .../__tests__/create-company.service.spec.ts | 2 +- .../src/modules/favorite/favorite.module.ts | 5 +- .../services/favorite-deletion.service.ts | 4 +- .../common/messaging-common.module.ts | 2 +- .../messaging-message-list-fetch.cron.job.ts | 2 +- .../messaging-messages-import.cron.job.ts | 2 +- .../jobs/messaging-ongoing-stale.cron.job.ts | 2 +- .../gmail/messaging-gmail-driver.module.ts | 2 +- .../imap/messaging-imap-driver.module.ts | 2 +- .../messaging-import-manager.module.ts | 9 +-- ...d-enqueue-contact-creation.service.spec.ts | 2 +- ...e-participant-workspace-member.listener.ts | 2 +- .../listeners/message-participant.listener.ts | 2 +- .../message-participant-manager.module.ts | 5 +- ...channel-sync-status-monitoring.cron.job.ts | 2 +- .../monitoring/messaging-monitoring.module.ts | 4 +- .../view/services/view-field-sync.service.ts | 2 +- .../view-filter-group-sync.service.ts | 2 +- .../view/services/view-filter-sync.service.ts | 2 +- .../view/services/view-group-sync.service.ts | 2 +- .../view/services/view-sort-sync.service.ts | 2 +- .../view/services/view-sync.service.ts | 2 +- .../src/modules/view/view.module.ts | 21 +++---- .../query-hooks/workflow-query-hook.module.ts | 2 +- .../workflow-builder.module.ts | 2 +- ...low-version-step.workspace-service.spec.ts | 4 +- .../workflow-version-step.module.ts | 5 +- ...workflow-version-step.workspace-service.ts | 4 +- .../workflow-version.module.ts | 2 +- .../ai-agent/ai-agent-action.module.ts | 5 +- .../ai-agent/ai-agent.workflow-action.ts | 2 +- .../services/ai-agent-executor.service.ts | 4 +- .../create-record.workflow-action.ts | 2 +- .../record-crud/record-crud-action.module.ts | 2 +- .../workflow-clean-workflow-runs.cron.job.ts | 2 +- .../jobs/workflow-handle-staled-runs.job.ts | 2 +- .../cron/jobs/workflow-run-enqueue.job.ts | 2 +- .../workflow-run-queue.module.ts | 2 +- .../command/delete-workflow-runs.command.ts | 2 +- .../workflow-run/workflow-run.module.ts | 5 +- .../workflow-statuses-update.job.spec.ts | 4 +- .../workflow-status/workflow-status.module.ts | 5 +- .../automated-trigger.module.ts | 2 +- .../crons/jobs/cron-trigger.cron.job.ts | 2 +- .../workflow-trigger.module.ts | 2 +- ...kspace-member-delete-one.pre-query.hook.ts | 2 +- .../workspace-member-query-hook.module.ts | 2 +- ...kspace-member-update-one.pre-query.hook.ts | 2 +- .../suites/agent/agent.integration-spec.ts | 6 +- .../agent/utils/agent-tool-test-utils.ts | 4 +- ...ate-one-field-metadata.integration-spec.ts | 56 ------------------- 321 files changed, 702 insertions(+), 849 deletions(-) diff --git a/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts b/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts index de62f2eba48..e998e762de8 100644 --- a/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts +++ b/packages/twenty-server/src/database/commands/command-runners/__tests__/upgrade.command-runner.spec.ts @@ -73,7 +73,7 @@ const buildUpgradeCommandModule = async ({ providers: [ commandRunner, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { findOneByOrFail: jest .fn() @@ -167,7 +167,7 @@ describe('UpgradeCommandRunner', () => { jest.spyOn(upgradeCommandRunner, 'runOnWorkspace'); workspaceRepository = module.get>( - getRepositoryToken(Workspace, 'core'), + getRepositoryToken(Workspace), ); syncWorkspaceMetadataCommand = module.get(SyncWorkspaceMetadataCommand); twentyORMGlobalManagerSpy = module.get( diff --git a/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts b/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts index 4191a880fae..16c473aa2a8 100644 --- a/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts +++ b/packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts @@ -32,7 +32,7 @@ export abstract class UpgradeCommandRunner extends ActiveOrSuspendedWorkspacesMi public readonly VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG?: true; constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyConfigService: TwentyConfigService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts index 464be1473b0..330008f20d6 100644 --- a/packages/twenty-server/src/database/commands/database-command.module.ts +++ b/packages/twenty-server/src/database/commands/database-command.module.ts @@ -27,7 +27,7 @@ import { DataSeedWorkspaceCommand } from './data-seed-dev-workspace.command'; @Module({ imports: [ UpgradeVersionCommandModule, - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), // Cron command dependencies MessagingImportManagerModule, CalendarEventImportManagerModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-clean-not-found-files.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-clean-not-found-files.command.ts index cb0dac82009..01b76553b66 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-clean-not-found-files.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-clean-not-found-files.command.ts @@ -21,7 +21,7 @@ import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-membe }) export class CleanNotFoundFilesCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, private readonly fileStorageService: FileStorageService, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-created-by-default-value.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-created-by-default-value.command.ts index 484df254329..b9fd2f95f33 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-created-by-default-value.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-created-by-default-value.command.ts @@ -22,10 +22,10 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/ge }) export class FixCreatedByDefaultValueCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, ) { super(workspaceRepository, twentyORMGlobalManager); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-fix-standard-select-fields-position.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-fix-standard-select-fields-position.command.ts index 5b6b051946b..ac1542751fe 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-fix-standard-select-fields-position.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-fix-standard-select-fields-position.command.ts @@ -19,10 +19,10 @@ import { TASK_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace- }) export class FixStandardSelectFieldsPositionCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-lowercase-user-and-invitation-emails.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-lowercase-user-and-invitation-emails.command.ts index 87a70db62f4..1f7986cf702 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-lowercase-user-and-invitation-emails.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-lowercase-user-and-invitation-emails.command.ts @@ -21,11 +21,11 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global. }) export class LowercaseUserAndInvitationEmailsCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(User, 'core') + @InjectRepository(User) protected readonly userRepository: Repository, - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) protected readonly appTokenRepository: Repository, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-migrate-default-avatar-url-to-user-workspace.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-migrate-default-avatar-url-to-user-workspace.command.ts index 78fbe7fa332..46f8c9ce7e4 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-migrate-default-avatar-url-to-user-workspace.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-migrate-default-avatar-url-to-user-workspace.command.ts @@ -18,9 +18,9 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global. }) export class MigrateDefaultAvatarUrlToUserWorkspaceCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) protected readonly userWorkspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-upgrade-version-command.module.ts index 1e026b6a00a..824b2fcb11b 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-54/0-54-upgrade-version-command.module.ts @@ -20,14 +20,8 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor @Module({ imports: [ - TypeOrmModule.forFeature( - [Workspace, AppToken, User, UserWorkspace], - 'core', - ), - TypeOrmModule.forFeature( - [FieldMetadataEntity, ObjectMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([Workspace, AppToken, User, UserWorkspace]), + TypeOrmModule.forFeature([FieldMetadataEntity, ObjectMetadataEntity]), WorkspaceDataSourceModule, WorkspaceMigrationRunnerModule, WorkspaceMetadataVersionModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-deduplicate-indexed-fields.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-deduplicate-indexed-fields.command.ts index 0027920e852..a9fac414d26 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-deduplicate-indexed-fields.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-deduplicate-indexed-fields.command.ts @@ -16,7 +16,7 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global. }) export class DeduplicateIndexedFieldsCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-upgrade-version-command.module.ts index 6eca5dc72a1..5654eeebe66 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/0-55/0-55-upgrade-version-command.module.ts @@ -14,17 +14,14 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor @Module({ imports: [ - TypeOrmModule.forFeature( - [ - Workspace, - AppToken, - User, - UserWorkspace, - FieldMetadataEntity, - ObjectMetadataEntity, - ], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + AppToken, + User, + UserWorkspace, + FieldMetadataEntity, + ObjectMetadataEntity, + ]), WorkspaceDataSourceModule, WorkspaceMigrationRunnerModule, WorkspaceMetadataVersionModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-add-enqueued-status-to-workflow-run.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-add-enqueued-status-to-workflow-run.command.ts index ec071773e22..7c76c87b4dc 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-add-enqueued-status-to-workflow-run.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-add-enqueued-status-to-workflow-run.command.ts @@ -21,10 +21,10 @@ import { WorkflowRunStatus } from 'src/modules/workflow/common/standard-objects/ }) export class AddEnqueuedStatusToWorkflowRunCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceDataSourceService: WorkspaceDataSourceService, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-schema-array-type.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-schema-array-type.command.ts index b970b708aca..6b7caeebf63 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-schema-array-type.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-schema-array-type.command.ts @@ -23,12 +23,12 @@ import { DatabaseStructureService } from 'src/engine/workspace-manager/workspace }) export class FixSchemaArrayTypeCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, private readonly databaseStructureService: DatabaseStructureService, private readonly typeORMService: TypeORMService, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, ) { super(workspaceRepository, twentyORMGlobalManager); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-update-standard-field-is-label-synced-with-name.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-update-standard-field-is-label-synced-with-name.command.ts index 90fb5dbdeb8..dbea633413f 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-update-standard-field-is-label-synced-with-name.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-fix-update-standard-field-is-label-synced-with-name.command.ts @@ -20,10 +20,10 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global. }) export class FixUpdateStandardFieldsIsLabelSyncedWithName extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-migrate-workflow-run-state.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-migrate-workflow-run-state.command.ts index 9e67fcbba68..47a40b3e981 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-migrate-workflow-run-state.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-migrate-workflow-run-state.command.ts @@ -28,7 +28,7 @@ export class MigrateWorkflowRunStatesCommand extends ActiveOrSuspendedWorkspaces private chunkSize = DEFAULT_CHUNK_SIZE; constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-upgrade-version-command.module.ts index 0edd5737b0f..cd917409937 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-1/1-1-upgrade-version-command.module.ts @@ -23,19 +23,16 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor @Module({ imports: [ - TypeOrmModule.forFeature( - [ - Workspace, - AppToken, - User, - UserWorkspace, - FieldMetadataEntity, - ObjectMetadataEntity, - ApiKey, - Webhook, - ], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + AppToken, + User, + UserWorkspace, + FieldMetadataEntity, + ObjectMetadataEntity, + ApiKey, + Webhook, + ]), WorkspaceDataSourceModule, WorkspaceMigrationRunnerModule, WorkspaceMetadataVersionModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-enqueued-status-to-workflow-run-v2.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-enqueued-status-to-workflow-run-v2.command.ts index 8909fd8d963..1250ed7829e 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-enqueued-status-to-workflow-run-v2.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-enqueued-status-to-workflow-run-v2.command.ts @@ -23,12 +23,12 @@ import { WorkflowRunStatus } from 'src/modules/workflow/common/standard-objects/ }) export class AddEnqueuedStatusToWorkflowRunV2Command extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceDataSourceService: WorkspaceDataSourceService, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-next-step-ids-to-workflow-version-triggers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-next-step-ids-to-workflow-version-triggers.command.ts index f266870bc29..595ac763b9e 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-next-step-ids-to-workflow-version-triggers.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-add-next-step-ids-to-workflow-version-triggers.command.ts @@ -19,7 +19,7 @@ import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/work }) export class AddNextStepIdsToWorkflowVersionTriggers extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-remove-workflow-runs-without-state.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-remove-workflow-runs-without-state.command.ts index 066881283b0..3cb789ddac4 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-remove-workflow-runs-without-state.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-remove-workflow-runs-without-state.command.ts @@ -17,7 +17,7 @@ import { type WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/sta }) export class RemoveWorkflowRunsWithoutState extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-upgrade-version-command.module.ts index f95f35e41db..c7a9884d679 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-2/1-2-upgrade-version-command.module.ts @@ -11,10 +11,11 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works @Module({ imports: [ - TypeOrmModule.forFeature( - [Workspace, FieldMetadataEntity, ObjectMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + FieldMetadataEntity, + ObjectMetadataEntity, + ]), WorkspaceDataSourceModule, ], providers: [ diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-add-next-step-ids-to-workflow-runs-trigger.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-add-next-step-ids-to-workflow-runs-trigger.command.ts index e095ac0d6b9..88e65e2168a 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-add-next-step-ids-to-workflow-runs-trigger.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-add-next-step-ids-to-workflow-runs-trigger.command.ts @@ -20,7 +20,7 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/ge }) export class AddNextStepIdsToWorkflowRunsTrigger extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly workspaceDataSourceService: WorkspaceDataSourceService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-assign-roles-to-existing-api-keys.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-assign-roles-to-existing-api-keys.command.ts index acf83d17b58..e15f2adf6de 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-assign-roles-to-existing-api-keys.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-assign-roles-to-existing-api-keys.command.ts @@ -27,19 +27,19 @@ import { ADMIN_ROLE } from 'src/engine/workspace-manager/workspace-sync-metadata }) export class AssignRolesToExistingApiKeysCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, - @InjectRepository(ApiKey, 'core') + @InjectRepository(ApiKey) private readonly apiKeyRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, private readonly featureFlagService: FeatureFlagService, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly workspaceFeatureFlagsMapCacheService: WorkspaceFeatureFlagsMapCacheService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectDataSource('core') + @InjectDataSource() private readonly dataSource: DataSource, ) { super(workspaceRepository, twentyORMGlobalManager); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-update-timestamp-column-type-in-workspace-schema.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-update-timestamp-column-type-in-workspace-schema.command.ts index fb6c9a9dc01..9e0046429db 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-update-timestamp-column-type-in-workspace-schema.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-update-timestamp-column-type-in-workspace-schema.command.ts @@ -22,11 +22,11 @@ import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/work }) export class UpdateTimestampColumnTypeInWorkspaceSchemaCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly workspaceDataSourceService: WorkspaceDataSourceService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, ) { super(workspaceRepository, twentyORMGlobalManager); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-upgrade-version-command.module.ts index d6013b25609..694c70521ff 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-3/1-3-upgrade-version-command.module.ts @@ -20,17 +20,14 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works @Module({ imports: [ - TypeOrmModule.forFeature( - [ - Workspace, - ApiKey, - FieldMetadataEntity, - ObjectMetadataEntity, - RoleEntity, - RoleTargetsEntity, - ], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + ApiKey, + FieldMetadataEntity, + ObjectMetadataEntity, + RoleEntity, + RoleTargetsEntity, + ]), WorkspaceDataSourceModule, ApiKeyModule, FeatureFlagModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-add-positions-to-workflow-versions-and-workflow-runs.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-add-positions-to-workflow-versions-and-workflow-runs.command.ts index a8902c73748..09916cff6ff 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-add-positions-to-workflow-versions-and-workflow-runs.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-add-positions-to-workflow-versions-and-workflow-runs.command.ts @@ -1,10 +1,10 @@ import { InjectRepository } from '@nestjs/typeorm'; -import { Command, Option } from 'nest-commander'; -import { Repository } from 'typeorm'; -import { isDefined } from 'twenty-shared/utils'; -import { v4 } from 'uuid'; import Dagre from '@dagrejs/dagre'; +import { Command, Option } from 'nest-commander'; +import { isDefined } from 'twenty-shared/utils'; +import { Repository } from 'typeorm'; +import { v4 } from 'uuid'; import { ActiveOrSuspendedWorkspacesMigrationCommandOptions, @@ -13,11 +13,11 @@ import { } from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager'; -import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service'; import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util'; -import { type WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type'; -import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type'; +import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service'; import { type WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity'; +import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type'; +import { type WorkflowTrigger } from 'src/modules/workflow/workflow-trigger/types/workflow-trigger.type'; type Node = { id: string; @@ -44,7 +44,7 @@ export type AddPositionsToWorkflowVersionsAndWorkflowRunsOptions = }) export class AddPositionsToWorkflowVersionsAndWorkflowRuns extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly workspaceDataSourceService: WorkspaceDataSourceService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-remove-favorite-view-relation.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-remove-favorite-view-relation.command.ts index 5fc1adf1f70..a2b85d154b5 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-remove-favorite-view-relation.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-remove-favorite-view-relation.command.ts @@ -27,11 +27,11 @@ import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync }) export class RemoveFavoriteViewRelation extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, protected readonly workspaceSchemaManager: WorkspaceSchemaManagerService, - @InjectDataSource('core') + @InjectDataSource() protected readonly coreDataSource: DataSource, private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService, ) { diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-upgrade-version-command.module.ts index 149a75f0bee..dd3d332d682 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-5/1-5-upgrade-version-command.module.ts @@ -12,10 +12,11 @@ import { AddPositionsToWorkflowVersionsAndWorkflowRuns } from 'src/database/comm @Module({ imports: [ - TypeOrmModule.forFeature( - [Workspace, FieldMetadataEntity, ObjectMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + FieldMetadataEntity, + ObjectMetadataEntity, + ]), WorkspaceDataSourceModule, WorkspaceSchemaManagerModule, WorkspaceMetadataVersionModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade-version-command.module.ts index 69abcdee3aa..56a866fc979 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade-version-command.module.ts @@ -16,7 +16,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp @Module({ imports: [ - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), V0_54_UpgradeVersionCommandModule, V0_55_UpgradeVersionCommandModule, V1_1_UpgradeVersionCommandModule, diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts index 46e38385014..b74b03c043b 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/upgrade.command.ts @@ -46,7 +46,7 @@ export class DatabaseMigrationService { private logger = new Logger(DatabaseMigrationService.name); constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} @@ -130,7 +130,7 @@ export class UpgradeCommand extends UpgradeCommandRunner { override allCommands: AllCommands; constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyConfigService: TwentyConfigService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/database/commands/views-migration/migrate-views-to-core.command.ts b/packages/twenty-server/src/database/commands/views-migration/migrate-views-to-core.command.ts index b8a2222fc02..0c7139dcc20 100644 --- a/packages/twenty-server/src/database/commands/views-migration/migrate-views-to-core.command.ts +++ b/packages/twenty-server/src/database/commands/views-migration/migrate-views-to-core.command.ts @@ -39,11 +39,11 @@ import { convertViewFilterWorkspaceValueToCoreValue } from 'src/modules/view/uti }) export class MigrateViewsToCoreCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly featureFlagService: FeatureFlagService, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, ) { super(workspaceRepository, twentyORMGlobalManager); diff --git a/packages/twenty-server/src/database/typeorm/typeorm.module.ts b/packages/twenty-server/src/database/typeorm/typeorm.module.ts index c64378b372e..88d7a6924e0 100644 --- a/packages/twenty-server/src/database/typeorm/typeorm.module.ts +++ b/packages/twenty-server/src/database/typeorm/typeorm.module.ts @@ -1,23 +1,15 @@ import { Module } from '@nestjs/common'; -import { TypeOrmModule, type TypeOrmModuleOptions } from '@nestjs/typeorm'; +import { TypeOrmModule } from '@nestjs/typeorm'; import { typeORMCoreModuleOptions } from 'src/database/typeorm/core/core.datasource'; import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module'; import { TypeORMService } from './typeorm.service'; -const coreTypeORMFactory = async (): Promise => ({ - ...typeORMCoreModuleOptions, - name: 'core', -}); - @Module({ imports: [ TwentyConfigModule, - TypeOrmModule.forRootAsync({ - useFactory: coreTypeORMFactory, - name: 'core', - }), + TypeOrmModule.forRoot(typeORMCoreModuleOptions), ], providers: [TypeORMService], exports: [TypeORMService], diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts index 3f79ab44970..c512ab24422 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-runner.module.ts @@ -47,7 +47,7 @@ const graphqlQueryResolvers = [ WorkspaceQueryHookModule, WorkspaceQueryRunnerModule, PermissionsModule, - TypeOrmModule.forFeature([RoleTargetsEntity], 'core'), + TypeOrmModule.forFeature([RoleTargetsEntity]), UserRoleModule, ApiKeyModule, ], diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts index b015c96a6c2..08505ee6fd7 100644 --- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts +++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts @@ -23,7 +23,7 @@ import { EntityEventsToDbListener } from './listeners/entity-events-to-db.listen WorkspaceQueryBuilderModule, WorkspaceDataSourceModule, WorkspaceQueryHookModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), + TypeOrmModule.forFeature([FeatureFlag]), AuditModule, TelemetryModule, FileModule, diff --git a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts index 80f5c1259a5..814da50e0ee 100644 --- a/packages/twenty-server/src/engine/api/mcp/mcp.module.ts +++ b/packages/twenty-server/src/engine/api/mcp/mcp.module.ts @@ -19,7 +19,7 @@ import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module'; @Module({ imports: [ - TypeOrmModule.forFeature([RoleEntity], 'core'), + TypeOrmModule.forFeature([RoleEntity]), AiModule, TokenModule, WorkspaceCacheStorageModule, diff --git a/packages/twenty-server/src/engine/core-modules/actor/actor.module.ts b/packages/twenty-server/src/engine/core-modules/actor/actor.module.ts index 5aab51dda26..df1fd7f5df0 100644 --- a/packages/twenty-server/src/engine/core-modules/actor/actor.module.ts +++ b/packages/twenty-server/src/engine/core-modules/actor/actor.module.ts @@ -8,7 +8,7 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/ import { CreatedByFromAuthContextService } from './services/created-by-from-auth-context.service'; @Module({ - imports: [TypeOrmModule.forFeature([FieldMetadataEntity], 'core')], + imports: [TypeOrmModule.forFeature([FieldMetadataEntity])], providers: [ CreatedByCreateManyPreQueryHook, CreatedByCreateOnePreQueryHook, diff --git a/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/created-by-from-auth-context.service.spec.ts b/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/created-by-from-auth-context.service.spec.ts index 01b1d240a99..4f8897187e5 100644 --- a/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/created-by-from-auth-context.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/created-by-from-auth-context.service.spec.ts @@ -51,7 +51,7 @@ describe('CreatedByFromAuthContextService', () => { useValue: twentyORMGlobalManager, }, { - provide: getRepositoryToken(FieldMetadataEntity, 'core'), + provide: getRepositoryToken(FieldMetadataEntity), useValue: { findOne: jest.fn().mockResolvedValue(true), }, diff --git a/packages/twenty-server/src/engine/core-modules/actor/services/created-by-from-auth-context.service.ts b/packages/twenty-server/src/engine/core-modules/actor/services/created-by-from-auth-context.service.ts index 5032d57139a..5028c298724 100644 --- a/packages/twenty-server/src/engine/core-modules/actor/services/created-by-from-auth-context.service.ts +++ b/packages/twenty-server/src/engine/core-modules/actor/services/created-by-from-auth-context.service.ts @@ -21,7 +21,7 @@ export class CreatedByFromAuthContextService { private readonly logger = new Logger(CreatedByFromAuthContextService.name); constructor( - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/__tests__/admin-panel.service.spec.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/__tests__/admin-panel.service.spec.ts index 83748e08a7e..7e81bc39fb0 100644 --- a/packages/twenty-server/src/engine/core-modules/admin-panel/__tests__/admin-panel.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/admin-panel/__tests__/admin-panel.service.spec.ts @@ -49,7 +49,7 @@ describe('AdminPanelService', () => { providers: [ AdminPanelService, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { findOne: UserFindOneMock, }, diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts index afdc157ffc1..4359d6e711a 100644 --- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts +++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts @@ -14,7 +14,7 @@ import { User } from 'src/engine/core-modules/user/user.entity'; @Module({ imports: [ - TypeOrmModule.forFeature([User], 'core'), + TypeOrmModule.forFeature([User]), AuthModule, DomainManagerModule, HealthModule, diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts index fd94e20625d..8bd6a234e53 100644 --- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts +++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts @@ -32,7 +32,7 @@ export class AdminPanelService { private readonly loginTokenService: LoginTokenService, private readonly twentyConfigService: TwentyConfigService, private readonly domainManagerService: DomainManagerService, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/ai/ai.module.ts b/packages/twenty-server/src/engine/core-modules/ai/ai.module.ts index 46657834c18..6fb0638235b 100644 --- a/packages/twenty-server/src/engine/core-modules/ai/ai.module.ts +++ b/packages/twenty-server/src/engine/core-modules/ai/ai.module.ts @@ -26,7 +26,7 @@ import { MessagingModule } from 'src/modules/messaging/messaging.module'; @Global() @Module({ imports: [ - TypeOrmModule.forFeature([RoleEntity], 'core'), + TypeOrmModule.forFeature([RoleEntity]), TokenModule, FeatureFlagModule, RecordTransformerModule, diff --git a/packages/twenty-server/src/engine/core-modules/ai/services/__tests__/mcp.service.spec.ts b/packages/twenty-server/src/engine/core-modules/ai/services/__tests__/mcp.service.spec.ts index 73c1a7c8e3e..1ce4590038f 100644 --- a/packages/twenty-server/src/engine/core-modules/ai/services/__tests__/mcp.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/ai/services/__tests__/mcp.service.spec.ts @@ -59,7 +59,7 @@ describe('McpService', () => { useValue: mockUserRoleService, }, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: { find: jest.fn().mockResolvedValue([mockAdminRole]), }, diff --git a/packages/twenty-server/src/engine/core-modules/ai/services/mcp.service.ts b/packages/twenty-server/src/engine/core-modules/ai/services/mcp.service.ts index a8ede663b2b..264244afbbc 100644 --- a/packages/twenty-server/src/engine/core-modules/ai/services/mcp.service.ts +++ b/packages/twenty-server/src/engine/core-modules/ai/services/mcp.service.ts @@ -21,7 +21,7 @@ export class McpService { private readonly featureFlagService: FeatureFlagService, private readonly toolService: ToolService, private readonly userRoleService: UserRoleService, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.spec.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.spec.ts index c9528c9a515..284afe1f45b 100644 --- a/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.spec.ts @@ -113,23 +113,23 @@ describe('ApiKeyRoleService', () => { providers: [ ApiKeyRoleService, { - provide: getRepositoryToken(RoleTargetsEntity, 'core'), + provide: getRepositoryToken(RoleTargetsEntity), useValue: mockRoleTargetsRepository, }, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: mockRoleRepository, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: mockWorkspaceRepository, }, { - provide: getRepositoryToken(ApiKey, 'core'), + provide: getRepositoryToken(ApiKey), useValue: mockApiKeyRepository, }, { - provide: getDataSourceToken('core'), + provide: getDataSourceToken(), useValue: mockDataSource, }, { diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.ts index 08206327015..bc074f10616 100644 --- a/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.ts +++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key-role.service.ts @@ -17,15 +17,15 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo @Injectable() export class ApiKeyRoleService { constructor( - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(ApiKey, 'core') + @InjectRepository(ApiKey) private readonly apiKeyRepository: Repository, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, - @InjectDataSource('core') + @InjectDataSource() private readonly dataSource: DataSource, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts index e2412c1aa14..c81e72e5da0 100644 --- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts +++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.module.ts @@ -19,10 +19,12 @@ import { ApiKeyController } from './controllers/api-key.controller'; @Module({ imports: [ - TypeOrmModule.forFeature( - [ApiKey, RoleTargetsEntity, RoleEntity, Workspace], - 'core', - ), + TypeOrmModule.forFeature([ + ApiKey, + RoleTargetsEntity, + RoleEntity, + Workspace, + ]), JwtModule, TokenModule, WorkspacePermissionsCacheModule, diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.spec.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.spec.ts index 3a1f36a55a6..a331ca2a181 100644 --- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.spec.ts @@ -83,7 +83,7 @@ describe('ApiKeyService', () => { providers: [ ApiKeyService, { - provide: getRepositoryToken(ApiKey, 'core'), + provide: getRepositoryToken(ApiKey), useValue: mockApiKeyRepository, }, { @@ -91,7 +91,7 @@ describe('ApiKeyService', () => { useValue: mockJwtWrapperService, }, { - provide: getRepositoryToken(RoleTargetsEntity, 'core'), + provide: getRepositoryToken(RoleTargetsEntity), useValue: mockRoleTargetsRepository, }, { @@ -99,7 +99,7 @@ describe('ApiKeyService', () => { useValue: mockApiKeyRoleService, }, { - provide: getDataSourceToken('core'), + provide: getDataSourceToken(), useValue: mockDataSource, }, ], diff --git a/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.ts b/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.ts index 8762031bf26..0669a441421 100644 --- a/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.ts +++ b/packages/twenty-server/src/engine/core-modules/api-key/api-key.service.ts @@ -16,11 +16,11 @@ import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrap @Injectable() export class ApiKeyService { constructor( - @InjectRepository(ApiKey, 'core') + @InjectRepository(ApiKey) private readonly apiKeyRepository: Repository, private readonly jwtWrapperService: JwtWrapperService, private readonly apiKeyRoleService: ApiKeyRoleService, - @InjectDataSource('core') + @InjectDataSource() private readonly dataSource: DataSource, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts index ade8e7cb660..04ce163588c 100644 --- a/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts +++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.module.ts @@ -10,7 +10,7 @@ import { AppTokenService } from 'src/engine/core-modules/app-token/services/app- @Module({ imports: [ NestjsQueryGraphQLModule.forFeature({ - imports: [NestjsQueryTypeOrmModule.forFeature([AppToken], 'core')], + imports: [NestjsQueryTypeOrmModule.forFeature([AppToken])], services: [AppTokenService], resolvers: appTokenAutoResolverOpts, }), diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts index ee7654fede3..0803d30ebcb 100644 --- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts +++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/approved-access-domain.module.ts @@ -10,7 +10,7 @@ import { ApprovedAccessDomain } from 'src/engine/core-modules/approved-access-do @Module({ imports: [ DomainManagerModule, - NestjsQueryTypeOrmModule.forFeature([ApprovedAccessDomain], 'core'), + NestjsQueryTypeOrmModule.forFeature([ApprovedAccessDomain]), ], exports: [ApprovedAccessDomainService], providers: [ApprovedAccessDomainService, ApprovedAccessDomainResolver], diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts index fc96b837ab3..f6d8cc538ee 100644 --- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts +++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts @@ -24,7 +24,7 @@ import { isWorkDomain } from 'src/utils/is-work-email'; @Injectable() export class ApprovedAccessDomainService { constructor( - @InjectRepository(ApprovedAccessDomainEntity, 'core') + @InjectRepository(ApprovedAccessDomainEntity) private readonly approvedAccessDomainRepository: Repository, private readonly emailService: EmailService, private readonly twentyConfigService: TwentyConfigService, diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts index 39d79507f69..cd5886e9b86 100644 --- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts @@ -28,7 +28,7 @@ describe('ApprovedAccessDomainService', () => { providers: [ ApprovedAccessDomainService, { - provide: getRepositoryToken(ApprovedAccessDomain, 'core'), + provide: getRepositoryToken(ApprovedAccessDomain), useValue: { delete: jest.fn(), findOneBy: jest.fn(), @@ -61,7 +61,7 @@ describe('ApprovedAccessDomainService', () => { ApprovedAccessDomainService, ); approvedAccessDomainRepository = module.get( - getRepositoryToken(ApprovedAccessDomain, 'core'), + getRepositoryToken(ApprovedAccessDomain), ); emailService = module.get(EmailService); twentyConfigService = module.get(TwentyConfigService); diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts index ed7de8f30cd..f1af4a33b31 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts @@ -78,21 +78,18 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy'; UserModule, WorkspaceManagerModule, TypeORMModule, - TypeOrmModule.forFeature( - [ - Workspace, - User, - AppToken, - ApiKey, - FeatureFlag, - WorkspaceSSOIdentityProvider, - KeyValuePair, - UserWorkspace, - TwoFactorAuthenticationMethod, - ], - 'core', - ), - TypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + TypeOrmModule.forFeature([ + Workspace, + User, + AppToken, + ApiKey, + FeatureFlag, + WorkspaceSSOIdentityProvider, + KeyValuePair, + UserWorkspace, + TwoFactorAuthenticationMethod, + ]), + TypeOrmModule.forFeature([ObjectMetadataEntity]), HttpModule, UserWorkspaceModule, WorkspaceModule, diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts index 5212f8ad9c2..90ebee9d5ad 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts @@ -38,11 +38,11 @@ describe('AuthResolver', () => { providers: [ AuthResolver, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useValue: {}, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: {}, }, { diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts index 42c8820dc16..711a739fc2f 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts @@ -92,9 +92,9 @@ import { AuthService } from './services/auth.service'; ) export class AuthResolver { constructor( - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, private readonly twoFactorAuthenticationService: TwoFactorAuthenticationService, private authService: AuthService, diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts index 9724dffaae3..e45132f7107 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-apis-auth.controller.ts @@ -38,7 +38,7 @@ export class GoogleAPIsAuthController { private readonly onboardingService: OnboardingService, private readonly domainManagerService: DomainManagerService, private readonly guardRedirectService: GuardRedirectService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts index 564ee8634e4..0a9602c9032 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-apis-auth.controller.ts @@ -38,7 +38,7 @@ export class MicrosoftAPIsAuthController { private readonly domainManagerService: DomainManagerService, private readonly onboardingService: OnboardingService, private readonly guardRedirectService: GuardRedirectService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts index 3f9244ee39e..7afb4806326 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts @@ -50,9 +50,9 @@ export class SSOAuthController { private readonly domainManagerService: DomainManagerService, private readonly sSOService: SSOService, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(WorkspaceSSOIdentityProvider, 'core') + @InjectRepository(WorkspaceSSOIdentityProvider) private readonly workspaceSSOIdentityProviderRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts index 7227bbcea7c..31a7d52aa73 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts @@ -25,7 +25,7 @@ export class GoogleAPIsOauthExchangeCodeForTokenGuard extends AuthGuard( private readonly twentyConfigService: TwentyConfigService, private readonly transientTokenService: TransientTokenService, private readonly domainManagerService: DomainManagerService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) { super(); diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts index bf085676b91..3b682c10fa4 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts @@ -22,7 +22,7 @@ export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') { private readonly twentyConfigService: TwentyConfigService, private readonly transientTokenService: TransientTokenService, private readonly guardRedirectService: GuardRedirectService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly domainManagerService: DomainManagerService, ) { diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts index 5367fe6ea0e..c86e3316ca0 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts @@ -17,7 +17,7 @@ import { DomainManagerService } from 'src/engine/core-modules/domain-manager/ser export class GoogleOauthGuard extends AuthGuard('google') { constructor( private readonly guardRedirectService: GuardRedirectService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly domainManagerService: DomainManagerService, ) { diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts index dd872aa1614..657cf9d8fe1 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-request-code.guard.ts @@ -24,7 +24,7 @@ export class MicrosoftAPIsOauthRequestCodeGuard extends AuthGuard( private readonly twentyConfigService: TwentyConfigService, private readonly transientTokenService: TransientTokenService, private readonly guardRedirectService: GuardRedirectService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly domainManagerService: DomainManagerService, ) { diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts index 5b29a2bf88a..28b86c88dc1 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-oauth.guard.ts @@ -12,7 +12,7 @@ import { DomainManagerService } from 'src/engine/core-modules/domain-manager/ser export class MicrosoftOAuthGuard extends AuthGuard('microsoft') { constructor( private readonly guardRedirectService: GuardRedirectService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly domainManagerService: DomainManagerService, ) { diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.service.ts index 9085f192465..3b2e74a2461 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.service.ts @@ -10,7 +10,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; @Injectable() export class AuthSsoService { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly twentyConfigService: TwentyConfigService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.spec.ts index 0b785096172..7f2826a515a 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth-sso.spec.ts @@ -18,7 +18,7 @@ describe('AuthSsoService', () => { providers: [ AuthSsoService, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { findOne: jest.fn(), }, @@ -34,7 +34,7 @@ describe('AuthSsoService', () => { authSsoService = module.get(AuthSsoService); workspaceRepository = module.get>( - getRepositoryToken(Workspace, 'core'), + getRepositoryToken(Workspace), ); twentyConfigService = module.get(TwentyConfigService); }); diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts index 7ef5c08c4b4..f8c758c3ec7 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts @@ -47,19 +47,19 @@ describe('AuthService', () => { providers: [ AuthService, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { findOne: jest.fn(), }, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { findOne: jest.fn(), }, }, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useValue: { createQueryBuilder: jest.fn().mockReturnValue({ leftJoin: jest.fn().mockReturnThis(), @@ -146,11 +146,9 @@ describe('AuthService', () => { userWorkspaceService = module.get(UserWorkspaceService); workspaceRepository = module.get>( - getRepositoryToken(Workspace, 'core'), - ); - userRepository = module.get>( - getRepositoryToken(User, 'core'), + getRepositoryToken(Workspace), ); + userRepository = module.get>(getRepositoryToken(User)); }); beforeEach(() => { diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts index a079694c282..3a5f4b902e1 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts @@ -78,13 +78,13 @@ export class AuthService { private readonly authSsoService: AuthSsoService, private readonly userService: UserService, private readonly signInUpService: SignInUpService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, private readonly twentyConfigService: TwentyConfigService, private readonly emailService: EmailService, - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts index 7fa803ab7d6..8782ee2e3b2 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.spec.ts @@ -99,7 +99,7 @@ describe('GoogleAPIsService', () => { }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOneOrFail: jest.fn(), }, diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts index 64eb7ed173c..01fe1760580 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.spec.ts @@ -100,7 +100,7 @@ describe('MicrosoftAPIsService', () => { }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOneOrFail: jest.fn(), }, diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/oauth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/oauth.service.ts index db61b41be34..c9c0b338ce5 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/oauth.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/oauth.service.ts @@ -21,9 +21,9 @@ // @Injectable() // export class OAuthService { // constructor( -// @InjectRepository(User, 'core') +// @InjectRepository(User) // private readonly userRepository: Repository, -// @InjectRepository(AppToken, 'core') +// @InjectRepository(AppToken) // private readonly appTokenRepository: Repository, // private readonly accessTokenService: AccessTokenService, // private readonly refreshTokenService: RefreshTokenService, diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts index ad36b5281b6..a4648dd8765 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.spec.ts @@ -31,19 +31,19 @@ describe('ResetPasswordService', () => { providers: [ ResetPasswordService, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useClass: Repository, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useClass: Repository, }, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useClass: Repository, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useClass: Repository, }, { @@ -71,14 +71,12 @@ describe('ResetPasswordService', () => { }).compile(); service = module.get(ResetPasswordService); - userRepository = module.get>( - getRepositoryToken(User, 'core'), - ); + userRepository = module.get>(getRepositoryToken(User)); workspaceRepository = module.get>( - getRepositoryToken(Workspace, 'core'), + getRepositoryToken(Workspace), ); appTokenRepository = module.get>( - getRepositoryToken(AppToken, 'core'), + getRepositoryToken(AppToken), ); emailService = module.get(EmailService); twentyConfigService = module.get(TwentyConfigService); diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts index 132e79cd929..0a32de194a2 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/reset-password.service.ts @@ -36,11 +36,11 @@ export class ResetPasswordService { constructor( private readonly twentyConfigService: TwentyConfigService, private readonly domainManagerService: DomainManagerService, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, private readonly emailService: EmailService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts index 8f733a1698f..21e31e0f952 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts @@ -52,14 +52,14 @@ describe('SignInUpService', () => { providers: [ SignInUpService, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { create: jest.fn(), save: jest.fn(), }, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { save: jest.fn(), create: jest.fn(), @@ -147,8 +147,8 @@ describe('SignInUpService', () => { }).compile(); service = module.get(SignInUpService); - UserRepository = module.get(getRepositoryToken(User, 'core')); - WorkspaceRepository = module.get(getRepositoryToken(Workspace, 'core')); + UserRepository = module.get(getRepositoryToken(User)); + WorkspaceRepository = module.get(getRepositoryToken(Workspace)); workspaceInvitationService = module.get( WorkspaceInvitationService, ); diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts index 57b4a30c33e..c2b46d9f325 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts @@ -43,9 +43,9 @@ import { isWorkEmail } from 'src/utils/is-work-email'; // eslint-disable-next-line @nx/workspace-inject-workspace-repository export class SignInUpService { constructor( - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly workspaceInvitationService: WorkspaceInvitationService, private readonly userWorkspaceService: UserWorkspaceService, diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts index a32ec7db4fb..364864517ab 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts @@ -30,13 +30,13 @@ import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace. export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') { constructor( private readonly jwtWrapperService: JwtWrapperService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, - @InjectRepository(ApiKey, 'core') + @InjectRepository(ApiKey) private readonly apiKeyRepository: Repository, ) { const jwtFromRequestFunction = jwtWrapperService.extractJwtFromRequest(); diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts index 8b477097657..421537268be 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts @@ -54,19 +54,19 @@ describe('AccessTokenService', () => { }, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useClass: Repository, }, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useClass: Repository, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useClass: Repository, }, { - provide: getRepositoryToken(UserWorkspace, 'core'), + provide: getRepositoryToken(UserWorkspace), useClass: Repository, }, { @@ -85,17 +85,15 @@ describe('AccessTokenService', () => { service = module.get(AccessTokenService); jwtWrapperService = module.get(JwtWrapperService); twentyConfigService = module.get(TwentyConfigService); - userRepository = module.get>( - getRepositoryToken(User, 'core'), - ); + userRepository = module.get>(getRepositoryToken(User)); workspaceRepository = module.get>( - getRepositoryToken(Workspace, 'core'), + getRepositoryToken(Workspace), ); twentyORMGlobalManager = module.get( TwentyORMGlobalManager, ); userWorkspaceRepository = module.get>( - getRepositoryToken(UserWorkspace, 'core'), + getRepositoryToken(UserWorkspace), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts index c4fa79d304e..1571ae16667 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts @@ -35,12 +35,12 @@ export class AccessTokenService { private readonly jwtWrapperService: JwtWrapperService, private readonly jwtStrategy: JwtAuthStrategy, private readonly twentyConfigService: TwentyConfigService, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts index b2942b9ccdb..f305432dc24 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts @@ -29,11 +29,11 @@ describe('EmailVerificationTokenService', () => { providers: [ EmailVerificationTokenService, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useClass: Repository, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { findOne: jest.fn(), }, @@ -51,11 +51,9 @@ describe('EmailVerificationTokenService', () => { EmailVerificationTokenService, ); appTokenRepository = module.get>( - getRepositoryToken(AppToken, 'core'), - ); - userRepository = module.get>( - getRepositoryToken(User, 'core'), + getRepositoryToken(AppToken), ); + userRepository = module.get>(getRepositoryToken(User)); twentyConfigService = module.get(TwentyConfigService); }); diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts index a4aabc9505e..469406ee1f8 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts @@ -23,9 +23,9 @@ import { User } from 'src/engine/core-modules/user/user.entity'; @Injectable() export class EmailVerificationTokenService { constructor( - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, private readonly twentyConfigService: TwentyConfigService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts index c786e7138f6..c125aeaff60 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts @@ -39,11 +39,11 @@ describe('RefreshTokenService', () => { }, }, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useClass: Repository, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useClass: Repository, }, ], @@ -53,11 +53,9 @@ describe('RefreshTokenService', () => { jwtWrapperService = module.get(JwtWrapperService); twentyConfigService = module.get(TwentyConfigService); appTokenRepository = module.get>( - getRepositoryToken(AppToken, 'core'), - ); - userRepository = module.get>( - getRepositoryToken(User, 'core'), + getRepositoryToken(AppToken), ); + userRepository = module.get>(getRepositoryToken(User)); }); it('should be defined', () => { diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts index 2784a89c5ae..679b2d518ec 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts @@ -27,9 +27,9 @@ export class RefreshTokenService { constructor( private readonly jwtWrapperService: JwtWrapperService, private readonly twentyConfigService: TwentyConfigService, - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.spec.ts index ca2361287a3..42a383f5f2f 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.spec.ts @@ -24,7 +24,7 @@ describe('RenewTokenService', () => { providers: [ RenewTokenService, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useClass: Repository, }, { @@ -51,7 +51,7 @@ describe('RenewTokenService', () => { service = module.get(RenewTokenService); appTokenRepository = module.get>( - getRepositoryToken(AppToken, 'core'), + getRepositoryToken(AppToken), ); accessTokenService = module.get(AccessTokenService); refreshTokenService = module.get(RefreshTokenService); diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.ts index e2e4d531d4d..b22a6ac34e5 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/renew-token.service.ts @@ -18,7 +18,7 @@ import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/auth-contex @Injectable() export class RenewTokenService { constructor( - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, private readonly accessTokenService: AccessTokenService, private readonly workspaceAgnosticTokenService: WorkspaceAgnosticTokenService, diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.spec.ts index d03608f05d5..3e076539a28 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.spec.ts @@ -36,7 +36,7 @@ describe('WorkspaceAgnosticToken', () => { }, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { findOne: jest.fn(), }, @@ -49,9 +49,7 @@ describe('WorkspaceAgnosticToken', () => { ); jwtWrapperService = module.get(JwtWrapperService); twentyConfigService = module.get(TwentyConfigService); - userRepository = module.get>( - getRepositoryToken(User, 'core'), - ); + userRepository = module.get>(getRepositoryToken(User)); }); it('should be defined', () => { diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts index 6c8c71c7a66..e5931ace74c 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/workspace-agnostic-token.service.ts @@ -25,7 +25,7 @@ export class WorkspaceAgnosticTokenService { constructor( private readonly jwtWrapperService: JwtWrapperService, private readonly twentyConfigService: TwentyConfigService, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts b/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts index 9c545f9f14b..fdc4b0d102a 100644 --- a/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts +++ b/packages/twenty-server/src/engine/core-modules/auth/token/token.module.ts @@ -19,10 +19,13 @@ import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-s @Module({ imports: [ JwtModule, - TypeOrmModule.forFeature( - [User, AppToken, Workspace, UserWorkspace, ApiKey], - 'core', - ), + TypeOrmModule.forFeature([ + User, + AppToken, + Workspace, + UserWorkspace, + ApiKey, + ]), TypeORMModule, DataSourceModule, ], diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts index 87c9abd7242..f325d4272c9 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/billing-webhook.module.ts @@ -36,21 +36,18 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi PermissionsModule, WorkspaceModule, BillingModule, - TypeOrmModule.forFeature( - [ - BillingSubscription, - BillingSubscriptionItem, - BillingCustomer, - BillingProduct, - BillingPrice, - BillingMeter, - BillingEntitlement, - Workspace, - UserWorkspace, - FeatureFlag, - ], - 'core', - ), + TypeOrmModule.forFeature([ + BillingSubscription, + BillingSubscriptionItem, + BillingCustomer, + BillingProduct, + BillingPrice, + BillingMeter, + BillingEntitlement, + Workspace, + UserWorkspace, + FeatureFlag, + ]), ], controllers: [BillingWebhookController], providers: [ diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-alert.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-alert.service.ts index 751be62a9b2..8c3e6549c87 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-alert.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-alert.service.ts @@ -23,11 +23,11 @@ const TRIAL_PERIOD_ALERT_TITLE = 'TRIAL_PERIOD_ALERT'; // to set in Stripe confi export class BillingWebhookAlertService { protected readonly logger = new Logger(BillingWebhookAlertService.name); constructor( - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, - @InjectRepository(BillingProduct, 'core') + @InjectRepository(BillingProduct) private readonly billingProductRepository: Repository, - @InjectRepository(BillingSubscriptionItem, 'core') + @InjectRepository(BillingSubscriptionItem) private readonly billingSubscriptionItemRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-customer.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-customer.service.ts index 44eceb0a595..1df71fb804e 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-customer.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-customer.service.ts @@ -17,7 +17,7 @@ import { BillingCustomer } from 'src/engine/core-modules/billing/entities/billin export class BillingWebhookCustomerService { protected readonly logger = new Logger(BillingWebhookCustomerService.name); constructor( - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) private readonly billingCustomerRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-entitlement.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-entitlement.service.ts index b7103fc9626..114727e56f5 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-entitlement.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-entitlement.service.ts @@ -18,9 +18,9 @@ import { BillingEntitlement } from 'src/engine/core-modules/billing/entities/bil @Injectable() export class BillingWebhookEntitlementService { constructor( - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) private readonly billingCustomerRepository: Repository, - @InjectRepository(BillingEntitlement, 'core') + @InjectRepository(BillingEntitlement) private readonly billingEntitlementRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts index fb7d21cd6f7..7dd53e6bd11 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-invoice.service.ts @@ -14,7 +14,7 @@ const SUBSCRIPTION_CYCLE_BILLING_REASON = 'subscription_cycle'; export class BillingWebhookInvoiceService { protected readonly logger = new Logger(BillingWebhookInvoiceService.name); constructor( - @InjectRepository(BillingSubscriptionItem, 'core') + @InjectRepository(BillingSubscriptionItem) private readonly billingSubscriptionItemRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-price.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-price.service.ts index b6d7d09bad4..b60045a8ed0 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-price.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-price.service.ts @@ -23,11 +23,11 @@ export class BillingWebhookPriceService { protected readonly logger = new Logger(BillingWebhookPriceService.name); constructor( private readonly stripeBillingMeterService: StripeBillingMeterService, - @InjectRepository(BillingPrice, 'core') + @InjectRepository(BillingPrice) private readonly billingPriceRepository: Repository, - @InjectRepository(BillingMeter, 'core') + @InjectRepository(BillingMeter) private readonly billingMeterRepository: Repository, - @InjectRepository(BillingProduct, 'core') + @InjectRepository(BillingProduct) private readonly billingProductRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-product.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-product.service.ts index f873084e4c7..4aeeb7b1471 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-product.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-product.service.ts @@ -14,7 +14,7 @@ import { isStripeValidProductMetadata } from 'src/engine/core-modules/billing/ut export class BillingWebhookProductService { protected readonly logger = new Logger(BillingWebhookProductService.name); constructor( - @InjectRepository(BillingProduct, 'core') + @InjectRepository(BillingProduct) private readonly billingProductRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-subscription.service.ts b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-subscription.service.ts index bad15d80795..0813cea0e97 100644 --- a/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-subscription.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing-webhook/services/billing-webhook-subscription.service.ts @@ -40,13 +40,13 @@ export class BillingWebhookSubscriptionService { private readonly stripeCustomerService: StripeCustomerService, @InjectMessageQueue(MessageQueue.workspaceQueue) private readonly messageQueueService: MessageQueueService, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, - @InjectRepository(BillingSubscriptionItem, 'core') + @InjectRepository(BillingSubscriptionItem) private readonly billingSubscriptionItemRepository: Repository, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) private readonly billingCustomerRepository: Repository, private readonly billingSubscriptionService: BillingSubscriptionService, private readonly workspaceService: WorkspaceService, diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts index df30fbf16d9..0afd746d886 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts @@ -43,21 +43,18 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi MessageQueueModule, PermissionsModule, AiModule, - TypeOrmModule.forFeature( - [ - BillingSubscription, - BillingSubscriptionItem, - BillingCustomer, - BillingProduct, - BillingPrice, - BillingMeter, - BillingEntitlement, - Workspace, - UserWorkspace, - FeatureFlag, - ], - 'core', - ), + TypeOrmModule.forFeature([ + BillingSubscription, + BillingSubscriptionItem, + BillingCustomer, + BillingProduct, + BillingPrice, + BillingMeter, + BillingEntitlement, + Workspace, + UserWorkspace, + FeatureFlag, + ]), ], providers: [ BillingSubscriptionService, diff --git a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-add-workflow-subscription-item.command.ts b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-add-workflow-subscription-item.command.ts index 74e95427014..f16dcc45ffd 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-add-workflow-subscription-item.command.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-add-workflow-subscription-item.command.ts @@ -25,12 +25,12 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global. }) export class BillingAddWorkflowSubscriptionItemCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) protected readonly billingSubscriptionRepository: Repository, - @InjectRepository(BillingProduct, 'core') + @InjectRepository(BillingProduct) protected readonly billingProductRepository: Repository, private readonly stripeSubscriptionItemService: StripeSubscriptionItemService, private readonly stripeSubscriptionService: StripeSubscriptionService, diff --git a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts index 1d12d92a7e5..d98469beb15 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts @@ -21,10 +21,10 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global. }) export class BillingSyncCustomerDataCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly stripeSubscriptionService: StripeSubscriptionService, - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) protected readonly billingCustomerRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts index 8e76fb12a86..d4fb7b1911e 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts @@ -29,11 +29,11 @@ import { transformStripeProductToDatabaseProduct } from 'src/engine/core-modules export class BillingSyncPlansDataCommand extends MigrationCommandRunner { private readonly batchSize = 5; constructor( - @InjectRepository(BillingPrice, 'core') + @InjectRepository(BillingPrice) private readonly billingPriceRepository: Repository, - @InjectRepository(BillingProduct, 'core') + @InjectRepository(BillingProduct) private readonly billingProductRepository: Repository, - @InjectRepository(BillingMeter, 'core') + @InjectRepository(BillingMeter) private readonly billingMeterRepository: Repository, private readonly stripeBillingMeterService: StripeBillingMeterService, private readonly stripeProductService: StripeProductService, diff --git a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-update-subscription-price.command.ts b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-update-subscription-price.command.ts index 85c04f84c5f..e972f3c579c 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-update-subscription-price.command.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-update-subscription-price.command.ts @@ -30,10 +30,10 @@ export class BillingUpdateSubscriptionPriceCommand extends ActiveOrSuspendedWork private clearUsage = false; constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) protected readonly billingSubscriptionRepository: Repository, private readonly billingSubscriptionService: BillingSubscriptionService, private readonly stripeSubscriptionItemService: StripeSubscriptionItemService, diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts index 40a42dc2c04..1c379593e72 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts @@ -21,7 +21,7 @@ import { type BillingGetPricesPerPlanResult } from 'src/engine/core-modules/bill export class BillingPlanService { protected readonly logger = new Logger(BillingPlanService.name); constructor( - @InjectRepository(BillingProduct, 'core') + @InjectRepository(BillingProduct) private readonly billingProductRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts index 08fafcd2a7d..58749b611a7 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts @@ -36,13 +36,13 @@ export class BillingPortalWorkspaceService { private readonly stripeBillingPortalService: StripeBillingPortalService, private readonly domainManagerService: DomainManagerService, private readonly billingSubscriptionService: BillingSubscriptionService, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, - @InjectRepository(BillingSubscriptionItem, 'core') + @InjectRepository(BillingSubscriptionItem) private readonly billingSubscriptionItemRepository: Repository, - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) private readonly billingCustomerRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-item.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-item.service.ts index 07ad7ae1e3d..51519781f45 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-item.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription-item.service.ts @@ -16,7 +16,7 @@ import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twent @Injectable() export class BillingSubscriptionItemService { constructor( - @InjectRepository(BillingSubscriptionItem, 'core') + @InjectRepository(BillingSubscriptionItem) private readonly billingSubscriptionItemRepository: Repository, private readonly twentyConfigService: TwentyConfigService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts index c8c7943eeaf..279338317cc 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts @@ -41,14 +41,14 @@ export class BillingSubscriptionService { private readonly stripeSubscriptionService: StripeSubscriptionService, private readonly billingPlanService: BillingPlanService, private readonly billingProductService: BillingProductService, - @InjectRepository(BillingEntitlement, 'core') + @InjectRepository(BillingEntitlement) private readonly billingEntitlementRepository: Repository, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, private readonly stripeCustomerService: StripeCustomerService, private readonly twentyConfigService: TwentyConfigService, private readonly stripeSubscriptionItemService: StripeSubscriptionItemService, - @InjectRepository(BillingSubscriptionItem, 'core') + @InjectRepository(BillingSubscriptionItem) private readonly billingSubscriptionItemRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-usage.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-usage.service.ts index 13aa3c7e463..ccad2a3f38d 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-usage.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-usage.service.ts @@ -24,7 +24,7 @@ import { type Workspace } from 'src/engine/core-modules/workspace/workspace.enti export class BillingUsageService { protected readonly logger = new Logger(BillingUsageService.name); constructor( - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) private readonly billingCustomerRepository: Repository, private readonly billingSubscriptionService: BillingSubscriptionService, private readonly stripeBillingMeterEventService: StripeBillingMeterEventService, diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts index e5d16c701c5..fe01de18cf9 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts @@ -22,7 +22,7 @@ export class BillingService { private readonly twentyConfigService: TwentyConfigService, private readonly billingSubscriptionService: BillingSubscriptionService, private readonly billingProductService: BillingProductService, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts index 0ef3f1c7297..12236e80dbe 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts @@ -19,7 +19,7 @@ export class StripeCustomerService { constructor( private readonly twentyConfigService: TwentyConfigService, private readonly stripeSDKService: StripeSDKService, - @InjectRepository(BillingCustomer, 'core') + @InjectRepository(BillingCustomer) private readonly billingCustomerRepository: Repository, ) { if (!this.twentyConfigService.get('IS_BILLING_ENABLED')) { diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts index 43594738ea9..bcff25ed067 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts @@ -21,7 +21,7 @@ import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/doma imports: [ DomainManagerModule, StripeSDKModule, - TypeOrmModule.forFeature([BillingCustomer], 'core'), + TypeOrmModule.forFeature([BillingCustomer]), ], providers: [ StripeSubscriptionItemService, diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.controller.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.controller.ts index 4c8a46e51d6..2fcc80a6f28 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.controller.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.controller.ts @@ -31,7 +31,7 @@ import { handleException } from 'src/engine/utils/global-exception-handler.util' @UseFilters(AuthRestApiExceptionFilter) export class CloudflareController { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly domainManagerService: DomainManagerService, private readonly customDomainService: CustomDomainService, diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.spec.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.spec.ts index 657e33220b4..c4a6984c336 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/controllers/cloudflare.spec.ts @@ -27,7 +27,7 @@ describe('CloudflareController - customHostnameWebhooks', () => { controllers: [CloudflareController], providers: [ { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { findOneBy: jest.fn(), save: jest.fn(), @@ -73,7 +73,7 @@ describe('CloudflareController - customHostnameWebhooks', () => { }).compile(); controller = module.get(CloudflareController); - WorkspaceRepository = module.get(getRepositoryToken(Workspace, 'core')); + WorkspaceRepository = module.get(getRepositoryToken(Workspace)); twentyConfigService = module.get(TwentyConfigService); domainManagerService = module.get(DomainManagerService); diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/crons/jobs/check-custom-domain-valid-records.cron.job.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/crons/jobs/check-custom-domain-valid-records.cron.job.ts index 1e45201a54a..4f49997dac3 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/crons/jobs/check-custom-domain-valid-records.cron.job.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/crons/jobs/check-custom-domain-valid-records.cron.job.ts @@ -15,7 +15,7 @@ export const CHECK_CUSTOM_DOMAIN_VALID_RECORDS_CRON_PATTERN = '0 * * * *'; @Processor(MessageQueue.cronQueue) export class CheckCustomDomainValidRecordsCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly customDomainService: CustomDomainService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/domain-manager.module.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/domain-manager.module.ts index b38c000bf37..08dd01c1b28 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/domain-manager.module.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/domain-manager.module.ts @@ -11,7 +11,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { DomainManagerResolver } from 'src/engine/core-modules/domain-manager/domain-manager.resolver'; @Module({ - imports: [AuditModule, TypeOrmModule.forFeature([Workspace], 'core')], + imports: [AuditModule, TypeOrmModule.forFeature([Workspace])], providers: [ DomainManagerResolver, DomainManagerService, diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.spec.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.spec.ts index 11674c021e9..9b6c8811a76 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.spec.ts @@ -42,7 +42,7 @@ describe('CustomDomainService', () => { }, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { save: jest.fn(), }, diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.ts index f85be07e92c..302f19303aa 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/services/custom-domain.service.ts @@ -28,7 +28,7 @@ export class CustomDomainService { private readonly twentyConfigService: TwentyConfigService, private readonly domainManagerService: DomainManagerService, private readonly auditService: AuditService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) { if (this.twentyConfigService.get('CLOUDFLARE_API_KEY')) { diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.spec.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.spec.ts index 85266367510..3c0806e26d2 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.spec.ts @@ -67,7 +67,7 @@ describe('DomainManagerService', () => { providers: [ DomainManagerService, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useClass: Repository, }, { diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts index d972f71c3aa..92df10e55ad 100644 --- a/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts +++ b/packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts @@ -16,7 +16,7 @@ import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace. @Injectable() export class DomainManagerService { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly twentyConfigService: TwentyConfigService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts index e8da2a485cf..fb9d3a35160 100644 --- a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts +++ b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts @@ -14,7 +14,7 @@ import { User } from 'src/engine/core-modules/user/user.entity'; @Module({ imports: [ - TypeOrmModule.forFeature([AppToken, User], 'core'), + TypeOrmModule.forFeature([AppToken, User]), EmailModule, TwentyConfigModule, DomainManagerModule, diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts b/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts index 300df9d4b96..bd1d4f3c037 100644 --- a/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts +++ b/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts @@ -29,7 +29,7 @@ import { UserService } from 'src/engine/core-modules/user/services/user.service' @Injectable() export class EmailVerificationService { constructor( - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, private readonly domainManagerService: DomainManagerService, private readonly emailService: EmailService, diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts index d1b423aaa91..b3dc35b1f0d 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.module.ts @@ -13,7 +13,7 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor imports: [ TypeORMModule, NestjsQueryGraphQLModule.forFeature({ - imports: [NestjsQueryTypeOrmModule.forFeature([FeatureFlag], 'core')], + imports: [NestjsQueryTypeOrmModule.forFeature([FeatureFlag])], services: [], resolvers: [], }), diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/services/__tests__/feature-flag.service.spec.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/services/__tests__/feature-flag.service.spec.ts index 5aee691bb24..563931e9efa 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/services/__tests__/feature-flag.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/services/__tests__/feature-flag.service.spec.ts @@ -55,7 +55,7 @@ describe('FeatureFlagService', () => { providers: [ FeatureFlagService, { - provide: getRepositoryToken(FeatureFlag, 'core'), + provide: getRepositoryToken(FeatureFlag), useValue: mockFeatureFlagRepository, }, { diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts index bf7e7bea6bb..dd5d46b0d2f 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts @@ -20,7 +20,7 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo @Injectable() export class FeatureFlagService { constructor( - @InjectRepository(FeatureFlag, 'core') + @InjectRepository(FeatureFlag) private readonly featureFlagRepository: Repository, private readonly workspaceFeatureFlagsMapCacheService: WorkspaceFeatureFlagsMapCacheService, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, diff --git a/packages/twenty-server/src/engine/core-modules/file/crons/jobs/cleanup-orphaned-files.cron.job.ts b/packages/twenty-server/src/engine/core-modules/file/crons/jobs/cleanup-orphaned-files.cron.job.ts index 993ce729058..e44c72feced 100644 --- a/packages/twenty-server/src/engine/core-modules/file/crons/jobs/cleanup-orphaned-files.cron.job.ts +++ b/packages/twenty-server/src/engine/core-modules/file/crons/jobs/cleanup-orphaned-files.cron.job.ts @@ -16,9 +16,9 @@ export const CLEANUP_ORPHANED_FILES_CRON_PATTERN = '0 2 * * *'; @Processor(MessageQueue.cronQueue) export class CleanupOrphanedFilesCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(FileEntity, 'core') + @InjectRepository(FileEntity) private readonly fileRepository: Repository, private readonly fileMetadataService: FileMetadataService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/file/file.module.ts b/packages/twenty-server/src/engine/core-modules/file/file.module.ts index bfc8858318d..babcdff4a28 100644 --- a/packages/twenty-server/src/engine/core-modules/file/file.module.ts +++ b/packages/twenty-server/src/engine/core-modules/file/file.module.ts @@ -22,7 +22,7 @@ import { FileService } from './services/file.service'; @Module({ imports: [ JwtModule, - TypeOrmModule.forFeature([FileEntity, Workspace], 'core'), + TypeOrmModule.forFeature([FileEntity, Workspace]), HttpModule, ], providers: [ diff --git a/packages/twenty-server/src/engine/core-modules/file/services/file-metadata.service.ts b/packages/twenty-server/src/engine/core-modules/file/services/file-metadata.service.ts index 9f963abd05d..a817144b89f 100644 --- a/packages/twenty-server/src/engine/core-modules/file/services/file-metadata.service.ts +++ b/packages/twenty-server/src/engine/core-modules/file/services/file-metadata.service.ts @@ -15,7 +15,7 @@ import { FileService } from './file.service'; @Injectable() export class FileMetadataService { constructor( - @InjectRepository(FileEntity, 'core') + @InjectRepository(FileEntity) private readonly fileRepository: Repository, private readonly fileService: FileService, private readonly fileUploadService: FileUploadService, diff --git a/packages/twenty-server/src/engine/core-modules/health/health.module.ts b/packages/twenty-server/src/engine/core-modules/health/health.module.ts index 7cb971f8028..69f083bb65d 100644 --- a/packages/twenty-server/src/engine/core-modules/health/health.module.ts +++ b/packages/twenty-server/src/engine/core-modules/health/health.module.ts @@ -18,7 +18,7 @@ import { WorkerHealthIndicator } from './indicators/worker.health'; TerminusModule, RedisClientModule, WorkspaceMigrationModule, - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), MetricsModule, ], controllers: [HealthController], diff --git a/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/app.health.spec.ts b/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/app.health.spec.ts index 722ec55936a..18f18e5d4b8 100644 --- a/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/app.health.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/app.health.spec.ts @@ -39,7 +39,7 @@ describe('AppHealthIndicator', () => { providers: [ AppHealthIndicator, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: workspaceRepository, }, { diff --git a/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/database.health.spec.ts b/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/database.health.spec.ts index 07d7dcb9d33..a07d195c55b 100644 --- a/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/database.health.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/health/indicators/__tests__/database.health.spec.ts @@ -1,5 +1,6 @@ import { HealthIndicatorService } from '@nestjs/terminus'; import { Test, type TestingModule } from '@nestjs/testing'; +import { getDataSourceToken } from '@nestjs/typeorm'; import { type DataSource } from 'typeorm'; @@ -32,7 +33,7 @@ describe('DatabaseHealthIndicator', () => { providers: [ DatabaseHealthIndicator, { - provide: 'coreDataSource', + provide: getDataSourceToken(), useValue: dataSource, }, { diff --git a/packages/twenty-server/src/engine/core-modules/health/indicators/app.health.ts b/packages/twenty-server/src/engine/core-modules/health/indicators/app.health.ts index d7c02b82e40..8ca860c036e 100644 --- a/packages/twenty-server/src/engine/core-modules/health/indicators/app.health.ts +++ b/packages/twenty-server/src/engine/core-modules/health/indicators/app.health.ts @@ -17,7 +17,7 @@ export class AppHealthIndicator { constructor( private readonly healthIndicatorService: HealthIndicatorService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly workspaceMigrationService: WorkspaceMigrationService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/health/indicators/database.health.ts b/packages/twenty-server/src/engine/core-modules/health/indicators/database.health.ts index 0d38ce536d1..3511ed89926 100644 --- a/packages/twenty-server/src/engine/core-modules/health/indicators/database.health.ts +++ b/packages/twenty-server/src/engine/core-modules/health/indicators/database.health.ts @@ -16,7 +16,7 @@ export class DatabaseHealthIndicator { private stateManager = new HealthStateManager(); constructor( - @InjectDataSource('core') + @InjectDataSource() private readonly dataSource: DataSource, private readonly healthIndicatorService: HealthIndicatorService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.module.ts b/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.module.ts index bf894e7eaff..a5ae662385f 100644 --- a/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.module.ts +++ b/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.module.ts @@ -11,7 +11,7 @@ import { TypeORMModule } from 'src/database/typeorm/typeorm.module'; imports: [ NestjsQueryGraphQLModule.forFeature({ imports: [ - NestjsQueryTypeOrmModule.forFeature([KeyValuePair], 'core'), + NestjsQueryTypeOrmModule.forFeature([KeyValuePair]), TypeORMModule, ], }), diff --git a/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.service.ts b/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.service.ts index a56bb748549..39d3ff0f611 100644 --- a/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.service.ts +++ b/packages/twenty-server/src/engine/core-modules/key-value-pair/key-value-pair.service.ts @@ -12,7 +12,7 @@ export class KeyValuePairService< KeyValueTypesMap extends Record = Record, > { constructor( - @InjectRepository(KeyValuePair, 'core') + @InjectRepository(KeyValuePair) private readonly keyValuePairRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts index 50706ed7241..3572da18663 100644 --- a/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts +++ b/packages/twenty-server/src/engine/core-modules/message-queue/jobs.module.ts @@ -36,7 +36,7 @@ import { WorkflowModule } from 'src/modules/workflow/workflow.module'; @Module({ imports: [ - TypeOrmModule.forFeature([Workspace, BillingSubscription], 'core'), + TypeOrmModule.forFeature([Workspace, BillingSubscription]), DataSourceModule, ObjectMetadataModule, TypeORMModule, diff --git a/packages/twenty-server/src/engine/core-modules/page-layout/page-layout.module.ts b/packages/twenty-server/src/engine/core-modules/page-layout/page-layout.module.ts index 69a207cd065..70db0c11f01 100644 --- a/packages/twenty-server/src/engine/core-modules/page-layout/page-layout.module.ts +++ b/packages/twenty-server/src/engine/core-modules/page-layout/page-layout.module.ts @@ -7,10 +7,11 @@ import { PageLayoutEntity } from 'src/engine/core-modules/page-layout/entities/p @Module({ imports: [ - TypeOrmModule.forFeature( - [PageLayoutEntity, PageLayoutTabEntity, PageLayoutWidgetEntity], - 'core', - ), + TypeOrmModule.forFeature([ + PageLayoutEntity, + PageLayoutTabEntity, + PageLayoutWidgetEntity, + ]), ], exports: [], }) diff --git a/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.module.ts b/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.module.ts index 609322454cd..4124f30c78d 100644 --- a/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.module.ts +++ b/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.module.ts @@ -7,7 +7,7 @@ import { PostgresCredentialsResolver } from 'src/engine/core-modules/postgres-cr import { PostgresCredentialsService } from 'src/engine/core-modules/postgres-credentials/postgres-credentials.service'; @Module({ - imports: [JwtModule, TypeOrmModule.forFeature([PostgresCredentials], 'core')], + imports: [JwtModule, TypeOrmModule.forFeature([PostgresCredentials])], providers: [ PostgresCredentialsResolver, PostgresCredentialsService, diff --git a/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.service.ts b/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.service.ts index 3b965db45ba..699d55946a6 100644 --- a/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.service.ts +++ b/packages/twenty-server/src/engine/core-modules/postgres-credentials/postgres-credentials.service.ts @@ -17,7 +17,7 @@ import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/auth-contex export class PostgresCredentialsService { constructor( - @InjectRepository(PostgresCredentials, 'core') + @InjectRepository(PostgresCredentials) private readonly postgresCredentialsRepository: Repository, private readonly jwtWrapperService: JwtWrapperService, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.spec.ts b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.spec.ts index e0313295a08..541150ee7cc 100644 --- a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.spec.ts @@ -20,7 +20,7 @@ describe('SSOService', () => { providers: [ SSOService, { - provide: getRepositoryToken(WorkspaceSSOIdentityProvider, 'core'), + provide: getRepositoryToken(WorkspaceSSOIdentityProvider), useClass: Repository, }, { @@ -46,7 +46,7 @@ describe('SSOService', () => { service = module.get(SSOService); repository = module.get>( - getRepositoryToken(WorkspaceSSOIdentityProvider, 'core'), + getRepositoryToken(WorkspaceSSOIdentityProvider), ); billingService = module.get(BillingService); }); diff --git a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts index d37527641d4..9609309d2e1 100644 --- a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts +++ b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts @@ -29,7 +29,7 @@ import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twent export class SSOService { private readonly featureLookUpKey = BillingEntitlementKey.SSO; constructor( - @InjectRepository(WorkspaceSSOIdentityProvider, 'core') + @InjectRepository(WorkspaceSSOIdentityProvider) private readonly workspaceSSOIdentityProviderRepository: Repository, private readonly twentyConfigService: TwentyConfigService, private readonly billingService: BillingService, diff --git a/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts b/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts index e7e7f68d3ef..c8a91235894 100644 --- a/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts +++ b/packages/twenty-server/src/engine/core-modules/sso/sso.module.ts @@ -17,10 +17,12 @@ import { User } from 'src/engine/core-modules/user/user.entity'; import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module'; @Module({ imports: [ - NestjsQueryTypeOrmModule.forFeature( - [WorkspaceSSOIdentityProvider, User, AppToken, FeatureFlag], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([ + WorkspaceSSOIdentityProvider, + User, + AppToken, + FeatureFlag, + ]), BillingModule, DomainManagerModule, GuardRedirectModule, diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/drivers/database-config.module.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/drivers/database-config.module.ts index b2d7da5cc88..26e83c6b2aa 100644 --- a/packages/twenty-server/src/engine/core-modules/twenty-config/drivers/database-config.module.ts +++ b/packages/twenty-server/src/engine/core-modules/twenty-config/drivers/database-config.module.ts @@ -17,7 +17,7 @@ export class DatabaseConfigModule { return { module: DatabaseConfigModule, imports: [ - TypeOrmModule.forFeature([KeyValuePair], 'core'), + TypeOrmModule.forFeature([KeyValuePair]), ScheduleModule.forRoot(), ], providers: [ diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/storage/__tests__/config-storage.service.spec.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/storage/__tests__/config-storage.service.spec.ts index 30bea7de00b..49a661b951e 100644 --- a/packages/twenty-server/src/engine/core-modules/twenty-config/storage/__tests__/config-storage.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/twenty-config/storage/__tests__/config-storage.service.spec.ts @@ -70,7 +70,7 @@ describe('ConfigStorageService', () => { }, ConfigVariables, { - provide: getRepositoryToken(KeyValuePair, 'core'), + provide: getRepositoryToken(KeyValuePair), useValue: { findOne: jest.fn(), find: jest.fn(), @@ -84,7 +84,7 @@ describe('ConfigStorageService', () => { service = module.get(ConfigStorageService); keyValuePairRepository = module.get>( - getRepositoryToken(KeyValuePair, 'core'), + getRepositoryToken(KeyValuePair), ); configValueConverter = module.get( ConfigValueConverterService, diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/storage/config-storage.service.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/storage/config-storage.service.ts index 6c71faa0cd6..ee05bdc5677 100644 --- a/packages/twenty-server/src/engine/core-modules/twenty-config/storage/config-storage.service.ts +++ b/packages/twenty-server/src/engine/core-modules/twenty-config/storage/config-storage.service.ts @@ -28,7 +28,7 @@ export class ConfigStorageService implements ConfigStorageInterface { private readonly logger = new Logger(ConfigStorageService.name); constructor( - @InjectRepository(KeyValuePair, 'core') + @InjectRepository(KeyValuePair) private readonly keyValuePairRepository: Repository, private readonly configValueConverter: ConfigValueConverterService, private readonly environmentConfigDriver: EnvironmentConfigDriver, diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.module.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.module.ts index 30b533779d9..6eb47d7dfe9 100644 --- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.module.ts +++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.module.ts @@ -23,10 +23,11 @@ import { TwoFactorAuthenticationMethod } from './entities/two-factor-authenticat MetricsModule, TokenModule, JwtModule, - TypeOrmModule.forFeature( - [User, TwoFactorAuthenticationMethod, UserWorkspace], - 'core', - ), + TypeOrmModule.forFeature([ + User, + TwoFactorAuthenticationMethod, + UserWorkspace, + ]), UserModule, ], providers: [ diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.spec.ts index 252312bed90..0900b1942d5 100644 --- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.spec.ts @@ -90,7 +90,7 @@ describe('TwoFactorAuthenticationResolver', () => { useFactory: createMockDomainManagerService, }, { - provide: getRepositoryToken(TwoFactorAuthenticationMethod, 'core'), + provide: getRepositoryToken(TwoFactorAuthenticationMethod), useFactory: createMockRepository, }, ], @@ -103,9 +103,7 @@ describe('TwoFactorAuthenticationResolver', () => { loginTokenService = module.get(LoginTokenService); userService = module.get(UserService); domainManagerService = module.get(DomainManagerService); - repository = module.get( - getRepositoryToken(TwoFactorAuthenticationMethod, 'core'), - ); + repository = module.get(getRepositoryToken(TwoFactorAuthenticationMethod)); }); afterEach(() => { diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts index 2edb7039f4d..869f5cd5f53 100644 --- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts +++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts @@ -41,7 +41,7 @@ export class TwoFactorAuthenticationResolver { private readonly loginTokenService: LoginTokenService, private readonly userService: UserService, private readonly domainManagerService: DomainManagerService, - @InjectRepository(TwoFactorAuthenticationMethod, 'core') + @InjectRepository(TwoFactorAuthenticationMethod) private readonly twoFactorAuthenticationMethodRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.spec.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.spec.ts index df49790427c..09bf0033581 100644 --- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.spec.ts @@ -74,7 +74,7 @@ describe('TwoFactorAuthenticationService', () => { providers: [ TwoFactorAuthenticationService, { - provide: getRepositoryToken(TwoFactorAuthenticationMethod, 'core'), + provide: getRepositoryToken(TwoFactorAuthenticationMethod), useValue: { findOne: jest.fn(), save: jest.fn(), @@ -99,9 +99,7 @@ describe('TwoFactorAuthenticationService', () => { service = module.get( TwoFactorAuthenticationService, ); - repository = module.get( - getRepositoryToken(TwoFactorAuthenticationMethod, 'core'), - ); + repository = module.get(getRepositoryToken(TwoFactorAuthenticationMethod)); userWorkspaceService = module.get(UserWorkspaceService); simpleSecretEncryptionUtil = module.get( diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts index 46f00ea1fd2..75e34e895e8 100644 --- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts +++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts @@ -32,7 +32,7 @@ const PENDING_METHOD_REUSE_WINDOW_MS = 60 * 60 * 1000; // eslint-disable-next-line @nx/workspace-inject-workspace-repository export class TwoFactorAuthenticationService { constructor( - @InjectRepository(TwoFactorAuthenticationMethod, 'core') + @InjectRepository(TwoFactorAuthenticationMethod) private readonly twoFactorAuthenticationMethodRepository: Repository, private readonly userWorkspaceService: UserWorkspaceService, private readonly simpleSecretEncryptionUtil: SimpleSecretEncryptionUtil, diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts index 234c416addd..ac4cc3aea5b 100644 --- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts +++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts @@ -24,11 +24,8 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works imports: [ NestjsQueryGraphQLModule.forFeature({ imports: [ - NestjsQueryTypeOrmModule.forFeature( - [User, UserWorkspace, Workspace], - 'core', - ), - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([User, UserWorkspace, Workspace]), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), TypeORMModule, DataSourceModule, WorkspaceDataSourceModule, diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.spec.ts index 79936a3e842..2e761f7af1c 100644 --- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.spec.ts @@ -46,7 +46,7 @@ describe('UserWorkspaceService', () => { providers: [ UserWorkspaceService, { - provide: getRepositoryToken(UserWorkspace, 'core'), + provide: getRepositoryToken(UserWorkspace), useValue: { create: jest.fn(), save: jest.fn(), @@ -58,13 +58,13 @@ describe('UserWorkspaceService', () => { }, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { findOne: jest.fn(), }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOneOrFail: jest.fn(), }, @@ -140,10 +140,8 @@ describe('UserWorkspaceService', () => { service = module.get(UserWorkspaceService); fileService = module.get(FileService); - userWorkspaceRepository = module.get( - getRepositoryToken(UserWorkspace, 'core'), - ); - userRepository = module.get(getRepositoryToken(User, 'core')); + userWorkspaceRepository = module.get(getRepositoryToken(UserWorkspace)); + userRepository = module.get(getRepositoryToken(User)); typeORMService = module.get(TypeORMService); workspaceInvitationService = module.get( WorkspaceInvitationService, diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts index 026b24069d2..8c531f3df2d 100644 --- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts +++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts @@ -38,9 +38,9 @@ import { getDomainNameByEmail } from 'src/utils/get-domain-name-by-email'; export class UserWorkspaceService extends TypeOrmQueryService { constructor( - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, private readonly workspaceInvitationService: WorkspaceInvitationService, private readonly domainManagerService: DomainManagerService, diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts index 65c70e1d4a6..3ecd7ba956e 100644 --- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts +++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts @@ -26,7 +26,7 @@ import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-membe // eslint-disable-next-line @nx/workspace-inject-workspace-repository export class UserService extends TypeOrmQueryService { constructor( - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, private readonly workspaceService: WorkspaceService, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/engine/core-modules/user/user.module.ts b/packages/twenty-server/src/engine/core-modules/user/user.module.ts index 7e4f23108c0..745c7754928 100644 --- a/packages/twenty-server/src/engine/core-modules/user/user.module.ts +++ b/packages/twenty-server/src/engine/core-modules/user/user.module.ts @@ -32,18 +32,18 @@ import { UserService } from './services/user.service'; imports: [ NestjsQueryGraphQLModule.forFeature({ imports: [ - NestjsQueryTypeOrmModule.forFeature([User], 'core'), + NestjsQueryTypeOrmModule.forFeature([User]), TypeORMModule, FileModule, ], resolvers: userAutoResolverOpts, }), - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), DataSourceModule, FileUploadModule, WorkspaceModule, OnboardingModule, - TypeOrmModule.forFeature([KeyValuePair, UserWorkspace], 'core'), + TypeOrmModule.forFeature([KeyValuePair, UserWorkspace]), UserVarsModule, UserWorkspaceModule, AuditModule, diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts index 8ae983ff342..0cbaeefa99f 100644 --- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts +++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts @@ -73,14 +73,14 @@ const getHMACKey = (email?: string, key?: string | null) => { @UseFilters(PermissionsGraphqlApiExceptionFilter) export class UserResolver { constructor( - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, private readonly userService: UserService, private readonly twentyConfigService: TwentyConfigService, private readonly fileUploadService: FileUploadService, private readonly onboardingService: OnboardingService, private readonly userVarService: UserVarsService, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, private readonly userRoleService: UserRoleService, private readonly permissionsService: PermissionsService, diff --git a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-field.service.spec.ts b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-field.service.spec.ts index 8ae651152f4..6cc291195b5 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-field.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-field.service.spec.ts @@ -35,7 +35,7 @@ describe('ViewFieldService', () => { providers: [ ViewFieldService, { - provide: getRepositoryToken(ViewFieldEntity, 'core'), + provide: getRepositoryToken(ViewFieldEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -50,7 +50,7 @@ describe('ViewFieldService', () => { viewFieldService = module.get(ViewFieldService); viewFieldRepository = module.get>( - getRepositoryToken(ViewFieldEntity, 'core'), + getRepositoryToken(ViewFieldEntity), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter-group.service.spec.ts b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter-group.service.spec.ts index d55324a9aea..414b1863612 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter-group.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter-group.service.spec.ts @@ -34,7 +34,7 @@ describe('ViewFilterGroupService', () => { providers: [ ViewFilterGroupService, { - provide: getRepositoryToken(ViewFilterGroupEntity, 'core'), + provide: getRepositoryToken(ViewFilterGroupEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -51,7 +51,7 @@ describe('ViewFilterGroupService', () => { ViewFilterGroupService, ); viewFilterGroupRepository = module.get>( - getRepositoryToken(ViewFilterGroupEntity, 'core'), + getRepositoryToken(ViewFilterGroupEntity), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter.service.spec.ts b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter.service.spec.ts index 6a7f9925eba..10f708e1741 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-filter.service.spec.ts @@ -36,7 +36,7 @@ describe('ViewFilterService', () => { providers: [ ViewFilterService, { - provide: getRepositoryToken(ViewFilterEntity, 'core'), + provide: getRepositoryToken(ViewFilterEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -51,7 +51,7 @@ describe('ViewFilterService', () => { viewFilterService = module.get(ViewFilterService); viewFilterRepository = module.get>( - getRepositoryToken(ViewFilterEntity, 'core'), + getRepositoryToken(ViewFilterEntity), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-group.service.spec.ts b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-group.service.spec.ts index 062d4dc7ec7..c305abeb33b 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-group.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-group.service.spec.ts @@ -35,7 +35,7 @@ describe('ViewGroupService', () => { providers: [ ViewGroupService, { - provide: getRepositoryToken(ViewGroupEntity, 'core'), + provide: getRepositoryToken(ViewGroupEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -50,7 +50,7 @@ describe('ViewGroupService', () => { viewGroupService = module.get(ViewGroupService); viewGroupRepository = module.get>( - getRepositoryToken(ViewGroupEntity, 'core'), + getRepositoryToken(ViewGroupEntity), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-sort.service.spec.ts b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-sort.service.spec.ts index 207bc395234..d60c83062e3 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/tests/view-sort.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/tests/view-sort.service.spec.ts @@ -34,7 +34,7 @@ describe('ViewSortService', () => { providers: [ ViewSortService, { - provide: getRepositoryToken(ViewSortEntity, 'core'), + provide: getRepositoryToken(ViewSortEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -49,7 +49,7 @@ describe('ViewSortService', () => { viewSortService = module.get(ViewSortService); viewSortRepository = module.get>( - getRepositoryToken(ViewSortEntity, 'core'), + getRepositoryToken(ViewSortEntity), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/view/services/tests/view.service.spec.ts b/packages/twenty-server/src/engine/core-modules/view/services/tests/view.service.spec.ts index 99875db609d..4c3ebbc31a4 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/tests/view.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/tests/view.service.spec.ts @@ -44,7 +44,7 @@ describe('ViewService', () => { providers: [ ViewService, { - provide: getRepositoryToken(ViewEntity, 'core'), + provide: getRepositoryToken(ViewEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -59,7 +59,7 @@ describe('ViewService', () => { viewService = module.get(ViewService); viewRepository = module.get>( - getRepositoryToken(ViewEntity, 'core'), + getRepositoryToken(ViewEntity), ); }); diff --git a/packages/twenty-server/src/engine/core-modules/view/services/view-field.service.ts b/packages/twenty-server/src/engine/core-modules/view/services/view-field.service.ts index aabdd54ded6..49cf00982a1 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/view-field.service.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/view-field.service.ts @@ -16,7 +16,7 @@ import { @Injectable() export class ViewFieldService { constructor( - @InjectRepository(ViewFieldEntity, 'core') + @InjectRepository(ViewFieldEntity) private readonly viewFieldRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/view/services/view-filter-group.service.ts b/packages/twenty-server/src/engine/core-modules/view/services/view-filter-group.service.ts index a8035a6a713..f7fd2b090a5 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/view-filter-group.service.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/view-filter-group.service.ts @@ -16,7 +16,7 @@ import { @Injectable() export class ViewFilterGroupService { constructor( - @InjectRepository(ViewFilterGroupEntity, 'core') + @InjectRepository(ViewFilterGroupEntity) private readonly viewFilterGroupRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/view/services/view-filter.service.ts b/packages/twenty-server/src/engine/core-modules/view/services/view-filter.service.ts index faf4d3c6e4a..a045279beef 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/view-filter.service.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/view-filter.service.ts @@ -16,7 +16,7 @@ import { @Injectable() export class ViewFilterService { constructor( - @InjectRepository(ViewFilterEntity, 'core') + @InjectRepository(ViewFilterEntity) private readonly viewFilterRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/view/services/view-group.service.ts b/packages/twenty-server/src/engine/core-modules/view/services/view-group.service.ts index 44195579153..ba64d21888b 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/view-group.service.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/view-group.service.ts @@ -16,7 +16,7 @@ import { @Injectable() export class ViewGroupService { constructor( - @InjectRepository(ViewGroupEntity, 'core') + @InjectRepository(ViewGroupEntity) private readonly viewGroupRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/view/services/view-sort.service.ts b/packages/twenty-server/src/engine/core-modules/view/services/view-sort.service.ts index de0a2d2a973..03c868dea7b 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/view-sort.service.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/view-sort.service.ts @@ -16,7 +16,7 @@ import { @Injectable() export class ViewSortService { constructor( - @InjectRepository(ViewSortEntity, 'core') + @InjectRepository(ViewSortEntity) private readonly viewSortRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/core-modules/view/services/view.service.ts index 536efdd274e..1ec011aa8f8 100644 --- a/packages/twenty-server/src/engine/core-modules/view/services/view.service.ts +++ b/packages/twenty-server/src/engine/core-modules/view/services/view.service.ts @@ -16,7 +16,7 @@ import { @Injectable() export class ViewService { constructor( - @InjectRepository(ViewEntity, 'core') + @InjectRepository(ViewEntity) private readonly viewRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/view/view.module.ts b/packages/twenty-server/src/engine/core-modules/view/view.module.ts index 854e9ce3531..fd113aae6f5 100644 --- a/packages/twenty-server/src/engine/core-modules/view/view.module.ts +++ b/packages/twenty-server/src/engine/core-modules/view/view.module.ts @@ -31,17 +31,14 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/ @Module({ imports: [ - TypeOrmModule.forFeature( - [ - ViewEntity, - ViewFieldEntity, - ViewFilterEntity, - ViewFilterGroupEntity, - ViewGroupEntity, - ViewSortEntity, - ], - 'core', - ), + TypeOrmModule.forFeature([ + ViewEntity, + ViewFieldEntity, + ViewFilterEntity, + ViewFilterGroupEntity, + ViewGroupEntity, + ViewSortEntity, + ]), I18nModule, WorkspaceCacheStorageModule, WorkspaceMetadataCacheModule, diff --git a/packages/twenty-server/src/engine/core-modules/webhook/webhook.module.ts b/packages/twenty-server/src/engine/core-modules/webhook/webhook.module.ts index a16b4e4d019..21677071048 100644 --- a/packages/twenty-server/src/engine/core-modules/webhook/webhook.module.ts +++ b/packages/twenty-server/src/engine/core-modules/webhook/webhook.module.ts @@ -11,7 +11,7 @@ import { WebhookController } from './controllers/webhook.controller'; @Module({ imports: [ - TypeOrmModule.forFeature([Webhook], 'core'), + TypeOrmModule.forFeature([Webhook]), AuthModule, WorkspaceCacheStorageModule, ], diff --git a/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.spec.ts b/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.spec.ts index 78ed20be63a..93759a12d66 100644 --- a/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.spec.ts @@ -40,7 +40,7 @@ describe('WebhookService', () => { providers: [ WebhookService, { - provide: getRepositoryToken(Webhook, 'core'), + provide: getRepositoryToken(Webhook), useValue: mockWebhookRepository, }, ], diff --git a/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.ts b/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.ts index 9f90e43e10e..54218b1a25f 100644 --- a/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.ts +++ b/packages/twenty-server/src/engine/core-modules/webhook/webhook.service.ts @@ -10,7 +10,7 @@ import { WebhookException, WebhookExceptionCode } from './webhook.exception'; @Injectable() export class WebhookService { constructor( - @InjectRepository(Webhook, 'core') + @InjectRepository(Webhook) private readonly webhookRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.spec.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.spec.ts index b4f268726f2..d43c71758f4 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.spec.ts @@ -35,15 +35,15 @@ describe('WorkspaceInvitationService', () => { providers: [ WorkspaceInvitationService, { - provide: getRepositoryToken(AppToken, 'core'), + provide: getRepositoryToken(AppToken), useClass: Repository, }, { - provide: getRepositoryToken(UserWorkspace, 'core'), + provide: getRepositoryToken(UserWorkspace), useClass: Repository, }, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useClass: Repository, }, { @@ -90,10 +90,10 @@ describe('WorkspaceInvitationService', () => { WorkspaceInvitationService, ); appTokenRepository = module.get>( - getRepositoryToken(AppToken, 'core'), + getRepositoryToken(AppToken), ); userWorkspaceRepository = module.get>( - getRepositoryToken(UserWorkspace, 'core'), + getRepositoryToken(UserWorkspace), ); twentyConfigService = module.get(TwentyConfigService); emailService = module.get(EmailService); diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts index ac07056313e..d2dc8b0ff88 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts @@ -36,9 +36,9 @@ import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-membe @Injectable() export class WorkspaceInvitationService { constructor( - @InjectRepository(AppToken, 'core') + @InjectRepository(AppToken) private readonly appTokenRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, private readonly twentyConfigService: TwentyConfigService, private readonly emailService: EmailService, diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts index 7c96164e2c8..214c324cb71 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/workspace-invitation.module.ts @@ -16,10 +16,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permi @Module({ imports: [ DomainManagerModule, - NestjsQueryTypeOrmModule.forFeature( - [AppToken, UserWorkspace, Workspace], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([AppToken, UserWorkspace, Workspace]), FileModule, OnboardingModule, PermissionsModule, diff --git a/packages/twenty-server/src/engine/core-modules/workspace/__tests__/workspace.service.spec.ts b/packages/twenty-server/src/engine/core-modules/workspace/__tests__/workspace.service.spec.ts index d34ddec483f..c5c34f389ef 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace/__tests__/workspace.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace/__tests__/workspace.service.spec.ts @@ -42,7 +42,7 @@ describe('WorkspaceService', () => { providers: [ WorkspaceService, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: { findOne: jest.fn(), softDelete: jest.fn(), @@ -50,7 +50,7 @@ describe('WorkspaceService', () => { }, }, { - provide: getRepositoryToken(UserWorkspace, 'core'), + provide: getRepositoryToken(UserWorkspace), useValue: { find: jest.fn(), softDelete: jest.fn(), @@ -58,7 +58,7 @@ describe('WorkspaceService', () => { }, }, { - provide: getRepositoryToken(User, 'core'), + provide: getRepositoryToken(User), useValue: { softDelete: jest.fn(), }, @@ -116,13 +116,11 @@ describe('WorkspaceService', () => { service = module.get(WorkspaceService); userWorkspaceRepository = module.get>( - getRepositoryToken(UserWorkspace, 'core'), - ); - userRepository = module.get>( - getRepositoryToken(User, 'core'), + getRepositoryToken(UserWorkspace), ); + userRepository = module.get>(getRepositoryToken(User)); workspaceRepository = module.get>( - getRepositoryToken(Workspace, 'core'), + getRepositoryToken(Workspace), ); workspaceCacheStorageService = module.get( WorkspaceCacheStorageService, diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts index 86274df71d4..eacab93c94d 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts @@ -51,11 +51,11 @@ export class WorkspaceService extends TypeOrmQueryService { protected readonly logger = new Logger(WorkspaceService.name); constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(User, 'core') + @InjectRepository(User) private readonly userRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, private readonly workspaceManagerService: WorkspaceManagerService, private readonly featureFlagService: FeatureFlagService, diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts index beb93860914..4aec14be937 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts @@ -35,7 +35,7 @@ import { WorkspaceService } from './services/workspace.service'; @Module({ imports: [ TypeORMModule, - TypeOrmModule.forFeature([BillingSubscription], 'core'), + TypeOrmModule.forFeature([BillingSubscription]), NestjsQueryGraphQLModule.forFeature({ imports: [ BillingModule, @@ -43,10 +43,7 @@ import { WorkspaceService } from './services/workspace.service'; TokenModule, FileUploadModule, WorkspaceMetadataCacheModule, - NestjsQueryTypeOrmModule.forFeature( - [User, Workspace, UserWorkspace], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([User, Workspace, UserWorkspace]), UserWorkspaceModule, WorkspaceManagerModule, FeatureFlagModule, diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts index 13cf5499303..87ee2afbf6a 100644 --- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts +++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts @@ -97,7 +97,7 @@ export class WorkspaceResolver { private readonly roleService: RoleService, private readonly agentService: AgentService, private readonly viewService: ViewService, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.module.ts b/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.module.ts index ed5f744bf64..4b6c82e079f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.module.ts @@ -9,10 +9,7 @@ import { AgentRoleService } from './agent-role.service'; @Module({ imports: [ - TypeOrmModule.forFeature( - [AgentEntity, RoleEntity, RoleTargetsEntity], - 'core', - ), + TypeOrmModule.forFeature([AgentEntity, RoleEntity, RoleTargetsEntity]), ], providers: [AgentRoleService], exports: [AgentRoleService], diff --git a/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.spec.ts index 58f6f4f2493..c6e9c95eca9 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.spec.ts @@ -30,21 +30,21 @@ describe('AgentRoleService', () => { providers: [ AgentRoleService, { - provide: getRepositoryToken(AgentEntity, 'core'), + provide: getRepositoryToken(AgentEntity), useValue: { findOne: jest.fn(), save: jest.fn(), }, }, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: { findOne: jest.fn(), save: jest.fn(), }, }, { - provide: getRepositoryToken(RoleTargetsEntity, 'core'), + provide: getRepositoryToken(RoleTargetsEntity), useValue: { findOne: jest.fn(), save: jest.fn(), @@ -57,13 +57,13 @@ describe('AgentRoleService', () => { service = module.get(AgentRoleService); agentRepository = module.get>( - getRepositoryToken(AgentEntity, 'core'), + getRepositoryToken(AgentEntity), ); roleRepository = module.get>( - getRepositoryToken(RoleEntity, 'core'), + getRepositoryToken(RoleEntity), ); roleTargetsRepository = module.get>( - getRepositoryToken(RoleTargetsEntity, 'core'), + getRepositoryToken(RoleTargetsEntity), ); // Setup test data diff --git a/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.ts index ae4eb26339f..8546062bafb 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent-role/agent-role.service.ts @@ -14,11 +14,11 @@ import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity'; @Injectable() export class AgentRoleService { constructor( - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent-chat.service.ts index 87241d0bfbc..5d7cb28abfb 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent-chat.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent-chat.service.ts @@ -19,11 +19,11 @@ import { AgentTitleGenerationService } from './agent-title-generation.service'; @Injectable() export class AgentChatService { constructor( - @InjectRepository(AgentChatThreadEntity, 'core') + @InjectRepository(AgentChatThreadEntity) private readonly threadRepository: Repository, - @InjectRepository(AgentChatMessageEntity, 'core') + @InjectRepository(AgentChatMessageEntity) private readonly messageRepository: Repository, - @InjectRepository(FileEntity, 'core') + @InjectRepository(FileEntity) private readonly fileRepository: Repository, private readonly titleGenerationService: AgentTitleGenerationService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent-execution.service.ts index c717832d94c..2e5da38b174 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent-execution.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent-execution.service.ts @@ -61,10 +61,9 @@ export class AgentExecutionService { private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly aiModelRegistryService: AiModelRegistryService, private readonly agentToolGeneratorService: AgentToolGeneratorService, - - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, - @InjectRepository(FileEntity, 'core') + @InjectRepository(FileEntity) private readonly fileRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff-executor.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff-executor.service.ts index c63e199919d..7d6ea2c7d83 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff-executor.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff-executor.service.ts @@ -23,7 +23,7 @@ export class AgentHandoffExecutorService { private readonly logger = new Logger(AgentHandoffExecutorService.name); constructor( - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, private readonly agentHandoffService: AgentHandoffService, private readonly aiModelRegistryService: AiModelRegistryService, diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff.service.ts index eb920335394..ecae086d473 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent-handoff.service.ts @@ -10,9 +10,9 @@ import { AgentException, AgentExceptionCode } from './agent.exception'; @Injectable() export class AgentHandoffService { constructor( - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, - @InjectRepository(AgentHandoffEntity, 'core') + @InjectRepository(AgentHandoffEntity) private readonly agentHandoffRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent-streaming.service.ts index 8e9802a5cd9..991b9557ba1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent-streaming.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent-streaming.service.ts @@ -30,7 +30,7 @@ export class AgentStreamingService { private readonly logger = new Logger(AgentStreamingService.name); constructor( - @InjectRepository(AgentChatThreadEntity, 'core') + @InjectRepository(AgentChatThreadEntity) private readonly threadRepository: Repository, private readonly agentChatService: AgentChatService, private readonly agentExecutionService: AgentExecutionService, diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent-tool-generator.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent-tool-generator.service.ts index 243c0a916b8..3e8774cbeeb 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent-tool-generator.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent-tool-generator.service.ts @@ -17,7 +17,7 @@ export class AgentToolGeneratorService { private readonly logger = new Logger(AgentToolGeneratorService.name); constructor( - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, private readonly toolAdapterService: ToolAdapterService, private readonly toolService: ToolService, diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent.module.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent.module.ts index ea19c9a8649..47b9f254657 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent.module.ts @@ -39,19 +39,16 @@ import { AgentService } from './agent.service'; @Module({ imports: [ - TypeOrmModule.forFeature( - [ - AgentEntity, - AgentHandoffEntity, - RoleEntity, - RoleTargetsEntity, - AgentChatMessageEntity, - AgentChatThreadEntity, - FileEntity, - UserWorkspace, - ], - 'core', - ), + TypeOrmModule.forFeature([ + AgentEntity, + AgentHandoffEntity, + RoleEntity, + RoleTargetsEntity, + AgentChatMessageEntity, + AgentChatThreadEntity, + FileEntity, + UserWorkspace, + ]), AiModule, AgentRoleModule, ThrottlerModule, @@ -89,10 +86,11 @@ import { AgentService } from './agent.service'; AgentChatService, AgentStreamingService, AgentTitleGenerationService, - TypeOrmModule.forFeature( - [AgentEntity, AgentChatMessageEntity, AgentChatThreadEntity], - 'core', - ), + TypeOrmModule.forFeature([ + AgentEntity, + AgentChatMessageEntity, + AgentChatThreadEntity, + ]), AgentHandoffExecutorService, AgentHandoffService, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent.resolver.ts index ca423dcf3ef..424132190e3 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent.resolver.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent.resolver.ts @@ -29,7 +29,7 @@ import { UpdateAgentInput } from './dtos/update-agent.input'; @Resolver() export class AgentResolver { constructor( - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, private readonly agentService: AgentService, private readonly agentHandoffService: AgentHandoffService, diff --git a/packages/twenty-server/src/engine/metadata-modules/agent/agent.service.ts b/packages/twenty-server/src/engine/metadata-modules/agent/agent.service.ts index 97b5bcf00ff..ec915d2a27c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/agent/agent.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/agent/agent.service.ts @@ -16,9 +16,9 @@ import { AgentException, AgentExceptionCode } from './agent.exception'; @Injectable() export class AgentService { constructor( - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, private readonly agentRoleService: AgentRoleService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.module.ts b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.module.ts index 0152959c83b..09085746bb3 100644 --- a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.module.ts @@ -5,7 +5,7 @@ import { DataSourceEntity } from './data-source.entity'; import { DataSourceService } from './data-source.service'; @Module({ - imports: [TypeOrmModule.forFeature([DataSourceEntity], 'core')], + imports: [TypeOrmModule.forFeature([DataSourceEntity])], providers: [DataSourceService], exports: [DataSourceService], }) diff --git a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts index 26cebbd3c86..55672ceee6c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/data-source/data-source.service.ts @@ -13,7 +13,7 @@ import { DataSourceEntity } from './data-source.entity'; @Injectable() export class DataSourceService { constructor( - @InjectRepository(DataSourceEntity, 'core') + @InjectRepository(DataSourceEntity) private readonly dataSourceMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts index 8805fc08b20..7c80ac53e90 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts @@ -48,10 +48,10 @@ import { FieldMetadataService } from './services/field-metadata.service'; imports: [ NestjsQueryGraphQLModule.forFeature({ imports: [ - NestjsQueryTypeOrmModule.forFeature( - [FieldMetadataEntity, ObjectMetadataEntity], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([ + FieldMetadataEntity, + ObjectMetadataEntity, + ]), WorkspaceMigrationModule, WorkspaceMigrationRunnerModule, WorkspaceMetadataVersionModule, diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service-v2.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service-v2.ts index 4cee4d64676..059c53c6ddd 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service-v2.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service-v2.ts @@ -32,7 +32,7 @@ import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspa @Injectable() export class FieldMetadataServiceV2 { constructor( - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService, private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService, diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts index 24ab6dbc1a7..c60665125eb 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts @@ -85,9 +85,9 @@ type GenerateMigrationArgs = { @Injectable() export class FieldMetadataService extends TypeOrmQueryService { constructor( - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMigrationFactory: WorkspaceMigrationFactory, private readonly workspaceMigrationService: WorkspaceMigrationService, diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts index 72d19b00d77..7ea4a42e587 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts @@ -21,7 +21,7 @@ export class IsFieldMetadataDefaultValue implements ValidatorConstraintInterface { constructor( - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly loggerService: LoggerService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts index 9f40fa96ce4..f9f4a48756a 100644 --- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts +++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts @@ -16,7 +16,7 @@ export class IsFieldMetadataOptions { private validationErrors: string[] = []; constructor( - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts index 45d4112ee01..25143df4594 100644 --- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts @@ -16,13 +16,13 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace- @Module({ imports: [ - TypeOrmModule.forFeature([IndexMetadataEntity], 'core'), + TypeOrmModule.forFeature([IndexMetadataEntity]), NestjsQueryGraphQLModule.forFeature({ imports: [ - NestjsQueryTypeOrmModule.forFeature( - [IndexMetadataEntity, IndexFieldMetadataEntity], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([ + IndexMetadataEntity, + IndexFieldMetadataEntity, + ]), WorkspaceMigrationModule, ], services: [IndexMetadataService], diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.service.ts index 0713468d8b1..2b69c6ce6da 100644 --- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.service.ts @@ -34,7 +34,7 @@ import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target @Injectable() export class IndexMetadataService { constructor( - @InjectRepository(IndexMetadataEntity, 'core') + @InjectRepository(IndexMetadataEntity) private readonly indexMetadataRepository: Repository, private readonly workspaceMigrationService: WorkspaceMigrationService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/__tests__/before-update-one-object.hook.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/__tests__/before-update-one-object.hook.spec.ts index b6af9c007b6..908de9ad2bf 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/__tests__/before-update-one-object.hook.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/hooks/__tests__/before-update-one-object.hook.spec.ts @@ -42,7 +42,7 @@ describe('BeforeUpdateOneObject', () => { }, }, { - provide: getRepositoryToken(FieldMetadataEntity, 'core'), + provide: getRepositoryToken(FieldMetadataEntity), useValue: { findBy: jest.fn(), }, @@ -57,7 +57,7 @@ describe('BeforeUpdateOneObject', () => { ObjectMetadataService, ); fieldMetadataRepository = module.get>( - getRepositoryToken(FieldMetadataEntity, 'core'), + getRepositoryToken(FieldMetadataEntity), ); }); diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata-v2.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata-v2.service.ts index 1bf8e6da86f..3b2f729e098 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata-v2.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata-v2.service.ts @@ -37,7 +37,7 @@ export class ObjectMetadataServiceV2 { private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService, private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService, private readonly objectMetadataRelatedRecordsService: ObjectMetadataRelatedRecordsService, - @InjectRepository(ViewEntity, 'core') + @InjectRepository(ViewEntity) private readonly viewRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts index 6ead17a4892..096f19151c1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts @@ -52,11 +52,11 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa NestjsQueryGraphQLModule.forFeature({ imports: [ TypeORMModule, - NestjsQueryTypeOrmModule.forFeature( - [ObjectMetadataEntity, FieldMetadataEntity], - 'core', - ), - TypeOrmModule.forFeature([FeatureFlag, ViewEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ + ObjectMetadataEntity, + FieldMetadataEntity, + ]), + TypeOrmModule.forFeature([FeatureFlag, ViewEntity]), DataSourceModule, WorkspaceMigrationModule, WorkspaceMigrationRunnerModule, diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts index eac968b7375..d8303c0a2a5 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts @@ -59,7 +59,7 @@ import { type CreateObjectInput } from './dtos/create-object.input'; @Injectable() export class ObjectMetadataService extends TypeOrmQueryService { constructor( - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, private readonly dataSourceService: DataSourceService, diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-field-relation.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-field-relation.service.ts index 58a2f91ce99..72b946594aa 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-field-relation.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-field-relation.service.ts @@ -39,9 +39,9 @@ export const DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS = [ @Injectable() export class ObjectMetadataFieldRelationService { constructor( - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts index 162dce2cb03..5422c8de6be 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts @@ -32,7 +32,7 @@ import { RELATION_MIGRATION_PRIORITY_PREFIX } from 'src/engine/workspace-manager @Injectable() export class ObjectMetadataMigrationService { constructor( - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMigrationService: WorkspaceMigrationService, private readonly workspaceMigrationFactory: WorkspaceMigrationFactory, diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts index 5967c9c75fa..e2ec516fb6f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts @@ -31,20 +31,20 @@ describe('ObjectPermissionService', () => { providers: [ ObjectPermissionService, { - provide: getRepositoryToken(ObjectPermissionEntity, 'core'), + provide: getRepositoryToken(ObjectPermissionEntity), useValue: { upsert: jest.fn(), find: jest.fn(), }, }, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: { findOne: jest.fn(), }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { find: jest.fn(), }, @@ -66,9 +66,9 @@ describe('ObjectPermissionService', () => { service = module.get(ObjectPermissionService); objectPermissionRepository = module.get( - getRepositoryToken(ObjectPermissionEntity, 'core'), + getRepositoryToken(ObjectPermissionEntity), ); - roleRepository = module.get(getRepositoryToken(RoleEntity, 'core')); + roleRepository = module.get(getRepositoryToken(RoleEntity)); workspacePermissionsCacheService = module.get( WorkspacePermissionsCacheService, ); diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts index 25c906f9f51..a578c8c6060 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts @@ -77,13 +77,13 @@ describe('FieldPermissionService', () => { providers: [ FieldPermissionService, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: { findOne: jest.fn(), }, }, { - provide: getRepositoryToken(FieldPermissionEntity, 'core'), + provide: getRepositoryToken(FieldPermissionEntity), useValue: { find: jest.fn(), upsert: jest.fn(), @@ -104,7 +104,7 @@ describe('FieldPermissionService', () => { }, }, { - provide: getRepositoryToken(FieldMetadataEntity, 'core'), + provide: getRepositoryToken(FieldMetadataEntity), useValue: { find: jest.fn(), }, @@ -114,11 +114,11 @@ describe('FieldPermissionService', () => { service = module.get(FieldPermissionService); fieldPermissionsRepository = module.get( - getRepositoryToken(FieldPermissionEntity, 'core'), + getRepositoryToken(FieldPermissionEntity), ); - roleRepository = module.get(getRepositoryToken(RoleEntity, 'core')); + roleRepository = module.get(getRepositoryToken(RoleEntity)); fieldMetadataRepository = module.get( - getRepositoryToken(FieldMetadataEntity, 'core'), + getRepositoryToken(FieldMetadataEntity), ); workspacePermissionsCacheService = module.get( WorkspacePermissionsCacheService, diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/field-permission.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/field-permission.service.ts index b00cd86edb2..c0b81ed928f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/field-permission.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/field-permission.service.ts @@ -28,11 +28,11 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage @Injectable() export class FieldPermissionService { constructor( - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, - @InjectRepository(FieldPermissionEntity, 'core') + @InjectRepository(FieldPermissionEntity) private readonly fieldPermissionsRepository: Repository, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly workspaceCacheStorageService: WorkspaceCacheStorageService, diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.module.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.module.ts index 919e555f3ca..75a4b8018ea 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.module.ts @@ -13,16 +13,13 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/ @Module({ imports: [ - TypeOrmModule.forFeature( - [ - ObjectPermissionEntity, - RoleEntity, - ObjectMetadataEntity, - FieldPermissionEntity, - FieldMetadataEntity, - ], - 'core', - ), + TypeOrmModule.forFeature([ + ObjectPermissionEntity, + RoleEntity, + ObjectMetadataEntity, + FieldPermissionEntity, + FieldMetadataEntity, + ]), WorkspaceCacheStorageModule, WorkspacePermissionsCacheModule, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.service.ts index a4686a85fe9..2a531911d7b 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/object-permission.service.ts @@ -20,11 +20,11 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage export class ObjectPermissionService { constructor( - @InjectRepository(ObjectPermissionEntity, 'core') + @InjectRepository(ObjectPermissionEntity) private readonly objectPermissionRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly workspaceCacheStorageService: WorkspaceCacheStorageService, diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts index 9b8be9e047a..9b54eb26d74 100644 --- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.module.ts @@ -8,7 +8,7 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor @Module({ imports: [ - TypeOrmModule.forFeature([PermissionFlagEntity, RoleEntity], 'core'), + TypeOrmModule.forFeature([PermissionFlagEntity, RoleEntity]), WorkspacePermissionsCacheModule, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts index 012819df99b..59cf9ce4a22 100644 --- a/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/permission-flag/permission-flag.service.ts @@ -16,9 +16,9 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo export class PermissionFlagService { constructor( - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts index f3143c15ce7..7801b532775 100644 --- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.module.ts @@ -14,12 +14,14 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor @Module({ imports: [ - TypeOrmModule.forFeature( - [RoleEntity, RoleTargetsEntity, ApiKey, Workspace], - 'core', - ), + TypeOrmModule.forFeature([ + RoleEntity, + RoleTargetsEntity, + ApiKey, + Workspace, + ]), FeatureFlagModule, - TypeOrmModule.forFeature([UserWorkspace], 'core'), + TypeOrmModule.forFeature([UserWorkspace]), UserRoleModule, WorkspacePermissionsCacheModule, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts index 7a481c30f21..8867fccc423 100644 --- a/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/permissions/permissions.service.ts @@ -27,7 +27,7 @@ export class PermissionsService { private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly apiKeyRoleService: ApiKeyRoleService, private readonly featureFlagService: FeatureFlagService, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts index 73d1faac782..11610515ddb 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.module.ts @@ -13,10 +13,10 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works @Module({ imports: [ JwtModule, - TypeOrmModule.forFeature([RemoteServerEntity], 'core'), + TypeOrmModule.forFeature([RemoteServerEntity]), RemoteTableModule, WorkspaceDataSourceModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), + TypeOrmModule.forFeature([FeatureFlag]), ], providers: [ RemoteServerService, diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts index aaf57e74e66..63e2a5842ea 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-server.service.ts @@ -33,17 +33,17 @@ import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/auth-contex @Injectable() export class RemoteServerService { constructor( - @InjectRepository(RemoteServerEntity, 'core') + @InjectRepository(RemoteServerEntity) private readonly remoteServerRepository: Repository< RemoteServerEntity >, - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, private readonly jwtWrapperService: JwtWrapperService, private readonly foreignDataWrapperServerQueryFactory: ForeignDataWrapperServerQueryFactory, private readonly remoteTableService: RemoteTableService, private readonly workspaceDataSourceService: WorkspaceDataSourceService, - @InjectRepository(FeatureFlag, 'core') + @InjectRepository(FeatureFlag) private readonly featureFlagRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.module.ts index 05f42f67f00..0706edaa594 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/distant-table/distant-table.module.ts @@ -8,7 +8,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works @Module({ imports: [ WorkspaceDataSourceModule, - TypeOrmModule.forFeature([RemoteServerEntity], 'core'), + TypeOrmModule.forFeature([RemoteServerEntity]), ], providers: [DistantTableService], exports: [DistantTableService], diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module.ts index 5a34f77c5d2..b8c38d096b0 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.module.ts @@ -8,10 +8,7 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace- @Module({ imports: [ - TypeOrmModule.forFeature( - [ObjectMetadataEntity, FieldMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([ObjectMetadataEntity, FieldMetadataEntity]), WorkspaceMigrationModule, ], providers: [RemoteTableRelationsService], diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts index 5902fcaa49f..458d1fba560 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts @@ -24,10 +24,10 @@ import { createForeignKeyDeterministicUuid } from 'src/engine/workspace-manager/ @Injectable() export class RemoteTableRelationsService { constructor( - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMigrationService: WorkspaceMigrationService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts index 21241bd822f..a595495adc1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.module.ts @@ -17,7 +17,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works @Module({ imports: [ DistantTableModule, - TypeOrmModule.forFeature([RemoteServerEntity, RemoteTableEntity], 'core'), + TypeOrmModule.forFeature([RemoteServerEntity, RemoteTableEntity]), DataSourceModule, ObjectMetadataModule, FieldMetadataModule, diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts index cfc04b420fa..34eb6ede359 100644 --- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table.service.ts @@ -49,9 +49,9 @@ export class RemoteTableService { private readonly logger = new Logger(RemoteTableService.name); constructor( - @InjectRepository(RemoteTableEntity, 'core') + @InjectRepository(RemoteTableEntity) private readonly remoteTableRepository: Repository, - @InjectRepository(RemoteServerEntity, 'core') + @InjectRepository(RemoteServerEntity) private readonly remoteServerRepository: Repository< RemoteServerEntity >, diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts index f5b03a26c3b..9fde81f25c9 100644 --- a/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/role/role.module.ts @@ -18,8 +18,8 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor @Module({ imports: [ - TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity], 'core'), - TypeOrmModule.forFeature([UserWorkspace, Workspace], 'core'), + TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity]), + TypeOrmModule.forFeature([UserWorkspace, Workspace]), UserRoleModule, AgentRoleModule, PermissionsModule, diff --git a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts index 97e60dfe471..5236907392c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/role/role.service.ts @@ -23,9 +23,9 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo export class RoleService { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, private readonly userRoleService: UserRoleService, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, diff --git a/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.module.ts b/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.module.ts index bc382dc99d3..d37384c55ca 100644 --- a/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.module.ts @@ -10,10 +10,10 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace- @Module({ imports: [ - NestjsQueryTypeOrmModule.forFeature( - [ObjectMetadataEntity, FieldMetadataEntity], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([ + ObjectMetadataEntity, + FieldMetadataEntity, + ]), IndexMetadataModule, WorkspaceMigrationModule, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.service.ts b/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.service.ts index 9a36dc3f3e8..4b55fbae79e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/search-vector/search-vector.service.ts @@ -35,11 +35,11 @@ import { type SearchableFieldType } from 'src/engine/workspace-manager/workspace @Injectable() export class SearchVectorService { constructor( - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, private readonly tsVectorColumnActionFactory: TsVectorColumnActionFactory, private readonly indexMetadataService: IndexMetadataService, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly workspaceMigrationService: WorkspaceMigrationService, private readonly workspaceMigrationFactory: WorkspaceMigrationFactory, diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.module.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.module.ts index ab6c3ffab6e..2f08044c887 100644 --- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.module.ts @@ -16,8 +16,8 @@ import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverles @Module({ imports: [ FileUploadModule, - NestjsQueryTypeOrmModule.forFeature([ServerlessFunctionEntity], 'core'), - TypeOrmModule.forFeature([FeatureFlag], 'core'), + NestjsQueryTypeOrmModule.forFeature([ServerlessFunctionEntity]), + TypeOrmModule.forFeature([FeatureFlag]), FileModule, ThrottlerModule, AuditModule, diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts index 15848da86a3..d72e3ac6e7d 100644 --- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts +++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts @@ -30,7 +30,7 @@ import { serverlessFunctionGraphQLApiExceptionHandler } from 'src/engine/metadat export class ServerlessFunctionResolver { constructor( private readonly serverlessFunctionService: ServerlessFunctionService, - @InjectRepository(ServerlessFunctionEntity, 'core') + @InjectRepository(ServerlessFunctionEntity) private readonly serverlessFunctionRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts index 2fea0781b25..7804732edf6 100644 --- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts @@ -40,7 +40,7 @@ export class ServerlessFunctionService { constructor( private readonly fileStorageService: FileStorageService, private readonly serverlessService: ServerlessService, - @InjectRepository(ServerlessFunctionEntity, 'core') + @InjectRepository(ServerlessFunctionEntity) private readonly serverlessFunctionRepository: Repository, private readonly throttlerService: ThrottlerService, private readonly twentyConfigService: TwentyConfigService, diff --git a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts index 2706a0ba48b..3e5bc02b115 100644 --- a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.module.ts @@ -9,8 +9,8 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor @Module({ imports: [ - TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity], 'core'), - TypeOrmModule.forFeature([UserWorkspace], 'core'), + TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity]), + TypeOrmModule.forFeature([UserWorkspace]), WorkspacePermissionsCacheModule, ], providers: [UserRoleService], diff --git a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts index dd3524ee689..79b6feafc5a 100644 --- a/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/user-role/user-role.service.ts @@ -18,11 +18,11 @@ import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-membe export class UserRoleService { constructor( - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module.ts index c0a5470c708..f2b0128a9db 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.module.ts @@ -8,7 +8,7 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/ @Module({ imports: [ - TypeOrmModule.forFeature([Workspace, FeatureFlag], 'core'), + TypeOrmModule.forFeature([Workspace, FeatureFlag]), WorkspaceCacheStorageModule, ], providers: [WorkspaceFeatureFlagsMapCacheService], diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.service.ts index 71f6413f5c0..4e2a80ab695 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.service.ts @@ -18,7 +18,7 @@ export class WorkspaceFeatureFlagsMapCacheService { constructor( private readonly workspaceCacheStorageService: WorkspaceCacheStorageService, - @InjectRepository(FeatureFlag, 'core') + @InjectRepository(FeatureFlag) private readonly featureFlagRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts index efb00cff325..3651e7b2b63 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts @@ -32,12 +32,12 @@ export class WorkspaceMetadataCacheService { logger = new Logger(WorkspaceMetadataCacheService.name); constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly workspaceCacheStorageService: WorkspaceCacheStorageService, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(IndexMetadataEntity, 'core') + @InjectRepository(IndexMetadataEntity) private readonly indexMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/workspace-metadata-cache.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/workspace-metadata-cache.module.ts index ce0a478d419..b167f682a4e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/workspace-metadata-cache.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/workspace-metadata-cache.module.ts @@ -9,10 +9,11 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/ @Module({ imports: [ - TypeOrmModule.forFeature( - [Workspace, ObjectMetadataEntity, IndexMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + ObjectMetadataEntity, + IndexMetadataEntity, + ]), WorkspaceCacheStorageModule, ], exports: [WorkspaceMetadataCacheService], diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service.ts index 35b691af5f0..0f16b4caf7f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service.ts @@ -16,7 +16,7 @@ export class WorkspaceMetadataVersionService { logger = new Logger(WorkspaceMetadataCacheService.name); constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts index 350d22b56b3..1eec23acb0d 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module.ts @@ -8,7 +8,7 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/ @Module({ imports: [ - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), WorkspaceCacheStorageModule, WorkspaceMetadataCacheModule, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts index 6094e4f0c56..0a129943307 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.module.ts @@ -8,7 +8,7 @@ import { WorkspaceMigrationEntity } from './workspace-migration.entity'; import { WorkspaceMigrationService } from './workspace-migration.service'; @Module({ - imports: [TypeOrmModule.forFeature([WorkspaceMigrationEntity], 'core')], + imports: [TypeOrmModule.forFeature([WorkspaceMigrationEntity])], providers: [ ...workspaceColumnActionFactories, WorkspaceMigrationFactory, diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.service.ts index 5bef714062e..7af7b39005a 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.service.ts @@ -11,7 +11,7 @@ import { @Injectable() export class WorkspaceMigrationService { constructor( - @InjectRepository(WorkspaceMigrationEntity, 'core') + @InjectRepository(WorkspaceMigrationEntity) private readonly workspaceMigrationRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module.ts index a6af4ebaaf1..54f829e794c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module.ts @@ -13,11 +13,12 @@ import { WorkspacePermissionsCacheService } from './workspace-permissions-cache. @Module({ imports: [ - TypeOrmModule.forFeature([Workspace], 'core'), - TypeOrmModule.forFeature( - [ObjectMetadataEntity, RoleEntity, RoleTargetsEntity], - 'core', - ), + TypeOrmModule.forFeature([Workspace]), + TypeOrmModule.forFeature([ + ObjectMetadataEntity, + RoleEntity, + RoleTargetsEntity, + ]), WorkspaceCacheStorageModule, WorkspaceFeatureFlagsMapCacheModule, ], diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service.ts index 4f760c05958..45f347260ff 100644 --- a/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.service.ts @@ -38,11 +38,11 @@ export class WorkspacePermissionsCacheService { logger = new Logger(WorkspacePermissionsCacheService.name); constructor( - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, private readonly workspacePermissionsCacheStorageService: WorkspacePermissionsCacheStorageService, private readonly workspaceFeatureFlagsMapCacheService: WorkspaceFeatureFlagsMapCacheService, diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts index e9dd3cfbb19..e31de40b4a0 100644 --- a/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts +++ b/packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts @@ -50,7 +50,7 @@ export class WorkspaceDatasourceFactory { private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly workspacePermissionsCacheStorageService: WorkspacePermissionsCacheStorageService, private readonly workspaceFeatureFlagsMapCacheService: WorkspaceFeatureFlagsMapCacheService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly workspaceEventEmitter: WorkspaceEventEmitter, ) {} diff --git a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts index 3c43232cbf5..039dc9443ee 100644 --- a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts +++ b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.manager.ts @@ -13,7 +13,7 @@ import { convertClassNameToObjectMetadataName } from 'src/engine/workspace-manag @Injectable() export class TwentyORMManager { constructor( - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, private readonly workspaceDataSourceFactory: WorkspaceDatasourceFactory, private readonly scopedWorkspaceContextFactory: ScopedWorkspaceContextFactory, diff --git a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts index 9e2860c6e23..5958145586d 100644 --- a/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts +++ b/packages/twenty-server/src/engine/twenty-orm/twenty-orm.module.ts @@ -23,10 +23,11 @@ import { PgPoolSharedModule } from './pg-shared-pool/pg-shared-pool.module'; @Global() @Module({ imports: [ - TypeOrmModule.forFeature( - [ObjectMetadataEntity, RoleTargetsEntity, Workspace], - 'core', - ), + TypeOrmModule.forFeature([ + ObjectMetadataEntity, + RoleTargetsEntity, + Workspace, + ]), DataSourceModule, WorkspaceCacheStorageModule, WorkspaceMetadataCacheModule, diff --git a/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts index fffc4c1054e..cd7fd615d26 100644 --- a/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts +++ b/packages/twenty-server/src/engine/workspace-manager/__tests__/workspace-manager.service.spec.ts @@ -40,45 +40,45 @@ describe('WorkspaceManagerService', () => { WorkspaceMigrationService, DataSourceService, { - provide: getRepositoryToken(Workspace, 'core'), + provide: getRepositoryToken(Workspace), useValue: {}, }, { - provide: getRepositoryToken(UserWorkspace, 'core'), + provide: getRepositoryToken(UserWorkspace), useValue: {}, }, { - provide: getRepositoryToken(FieldMetadataEntity, 'core'), + provide: getRepositoryToken(FieldMetadataEntity), useValue: { delete: jest.fn(), }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { delete: jest.fn(), }, }, { - provide: getRepositoryToken(WorkspaceMigrationEntity, 'core'), + provide: getRepositoryToken(WorkspaceMigrationEntity), useValue: { delete: jest.fn(), }, }, { - provide: getRepositoryToken(DataSourceEntity, 'core'), + provide: getRepositoryToken(DataSourceEntity), useValue: { delete: jest.fn(), }, }, { - provide: getRepositoryToken(RoleTargetsEntity, 'core'), + provide: getRepositoryToken(RoleTargetsEntity), useValue: { delete: jest.fn(), }, }, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: { delete: jest.fn(), }, @@ -133,21 +133,21 @@ describe('WorkspaceManagerService', () => { ); workspaceMigrationRepository = module.get< Repository - >(getRepositoryToken(WorkspaceMigrationEntity, 'core')); + >(getRepositoryToken(WorkspaceMigrationEntity)); dataSourceRepository = module.get>( - getRepositoryToken(DataSourceEntity, 'core'), + getRepositoryToken(DataSourceEntity), ); workspaceFieldMetadataRepository = module.get< Repository - >(getRepositoryToken(FieldMetadataEntity, 'core')); + >(getRepositoryToken(FieldMetadataEntity)); workspaceDataSourceService = module.get( WorkspaceDataSourceService, ); roleTargetsRepository = module.get>( - getRepositoryToken(RoleTargetsEntity, 'core'), + getRepositoryToken(RoleTargetsEntity), ); roleRepository = module.get>( - getRepositoryToken(RoleEntity, 'core'), + getRepositoryToken(RoleEntity), ); }); diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts index 0b2f9c667ef..16e6a40a09e 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/services/dev-seeder-permissions.service.ts @@ -29,9 +29,9 @@ export class DevSeederPermissionsService { private readonly roleService: RoleService, private readonly userRoleService: UserRoleService, private readonly objectPermissionService: ObjectPermissionService, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, private readonly typeORMService: TypeORMService, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts index 44bf860fe79..64ff1f712ab 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/dev-seeder.module.ts @@ -35,7 +35,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp ApiKeyModule, FeatureFlagModule, WorkspaceSyncMetadataModule, - TypeOrmModule.forFeature([Workspace, ObjectMetadataEntity], 'core'), + TypeOrmModule.forFeature([Workspace, ObjectMetadataEntity]), ObjectPermissionModule, WorkspacePermissionsCacheModule, ], diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-onboarding-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-onboarding-workspaces.command.ts index 6105c0ea023..aba88d1c814 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-onboarding-workspaces.command.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-onboarding-workspaces.command.ts @@ -20,7 +20,7 @@ export class CleanOnboardingWorkspacesCommand extends MigrationCommandRunner { constructor( private readonly cleanerWorkspaceService: CleanerWorkspaceService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) { super(); diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-suspended-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-suspended-workspaces.command.ts index 0257570cbf2..d11d0be7cc1 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-suspended-workspaces.command.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/clean-suspended-workspaces.command.ts @@ -20,7 +20,7 @@ export class CleanSuspendedWorkspacesCommand extends MigrationCommandRunner { constructor( private readonly cleanerWorkspaceService: CleanerWorkspaceService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, ) { super(); diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts index 47127e950a5..d195bb953c2 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts @@ -21,7 +21,7 @@ export class DeleteWorkspacesCommand extends CommandRunner { private readonly logger = new Logger(DeleteWorkspacesCommand.name); constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly dataSourceService: DataSourceService, ) { diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-onboarding-workspaces.job.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-onboarding-workspaces.job.ts index 58f0fd65e04..049176884d7 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-onboarding-workspaces.job.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-onboarding-workspaces.job.ts @@ -15,7 +15,7 @@ import { CleanerWorkspaceService } from 'src/engine/workspace-manager/workspace- export class CleanOnboardingWorkspacesJob { constructor( private readonly cleanerWorkspaceService: CleanerWorkspaceService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts index f19307771ff..6079dfa7b51 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/crons/clean-suspended-workspaces.job.ts @@ -15,7 +15,7 @@ import { CleanerWorkspaceService } from 'src/engine/workspace-manager/workspace- export class CleanSuspendedWorkspacesJob { constructor( private readonly cleanerWorkspaceService: CleanerWorkspaceService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/jobs/clean-workspace-deletion-warning-user-vars.job.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/jobs/clean-workspace-deletion-warning-user-vars.job.ts index ce28665f9c1..abb6cce6f98 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/jobs/clean-workspace-deletion-warning-user-vars.job.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/jobs/clean-workspace-deletion-warning-user-vars.job.ts @@ -28,7 +28,7 @@ export class CleanWorkspaceDeletionWarningUserVarsJob { constructor( private readonly userService: UserService, private readonly userVarsService: UserVarsService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts index dbc35bbf35a..e1be5e16408 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts @@ -43,12 +43,12 @@ export class CleanerWorkspaceService { private readonly userVarsService: UserVarsService, private readonly userService: UserService, private readonly emailService: EmailService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(BillingSubscription, 'core') + @InjectRepository(BillingSubscription) private readonly billingSubscriptionRepository: Repository, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, ) { this.inactiveDaysBeforeSoftDelete = this.twentyConfigService.get( diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts index 7a24cba9888..5b31586d791 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts @@ -20,10 +20,7 @@ import { CleanerWorkspaceService } from 'src/engine/workspace-manager/workspace- @Module({ imports: [ - TypeOrmModule.forFeature( - [Workspace, UserWorkspace, BillingSubscription], - 'core', - ), + TypeOrmModule.forFeature([Workspace, UserWorkspace, BillingSubscription]), WorkspaceModule, DataSourceModule, UserVarsModule, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts index 89e84841705..f886e8fd8f1 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/workspace-health.service.ts @@ -26,7 +26,7 @@ export class WorkspaceHealthService { private readonly logger = new Logger(WorkspaceHealthService.name); constructor( - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, private readonly dataSourceService: DataSourceService, private readonly objectMetadataService: ObjectMetadataService, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts index 63a660dd47d..95764eb8a98 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts @@ -35,13 +35,14 @@ import { WorkspaceManagerService } from './workspace-manager.service'; FeatureFlagModule, PermissionsModule, AgentModule, - TypeOrmModule.forFeature([UserWorkspace, Workspace], 'core'), + TypeOrmModule.forFeature([UserWorkspace, Workspace]), RoleModule, UserRoleModule, - TypeOrmModule.forFeature( - [FieldMetadataEntity, RoleTargetsEntity, RoleEntity], - 'core', - ), + TypeOrmModule.forFeature([ + FieldMetadataEntity, + RoleTargetsEntity, + RoleEntity, + ]), ], exports: [WorkspaceManagerService], providers: [WorkspaceManagerService], diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts index 932ff3f15cd..ff1f201ab4b 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts @@ -33,18 +33,18 @@ export class WorkspaceManagerService { private readonly objectMetadataService: ObjectMetadataService, private readonly dataSourceService: DataSourceService, private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, private readonly roleService: RoleService, private readonly userRoleService: UserRoleService, private readonly featureFlagService: FeatureFlagService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, private readonly agentService: AgentService, ) {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/services/workspace-migration-runner-v2.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/services/workspace-migration-runner-v2.service.ts index edb6c188324..98105fbe58e 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/services/workspace-migration-runner-v2.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/services/workspace-migration-runner-v2.service.ts @@ -17,7 +17,7 @@ export class WorkspaceMigrationRunnerV2Service { private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService, private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService, private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService, - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, private readonly workspaceMigrationRunnerActionHandlerRegistry: WorkspaceMigrationRunnerActionHandlerRegistryService, ) {} diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts index ccbd69fce36..7d27d901cad 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts @@ -21,7 +21,7 @@ import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.ser }) export class SyncWorkspaceMetadataCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService, private readonly dataSourceService: DataSourceService, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts index a657b705c92..b1a05cdf686 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts @@ -20,7 +20,7 @@ import { SyncWorkspaceMetadataCommand } from './sync-workspace-metadata.command' DataSourceModule, WorkspaceDataSourceModule, FeatureFlagModule, - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), SyncWorkspaceLoggerModule, ], providers: [SyncWorkspaceMetadataCommand], diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts index 7afe1461ac2..fe37e9f993d 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module.ts @@ -30,12 +30,13 @@ import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/works FeatureFlagModule, WorkspaceMigrationBuilderModule, WorkspaceMigrationRunnerModule, - TypeOrmModule.forFeature( - [FieldMetadataEntity, ObjectMetadataEntity, WorkspaceMigrationEntity], - 'core', - ), + TypeOrmModule.forFeature([ + FieldMetadataEntity, + ObjectMetadataEntity, + WorkspaceMigrationEntity, + ]), DataSourceModule, - TypeOrmModule.forFeature([Workspace, FeatureFlag], 'core'), + TypeOrmModule.forFeature([Workspace, FeatureFlag]), WorkspaceMetadataVersionModule, ], providers: [ diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts index 2e90a321f30..f01d158f8c2 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts @@ -29,7 +29,7 @@ export class WorkspaceSyncMetadataService { private readonly logger = new Logger(WorkspaceSyncMetadataService.name); constructor( - @InjectDataSource('core') + @InjectDataSource() private readonly coreDataSource: DataSource, private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService, private readonly workspaceSyncObjectMetadataService: WorkspaceSyncObjectMetadataService, diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts index fe15d4e2ae9..254f187e450 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/calendar-event-import-manager.module.ts @@ -37,10 +37,7 @@ import { RefreshTokensManagerModule } from 'src/modules/connected-account/refres imports: [ ObjectMetadataRepositoryModule.forFeature([BlocklistWorkspaceEntity]), CalendarEventParticipantManagerModule, - TypeOrmModule.forFeature( - [FeatureFlag, Workspace, DataSourceEntity], - 'core', - ), + TypeOrmModule.forFeature([FeatureFlag, Workspace, DataSourceEntity]), WorkspaceDataSourceModule, CalendarEventCleanerModule, GoogleCalendarDriverModule, diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts index d403a109d58..47751514098 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts @@ -26,7 +26,7 @@ export const CALENDAR_EVENT_LIST_FETCH_CRON_PATTERN = '*/5 * * * *'; }) export class CalendarEventListFetchCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.calendarQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts index e374c89adb6..91367a4538b 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts @@ -24,7 +24,7 @@ export const CALENDAR_EVENTS_IMPORT_CRON_PATTERN = '*/1 * * * *'; }) export class CalendarEventsImportCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.calendarQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts index 69273fc97fc..836f3cb4bc2 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts @@ -21,7 +21,7 @@ export const CALENDAR_ONGOING_STALE_CRON_PATTERN = '0 * * * *'; @Processor(MessageQueue.cronQueue) export class CalendarOngoingStaleCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.calendarQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts index af6f161f071..7cfccca7559 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts @@ -21,11 +21,8 @@ import { MatchParticipantModule } from 'src/modules/match-participant/match-part imports: [ WorkspaceDataSourceModule, WorkspaceModule, - TypeOrmModule.forFeature( - [ObjectMetadataEntity, FieldMetadataEntity], - 'core', - ), - NestjsQueryTypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([ObjectMetadataEntity, FieldMetadataEntity]), + NestjsQueryTypeOrmModule.forFeature([Workspace]), ContactCreationManagerModule, MatchParticipantModule, ], diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job.ts index a34554c5e29..b3ddf70d329 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job.ts @@ -25,7 +25,7 @@ export type CalendarEventParticipantMatchParticipantJobData = { }) export class CalendarEventParticipantMatchParticipantJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly matchParticipantService: MatchParticipantService, ) {} diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts index 781ad9ad99f..e558e6b7fa5 100644 --- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts +++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts @@ -17,7 +17,7 @@ export class CalendarEventParticipantListener { constructor( @InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity) private readonly timelineActivityRepository: TimelineActivityRepository, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/calendar/common/calendar-common.module.ts b/packages/twenty-server/src/modules/calendar/common/calendar-common.module.ts index 4ca6776242a..242bb1ae2f3 100644 --- a/packages/twenty-server/src/modules/calendar/common/calendar-common.module.ts +++ b/packages/twenty-server/src/modules/calendar/common/calendar-common.module.ts @@ -10,7 +10,7 @@ import { ConnectedAccountModule } from 'src/modules/connected-account/connected- @Module({ imports: [ WorkspaceDataSourceModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), + TypeOrmModule.forFeature([FeatureFlag]), ConnectedAccountModule, MetricsModule, ], diff --git a/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts b/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts index bdea02f86f5..21898e4157b 100644 --- a/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts +++ b/packages/twenty-server/src/modules/connected-account/imap-api/imap-apis.module.ts @@ -12,7 +12,7 @@ import { ImapSmtpCalDavAPIService } from 'src/modules/connected-account/services @Module({ imports: [ - TypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + TypeOrmModule.forFeature([ObjectMetadataEntity]), MessageQueueModule, WorkspaceEventEmitterModule, TwentyConfigModule, diff --git a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts index a760bf5d647..aad66815a88 100644 --- a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts +++ b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook.ts @@ -21,7 +21,7 @@ export class ConnectedAccountDeleteOnePreQueryHook constructor( private readonly twentyORMManager: TwentyORMManager, private readonly workspaceEventEmitter: WorkspaceEventEmitter, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts index ec13073fcbe..89d8cdaabaa 100644 --- a/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts +++ b/packages/twenty-server/src/modules/connected-account/query-hooks/connected-account-query-hook.module.ts @@ -6,9 +6,7 @@ import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadat import { ConnectedAccountDeleteOnePreQueryHook } from 'src/modules/connected-account/query-hooks/connected-account-delete-one.pre-query.hook'; @Module({ - imports: [ - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), - ], + imports: [NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity])], providers: [ConnectedAccountDeleteOnePreQueryHook], }) export class ConnectedAccountQueryHookModule {} diff --git a/packages/twenty-server/src/modules/contact-creation-manager/contact-creation-manager.module.ts b/packages/twenty-server/src/modules/contact-creation-manager/contact-creation-manager.module.ts index 8343f123d35..28fef31c9fe 100644 --- a/packages/twenty-server/src/modules/contact-creation-manager/contact-creation-manager.module.ts +++ b/packages/twenty-server/src/modules/contact-creation-manager/contact-creation-manager.module.ts @@ -14,11 +14,8 @@ import { CreateContactService } from 'src/modules/contact-creation-manager/servi @Module({ imports: [ WorkspaceDataSourceModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), - TypeOrmModule.forFeature( - [ObjectMetadataEntity, FieldMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([FeatureFlag]), + TypeOrmModule.forFeature([ObjectMetadataEntity, FieldMetadataEntity]), ], providers: [ CreateCompanyService, diff --git a/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company.service.spec.ts b/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company.service.spec.ts index 42f63101b52..e7de2c97e91 100644 --- a/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company.service.spec.ts +++ b/packages/twenty-server/src/modules/contact-creation-manager/services/__tests__/create-company.service.spec.ts @@ -103,7 +103,7 @@ describe('CreateCompanyService', () => { }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOne: jest.fn().mockResolvedValue({ id: 'mock-object-metadata-id', diff --git a/packages/twenty-server/src/modules/favorite/favorite.module.ts b/packages/twenty-server/src/modules/favorite/favorite.module.ts index 876c5242355..31b6c6338d2 100644 --- a/packages/twenty-server/src/modules/favorite/favorite.module.ts +++ b/packages/twenty-server/src/modules/favorite/favorite.module.ts @@ -9,10 +9,7 @@ import { FavoriteDeletionService } from 'src/modules/favorite/services/favorite- @Module({ imports: [ - TypeOrmModule.forFeature( - [ObjectMetadataEntity, FieldMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([ObjectMetadataEntity, FieldMetadataEntity]), ], providers: [ FavoriteDeletionService, diff --git a/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts b/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts index c846fb2d977..cdf1f40a6d7 100644 --- a/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts +++ b/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts @@ -13,10 +13,10 @@ import { type FavoriteWorkspaceEntity } from 'src/modules/favorite/standard-obje @Injectable() export class FavoriteDeletionService { constructor( - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, - @InjectRepository(FieldMetadataEntity, 'core') + @InjectRepository(FieldMetadataEntity) private readonly fieldMetadataRepository: Repository, private readonly twentyORMManager: TwentyORMManager, ) {} diff --git a/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts b/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts index cf97a07a671..f128ec9fbfa 100644 --- a/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts +++ b/packages/twenty-server/src/modules/messaging/common/messaging-common.module.ts @@ -10,7 +10,7 @@ import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/se @Module({ imports: [ WorkspaceDataSourceModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), + TypeOrmModule.forFeature([FeatureFlag]), ConnectedAccountModule, MetricsModule, ], diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts index 51904997c26..9984e26a54b 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts @@ -24,7 +24,7 @@ export const MESSAGING_MESSAGE_LIST_FETCH_CRON_PATTERN = '*/2 * * * *'; @Processor(MessageQueue.cronQueue) export class MessagingMessageListFetchCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.messagingQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts index 72c9765675c..af46be1ab1d 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts @@ -29,7 +29,7 @@ export const MESSAGING_MESSAGES_IMPORT_CRON_PATTERN = '*/1 * * * *'; @Processor(MessageQueue.cronQueue) export class MessagingMessagesImportCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.messagingQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts index 3171f5e2008..236f3bccec9 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts @@ -21,7 +21,7 @@ export const MESSAGING_ONGOING_STALE_CRON_PATTERN = '0 * * * *'; @Processor(MessageQueue.cronQueue) export class MessagingOngoingStaleCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.messagingQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/messaging-gmail-driver.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/messaging-gmail-driver.module.ts index 4b12764e409..077f3862d3e 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/messaging-gmail-driver.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/messaging-gmail-driver.module.ts @@ -28,7 +28,7 @@ import { OAuth2ClientProvider } from 'src/modules/messaging/message-import-manag TwentyConfigModule, ObjectMetadataRepositoryModule.forFeature([BlocklistWorkspaceEntity]), MessagingCommonModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), + TypeOrmModule.forFeature([FeatureFlag]), OAuth2ClientManagerModule, EmailAliasManagerModule, FeatureFlagModule, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/messaging-imap-driver.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/messaging-imap-driver.module.ts index bca9eb25fd5..ecd07e533cb 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/messaging-imap-driver.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/messaging-imap-driver.module.ts @@ -25,7 +25,7 @@ import { MessageParticipantManagerModule } from 'src/modules/messaging/message-p HttpModule, ObjectMetadataRepositoryModule.forFeature([BlocklistWorkspaceEntity]), MessagingCommonModule, - TypeOrmModule.forFeature([FeatureFlag], 'core'), + TypeOrmModule.forFeature([FeatureFlag]), EmailAliasManagerModule, FeatureFlagModule, WorkspaceDataSourceModule, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts index d4aa2a0ae30..bf468ae3553 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts @@ -49,10 +49,11 @@ import { MessagingMonitoringModule } from 'src/modules/messaging/monitoring/mess MessagingIMAPDriverModule, MessagingSmtpDriverModule, MessagingCommonModule, - TypeOrmModule.forFeature( - [Workspace, DataSourceEntity, ObjectMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([ + Workspace, + DataSourceEntity, + ObjectMetadataEntity, + ]), EmailAliasManagerModule, FeatureFlagModule, MessageParticipantManagerModule, diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.spec.ts index 4e53e23c779..38868701cc3 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.spec.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.spec.ts @@ -104,7 +104,7 @@ describe('MessagingSaveMessagesAndEnqueueContactCreationService', () => { }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOneOrFail: jest.fn(), }, diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts index 4836fe46118..5c27eff8998 100644 --- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts +++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts @@ -25,7 +25,7 @@ export class MessageParticipantWorkspaceMemberListener { constructor( @InjectMessageQueue(MessageQueue.messagingQueue) private readonly messageQueueService: MessageQueueService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts index f2117732e7d..4465c4898e1 100644 --- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts +++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts @@ -17,7 +17,7 @@ export class MessageParticipantListener { constructor( @InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity) private readonly timelineActivityRepository: TimelineActivityRepository, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts index c3419cd2484..32615dc560d 100644 --- a/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts @@ -20,10 +20,7 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-o @Module({ imports: [ - TypeOrmModule.forFeature( - [FeatureFlag, Workspace, ObjectMetadataEntity], - 'core', - ), + TypeOrmModule.forFeature([FeatureFlag, Workspace, ObjectMetadataEntity]), AuditModule, ContactCreationManagerModule, WorkspaceDataSourceModule, diff --git a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts index ef4e2253b47..84da20b4a94 100644 --- a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts @@ -20,7 +20,7 @@ export const MESSAGING_MESSAGE_CHANNEL_SYNC_STATUS_MONITORING_CRON_PATTERN = @Processor(MessageQueue.cronQueue) export class MessagingMessageChannelSyncStatusMonitoringCronJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly messagingMonitoringService: MessagingMonitoringService, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts b/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts index cde67c7ff06..1effbb2d5ea 100644 --- a/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts +++ b/packages/twenty-server/src/modules/messaging/monitoring/messaging-monitoring.module.ts @@ -13,8 +13,8 @@ import { MessagingMonitoringService } from 'src/modules/messaging/monitoring/ser imports: [ AuditModule, MessagingCommonModule, - TypeOrmModule.forFeature([Workspace], 'core'), - TypeOrmModule.forFeature([DataSourceEntity], 'core'), + TypeOrmModule.forFeature([Workspace]), + TypeOrmModule.forFeature([DataSourceEntity]), ], providers: [ MessagingMessageChannelSyncStatusMonitoringCronCommand, diff --git a/packages/twenty-server/src/modules/view/services/view-field-sync.service.ts b/packages/twenty-server/src/modules/view/services/view-field-sync.service.ts index b4dfc2f33d0..4a5e22bf782 100644 --- a/packages/twenty-server/src/modules/view/services/view-field-sync.service.ts +++ b/packages/twenty-server/src/modules/view/services/view-field-sync.service.ts @@ -11,7 +11,7 @@ import { type ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects @Injectable() export class ViewFieldSyncService { constructor( - @InjectRepository(ViewFieldEntity, 'core') + @InjectRepository(ViewFieldEntity) private readonly coreViewFieldRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/view/services/view-filter-group-sync.service.ts b/packages/twenty-server/src/modules/view/services/view-filter-group-sync.service.ts index 1c352feebc3..6ebd6aeff6e 100644 --- a/packages/twenty-server/src/modules/view/services/view-filter-group-sync.service.ts +++ b/packages/twenty-server/src/modules/view/services/view-filter-group-sync.service.ts @@ -12,7 +12,7 @@ import { type ViewFilterGroupWorkspaceEntity } from 'src/modules/view/standard-o @Injectable() export class ViewFilterGroupSyncService { constructor( - @InjectRepository(ViewFilterGroupEntity, 'core') + @InjectRepository(ViewFilterGroupEntity) private readonly coreViewFilterGroupRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/view/services/view-filter-sync.service.ts b/packages/twenty-server/src/modules/view/services/view-filter-sync.service.ts index 00dce42933d..0651b74f8ec 100644 --- a/packages/twenty-server/src/modules/view/services/view-filter-sync.service.ts +++ b/packages/twenty-server/src/modules/view/services/view-filter-sync.service.ts @@ -14,7 +14,7 @@ import { convertViewFilterWorkspaceValueToCoreValue } from 'src/modules/view/uti @Injectable() export class ViewFilterSyncService { constructor( - @InjectRepository(ViewFilterEntity, 'core') + @InjectRepository(ViewFilterEntity) private readonly coreViewFilterRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/view/services/view-group-sync.service.ts b/packages/twenty-server/src/modules/view/services/view-group-sync.service.ts index d7df690e26e..8db6f7ef9ba 100644 --- a/packages/twenty-server/src/modules/view/services/view-group-sync.service.ts +++ b/packages/twenty-server/src/modules/view/services/view-group-sync.service.ts @@ -11,7 +11,7 @@ import { type ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects @Injectable() export class ViewGroupSyncService { constructor( - @InjectRepository(ViewGroupEntity, 'core') + @InjectRepository(ViewGroupEntity) private readonly coreViewGroupRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/view/services/view-sort-sync.service.ts b/packages/twenty-server/src/modules/view/services/view-sort-sync.service.ts index 6e3b5091900..25cf19a8db9 100644 --- a/packages/twenty-server/src/modules/view/services/view-sort-sync.service.ts +++ b/packages/twenty-server/src/modules/view/services/view-sort-sync.service.ts @@ -12,7 +12,7 @@ import { type ViewSortWorkspaceEntity } from 'src/modules/view/standard-objects/ @Injectable() export class ViewSortSyncService { constructor( - @InjectRepository(ViewSortEntity, 'core') + @InjectRepository(ViewSortEntity) private readonly coreViewSortRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/view/services/view-sync.service.ts b/packages/twenty-server/src/modules/view/services/view-sync.service.ts index 773db344548..eaecb8c973c 100644 --- a/packages/twenty-server/src/modules/view/services/view-sync.service.ts +++ b/packages/twenty-server/src/modules/view/services/view-sync.service.ts @@ -14,7 +14,7 @@ import { type ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view @Injectable() export class ViewSyncService { constructor( - @InjectRepository(ViewEntity, 'core') + @InjectRepository(ViewEntity) private readonly coreViewRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/view/view.module.ts b/packages/twenty-server/src/modules/view/view.module.ts index 491fee22865..10938b38b49 100644 --- a/packages/twenty-server/src/modules/view/view.module.ts +++ b/packages/twenty-server/src/modules/view/view.module.ts @@ -26,18 +26,15 @@ import { ViewService } from 'src/modules/view/services/view.service'; @Module({ imports: [ - TypeOrmModule.forFeature( - [ - ViewEntity, - ViewFieldEntity, - ViewFilterEntity, - ViewFilterGroupEntity, - ViewGroupEntity, - ViewSortEntity, - ], - 'core', - ), - TypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + TypeOrmModule.forFeature([ + ViewEntity, + ViewFieldEntity, + ViewFilterEntity, + ViewFilterGroupEntity, + ViewGroupEntity, + ViewSortEntity, + ]), + TypeOrmModule.forFeature([ObjectMetadataEntity]), FeatureFlagModule, ], diff --git a/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts b/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts index de178c57a10..7b91dbdea63 100644 --- a/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts +++ b/packages/twenty-server/src/modules/workflow/common/query-hooks/workflow-query-hook.module.ts @@ -36,7 +36,7 @@ import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/ @Module({ imports: [ - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), ServerlessFunctionModule, RecordPositionModule, WorkspaceCacheStorageModule, diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts index dbc477ac95f..13828b55b35 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-builder.module.ts @@ -14,7 +14,7 @@ import { WorkflowVersionEdgeModule } from 'src/modules/workflow/workflow-builder WorkflowVersionModule, WorkflowVersionStepModule, WorkflowVersionEdgeModule, - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), ], exports: [ WorkflowSchemaModule, diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step.workspace-service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step.workspace-service.spec.ts index cf61a0c3339..b2caeb18795 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step.workspace-service.spec.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/__tests__/workflow-version-step.workspace-service.spec.ts @@ -116,13 +116,13 @@ describe('WorkflowVersionStepWorkspaceService', () => { }, { provide: ServerlessFunctionService, useValue: {} }, { - provide: getRepositoryToken(AgentEntity, 'core'), + provide: getRepositoryToken(AgentEntity), useValue: { findOne: jest.fn(), }, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOne: jest.fn(), }, diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts index 2897ad1f64a..3ed9b52b7e3 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.module.ts @@ -18,10 +18,7 @@ import { WorkflowRunnerModule } from 'src/modules/workflow/workflow-runner/workf WorkflowRunnerModule, WorkflowRunModule, WorkflowCommonModule, - NestjsQueryTypeOrmModule.forFeature( - [ObjectMetadataEntity, AgentEntity], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity, AgentEntity]), ], providers: [WorkflowVersionStepWorkspaceService], exports: [WorkflowVersionStepWorkspaceService], diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts index 8546450fd64..1c2108f7ea6 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version-step/workflow-version-step.workspace-service.ts @@ -54,9 +54,9 @@ export class WorkflowVersionStepWorkspaceService { private readonly twentyORMGlobalManager: TwentyORMGlobalManager, private readonly workflowSchemaWorkspaceService: WorkflowSchemaWorkspaceService, private readonly serverlessFunctionService: ServerlessFunctionService, - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, private readonly workflowRunWorkspaceService: WorkflowRunWorkspaceService, private readonly workflowRunnerWorkspaceService: WorkflowRunnerWorkspaceService, diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts index 52619b7cd4f..53bfd5754da 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-version/workflow-version.module.ts @@ -14,7 +14,7 @@ import { WorkflowVersionWorkspaceService } from 'src/modules/workflow/workflow-b WorkflowSchemaModule, ServerlessFunctionModule, WorkflowVersionStepModule, - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), RecordPositionModule, ], providers: [WorkflowVersionWorkspaceService], diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts index 4d666db09c8..d93eb04a691 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent-action.module.ts @@ -13,10 +13,7 @@ import { AiAgentWorkflowAction } from './ai-agent.workflow-action'; @Module({ imports: [ AiModule, - TypeOrmModule.forFeature( - [AgentEntity, RoleTargetsEntity, RoleEntity], - 'core', - ), + TypeOrmModule.forFeature([AgentEntity, RoleTargetsEntity, RoleEntity]), ], providers: [ ScopedWorkspaceContextFactory, diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts index 221549e2361..962c042c67c 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts @@ -27,7 +27,7 @@ export class AiAgentWorkflowAction implements WorkflowAction { constructor( private readonly aiAgentExecutionService: AiAgentExecutorService, private readonly aiBillingService: AIBillingService, - @InjectRepository(AgentEntity, 'core') + @InjectRepository(AgentEntity) private readonly agentRepository: Repository, ) {} diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts index e268e3beeb6..2fc6d33794e 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/ai-agent-executor.service.ts @@ -26,9 +26,9 @@ export class AiAgentExecutorService { constructor( private readonly aiModelRegistryService: AiModelRegistryService, private readonly toolAdapterService: ToolAdapterService, - @InjectRepository(RoleTargetsEntity, 'core') + @InjectRepository(RoleTargetsEntity) private readonly roleTargetsRepository: Repository, - @InjectRepository(RoleEntity, 'core') + @InjectRepository(RoleEntity) private readonly roleRepository: Repository, private readonly toolService: ToolService, ) {} diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts index 62277e75a91..b0858081b8a 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/create-record.workflow-action.ts @@ -31,7 +31,7 @@ import { type WorkflowCreateRecordActionInput } from 'src/modules/workflow/workf export class CreateRecordWorkflowAction implements WorkflowAction { constructor( private readonly twentyORMGlobalManager: TwentyORMGlobalManager, - @InjectRepository(ObjectMetadataEntity, 'core') + @InjectRepository(ObjectMetadataEntity) private readonly objectMetadataRepository: Repository, private readonly scopedWorkspaceContextFactory: ScopedWorkspaceContextFactory, private readonly recordPositionService: RecordPositionService, diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/record-crud-action.module.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/record-crud-action.module.ts index 5b6ffff0e3d..f4be17cf889 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/record-crud-action.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/record-crud-action.module.ts @@ -16,7 +16,7 @@ import { UpdateRecordWorkflowAction } from 'src/modules/workflow/workflow-execut @Module({ imports: [ WorkspaceCacheStorageModule, - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), RecordPositionModule, RecordTransformerModule, WorkflowCommonModule, diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts index dea32cc745c..a577a8467d2 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-clean-workflow-runs.cron.job.ts @@ -26,7 +26,7 @@ export class WorkflowCleanWorkflowRunsJob { private readonly logger = new Logger(WorkflowCleanWorkflowRunsJob.name); constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, private readonly workspaceDataSourceService: WorkspaceDataSourceService, private readonly twentyORMGlobalManager: TwentyORMGlobalManager, diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-handle-staled-runs.job.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-handle-staled-runs.job.ts index 6820aa4bead..f8c47e38df9 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-handle-staled-runs.job.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-handle-staled-runs.job.ts @@ -20,7 +20,7 @@ export const WORKFLOW_HANDLE_STALED_RUNS_CRON_PATTERN = '0 * * * *'; @Processor(MessageQueue.cronQueue) export class WorkflowHandleStaledRunsJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.workflowQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-run-enqueue.job.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-run-enqueue.job.ts index 605943d3704..e30c4114afc 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-run-enqueue.job.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/cron/jobs/workflow-run-enqueue.job.ts @@ -20,7 +20,7 @@ export const WORKFLOW_RUN_ENQUEUE_CRON_PATTERN = '* * * * *'; @Processor(MessageQueue.cronQueue) export class WorkflowRunEnqueueJob { constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.workflowQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workflow-run-queue.module.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workflow-run-queue.module.ts index 7ca8e714a4e..ca925d6ec09 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workflow-run-queue.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run-queue/workflow-run-queue.module.ts @@ -19,7 +19,7 @@ import { WorkflowRunQueueWorkspaceService } from 'src/modules/workflow/workflow- @Module({ imports: [ CacheStorageModule, - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), MessageQueueModule, WorkspaceDataSourceModule, MetricsModule, diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts index f9efd7a58d7..405a2e3dd83 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/command/delete-workflow-runs.command.ts @@ -19,7 +19,7 @@ export class DeleteWorkflowRunsCommand extends ActiveOrSuspendedWorkspacesMigrat private createdBeforeDate: string | undefined; constructor( - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) protected readonly workspaceRepository: Repository, protected readonly twentyORMGlobalManager: TwentyORMGlobalManager, ) { diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts index cf9a7527be7..99f4c52412a 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts @@ -15,10 +15,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; @Module({ imports: [ WorkflowCommonModule, - NestjsQueryTypeOrmModule.forFeature( - [ObjectMetadataEntity, Workspace], - 'core', - ), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity, Workspace]), RecordPositionModule, CacheLockModule, MetricsModule, diff --git a/packages/twenty-server/src/modules/workflow/workflow-status/jobs/__tests__/workflow-statuses-update.job.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-status/jobs/__tests__/workflow-statuses-update.job.spec.ts index e4f53930ed3..44a4c00fd3a 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-status/jobs/__tests__/workflow-statuses-update.job.spec.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-status/jobs/__tests__/workflow-statuses-update.job.spec.ts @@ -66,7 +66,7 @@ describe('WorkflowStatusesUpdate', () => { useValue: mockServerlessFunctionService, }, { - provide: getRepositoryToken(ObjectMetadataEntity, 'core'), + provide: getRepositoryToken(ObjectMetadataEntity), useValue: { findOneOrFail: jest.fn().mockResolvedValue({ nameSingular: 'workflow', @@ -74,7 +74,7 @@ describe('WorkflowStatusesUpdate', () => { }, }, { - provide: getRepositoryToken(ServerlessFunctionEntity, 'core'), + provide: getRepositoryToken(ServerlessFunctionEntity), useValue: { findOneOrFail: jest.fn().mockResolvedValue({ latestVersion: 'v2', diff --git a/packages/twenty-server/src/modules/workflow/workflow-status/workflow-status.module.ts b/packages/twenty-server/src/modules/workflow/workflow-status/workflow-status.module.ts index 4389bd0e58e..28b2acc3e43 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-status/workflow-status.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-status/workflow-status.module.ts @@ -12,10 +12,7 @@ import { WorkflowVersionStatusListener } from 'src/modules/workflow/workflow-sta imports: [ ServerlessFunctionModule, WorkspaceEventEmitterModule, - TypeOrmModule.forFeature( - [ObjectMetadataEntity, ServerlessFunctionEntity], - 'core', - ), + TypeOrmModule.forFeature([ObjectMetadataEntity, ServerlessFunctionEntity]), ], providers: [WorkflowStatusesUpdateJob, WorkflowVersionStatusListener], }) diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts index 60b53f04986..ae895089d24 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/automated-trigger.module.ts @@ -11,7 +11,7 @@ import { DatabaseEventTriggerListener } from 'src/modules/workflow/workflow-trig @Module({ imports: [ - TypeOrmModule.forFeature([Workspace], 'core'), + TypeOrmModule.forFeature([Workspace]), WorkflowCommonModule, WorkspaceDataSourceModule, ], diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts index 4e4d8396ea8..43d93c36b24 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/crons/jobs/cron-trigger.cron.job.ts @@ -28,7 +28,7 @@ export const CRON_TRIGGER_CRON_PATTERN = '* * * * *'; export class CronTriggerCronJob { constructor( private readonly workspaceDataSourceService: WorkspaceDataSourceService, - @InjectRepository(Workspace, 'core') + @InjectRepository(Workspace) private readonly workspaceRepository: Repository, @InjectMessageQueue(MessageQueue.workflowQueue) private readonly messageQueueService: MessageQueueService, diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts index 9714b03fadb..1bbafffaf73 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/workflow-trigger.module.ts @@ -15,7 +15,7 @@ import { WorkflowTriggerWorkspaceService } from 'src/modules/workflow/workflow-t WorkflowCommonModule, WorkflowRunnerModule, AutomatedTriggerModule, - NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'), + NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]), ], providers: [ WorkflowTriggerWorkspaceService, diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.pre-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.pre-query.hook.ts index 3aff201b089..35991b596eb 100644 --- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.pre-query.hook.ts +++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.pre-query.hook.ts @@ -25,7 +25,7 @@ export class WorkspaceMemberDeleteOnePreQueryHook { constructor( private readonly twentyORMManager: TwentyORMManager, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService, ) {} diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts index 0c7a2d2406b..900a0f17b85 100644 --- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts +++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-query-hook.module.ts @@ -33,7 +33,7 @@ import { WorkspaceMemberUpdateOnePreQueryHook } from 'src/modules/workspace-memb imports: [ FeatureFlagModule, PermissionsModule, - TypeOrmModule.forFeature([UserWorkspace], 'core'), + TypeOrmModule.forFeature([UserWorkspace]), ], }) export class WorkspaceMemberQueryHookModule {} diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-update-one.pre-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-update-one.pre-query.hook.ts index 3c2ed60218a..5cbeea36b8c 100644 --- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-update-one.pre-query.hook.ts +++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-update-one.pre-query.hook.ts @@ -22,7 +22,7 @@ export class WorkspaceMemberUpdateOnePreQueryHook { constructor( private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService, - @InjectRepository(UserWorkspace, 'core') + @InjectRepository(UserWorkspace) private readonly userWorkspaceRepository: Repository, ) {} diff --git a/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts index d6265a085f9..ff5cc4333f9 100644 --- a/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts +++ b/packages/twenty-server/test/integration/graphql/suites/agent/agent.integration-spec.ts @@ -58,7 +58,7 @@ describe('agentResolver', () => { }, }, { - provide: getRepositoryToken(AgentEntity, 'core'), + provide: getRepositoryToken(AgentEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -67,7 +67,7 @@ describe('agentResolver', () => { }, }, { - provide: getRepositoryToken(AgentHandoffEntity, 'core'), + provide: getRepositoryToken(AgentHandoffEntity), useValue: { find: jest.fn(), findOne: jest.fn(), @@ -76,7 +76,7 @@ describe('agentResolver', () => { }, }, { - provide: getRepositoryToken(RoleTargetsEntity, 'core'), + provide: getRepositoryToken(RoleTargetsEntity), useValue: { findOne: jest.fn(), }, diff --git a/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts b/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts index 93fc919d318..72231f83a8a 100644 --- a/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts +++ b/packages/twenty-server/test/integration/metadata/suites/agent/utils/agent-tool-test-utils.ts @@ -57,7 +57,7 @@ export const createAgentToolTestModule = }, }, { - provide: getRepositoryToken(RoleEntity, 'core'), + provide: getRepositoryToken(RoleEntity), useValue: { findOne: jest.fn(), }, @@ -161,7 +161,7 @@ export const createAgentToolTestModule = ObjectMetadataService, ); const roleRepository = module.get>( - getRepositoryToken(RoleEntity, 'core'), + getRepositoryToken(RoleEntity), ); const workspacePermissionsCacheService = module.get( diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts index 22316472067..34ae3b08dfc 100644 --- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts @@ -8,8 +8,6 @@ import { createOneObjectMetadata } from 'test/integration/metadata/suites/object import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util'; import { FieldMetadataType } from 'twenty-shared/types'; -import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface'; - describe('updateOne', () => { describe('FieldMetadataService name/label sync', () => { let listingObjectId = ''; @@ -117,59 +115,5 @@ describe('updateOne', () => { 'Name is not synced with label. Expected name: "testName", got newName', ); }); - - it('should throw if the field name is not available because of other field with the same name', async () => { - await createOneFieldMetadata({ - input: { - objectMetadataId: listingObjectId, - type: FieldMetadataType.TEXT, - name: 'otherTestName', - label: 'Test name', - }, - }); - - const { errors } = await updateOneFieldMetadata({ - input: { - idToUpdate: testFieldId, - updatePayload: { name: 'testName' }, - }, - }); - - // Assert - expect(errors[0].message).toBe( - 'Name "testName" is not available, check that it is not duplicating another field\'s name.', - ); - }); - - it('should throw if the field name is not available because of other relation field using the same {name}Id', async () => { - // Arrange - await createOneFieldMetadata({ - input: { - objectMetadataId: listingObjectId, - type: FieldMetadataType.RELATION, - name: 'children', - label: 'Children', - relationCreationPayload: { - targetObjectMetadataId: listingObjectId, - targetFieldLabel: 'parent', - targetFieldIcon: 'IconBuildingSkyscraper', - type: RelationType.ONE_TO_MANY, - }, - }, - }); - - // Act - const { errors } = await updateOneFieldMetadata({ - input: { - idToUpdate: testFieldId, - updatePayload: { name: 'parentId' }, - }, - }); - - // Assert - expect(errors[0].message).toBe( - 'Name "parentId" is not available, check that it is not duplicating another field\'s name.', - ); - }); }); });