Remove typeorm service (#14116)
## Context To simplify the way we inject our default datasource, I've recently removed the token injection that was confusion since we only had once configured on the module level. Now I'm removing TypeORM service which allows us to instantiate a new Datasource with the same parameters as the default one, it was redundant and confusing.
This commit is contained in:
-12
@@ -5,7 +5,6 @@ import { type DataSource, type Repository } from 'typeorm';
|
||||
|
||||
import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
|
||||
|
||||
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
|
||||
import { type ApprovedAccessDomain } from 'src/engine/core-modules/approved-access-domain/approved-access-domain.entity';
|
||||
import { ApprovedAccessDomainService } from 'src/engine/core-modules/approved-access-domain/services/approved-access-domain.service';
|
||||
import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
|
||||
@@ -33,7 +32,6 @@ describe('UserWorkspaceService', () => {
|
||||
let service: UserWorkspaceService;
|
||||
let userWorkspaceRepository: Repository<UserWorkspace>;
|
||||
let userRepository: Repository<User>;
|
||||
let typeORMService: TypeORMService;
|
||||
let workspaceInvitationService: WorkspaceInvitationService;
|
||||
let approvedAccessDomainService: ApprovedAccessDomainService;
|
||||
let twentyORMGlobalManager: TwentyORMGlobalManager;
|
||||
@@ -75,12 +73,6 @@ describe('UserWorkspaceService', () => {
|
||||
getLastDataSourceMetadataFromWorkspaceIdOrFail: jest.fn(),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: TypeORMService,
|
||||
useValue: {
|
||||
getMainDataSource: jest.fn(),
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: WorkspaceInvitationService,
|
||||
useValue: {
|
||||
@@ -142,7 +134,6 @@ describe('UserWorkspaceService', () => {
|
||||
fileService = module.get<FileService>(FileService);
|
||||
userWorkspaceRepository = module.get(getRepositoryToken(UserWorkspace));
|
||||
userRepository = module.get(getRepositoryToken(User));
|
||||
typeORMService = module.get<TypeORMService>(TypeORMService);
|
||||
workspaceInvitationService = module.get<WorkspaceInvitationService>(
|
||||
WorkspaceInvitationService,
|
||||
);
|
||||
@@ -346,9 +337,6 @@ describe('UserWorkspaceService', () => {
|
||||
find: jest.fn().mockResolvedValue(workspaceMember),
|
||||
};
|
||||
|
||||
jest
|
||||
.spyOn(typeORMService, 'getMainDataSource')
|
||||
.mockReturnValue(mainDataSource);
|
||||
jest
|
||||
.spyOn(mainDataSource, 'query')
|
||||
.mockResolvedValueOnce(undefined)
|
||||
|
||||
@@ -5,7 +5,6 @@ import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
|
||||
import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
|
||||
|
||||
import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
|
||||
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
|
||||
import { AuditModule } from 'src/engine/core-modules/audit/audit.module';
|
||||
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
|
||||
import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
|
||||
@@ -53,11 +52,6 @@ import { UserService } from './services/user.service';
|
||||
UserWorkspaceModule,
|
||||
],
|
||||
exports: [UserService, WorkspaceMemberTranspiler],
|
||||
providers: [
|
||||
UserService,
|
||||
UserResolver,
|
||||
TypeORMService,
|
||||
WorkspaceMemberTranspiler,
|
||||
],
|
||||
providers: [UserService, UserResolver, WorkspaceMemberTranspiler],
|
||||
})
|
||||
export class UserModule {}
|
||||
|
||||
Reference in New Issue
Block a user