Deprecate legacy core datasource token (#14096)

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,

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),
           },

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<FieldMetadataEntity>,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {}

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,
           },

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,

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<User>,
   ) {}
 

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,

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]),
           },

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<RoleEntity>,
   ) {}
 

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,
         },
         {

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<RoleTargetsEntity>,
-    @InjectRepository(RoleEntity, 'core')
+    @InjectRepository(RoleEntity)
     private readonly roleRepository: Repository<RoleEntity>,
 
-    @InjectRepository(ApiKey, 'core')
+    @InjectRepository(ApiKey)
     private readonly apiKeyRepository: Repository<ApiKey>,
     private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
-    @InjectDataSource('core')
+    @InjectDataSource()
     private readonly dataSource: DataSource,
   ) {}
 

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,

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,
         },
       ],

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<ApiKey>,
     private readonly jwtWrapperService: JwtWrapperService,
     private readonly apiKeyRoleService: ApiKeyRoleService,
-    @InjectDataSource('core')
+    @InjectDataSource()
     private readonly dataSource: DataSource,
   ) {}
 

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,
     }),

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],

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<ApprovedAccessDomainEntity>,
     private readonly emailService: EmailService,
     private readonly twentyConfigService: TwentyConfigService,

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>(EmailService);
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);

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,

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: {},
         },
         {

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<User>,
-    @InjectRepository(AppToken, 'core')
+    @InjectRepository(AppToken)
     private readonly appTokenRepository: Repository<AppToken>,
     private readonly twoFactorAuthenticationService: TwoFactorAuthenticationService,
     private authService: AuthService,

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<Workspace>,
   ) {}
 

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<Workspace>,
   ) {}
 

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<User>,
-    @InjectRepository(WorkspaceSSOIdentityProvider, 'core')
+    @InjectRepository(WorkspaceSSOIdentityProvider)
     private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProvider>,
   ) {}
 

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<Workspace>,
   ) {
     super();

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<Workspace>,
     private readonly domainManagerService: DomainManagerService,
   ) {

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<Workspace>,
     private readonly domainManagerService: DomainManagerService,
   ) {

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<Workspace>,
     private readonly domainManagerService: DomainManagerService,
   ) {

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<Workspace>,
     private readonly domainManagerService: DomainManagerService,
   ) {

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<Workspace>,
     private readonly twentyConfigService: TwentyConfigService,
   ) {}

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>(AuthSsoService);
     workspaceRepository = module.get<Repository<Workspace>>(
-      getRepositoryToken(Workspace, 'core'),
+      getRepositoryToken(Workspace),
     );
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
   });

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>(UserWorkspaceService);
     workspaceRepository = module.get<Repository<Workspace>>(
-      getRepositoryToken(Workspace, 'core'),
-    );
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
+      getRepositoryToken(Workspace),
     );
+    userRepository = module.get<Repository<User>>(getRepositoryToken(User));
   });
 
   beforeEach(() => {

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<Workspace>,
-    @InjectRepository(User, 'core')
+    @InjectRepository(User)
     private readonly userRepository: Repository<User>,
     private readonly twentyConfigService: TwentyConfigService,
     private readonly emailService: EmailService,
-    @InjectRepository(AppToken, 'core')
+    @InjectRepository(AppToken)
     private readonly appTokenRepository: Repository<AppToken>,
   ) {}
 

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(),
           },

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(),
           },

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<User>,
-//     @InjectRepository(AppToken, 'core')
+//     @InjectRepository(AppToken)
 //     private readonly appTokenRepository: Repository<AppToken>,
 //     private readonly accessTokenService: AccessTokenService,
 //     private readonly refreshTokenService: RefreshTokenService,

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>(ResetPasswordService);
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
-    );
+    userRepository = module.get<Repository<User>>(getRepositoryToken(User));
     workspaceRepository = module.get<Repository<Workspace>>(
-      getRepositoryToken(Workspace, 'core'),
+      getRepositoryToken(Workspace),
     );
     appTokenRepository = module.get<Repository<AppToken>>(
-      getRepositoryToken(AppToken, 'core'),
+      getRepositoryToken(AppToken),
     );
     emailService = module.get<EmailService>(EmailService);
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);

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<User>,
-    @InjectRepository(Workspace, 'core')
+    @InjectRepository(Workspace)
     private readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(AppToken, 'core')
