Merge pull request #1120 from RedisInsight/feature/RI-3357-nestjs-upgrade

Feature/ri 3357 nestjs upgrade

Author: AlenaSY

redisinsight/api/config/ormconfig.ts

@@ -29,9 +29,6 @@ const ormConfig: TypeOrmModuleOptions = {
     NotificationEntity,
   ],
   migrations,
-  cli: {
-    migrationsDir: 'migration',
-  },
 };
 
 export default ormConfig;

redisinsight/api/package.json

@@ -38,15 +38,15 @@
     "typeorm:run": "yarn typeorm migration:run"
   },
   "dependencies": {
-    "@nestjs/common": "^7.6.15",
-    "@nestjs/core": "^7.0.0",
-    "@nestjs/event-emitter": "^1.0.0",
-    "@nestjs/platform-express": "^7.0.0",
-    "@nestjs/platform-socket.io": "^8.2.3",
-    "@nestjs/serve-static": "^2.1.3",
-    "@nestjs/swagger": "^4.6.1",
-    "@nestjs/typeorm": "^7.1.5",
-    "@nestjs/websockets": "^8.2.3",
+    "@nestjs/common": "^9.0.11",
+    "@nestjs/core": "^9.0.11",
+    "@nestjs/event-emitter": "^1.3.1",
+    "@nestjs/platform-express": "^9.0.11",
+    "@nestjs/platform-socket.io": "^9.0.11",
+    "@nestjs/serve-static": "^3.0.0",
+    "@nestjs/swagger": "^6.1.2",
+    "@nestjs/typeorm": "^9.0.1",
+    "@nestjs/websockets": "^9.0.11",
     "adm-zip": "^0.5.9",
     "analytics-node": "^4.0.1",
     "axios": "^0.25.0",
@@ -63,21 +63,21 @@
     "nest-router": "^1.0.9",
     "nest-winston": "^1.4.0",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.6.7",
+    "rxjs": "^7.5.6",
     "socket.io": "^4.4.0",
     "source-map-support": "^0.5.19",
     "sqlite3": "^5.0.11",
     "swagger-ui-express": "^4.1.4",
-    "typeorm": "^0.2.29",
+    "typeorm": "^0.3.9",
     "uuid": "^8.3.2",
     "winston": "^3.3.3",
     "winston-daily-rotate-file": "^4.5.0"
   },
   "devDependencies": {
     "@mochajs/json-file-reporter": "^1.3.0",
-    "@nestjs/cli": "^7.5.4",
-    "@nestjs/schematics": "^7.0.0",
-    "@nestjs/testing": "^7.0.0",
+    "@nestjs/cli": "^9.1.2",
+    "@nestjs/schematics": "^9.0.3",
+    "@nestjs/testing": "^9.0.11",
     "@types/axios": "^0.14.0",
     "@types/express": "^4.17.3",
     "@types/jest": "^26.0.15",

redisinsight/api/src/__mocks__/common.ts

@@ -46,6 +46,7 @@ export const mockCreateQueryBuilder = jest.fn(() => ({
 
 export const mockRepository = jest.fn(() => ({
   findOne: jest.fn(),
+  findOneBy: jest.fn(),
   find: jest.fn(),
   findByIds: jest.fn(),
   create: jest.fn(),

redisinsight/api/src/modules/core/core.module.ts

@@ -3,13 +3,13 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { CaCertificateEntity } from 'src/modules/core/models/ca-certificate.entity';
 import { ClientCertificateEntity } from 'src/modules/core/models/client-certificate.entity';
 import { PlainEncryptionStrategy } from 'src/modules/core/encryption/strategies/plain-encryption.strategy';
-import { AgreementsRepository } from './repositories/agreements.repository';
-import { ServerRepository } from './repositories/server.repository';
-import { SettingsRepository } from './repositories/settings.repository';
-import settingsOnPremiseFactory from './providers/settings-on-premise';
-import serverOnPremiseFactory from './providers/server-on-premise';
 import { EncryptionService } from 'src/modules/core/encryption/encryption.service';
 import { KeytarEncryptionStrategy } from 'src/modules/core/encryption/strategies/keytar-encryption.strategy';
+import { AgreementsEntity } from 'src/modules/core/models/agreements.entity';
+import { ServerEntity } from 'src/modules/core/models/server.entity';
+import { SettingsEntity } from 'src/modules/core/models/settings.entity';
+import settingsOnPremiseFactory from './providers/settings-on-premise';
+import serverOnPremiseFactory from './providers/server-on-premise';
 import { CaCertBusinessService } from './services/certificates/ca-cert-business/ca-cert-business.service';
 import { ClientCertBusinessService } from './services/certificates/client-cert-business/client-cert-business.service';
 import { RedisService } from './services/redis/redis.service';
@@ -32,11 +32,11 @@ export class CoreModule {
       module: CoreModule,
       imports: [
         TypeOrmModule.forFeature([
+          ServerEntity,
+          SettingsEntity,
+          AgreementsEntity,
           CaCertificateEntity,
           ClientCertificateEntity,
-          AgreementsRepository,
-          ServerRepository,
-          SettingsRepository,
         ]),
       ],
       providers: [

redisinsight/api/src/modules/core/providers/server-on-premise/index.ts

@@ -1,14 +1,6 @@
-import { ServerRepository } from 'src/modules/core/repositories/server.repository';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { EncryptionService } from 'src/modules/core/encryption/encryption.service';
 import { ServerOnPremiseService } from './server-on-premise.service';
 
 export default {
   provide: 'SERVER_PROVIDER',
-  useFactory: (
-    repository: ServerRepository,
-    eventEmitter: EventEmitter2,
-    encryptionService: EncryptionService,
-  ) => new ServerOnPremiseService(repository, eventEmitter, encryptionService),
-  inject: [ServerRepository, EventEmitter2, EncryptionService],
+  useClass: ServerOnPremiseService,
 };

redisinsight/api/src/modules/core/providers/server-on-premise/server-on-premise.service.spec.ts

@@ -45,6 +45,7 @@ describe('ServerOnPremiseService', () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         EventEmitter2,
+        ServerOnPremiseService,
         {
           provide: getRepositoryToken(ServerEntity),
           useFactory: mockRepository,
@@ -59,34 +60,34 @@ describe('ServerOnPremiseService', () => {
     serverRepository = await module.get(getRepositoryToken(ServerEntity));
     eventEmitter = await module.get<EventEmitter2>(EventEmitter2);
     encryptionService = module.get(EncryptionService);
-    service = new ServerOnPremiseService(serverRepository, eventEmitter, encryptionService);
+    service = module.get(ServerOnPremiseService);
   });
 
   describe('onApplicationBootstrap', () => {
     beforeEach(() => {
       eventEmitter.emit = jest.fn();
     });
     it('should create server instance on first application launch', async () => {
-      serverRepository.findOne.mockResolvedValue(null);
+      serverRepository.findOneBy.mockResolvedValue(null);
       serverRepository.create.mockReturnValue(mockServerEntity);
 
       await service.onApplicationBootstrap();
 
-      expect(serverRepository.findOne).toHaveBeenCalled();
+      expect(serverRepository.findOneBy).toHaveBeenCalled();
       expect(serverRepository.create).toHaveBeenCalled();
       expect(serverRepository.save).toHaveBeenCalledWith(mockServerEntity);
     });
     it('should not create server instance on the second application launch', async () => {
-      serverRepository.findOne.mockResolvedValue(mockServerEntity);
+      serverRepository.findOneBy.mockResolvedValue(mockServerEntity);
 
       await service.onApplicationBootstrap();
 
-      expect(serverRepository.findOne).toHaveBeenCalled();
+      expect(serverRepository.findOneBy).toHaveBeenCalled();
       expect(serverRepository.create).not.toHaveBeenCalled();
       expect(serverRepository.save).not.toHaveBeenCalled();
     });
     it('should emit APPLICATION_FIRST_START on first application launch', async () => {
-      serverRepository.findOne.mockResolvedValue(null);
+      serverRepository.findOneBy.mockResolvedValue(null);
       serverRepository.create.mockReturnValue(mockServerEntity);
 
       await service.onApplicationBootstrap(sessionId);
@@ -106,7 +107,7 @@ describe('ServerOnPremiseService', () => {
       );
     });
     it('should emit APPLICATION_STARTED on second application launch', async () => {
-      serverRepository.findOne.mockResolvedValue(mockServerEntity);
+      serverRepository.findOneBy.mockResolvedValue(mockServerEntity);
 
       await service.onApplicationBootstrap(sessionId);
 
@@ -128,7 +129,7 @@ describe('ServerOnPremiseService', () => {
 
   describe('getInfo', () => {
     it('should return server info', async () => {
-      serverRepository.findOne.mockResolvedValue(mockServerEntity);
+      serverRepository.findOneBy.mockResolvedValue(mockServerEntity);
       encryptionService.getAvailableEncryptionStrategies.mockResolvedValue([
         EncryptionStrategy.PLAIN,
         EncryptionStrategy.KEYTAR,
@@ -148,7 +149,7 @@ describe('ServerOnPremiseService', () => {
       });
     });
     it('should throw ServerInfoNotFoundException', async () => {
-      serverRepository.findOne.mockResolvedValue(null);
+      serverRepository.findOneBy.mockResolvedValue(null);
 
       try {
         await service.getInfo();
@@ -158,7 +159,7 @@ describe('ServerOnPremiseService', () => {
       }
     });
     it('should throw InternalServerError', async () => {
-      serverRepository.findOne.mockRejectedValue(new Error('some error'));
+      serverRepository.findOneBy.mockRejectedValue(new Error('some error'));
 
       try {
         await service.getInfo();

redisinsight/api/src/modules/core/providers/server-on-premise/server-on-premise.service.ts

@@ -4,10 +4,12 @@ import config from 'src/utils/config';
 import { AppAnalyticsEvents } from 'src/constants/app-events';
 import { TelemetryEvents } from 'src/constants/telemetry-events';
 import { GetServerInfoResponse } from 'src/dto/server.dto';
-import { ServerRepository } from 'src/modules/core/repositories/server.repository';
 import { AppType, BuildType, IServerProvider } from 'src/modules/core/models/server-provider.interface';
 import { ServerInfoNotFoundException } from 'src/constants/exceptions';
 import { EncryptionService } from 'src/modules/core/encryption/encryption.service';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { ServerEntity } from 'src/modules/core/models/server.entity';
 
 const SERVER_CONFIG = config.get('server');
 const REDIS_STACK_CONFIG = config.get('redisStack');
@@ -17,19 +19,14 @@ export class ServerOnPremiseService
 implements OnApplicationBootstrap, IServerProvider {
   private logger = new Logger('ServerOnPremiseService');
 
-  private repository: ServerRepository;
-
-  private eventEmitter: EventEmitter2;
-
-  private encryptionService: EncryptionService;
-
   private sessionId: number;
 
-  constructor(repository, eventEmitter, encryptionService) {
-    this.repository = repository;
-    this.eventEmitter = eventEmitter;
-    this.encryptionService = encryptionService;
-  }
+  constructor(
+    @InjectRepository(ServerEntity)
+    private readonly repository: Repository<ServerEntity>,
+    private readonly eventEmitter: EventEmitter2,
+    private readonly encryptionService: EncryptionService,
+  ) {}
 
   async onApplicationBootstrap(sessionId: number = new Date().getTime()) {
     this.sessionId = sessionId;
@@ -38,7 +35,7 @@ implements OnApplicationBootstrap, IServerProvider {
 
   private async upsertServerInfo() {
     this.logger.log('Checking server info.');
-    let serverInfo = await this.repository.findOne();
+    let serverInfo = await this.repository.findOneBy({});
     if (!serverInfo) {
       this.logger.log('First application launch.');
       // Create default server info on first application launch
@@ -83,7 +80,7 @@ implements OnApplicationBootstrap, IServerProvider {
   public async getInfo(): Promise<GetServerInfoResponse> {
     this.logger.log('Getting server info.');
     try {
-      const info = await this.repository.findOne();
+      const info = await this.repository.findOneBy({});
       if (!info) {
         return Promise.reject(new ServerInfoNotFoundException());
       }

redisinsight/api/src/modules/core/providers/settings-on-premise/index.ts

@@ -1,26 +1,6 @@
-import { SettingsRepository } from 'src/modules/core/repositories/settings.repository';
-import { SettingsAnalyticsService } from 'src/modules/core/services/settings-analytics/settings-analytics.service';
-import { KeytarEncryptionStrategy } from 'src/modules/core/encryption/strategies/keytar-encryption.strategy';
 import { SettingsOnPremiseService } from './settings-on-premise.service';
-import { AgreementsRepository } from '../../repositories/agreements.repository';
 
 export default {
   provide: 'SETTINGS_PROVIDER',
-  useFactory: (
-    agreementsRepository: AgreementsRepository,
-    settingsRepository: SettingsRepository,
-    analyticsService: SettingsAnalyticsService,
-    keytarEncryptionStrategy: KeytarEncryptionStrategy,
-  ) => new SettingsOnPremiseService(
-    agreementsRepository,
-    settingsRepository,
-    analyticsService,
-    keytarEncryptionStrategy,
-  ),
-  inject: [
-    AgreementsRepository,
-    SettingsRepository,
-    SettingsAnalyticsService,
-    KeytarEncryptionStrategy,
-  ],
+  useClass: SettingsOnPremiseService,
 };