Deprecate legacy core datasource token (#14096)
This commit is contained in:
+1
-4
@@ -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,
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
@InjectMessageQueue(MessageQueue.calendarQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
@InjectMessageQueue(MessageQueue.calendarQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
@InjectMessageQueue(MessageQueue.calendarQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
|
||||
+2
-5
@@ -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,
|
||||
],
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ export type CalendarEventParticipantMatchParticipantJobData = {
|
||||
})
|
||||
export class CalendarEventParticipantMatchParticipantJob {
|
||||
constructor(
|
||||
@InjectRepository(Workspace, 'core')
|
||||
@InjectRepository(Workspace)
|
||||
private readonly workspaceRepository: Repository<Workspace>,
|
||||
private readonly matchParticipantService: MatchParticipantService<CalendarEventParticipantWorkspaceEntity>,
|
||||
) {}
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ export class CalendarEventParticipantListener {
|
||||
constructor(
|
||||
@InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity)
|
||||
private readonly timelineActivityRepository: TimelineActivityRepository,
|
||||
@InjectRepository(ObjectMetadataEntity, 'core')
|
||||
@InjectRepository(ObjectMetadataEntity)
|
||||
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import { ConnectedAccountModule } from 'src/modules/connected-account/connected-
|
||||
@Module({
|
||||
imports: [
|
||||
WorkspaceDataSourceModule,
|
||||
TypeOrmModule.forFeature([FeatureFlag], 'core'),
|
||||
TypeOrmModule.forFeature([FeatureFlag]),
|
||||
ConnectedAccountModule,
|
||||
MetricsModule,
|
||||
],
|
||||
|
||||
@@ -12,7 +12,7 @@ import { ImapSmtpCalDavAPIService } from 'src/modules/connected-account/services
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
|
||||
TypeOrmModule.forFeature([ObjectMetadataEntity]),
|
||||
MessageQueueModule,
|
||||
WorkspaceEventEmitterModule,
|
||||
TwentyConfigModule,
|
||||
|
||||
+1
-1
@@ -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<ObjectMetadataEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
+1
-3
@@ -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 {}
|
||||
|
||||
+2
-5
@@ -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,
|
||||
|
||||
+1
-1
@@ -103,7 +103,7 @@ describe('CreateCompanyService', () => {
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(ObjectMetadataEntity, 'core'),
|
||||
provide: getRepositoryToken(ObjectMetadataEntity),
|
||||
useValue: {
|
||||
findOne: jest.fn().mockResolvedValue({
|
||||
id: 'mock-object-metadata-id',
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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<ObjectMetadataEntity>,
|
||||
|
||||
@InjectRepository(FieldMetadataEntity, 'core')
|
||||
@InjectRepository(FieldMetadataEntity)
|
||||
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
|
||||
private readonly twentyORMManager: TwentyORMManager,
|
||||
) {}
|
||||
|
||||
@@ -10,7 +10,7 @@ import { MessageChannelSyncStatusService } from 'src/modules/messaging/common/se
|
||||
@Module({
|
||||
imports: [
|
||||
WorkspaceDataSourceModule,
|
||||
TypeOrmModule.forFeature([FeatureFlag], 'core'),
|
||||
TypeOrmModule.forFeature([FeatureFlag]),
|
||||
ConnectedAccountModule,
|
||||
MetricsModule,
|
||||
],
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
@InjectMessageQueue(MessageQueue.messagingQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
@InjectMessageQueue(MessageQueue.messagingQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
@InjectMessageQueue(MessageQueue.messagingQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+5
-4
@@ -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,
|
||||
|
||||
+1
-1
@@ -104,7 +104,7 @@ describe('MessagingSaveMessagesAndEnqueueContactCreationService', () => {
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: getRepositoryToken(ObjectMetadataEntity, 'core'),
|
||||
provide: getRepositoryToken(ObjectMetadataEntity),
|
||||
useValue: {
|
||||
findOneOrFail: jest.fn(),
|
||||
},
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ export class MessageParticipantWorkspaceMemberListener {
|
||||
constructor(
|
||||
@InjectMessageQueue(MessageQueue.messagingQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
@InjectRepository(Workspace, 'core')
|
||||
@InjectRepository(Workspace)
|
||||
private readonly workspaceRepository: Repository<Workspace>,
|
||||
) {}
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ export class MessageParticipantListener {
|
||||
constructor(
|
||||
@InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity)
|
||||
private readonly timelineActivityRepository: TimelineActivityRepository,
|
||||
@InjectRepository(ObjectMetadataEntity, 'core')
|
||||
@InjectRepository(ObjectMetadataEntity)
|
||||
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
+1
-4
@@ -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,
|
||||
|
||||
+1
-1
@@ -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<Workspace>,
|
||||
private readonly messagingMonitoringService: MessagingMonitoringService,
|
||||
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
|
||||
|
||||
+2
-2
@@ -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,
|
||||
|
||||
@@ -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<ViewFieldEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -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<ViewFilterGroupEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -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<ViewFilterEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -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<ViewGroupEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -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<ViewSortEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -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<ViewEntity>,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -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,
|
||||
],
|
||||
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ import { WorkflowVersionValidationWorkspaceService } from 'src/modules/workflow/
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
|
||||
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
|
||||
ServerlessFunctionModule,
|
||||
RecordPositionModule,
|
||||
WorkspaceCacheStorageModule,
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ import { WorkflowVersionEdgeModule } from 'src/modules/workflow/workflow-builder
|
||||
WorkflowVersionModule,
|
||||
WorkflowVersionStepModule,
|
||||
WorkflowVersionEdgeModule,
|
||||
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
|
||||
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
|
||||
],
|
||||
exports: [
|
||||
WorkflowSchemaModule,
|
||||
|
||||
+2
-2
@@ -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(),
|
||||
},
|
||||
|
||||
+1
-4
@@ -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],
|
||||
|
||||
+2
-2
@@ -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,
|
||||
|
||||
+1
-1
@@ -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],
|
||||
|
||||
+1
-4
@@ -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,
|
||||
|
||||
+1
-1
@@ -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>,
|
||||
) {}
|
||||
|
||||
|
||||
+2
-2
@@ -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,
|
||||
) {}
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ import { WorkflowRunQueueWorkspaceService } from 'src/modules/workflow/workflow-
|
||||
@Module({
|
||||
imports: [
|
||||
CacheStorageModule,
|
||||
TypeOrmModule.forFeature([Workspace], 'core'),
|
||||
TypeOrmModule.forFeature([Workspace]),
|
||||
MessageQueueModule,
|
||||
WorkspaceDataSourceModule,
|
||||
MetricsModule,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
) {
|
||||
|
||||
+1
-4
@@ -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,
|
||||
|
||||
+2
-2
@@ -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',
|
||||
|
||||
+1
-4
@@ -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],
|
||||
})
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import { DatabaseEventTriggerListener } from 'src/modules/workflow/workflow-trig
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([Workspace], 'core'),
|
||||
TypeOrmModule.forFeature([Workspace]),
|
||||
WorkflowCommonModule,
|
||||
WorkspaceDataSourceModule,
|
||||
],
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ import { WorkflowTriggerWorkspaceService } from 'src/modules/workflow/workflow-t
|
||||
WorkflowCommonModule,
|
||||
WorkflowRunnerModule,
|
||||
AutomatedTriggerModule,
|
||||
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'core'),
|
||||
NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),
|
||||
],
|
||||
providers: [
|
||||
WorkflowTriggerWorkspaceService,
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ export class WorkspaceMemberDeleteOnePreQueryHook
|
||||
{
|
||||
constructor(
|
||||
private readonly twentyORMManager: TwentyORMManager,
|
||||
@InjectRepository(UserWorkspace, 'core')
|
||||
@InjectRepository(UserWorkspace)
|
||||
private readonly userWorkspaceRepository: Repository<UserWorkspace>,
|
||||
private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,
|
||||
) {}
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ import { WorkspaceMemberUpdateOnePreQueryHook } from 'src/modules/workspace-memb
|
||||
imports: [
|
||||
FeatureFlagModule,
|
||||
PermissionsModule,
|
||||
TypeOrmModule.forFeature([UserWorkspace], 'core'),
|
||||
TypeOrmModule.forFeature([UserWorkspace]),
|
||||
],
|
||||
})
|
||||
export class WorkspaceMemberQueryHookModule {}
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ export class WorkspaceMemberUpdateOnePreQueryHook
|
||||
{
|
||||
constructor(
|
||||
private readonly workspaceMemberPreQueryHookService: WorkspaceMemberPreQueryHookService,
|
||||
@InjectRepository(UserWorkspace, 'core')
|
||||
@InjectRepository(UserWorkspace)
|
||||
private readonly userWorkspaceRepository: Repository<UserWorkspace>,
|
||||
) {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user