+    @InjectRepository(AppToken)
     private readonly appTokenRepository: Repository<AppToken>,
     private readonly emailService: EmailService,
   ) {}

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>(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>(
       WorkspaceInvitationService,
     );

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<User>,
-    @InjectRepository(Workspace, 'core')
+    @InjectRepository(Workspace)
     private readonly workspaceRepository: Repository<Workspace>,
     private readonly workspaceInvitationService: WorkspaceInvitationService,
     private readonly userWorkspaceService: UserWorkspaceService,

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<Workspace>,
-    @InjectRepository(User, 'core')
+    @InjectRepository(User)
     private readonly userRepository: Repository<User>,
-    @InjectRepository(UserWorkspace, 'core')
+    @InjectRepository(UserWorkspace)
     private readonly userWorkspaceRepository: Repository<UserWorkspace>,
-    @InjectRepository(ApiKey, 'core')
+    @InjectRepository(ApiKey)
     private readonly apiKeyRepository: Repository<ApiKey>,
   ) {
     const jwtFromRequestFunction = jwtWrapperService.extractJwtFromRequest();

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>(AccessTokenService);
     jwtWrapperService = module.get<JwtWrapperService>(JwtWrapperService);
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
-    );
+    userRepository = module.get<Repository<User>>(getRepositoryToken(User));
     workspaceRepository = module.get<Repository<Workspace>>(
-      getRepositoryToken(Workspace, 'core'),
+      getRepositoryToken(Workspace),
     );
     twentyORMGlobalManager = module.get<TwentyORMGlobalManager>(
       TwentyORMGlobalManager,
     );
     userWorkspaceRepository = module.get<Repository<UserWorkspace>>(
-      getRepositoryToken(UserWorkspace, 'core'),
+      getRepositoryToken(UserWorkspace),
     );
   });
 

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<User>,
-    @InjectRepository(Workspace, 'core')
+    @InjectRepository(Workspace)
     private readonly workspaceRepository: Repository<Workspace>,
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    @InjectRepository(UserWorkspace, 'core')
+    @InjectRepository(UserWorkspace)
     private readonly userWorkspaceRepository: Repository<UserWorkspace>,
   ) {}
 

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<Repository<AppToken>>(
-      getRepositoryToken(AppToken, 'core'),
-    );
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
+      getRepositoryToken(AppToken),
     );
+    userRepository = module.get<Repository<User>>(getRepositoryToken(User));
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
   });
 

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<AppToken>,
-    @InjectRepository(User, 'core')
+    @InjectRepository(User)
     private readonly userRepository: Repository<User>,
     private readonly twentyConfigService: TwentyConfigService,
   ) {}

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>(JwtWrapperService);
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
     appTokenRepository = module.get<Repository<AppToken>>(
-      getRepositoryToken(AppToken, 'core'),
-    );
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
+      getRepositoryToken(AppToken),
     );
+    userRepository = module.get<Repository<User>>(getRepositoryToken(User));
   });
 
   it('should be defined', () => {

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<AppToken>,
-    @InjectRepository(User, 'core')
+    @InjectRepository(User)
     private readonly userRepository: Repository<User>,
   ) {}
 

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>(RenewTokenService);
     appTokenRepository = module.get<Repository<AppToken>>(
-      getRepositoryToken(AppToken, 'core'),
+      getRepositoryToken(AppToken),
     );
     accessTokenService = module.get<AccessTokenService>(AccessTokenService);
     refreshTokenService = module.get<RefreshTokenService>(RefreshTokenService);

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<AppToken>,
     private readonly accessTokenService: AccessTokenService,
     private readonly workspaceAgnosticTokenService: WorkspaceAgnosticTokenService,

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>(JwtWrapperService);
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
-    );
+    userRepository = module.get<Repository<User>>(getRepositoryToken(User));
   });
 
   it('should be defined', () => {

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<User>,
   ) {}
 

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,
   ],

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: [

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<BillingSubscription>,
-    @InjectRepository(BillingProduct, 'core')
+    @InjectRepository(BillingProduct)
     private readonly billingProductRepository: Repository<BillingProduct>,
-    @InjectRepository(BillingSubscriptionItem, 'core')
+    @InjectRepository(BillingSubscriptionItem)
     private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
   ) {}
 

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<BillingCustomer>,
   ) {}
 

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<BillingCustomer>,
-    @InjectRepository(BillingEntitlement, 'core')
+    @InjectRepository(BillingEntitlement)
     private readonly billingEntitlementRepository: Repository<BillingEntitlement>,
   ) {}
 

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<BillingSubscriptionItem>,
   ) {}
 

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<BillingPrice>,
-    @InjectRepository(BillingMeter, 'core')
+    @InjectRepository(BillingMeter)
     private readonly billingMeterRepository: Repository<BillingMeter>,
-    @InjectRepository(BillingProduct, 'core')
+    @InjectRepository(BillingProduct)
     private readonly billingProductRepository: Repository<BillingProduct>,
   ) {}
 

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<BillingProduct>,
   ) {}
 

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<BillingSubscription>,
-    @InjectRepository(BillingSubscriptionItem, 'core')
+    @InjectRepository(BillingSubscriptionItem)
     private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
-    @InjectRepository(Workspace, 'core')
+    @InjectRepository(Workspace)
     private readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(BillingCustomer, 'core')
+    @InjectRepository(BillingCustomer)
     private readonly billingCustomerRepository: Repository<BillingCustomer>,
     private readonly billingSubscriptionService: BillingSubscriptionService,
     private readonly workspaceService: WorkspaceService,

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,

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<Workspace>,
     protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    @InjectRepository(BillingSubscription, 'core')
+    @InjectRepository(BillingSubscription)
     protected readonly billingSubscriptionRepository: Repository<BillingSubscription>,
