Skip to content

Commit ec9d6a5

Browse files
#RI-3612-rename vszet validator
1 parent 4446be6 commit ec9d6a5

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

redisinsight/api/src/common/decorators/zset-score/zset-score.decorator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
} from 'class-validator';
55
import { ZSetScoreValidator } from 'src/common/validators';
66

7-
export function IsNumberOrString(validationOptions?: ValidationOptions) {
7+
export function isZSetScore(validationOptions?: ValidationOptions) {
88
return (object: any, propertyName: string) => {
99
registerDecorator({
10-
name: 'IsNumberOrString',
10+
name: 'isZSetScore',
1111
target: object.constructor,
1212
propertyName,
1313
options: validationOptions,

redisinsight/api/src/modules/browser/dto/z-set.dto.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
DeleteMembersFromSetResponse,
1919
} from 'src/modules/browser/dto/set.dto';
2020
import { RedisString } from 'src/common/constants';
21-
import { IsRedisString, RedisStringType, IsNumberOrString } from 'src/common/decorators';
21+
import { IsRedisString, RedisStringType, isZSetScore } from 'src/common/decorators';
2222
import {
2323
KeyDto, KeyResponse, KeyWithExpireDto, ScanDataTypeDto,
2424
} from './keys.dto';
@@ -65,24 +65,6 @@ export class GetZSetMembersDto extends KeyDto {
6565
sortOrder: SortOrder;
6666
}
6767

68-
export class ScoreNumberValidation {
69-
@ApiProperty({
70-
description: 'Infinity score values',
71-
type: String,
72-
})
73-
@IsString()
74-
score: string;
75-
}
76-
77-
export class ScoreStringValidation {
78-
@ApiProperty({
79-
description: 'Common score value',
80-
type: Number,
81-
})
82-
@IsNumber({ maxDecimalPlaces: 15 })
83-
score: number;
84-
}
85-
8668
export class ZSetMemberDto {
8769
@ApiProperty({
8870
type: String,
@@ -99,7 +81,7 @@ export class ZSetMemberDto {
9981
default: 1,
10082
})
10183
@IsDefined()
102-
@IsNumberOrString()
84+
@isZSetScore()
10385
score: number | 'inf' | '-inf';
10486
}
10587

0 commit comments

Comments
 (0)