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
@@ -9,10 +9,7 @@ import { AgentRoleService } from './agent-role.service';
@Module({
imports: [
TypeOrmModule.forFeature(
[AgentEntity, RoleEntity, RoleTargetsEntity],
'core',
),
TypeOrmModule.forFeature([AgentEntity, RoleEntity, RoleTargetsEntity]),
],
providers: [AgentRoleService],
exports: [AgentRoleService],
@@ -30,21 +30,21 @@ describe('AgentRoleService', () => {
providers: [
AgentRoleService,
{
provide: getRepositoryToken(AgentEntity, 'core'),
provide: getRepositoryToken(AgentEntity),
useValue: {
findOne: jest.fn(),
save: jest.fn(),
},
},
{
provide: getRepositoryToken(RoleEntity, 'core'),
provide: getRepositoryToken(RoleEntity),
useValue: {
findOne: jest.fn(),
save: jest.fn(),
},
},
{
provide: getRepositoryToken(RoleTargetsEntity, 'core'),
provide: getRepositoryToken(RoleTargetsEntity),
useValue: {
findOne: jest.fn(),
save: jest.fn(),
@@ -57,13 +57,13 @@ describe('AgentRoleService', () => {
service = module.get<AgentRoleService>(AgentRoleService);
agentRepository = module.get<Repository<AgentEntity>>(
getRepositoryToken(AgentEntity, 'core'),
getRepositoryToken(AgentEntity),
);
roleRepository = module.get<Repository<RoleEntity>>(
getRepositoryToken(RoleEntity, 'core'),
getRepositoryToken(RoleEntity),
);
roleTargetsRepository = module.get<Repository<RoleTargetsEntity>>(
getRepositoryToken(RoleTargetsEntity, 'core'),
getRepositoryToken(RoleTargetsEntity),
);
// Setup test data
@@ -14,11 +14,11 @@ import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
@Injectable()
export class AgentRoleService {
constructor(
@InjectRepository(AgentEntity, 'core')
@InjectRepository(AgentEntity)
private readonly agentRepository: Repository<AgentEntity>,
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
@InjectRepository(RoleTargetsEntity, 'core')
@InjectRepository(RoleTargetsEntity)
private readonly roleTargetsRepository: Repository<RoleTargetsEntity>,
) {}
@@ -19,11 +19,11 @@ import { AgentTitleGenerationService } from './agent-title-generation.service';
@Injectable()
export class AgentChatService {
constructor(
@InjectRepository(AgentChatThreadEntity, 'core')
@InjectRepository(AgentChatThreadEntity)
private readonly threadRepository: Repository<AgentChatThreadEntity>,
@InjectRepository(AgentChatMessageEntity, 'core')
@InjectRepository(AgentChatMessageEntity)
private readonly messageRepository: Repository<AgentChatMessageEntity>,
@InjectRepository(FileEntity, 'core')
@InjectRepository(FileEntity)
private readonly fileRepository: Repository<FileEntity>,
private readonly titleGenerationService: AgentTitleGenerationService,
) {}
@@ -61,10 +61,9 @@ export class AgentExecutionService {
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
private readonly aiModelRegistryService: AiModelRegistryService,
private readonly agentToolGeneratorService: AgentToolGeneratorService,
@InjectRepository(AgentEntity, 'core')
@InjectRepository(AgentEntity)
private readonly agentRepository: Repository<AgentEntity>,
@InjectRepository(FileEntity, 'core')
@InjectRepository(FileEntity)
private readonly fileRepository: Repository<FileEntity>,
) {}
@@ -23,7 +23,7 @@ export class AgentHandoffExecutorService {
private readonly logger = new Logger(AgentHandoffExecutorService.name);
constructor(
@InjectRepository(AgentEntity, 'core')
@InjectRepository(AgentEntity)
private readonly agentRepository: Repository<AgentEntity>,
private readonly agentHandoffService: AgentHandoffService,
private readonly aiModelRegistryService: AiModelRegistryService,
@@ -10,9 +10,9 @@ import { AgentException, AgentExceptionCode } from './agent.exception';
@Injectable()
export class AgentHandoffService {
constructor(
@InjectRepository(AgentEntity, 'core')
@InjectRepository(AgentEntity)
private readonly agentRepository: Repository<AgentEntity>,
@InjectRepository(AgentHandoffEntity, 'core')
@InjectRepository(AgentHandoffEntity)
private readonly agentHandoffRepository: Repository<AgentHandoffEntity>,
) {}
@@ -30,7 +30,7 @@ export class AgentStreamingService {
private readonly logger = new Logger(AgentStreamingService.name);
constructor(
@InjectRepository(AgentChatThreadEntity, 'core')
@InjectRepository(AgentChatThreadEntity)
private readonly threadRepository: Repository<AgentChatThreadEntity>,
private readonly agentChatService: AgentChatService,
private readonly agentExecutionService: AgentExecutionService,
@@ -17,7 +17,7 @@ export class AgentToolGeneratorService {
private readonly logger = new Logger(AgentToolGeneratorService.name);
constructor(
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
private readonly toolAdapterService: ToolAdapterService,
private readonly toolService: ToolService,
@@ -39,19 +39,16 @@ import { AgentService } from './agent.service';
@Module({
imports: [
TypeOrmModule.forFeature(
[
AgentEntity,
AgentHandoffEntity,
RoleEntity,
RoleTargetsEntity,
AgentChatMessageEntity,
AgentChatThreadEntity,
FileEntity,
UserWorkspace,
],
'core',
),
TypeOrmModule.forFeature([
AgentEntity,
AgentHandoffEntity,
RoleEntity,
RoleTargetsEntity,
AgentChatMessageEntity,
AgentChatThreadEntity,
FileEntity,
UserWorkspace,
]),
AiModule,
AgentRoleModule,
ThrottlerModule,
@@ -89,10 +86,11 @@ import { AgentService } from './agent.service';
AgentChatService,
AgentStreamingService,
AgentTitleGenerationService,
TypeOrmModule.forFeature(
[AgentEntity, AgentChatMessageEntity, AgentChatThreadEntity],
'core',
),
TypeOrmModule.forFeature([
AgentEntity,
AgentChatMessageEntity,
AgentChatThreadEntity,
]),
AgentHandoffExecutorService,
AgentHandoffService,
],
@@ -29,7 +29,7 @@ import { UpdateAgentInput } from './dtos/update-agent.input';
@Resolver()
export class AgentResolver {
constructor(
@InjectRepository(AgentEntity, 'core')
@InjectRepository(AgentEntity)
private readonly agentRepository: Repository<AgentEntity>,
private readonly agentService: AgentService,
private readonly agentHandoffService: AgentHandoffService,
@@ -16,9 +16,9 @@ import { AgentException, AgentExceptionCode } from './agent.exception';
@Injectable()
export class AgentService {
constructor(
@InjectRepository(AgentEntity, 'core')
@InjectRepository(AgentEntity)
private readonly agentRepository: Repository<AgentEntity>,
@InjectRepository(RoleTargetsEntity, 'core')
@InjectRepository(RoleTargetsEntity)
private readonly roleTargetsRepository: Repository<RoleTargetsEntity>,
private readonly agentRoleService: AgentRoleService,
) {}
@@ -5,7 +5,7 @@ import { DataSourceEntity } from './data-source.entity';
import { DataSourceService } from './data-source.service';
@Module({
imports: [TypeOrmModule.forFeature([DataSourceEntity], 'core')],
imports: [TypeOrmModule.forFeature([DataSourceEntity])],
providers: [DataSourceService],
exports: [DataSourceService],
})
@@ -13,7 +13,7 @@ import { DataSourceEntity } from './data-source.entity';
@Injectable()
export class DataSourceService {
constructor(
@InjectRepository(DataSourceEntity, 'core')
@InjectRepository(DataSourceEntity)
private readonly dataSourceMetadataRepository: Repository<DataSourceEntity>,
) {}
@@ -48,10 +48,10 @@ import { FieldMetadataService } from './services/field-metadata.service';
imports: [
NestjsQueryGraphQLModule.forFeature({
imports: [
NestjsQueryTypeOrmModule.forFeature(
[FieldMetadataEntity, ObjectMetadataEntity],
'core',
),
NestjsQueryTypeOrmModule.forFeature([
FieldMetadataEntity,
ObjectMetadataEntity,
]),
WorkspaceMigrationModule,
WorkspaceMigrationRunnerModule,
WorkspaceMetadataVersionModule,
@@ -32,7 +32,7 @@ import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspa
@Injectable()
export class FieldMetadataServiceV2 {
constructor(
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService,
private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
@@ -85,9 +85,9 @@ type GenerateMigrationArgs = {
@Injectable()
export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntity> {
constructor(
@InjectDataSource('core')
@InjectDataSource()
private readonly coreDataSource: DataSource,
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
private readonly workspaceMigrationService: WorkspaceMigrationService,
@@ -21,7 +21,7 @@ export class IsFieldMetadataDefaultValue
implements ValidatorConstraintInterface
{
constructor(
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly loggerService: LoggerService,
) {}
@@ -16,7 +16,7 @@ export class IsFieldMetadataOptions {
private validationErrors: string[] = [];
constructor(
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
) {}
@@ -16,13 +16,13 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
@Module({
imports: [
TypeOrmModule.forFeature([IndexMetadataEntity], 'core'),
TypeOrmModule.forFeature([IndexMetadataEntity]),
NestjsQueryGraphQLModule.forFeature({
imports: [
NestjsQueryTypeOrmModule.forFeature(
[IndexMetadataEntity, IndexFieldMetadataEntity],
'core',
),
NestjsQueryTypeOrmModule.forFeature([
IndexMetadataEntity,
IndexFieldMetadataEntity,
]),
WorkspaceMigrationModule,
],
services: [IndexMetadataService],
@@ -34,7 +34,7 @@ import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target
@Injectable()
export class IndexMetadataService {
constructor(
@InjectRepository(IndexMetadataEntity, 'core')
@InjectRepository(IndexMetadataEntity)
private readonly indexMetadataRepository: Repository<IndexMetadataEntity>,
private readonly workspaceMigrationService: WorkspaceMigrationService,
) {}
@@ -42,7 +42,7 @@ describe('BeforeUpdateOneObject', () => {
},
},
{
provide: getRepositoryToken(FieldMetadataEntity, 'core'),
provide: getRepositoryToken(FieldMetadataEntity),
useValue: {
findBy: jest.fn(),
},
@@ -57,7 +57,7 @@ describe('BeforeUpdateOneObject', () => {
ObjectMetadataService,
);
fieldMetadataRepository = module.get<Repository<FieldMetadataEntity>>(
getRepositoryToken(FieldMetadataEntity, 'core'),
getRepositoryToken(FieldMetadataEntity),
);
});
@@ -37,7 +37,7 @@ export class ObjectMetadataServiceV2 {
private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService,
private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
private readonly objectMetadataRelatedRecordsService: ObjectMetadataRelatedRecordsService,
@InjectRepository(ViewEntity, 'core')
@InjectRepository(ViewEntity)
private readonly viewRepository: Repository<ViewEntity>,
) {}
@@ -52,11 +52,11 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa
NestjsQueryGraphQLModule.forFeature({
imports: [
TypeORMModule,
NestjsQueryTypeOrmModule.forFeature(
[ObjectMetadataEntity, FieldMetadataEntity],
'core',
),
TypeOrmModule.forFeature([FeatureFlag, ViewEntity], 'core'),
NestjsQueryTypeOrmModule.forFeature([
ObjectMetadataEntity,
FieldMetadataEntity,
]),
TypeOrmModule.forFeature([FeatureFlag, ViewEntity]),
DataSourceModule,
WorkspaceMigrationModule,
WorkspaceMigrationRunnerModule,
@@ -59,7 +59,7 @@ import { type CreateObjectInput } from './dtos/create-object.input';
@Injectable()
export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEntity> {
constructor(
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
private readonly dataSourceService: DataSourceService,
@@ -39,9 +39,9 @@ export const DEFAULT_RELATIONS_OBJECTS_STANDARD_IDS = [
@Injectable()
export class ObjectMetadataFieldRelationService {
constructor(
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
) {}
@@ -32,7 +32,7 @@ import { RELATION_MIGRATION_PRIORITY_PREFIX } from 'src/engine/workspace-manager
@Injectable()
export class ObjectMetadataMigrationService {
constructor(
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly workspaceMigrationService: WorkspaceMigrationService,
private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
@@ -31,20 +31,20 @@ describe('ObjectPermissionService', () => {
providers: [
ObjectPermissionService,
{
provide: getRepositoryToken(ObjectPermissionEntity, 'core'),
provide: getRepositoryToken(ObjectPermissionEntity),
useValue: {
upsert: jest.fn(),
find: jest.fn(),
},
},
{
provide: getRepositoryToken(RoleEntity, 'core'),
provide: getRepositoryToken(RoleEntity),
useValue: {
findOne: jest.fn(),
},
},
{
provide: getRepositoryToken(ObjectMetadataEntity, 'core'),
provide: getRepositoryToken(ObjectMetadataEntity),
useValue: {
find: jest.fn(),
},
@@ -66,9 +66,9 @@ describe('ObjectPermissionService', () => {
service = module.get<ObjectPermissionService>(ObjectPermissionService);
objectPermissionRepository = module.get(
getRepositoryToken(ObjectPermissionEntity, 'core'),
getRepositoryToken(ObjectPermissionEntity),
);
roleRepository = module.get(getRepositoryToken(RoleEntity, 'core'));
roleRepository = module.get(getRepositoryToken(RoleEntity));
workspacePermissionsCacheService = module.get(
WorkspacePermissionsCacheService,
);
@@ -77,13 +77,13 @@ describe('FieldPermissionService', () => {
providers: [
FieldPermissionService,
{
provide: getRepositoryToken(RoleEntity, 'core'),
provide: getRepositoryToken(RoleEntity),
useValue: {
findOne: jest.fn(),
},
},
{
provide: getRepositoryToken(FieldPermissionEntity, 'core'),
provide: getRepositoryToken(FieldPermissionEntity),
useValue: {
find: jest.fn(),
upsert: jest.fn(),
@@ -104,7 +104,7 @@ describe('FieldPermissionService', () => {
},
},
{
provide: getRepositoryToken(FieldMetadataEntity, 'core'),
provide: getRepositoryToken(FieldMetadataEntity),
useValue: {
find: jest.fn(),
},
@@ -114,11 +114,11 @@ describe('FieldPermissionService', () => {
service = module.get<FieldPermissionService>(FieldPermissionService);
fieldPermissionsRepository = module.get(
getRepositoryToken(FieldPermissionEntity, 'core'),
getRepositoryToken(FieldPermissionEntity),
);
roleRepository = module.get(getRepositoryToken(RoleEntity, 'core'));
roleRepository = module.get(getRepositoryToken(RoleEntity));
fieldMetadataRepository = module.get(
getRepositoryToken(FieldMetadataEntity, 'core'),
getRepositoryToken(FieldMetadataEntity),
);
workspacePermissionsCacheService = module.get(
WorkspacePermissionsCacheService,
@@ -28,11 +28,11 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage
@Injectable()
export class FieldPermissionService {
constructor(
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
@InjectRepository(FieldPermissionEntity, 'core')
@InjectRepository(FieldPermissionEntity)
private readonly fieldPermissionsRepository: Repository<FieldPermissionEntity>,
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
@@ -13,16 +13,13 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
@Module({
imports: [
TypeOrmModule.forFeature(
[
ObjectPermissionEntity,
RoleEntity,
ObjectMetadataEntity,
FieldPermissionEntity,
FieldMetadataEntity,
],
'core',
),
TypeOrmModule.forFeature([
ObjectPermissionEntity,
RoleEntity,
ObjectMetadataEntity,
FieldPermissionEntity,
FieldMetadataEntity,
]),
WorkspaceCacheStorageModule,
WorkspacePermissionsCacheModule,
],
@@ -20,11 +20,11 @@ import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage
export class ObjectPermissionService {
constructor(
@InjectRepository(ObjectPermissionEntity, 'core')
@InjectRepository(ObjectPermissionEntity)
private readonly objectPermissionRepository: Repository<ObjectPermissionEntity>,
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
@@ -8,7 +8,7 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor
@Module({
imports: [
TypeOrmModule.forFeature([PermissionFlagEntity, RoleEntity], 'core'),
TypeOrmModule.forFeature([PermissionFlagEntity, RoleEntity]),
WorkspacePermissionsCacheModule,
],
@@ -16,9 +16,9 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo
export class PermissionFlagService {
constructor(
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
@InjectDataSource('core')
@InjectDataSource()
private readonly coreDataSource: DataSource,
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
) {}
@@ -14,12 +14,14 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor
@Module({
imports: [
TypeOrmModule.forFeature(
[RoleEntity, RoleTargetsEntity, ApiKey, Workspace],
'core',
),
TypeOrmModule.forFeature([
RoleEntity,
RoleTargetsEntity,
ApiKey,
Workspace,
]),
FeatureFlagModule,
TypeOrmModule.forFeature([UserWorkspace], 'core'),
TypeOrmModule.forFeature([UserWorkspace]),
UserRoleModule,
WorkspacePermissionsCacheModule,
],
@@ -27,7 +27,7 @@ export class PermissionsService {
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
private readonly apiKeyRoleService: ApiKeyRoleService,
private readonly featureFlagService: FeatureFlagService,
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
) {}
@@ -13,10 +13,10 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
@Module({
imports: [
JwtModule,
TypeOrmModule.forFeature([RemoteServerEntity], 'core'),
TypeOrmModule.forFeature([RemoteServerEntity]),
RemoteTableModule,
WorkspaceDataSourceModule,
TypeOrmModule.forFeature([FeatureFlag], 'core'),
TypeOrmModule.forFeature([FeatureFlag]),
],
providers: [
RemoteServerService,
@@ -33,17 +33,17 @@ import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/auth-contex
@Injectable()
export class RemoteServerService<T extends RemoteServerType> {
constructor(
@InjectRepository(RemoteServerEntity, 'core')
@InjectRepository(RemoteServerEntity)
private readonly remoteServerRepository: Repository<
RemoteServerEntity<RemoteServerType>
>,
@InjectDataSource('core')
@InjectDataSource()
private readonly coreDataSource: DataSource,
private readonly jwtWrapperService: JwtWrapperService,
private readonly foreignDataWrapperServerQueryFactory: ForeignDataWrapperServerQueryFactory,
private readonly remoteTableService: RemoteTableService,
private readonly workspaceDataSourceService: WorkspaceDataSourceService,
@InjectRepository(FeatureFlag, 'core')
@InjectRepository(FeatureFlag)
private readonly featureFlagRepository: Repository<FeatureFlag>,
) {}
@@ -8,7 +8,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
@Module({
imports: [
WorkspaceDataSourceModule,
TypeOrmModule.forFeature([RemoteServerEntity], 'core'),
TypeOrmModule.forFeature([RemoteServerEntity]),
],
providers: [DistantTableService],
exports: [DistantTableService],
@@ -8,10 +8,7 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
@Module({
imports: [
TypeOrmModule.forFeature(
[ObjectMetadataEntity, FieldMetadataEntity],
'core',
),
TypeOrmModule.forFeature([ObjectMetadataEntity, FieldMetadataEntity]),
WorkspaceMigrationModule,
],
providers: [RemoteTableRelationsService],
@@ -24,10 +24,10 @@ import { createForeignKeyDeterministicUuid } from 'src/engine/workspace-manager/
@Injectable()
export class RemoteTableRelationsService {
constructor(
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly workspaceMigrationService: WorkspaceMigrationService,
) {}
@@ -17,7 +17,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
@Module({
imports: [
DistantTableModule,
TypeOrmModule.forFeature([RemoteServerEntity, RemoteTableEntity], 'core'),
TypeOrmModule.forFeature([RemoteServerEntity, RemoteTableEntity]),
DataSourceModule,
ObjectMetadataModule,
FieldMetadataModule,
@@ -49,9 +49,9 @@ export class RemoteTableService {
private readonly logger = new Logger(RemoteTableService.name);
constructor(
@InjectRepository(RemoteTableEntity, 'core')
@InjectRepository(RemoteTableEntity)
private readonly remoteTableRepository: Repository<RemoteTableEntity>,
@InjectRepository(RemoteServerEntity, 'core')
@InjectRepository(RemoteServerEntity)
private readonly remoteServerRepository: Repository<
RemoteServerEntity<RemoteServerType>
>,
@@ -18,8 +18,8 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor
@Module({
imports: [
TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity], 'core'),
TypeOrmModule.forFeature([UserWorkspace, Workspace], 'core'),
TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity]),
TypeOrmModule.forFeature([UserWorkspace, Workspace]),
UserRoleModule,
AgentRoleModule,
PermissionsModule,
@@ -23,9 +23,9 @@ import { WorkspacePermissionsCacheService } from 'src/engine/metadata-modules/wo
export class RoleService {
constructor(
@InjectRepository(Workspace, 'core')
@InjectRepository(Workspace)
private readonly workspaceRepository: Repository<Workspace>,
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
private readonly userRoleService: UserRoleService,
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
@@ -10,10 +10,10 @@ import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-
@Module({
imports: [
NestjsQueryTypeOrmModule.forFeature(
[ObjectMetadataEntity, FieldMetadataEntity],
'core',
),
NestjsQueryTypeOrmModule.forFeature([
ObjectMetadataEntity,
FieldMetadataEntity,
]),
IndexMetadataModule,
WorkspaceMigrationModule,
],
@@ -35,11 +35,11 @@ import { type SearchableFieldType } from 'src/engine/workspace-manager/workspace
@Injectable()
export class SearchVectorService {
constructor(
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
private readonly tsVectorColumnActionFactory: TsVectorColumnActionFactory,
private readonly indexMetadataService: IndexMetadataService,
@InjectRepository(FieldMetadataEntity, 'core')
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly workspaceMigrationService: WorkspaceMigrationService,
private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
@@ -16,8 +16,8 @@ import { ServerlessFunctionService } from 'src/engine/metadata-modules/serverles
@Module({
imports: [
FileUploadModule,
NestjsQueryTypeOrmModule.forFeature([ServerlessFunctionEntity], 'core'),
TypeOrmModule.forFeature([FeatureFlag], 'core'),
NestjsQueryTypeOrmModule.forFeature([ServerlessFunctionEntity]),
TypeOrmModule.forFeature([FeatureFlag]),
FileModule,
ThrottlerModule,
AuditModule,
@@ -30,7 +30,7 @@ import { serverlessFunctionGraphQLApiExceptionHandler } from 'src/engine/metadat
export class ServerlessFunctionResolver {
constructor(
private readonly serverlessFunctionService: ServerlessFunctionService,
@InjectRepository(ServerlessFunctionEntity, 'core')
@InjectRepository(ServerlessFunctionEntity)
private readonly serverlessFunctionRepository: Repository<ServerlessFunctionEntity>,
) {}
@@ -40,7 +40,7 @@ export class ServerlessFunctionService {
constructor(
private readonly fileStorageService: FileStorageService,
private readonly serverlessService: ServerlessService,
@InjectRepository(ServerlessFunctionEntity, 'core')
@InjectRepository(ServerlessFunctionEntity)
private readonly serverlessFunctionRepository: Repository<ServerlessFunctionEntity>,
private readonly throttlerService: ThrottlerService,
private readonly twentyConfigService: TwentyConfigService,
@@ -9,8 +9,8 @@ import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/wor
@Module({
imports: [
TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity], 'core'),
TypeOrmModule.forFeature([UserWorkspace], 'core'),
TypeOrmModule.forFeature([RoleEntity, RoleTargetsEntity]),
TypeOrmModule.forFeature([UserWorkspace]),
WorkspacePermissionsCacheModule,
],
providers: [UserRoleService],
@@ -18,11 +18,11 @@ import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-membe
export class UserRoleService {
constructor(
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
@InjectRepository(RoleTargetsEntity, 'core')
@InjectRepository(RoleTargetsEntity)
private readonly roleTargetsRepository: Repository<RoleTargetsEntity>,
@InjectRepository(UserWorkspace, 'core')
@InjectRepository(UserWorkspace)
private readonly userWorkspaceRepository: Repository<UserWorkspace>,
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
private readonly workspacePermissionsCacheService: WorkspacePermissionsCacheService,
@@ -8,7 +8,7 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
@Module({
imports: [
TypeOrmModule.forFeature([Workspace, FeatureFlag], 'core'),
TypeOrmModule.forFeature([Workspace, FeatureFlag]),
WorkspaceCacheStorageModule,
],
providers: [WorkspaceFeatureFlagsMapCacheService],
@@ -18,7 +18,7 @@ export class WorkspaceFeatureFlagsMapCacheService {
constructor(
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
@InjectRepository(FeatureFlag, 'core')
@InjectRepository(FeatureFlag)
private readonly featureFlagRepository: Repository<FeatureFlag>,
) {}
@@ -32,12 +32,12 @@ export class WorkspaceMetadataCacheService {
logger = new Logger(WorkspaceMetadataCacheService.name);
constructor(
@InjectRepository(Workspace, 'core')
@InjectRepository(Workspace)
private readonly workspaceRepository: Repository<Workspace>,
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
@InjectRepository(IndexMetadataEntity, 'core')
@InjectRepository(IndexMetadataEntity)
private readonly indexMetadataRepository: Repository<IndexMetadataEntity>,
) {}
@@ -9,10 +9,11 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
@Module({
imports: [
TypeOrmModule.forFeature(
[Workspace, ObjectMetadataEntity, IndexMetadataEntity],
'core',
),
TypeOrmModule.forFeature([
Workspace,
ObjectMetadataEntity,
IndexMetadataEntity,
]),
WorkspaceCacheStorageModule,
],
exports: [WorkspaceMetadataCacheService],
@@ -16,7 +16,7 @@ export class WorkspaceMetadataVersionService {
logger = new Logger(WorkspaceMetadataCacheService.name);
constructor(
@InjectRepository(Workspace, 'core')
@InjectRepository(Workspace)
private readonly workspaceRepository: Repository<Workspace>,
private readonly workspaceMetadataCacheService: WorkspaceMetadataCacheService,
) {}
@@ -8,7 +8,7 @@ import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/
@Module({
imports: [
TypeOrmModule.forFeature([Workspace], 'core'),
TypeOrmModule.forFeature([Workspace]),
WorkspaceCacheStorageModule,
WorkspaceMetadataCacheModule,
],
@@ -8,7 +8,7 @@ import { WorkspaceMigrationEntity } from './workspace-migration.entity';
import { WorkspaceMigrationService } from './workspace-migration.service';
@Module({
imports: [TypeOrmModule.forFeature([WorkspaceMigrationEntity], 'core')],
imports: [TypeOrmModule.forFeature([WorkspaceMigrationEntity])],
providers: [
...workspaceColumnActionFactories,
WorkspaceMigrationFactory,
@@ -11,7 +11,7 @@ import {
@Injectable()
export class WorkspaceMigrationService {
constructor(
@InjectRepository(WorkspaceMigrationEntity, 'core')
@InjectRepository(WorkspaceMigrationEntity)
private readonly workspaceMigrationRepository: Repository<WorkspaceMigrationEntity>,
) {}
@@ -13,11 +13,12 @@ import { WorkspacePermissionsCacheService } from './workspace-permissions-cache.
@Module({
imports: [
TypeOrmModule.forFeature([Workspace], 'core'),
TypeOrmModule.forFeature(
[ObjectMetadataEntity, RoleEntity, RoleTargetsEntity],
'core',
),
TypeOrmModule.forFeature([Workspace]),
TypeOrmModule.forFeature([
ObjectMetadataEntity,
RoleEntity,
RoleTargetsEntity,
]),
WorkspaceCacheStorageModule,
WorkspaceFeatureFlagsMapCacheModule,
],
@@ -38,11 +38,11 @@ export class WorkspacePermissionsCacheService {
logger = new Logger(WorkspacePermissionsCacheService.name);
constructor(
@InjectRepository(ObjectMetadataEntity, 'core')
@InjectRepository(ObjectMetadataEntity)
private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
@InjectRepository(RoleEntity, 'core')
@InjectRepository(RoleEntity)
private readonly roleRepository: Repository<RoleEntity>,
@InjectRepository(RoleTargetsEntity, 'core')
@InjectRepository(RoleTargetsEntity)
private readonly roleTargetsRepository: Repository<RoleTargetsEntity>,
private readonly workspacePermissionsCacheStorageService: WorkspacePermissionsCacheStorageService,
private readonly workspaceFeatureFlagsMapCacheService: WorkspaceFeatureFlagsMapCacheService,