-    @InjectRepository(BillingProduct, 'core')
+    @InjectRepository(BillingProduct)
     protected readonly billingProductRepository: Repository<BillingProduct>,
     private readonly stripeSubscriptionItemService: StripeSubscriptionItemService,
     private readonly stripeSubscriptionService: StripeSubscriptionService,

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<Workspace>,
     private readonly stripeSubscriptionService: StripeSubscriptionService,
-    @InjectRepository(BillingCustomer, 'core')
+    @InjectRepository(BillingCustomer)
     protected readonly billingCustomerRepository: Repository<BillingCustomer>,
     protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
   ) {

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<BillingPrice>,
-    @InjectRepository(BillingProduct, 'core')
+    @InjectRepository(BillingProduct)
     private readonly billingProductRepository: Repository<BillingProduct>,
-    @InjectRepository(BillingMeter, 'core')
+    @InjectRepository(BillingMeter)
     private readonly billingMeterRepository: Repository<BillingMeter>,
     private readonly stripeBillingMeterService: StripeBillingMeterService,
     private readonly stripeProductService: StripeProductService,

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<Workspace>,
     protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    @InjectRepository(BillingSubscription, 'core')
+    @InjectRepository(BillingSubscription)
     protected readonly billingSubscriptionRepository: Repository<BillingSubscription>,
     private readonly billingSubscriptionService: BillingSubscriptionService,
     private readonly stripeSubscriptionItemService: StripeSubscriptionItemService,

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<BillingProduct>,
   ) {}
 

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<BillingSubscription>,
-    @InjectRepository(BillingSubscriptionItem, 'core')
+    @InjectRepository(BillingSubscriptionItem)
     private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
-    @InjectRepository(BillingCustomer, 'core')
+    @InjectRepository(BillingCustomer)
     private readonly billingCustomerRepository: Repository<BillingCustomer>,
-    @InjectRepository(UserWorkspace, 'core')
+    @InjectRepository(UserWorkspace)
     private readonly userWorkspaceRepository: Repository<UserWorkspace>,
   ) {}
 

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<BillingSubscriptionItem>,
     private readonly twentyConfigService: TwentyConfigService,
   ) {}

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<BillingEntitlement>,
-    @InjectRepository(BillingSubscription, 'core')
+    @InjectRepository(BillingSubscription)
     private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
     private readonly stripeCustomerService: StripeCustomerService,
     private readonly twentyConfigService: TwentyConfigService,
     private readonly stripeSubscriptionItemService: StripeSubscriptionItemService,
-    @InjectRepository(BillingSubscriptionItem, 'core')
+    @InjectRepository(BillingSubscriptionItem)
     private readonly billingSubscriptionItemRepository: Repository<BillingSubscriptionItem>,
   ) {}
 

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<BillingCustomer>,
     private readonly billingSubscriptionService: BillingSubscriptionService,
     private readonly stripeBillingMeterEventService: StripeBillingMeterEventService,

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<BillingSubscription>,
   ) {}
 

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<BillingCustomer>,
   ) {
     if (!this.twentyConfigService.get('IS_BILLING_ENABLED')) {

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,

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<Workspace>,
     private readonly domainManagerService: DomainManagerService,
     private readonly customDomainService: CustomDomainService,

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>(CloudflareController);
-    WorkspaceRepository = module.get(getRepositoryToken(Workspace, 'core'));
+    WorkspaceRepository = module.get(getRepositoryToken(Workspace));
     twentyConfigService = module.get<TwentyConfigService>(TwentyConfigService);
     domainManagerService =
       module.get<DomainManagerService>(DomainManagerService);

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<Workspace>,
     private readonly customDomainService: CustomDomainService,
   ) {}

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,

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(),
           },

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<Workspace>,
   ) {
     if (this.twentyConfigService.get('CLOUDFLARE_API_KEY')) {

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,
         },
         {

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<Workspace>,
     private readonly twentyConfigService: TwentyConfigService,
   ) {}

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,

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<AppToken>,
     private readonly domainManagerService: DomainManagerService,
     private readonly emailService: EmailService,

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: [],
     }),

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,
         },
         {

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<FeatureFlag>,
     private readonly workspaceFeatureFlagsMapCacheService: WorkspaceFeatureFlagsMapCacheService,
     private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,

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<Workspace>,
-    @InjectRepository(FileEntity, 'core')
+    @InjectRepository(FileEntity)
     private readonly fileRepository: Repository<FileEntity>,
     private readonly fileMetadataService: FileMetadataService,
   ) {}

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: [

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<FileEntity>,
     private readonly fileService: FileService,
     private readonly fileUploadService: FileUploadService,

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],

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,
         },
         {

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,
         },
         {

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<Workspace>,
     private readonly workspaceMigrationService: WorkspaceMigrationService,
   ) {}

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,
   ) {}

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,
       ],
     }),

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<string, any> = Record<string, any>,
 > {
   constructor(
-    @InjectRepository(KeyValuePair, 'core')
+    @InjectRepository(KeyValuePair)
     private readonly keyValuePairRepository: Repository<KeyValuePair>,
   ) {}
 

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,

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: [],
 })

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,

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<PostgresCredentials>,
     private readonly jwtWrapperService: JwtWrapperService,
   ) {}