Merge pull request #2569 from RedisInsight/be/bugfix/RI-4882_modules_import

#RI-4882 - add modules import

Author: mariasergeenko

redisinsight/api/src/modules/database-import/database-import.service.spec.ts

@@ -165,7 +165,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         provider: 'RE_CLOUD',
         new: true,
       });
@@ -177,7 +177,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         name: `${mockDatabase.host}:${mockDatabase.port}`,
         new: true,
       });
@@ -189,7 +189,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         compressor: Compressor.NONE,
         new: true,
       });
@@ -201,7 +201,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor', 'modules']),
         compressor: Compressor.GZIP,
         new: true,
       });
@@ -214,7 +214,7 @@ describe('DatabaseImportService', () => {
       }, 0);
 
       expect(databaseRepository.create).toHaveBeenCalledWith({
-        ...pick(mockDatabase, ['host', 'port', 'name', 'timeout', 'compressor']),
+        ...pick(mockDatabase, ['host', 'port', 'name', 'timeout', 'compressor', 'modules']),
         connectionType: ConnectionType.CLUSTER,
         new: true,
       });

redisinsight/api/src/modules/database-import/database-import.service.ts

@@ -62,6 +62,7 @@ export class DatabaseImportService {
     ['sshPassphrase', ['sshOptions.passphrase', 'sshKeyPassphrase']],
     ['sshAgentPath', ['ssh_agent_path']],
     ['compressor', ['compressor']],
+    ['modules', ['modules']],
   ];
 
   constructor(

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', 'provider', 'compressor',
+  'new', 'ssh', 'sshOptions', 'provider', 'compressor', 'modules',
 ] as const) {
   @Expose()
   @IsNotEmpty()

redisinsight/api/src/modules/database/models/additional.redis.module.ts

@@ -1,4 +1,6 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { IsNumber, IsString } from 'class-validator';
+import { Expose } from 'class-transformer';
 import { AdditionalRedisModuleName } from 'src/constants';
 
 export class AdditionalRedisModule {
@@ -7,19 +9,25 @@ export class AdditionalRedisModule {
     type: String,
     example: AdditionalRedisModuleName.RediSearch,
   })
+  @IsString()
+  @Expose()
   name: string;
 
   @ApiPropertyOptional({
     description: 'Integer representation of a module version.',
     type: Number,
     example: 20008,
   })
+  @IsNumber()
+  @Expose()
   version?: number;
 
   @ApiPropertyOptional({
     description: 'Semantic versioning representation of a module version.',
     type: String,
     example: '2.0.8',
   })
+  @IsString()
+  @Expose()
   semanticVersion?: string;
 }

redisinsight/api/src/modules/database/models/database.ts

@@ -15,6 +15,7 @@ import {
   MaxLength,
   Min,
   ValidateNested,
+  IsArray,
 } from 'class-validator';
 import { SentinelMaster } from 'src/modules/redis-sentinel/models/sentinel-master';
 import { Endpoint } from 'src/common/models';
@@ -174,6 +175,9 @@ export class Database {
     isArray: true,
   })
   @Expose()
+  @IsOptional()
+  @IsArray()
+  @Type(() => AdditionalRedisModule)
   modules?: AdditionalRedisModule[];
 
   @ApiPropertyOptional({