Deprecate legacy core datasource token (#14096)

This commit is contained in:
Weiko
2025-08-27 20:09:54 +02:00
committed by GitHub
parent c6aa419c18
commit 533d7fe49a
321 changed files with 702 additions and 849 deletions
@@ -36,7 +36,7 @@ import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/
@Module({
imports: [
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
ServerlessFunctionModule,
RecordPositionModule,
WorkspaceCacheStorageModule,
@@ -14,7 +14,7 @@ import { WorkflowVersionEdgeModule } from 'src/modules/workflow/workflow-builder
WorkflowVersionModule,
WorkflowVersionStepModule,
WorkflowVersionEdgeModule,
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
],
exports: [
WorkflowSchemaModule,
@@ -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(),
},
@@ -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],
@@ -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<AgentEntity>,
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
private readonly workflowRunWorkspaceService: WorkflowRunWorkspaceService,
private readonly workflowRunnerWorkspaceService: WorkflowRunnerWorkspaceService,
@@ -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],
@@ -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,
@@ -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<AgentEntity>,
) {}
@@ -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<RoleTargetsEntity>,
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
private readonly toolService: ToolService,
) {}
@@ -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<ObjectMetadataEntity>,
private readonly scopedWorkspaceContextFactory: ScopedWorkspaceContextFactory,
private readonly recordPositionService: RecordPositionService,
@@ -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,
@@ -26,7 +26,7 @@ export class WorkflowCleanWorkflowRunsJob {
private readonly logger = new Logger(WorkflowCleanWorkflowRunsJob.name);
constructor(
@InjectRepository(Workspace, 'core')
@InjectRepository(Workspace)
private readonly workspaceRepository: Repository<Workspace>,
private readonly workspaceDataSourceService: WorkspaceDataSourceService,
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
@@ -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<Workspace>,
@InjectMessageQueue(MessageQueue.workflowQueue)
private readonly messageQueueService: MessageQueueService,
@@ -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<Workspace>,
@InjectMessageQueue(MessageQueue.workflowQueue)
private readonly messageQueueService: MessageQueueService,
@@ -19,7 +19,7 @@ import { WorkflowRunQueueWorkspaceService } from 'src/modules/workflow/workflow-
@Module({
imports: [
CacheStorageModule,
TypeOrmModule.forFeature([Workspace], 'core'),
TypeOrmModule.forFeature([Workspace]),
MessageQueueModule,
WorkspaceDataSourceModule,
MetricsModule,
@@ -19,7 +19,7 @@ export class DeleteWorkflowRunsCommand extends ActiveOrSuspendedWorkspacesMigrat
private createdBeforeDate: string | undefined;
constructor(
@InjectRepository(Workspace, 'core')
@InjectRepository(Workspace)
protected readonly workspaceRepository: Repository<Workspace>,
protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
) {
@@ -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,
@@ -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',
@@ -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],
})
@@ -11,7 +11,7 @@ import { DatabaseEventTriggerListener } from 'src/modules/workflow/workflow-trig
@Module({
imports: [
TypeOrmModule.forFeature([Workspace], 'core'),
TypeOrmModule.forFeature([Workspace]),
WorkflowCommonModule,
WorkspaceDataSourceModule,
],
@@ -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<Workspace>,
@InjectMessageQueue(MessageQueue.workflowQueue)
private readonly messageQueueService: MessageQueueService,
@@ -15,7 +15,7 @@ import { WorkflowTriggerWorkspaceService } from 'src/modules/workflow/workflow-t
WorkflowCommonModule,
WorkflowRunnerModule,
AutomatedTriggerModule,
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
],
providers: [
WorkflowTriggerWorkspaceService,