Merge branch 'feature/RI-2409-change_database_index' into e2e/feature/RI-2409-change_database_index

Author: vlad-dargel

redisinsight/api/src/common/models/client-metadata.ts

@@ -1,7 +1,7 @@
 import { Session } from 'src/common/models/session';
 import { Type } from 'class-transformer';
 import {
-  IsEnum, IsNotEmpty, IsNumber, IsOptional, IsString,
+  IsEnum, IsNotEmpty, IsNumber, IsOptional, IsString, Max, Min,
 } from 'class-validator';
 
 export enum ClientContext {
@@ -31,5 +31,7 @@ export class ClientMetadata {
   @IsOptional()
   @IsNumber()
   @Type(() => Number)
+  @Min(0)
+  @Max(2147483647)
   db?: number;
 }

redisinsight/api/src/common/models/database-index.ts

@@ -0,0 +1,4 @@
+import { PickType } from '@nestjs/swagger';
+import { ClientMetadata } from 'src/common/models/client-metadata';
+
+export class DatabaseIndex extends PickType(ClientMetadata, ['db'] as const) {}

redisinsight/api/src/common/models/index.ts

@@ -2,3 +2,4 @@ export * from './common';
 export * from './endpoint';
 export * from './session';
 export * from './client-metadata';
+export * from './database-index';

redisinsight/api/src/common/pipes/database-index.validation.pipe.ts

@@ -0,0 +1,7 @@
+import { ArgumentMetadata, ValidationPipe } from '@nestjs/common';
+
+export class DbIndexValidationPipe extends ValidationPipe {
+  async transform(db, metadata: ArgumentMetadata) {
+    return super.transform({ db }, metadata);
+  }
+}

redisinsight/api/src/common/pipes/index.ts

@@ -0,0 +1 @@
+export * from './database-index.validation.pipe';

redisinsight/api/src/modules/bulk-actions/bulk-actions.gateway.ts

@@ -46,7 +46,7 @@ export class BulkActionsGateway implements OnGatewayConnection, OnGatewayDisconn
 
   @SubscribeMessage(BulkActionsServerEvents.Abort)
   abort(@Body() dto: BulkActionIdDto) {
-    this.logger.log('Subscribing to bulk action.');
+    this.logger.log('Aborting bulk action.');
     return this.service.abort(dto);
   }
 

redisinsight/api/src/modules/bulk-actions/dto/create-bulk-action.dto.ts

@@ -1,6 +1,8 @@
 import { BulkActionFilter } from 'src/modules/bulk-actions/models/bulk-action-filter';
 import { BulkActionType } from 'src/modules/bulk-actions/constants';
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
+import {
+  IsEnum, IsNotEmpty, IsNumber, IsOptional, IsString, Max, Min,
+} from 'class-validator';
 import { Type } from 'class-transformer';
 import { BulkActionIdDto } from 'src/modules/bulk-actions/dto/bulk-action-id.dto';
 
@@ -16,4 +18,11 @@ export class CreateBulkActionDto extends BulkActionIdDto {
   @IsNotEmpty()
   @Type(() => BulkActionFilter)
   filter: BulkActionFilter;
+
+  @IsOptional()
+  @IsNumber()
+  @Type(() => Number)
+  @Min(0)
+  @Max(2147483647)
+  db?: number;
 }

redisinsight/api/src/modules/bulk-actions/providers/bulk-actions.provider.ts

@@ -38,6 +38,7 @@ export class BulkActionsProvider {
       session: undefined,
       databaseId: dto.databaseId,
       context: ClientContext.Common,
+      db: dto.db,
     });
 
     await bulkAction.prepare(client, BulkActionsProvider.getSimpleRunnerClass(dto));

redisinsight/api/src/modules/database/database-info.controller.ts

@@ -1,17 +1,19 @@
 import { ApiTags } from '@nestjs/swagger';
 import {
-  Controller, Get, Param, UseInterceptors,
+  Controller, Get, Param, UseInterceptors, UsePipes, ValidationPipe,
 } from '@nestjs/common';
 import { ApiEndpoint } from 'src/decorators/api-endpoint.decorator';
 import { TimeoutInterceptor } from 'src/common/interceptors/timeout.interceptor';
 import { DatabaseInfoService } from 'src/modules/database/database-info.service';
 import { DatabaseOverview } from 'src/modules/database/models/database-overview';
 import { RedisDatabaseInfoResponse } from 'src/modules/database/dto/redis-info.dto';
-import { ClientMetadata } from 'src/common/models';
+import { ClientMetadata, DatabaseIndex } from 'src/common/models';
 import { ClientMetadataParam } from 'src/common/decorators';
+import { DbIndexValidationPipe } from 'src/common/pipes';
 
 @ApiTags('Database Instances')
 @Controller('databases')
+@UsePipes(new ValidationPipe({ transform: true }))
 export class DatabaseInfoController {
   constructor(
     private databaseInfoService: DatabaseInfoService,
@@ -73,12 +75,12 @@ export class DatabaseInfoController {
     ],
   })
   async getDatabaseIndex(
-    @Param('index') db: string,
+    @Param('index', new DbIndexValidationPipe({ transform: true })) databaseIndexDto: DatabaseIndex,
       @ClientMetadataParam({
         databaseIdParam: 'id',
         ignoreDbIndex: true,
       }) clientMetadata: ClientMetadata,
   ): Promise<void> {
-    return this.databaseInfoService.getDatabaseIndex(clientMetadata, db);
+    return this.databaseInfoService.getDatabaseIndex(clientMetadata, databaseIndexDto.db);
   }
 }

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

@@ -50,15 +50,15 @@ export class DatabaseInfoService {
    * @param clientMetadata
    * @param db
    */
-  public async getDatabaseIndex(clientMetadata: ClientMetadata, db: string): Promise<void> {
+  public async getDatabaseIndex(clientMetadata: ClientMetadata, db: number): Promise<void> {
     this.logger.log(`Connection to database index: ${db}`);
 
     let client;
 
     try {
       client = await this.databaseConnectionService.createClient({
         ...clientMetadata,
-        db: parseInt(db, 10),
+        db,
       });
       client?.disconnect();
       return undefined;