From 4d3667f86603412d44d53c5eff2187f464a3fac7 Mon Sep 17 00:00:00 2001 From: Artem Date: Mon, 24 Apr 2023 17:45:12 +0300 Subject: [PATCH] #RI-4445 handle provider field during db import --- .../src/modules/database-import/database-import.service.spec.ts | 2 ++ .../api/src/modules/database-import/database-import.service.ts | 1 + .../api/src/modules/database-import/dto/import.database.dto.ts | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts index 14c9e934bc..db8d34c288 100644 --- a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts +++ b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts @@ -161,10 +161,12 @@ describe('DatabaseImportService', () => { it('should create standalone database', async () => { await service['createDatabase']({ ...mockDatabase, + provider: 'RE_CLOUD', }, 0); expect(databaseRepository.create).toHaveBeenCalledWith({ ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout']), + provider: 'RE_CLOUD', new: true, }); }); diff --git a/redisinsight/api/src/modules/database-import/database-import.service.ts b/redisinsight/api/src/modules/database-import/database-import.service.ts index deae2118ec..f8eb846424 100644 --- a/redisinsight/api/src/modules/database-import/database-import.service.ts +++ b/redisinsight/api/src/modules/database-import/database-import.service.ts @@ -37,6 +37,7 @@ export class DatabaseImportService { ['host', ['host']], ['port', ['port']], ['db', ['db']], + ['provider', ['provider']], ['isCluster', ['cluster']], ['type', ['type']], ['connectionType', ['connectionType']], diff --git a/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts b/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts index 0f15340745..67a5602548 100644 --- a/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts +++ b/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts @@ -14,7 +14,7 @@ import { UseClientCertificateDto } from 'src/modules/certificate/dto/use.client- export class ImportDatabaseDto extends PickType(Database, [ 'host', 'port', 'name', 'db', 'username', 'password', 'connectionType', 'tls', 'verifyServerCert', 'sentinelMaster', 'nodes', - 'new', 'ssh', 'sshOptions', + 'new', 'ssh', 'sshOptions', 'provider', ] as const) { @Expose() @IsNotEmpty()