RI-3612-update test

Author: AmirAllayarovSofteq

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

@@ -1 +1,2 @@
 export * from './redis-string';
+export * from './zset-score';

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

@@ -0,0 +1 @@
+export * from './zset-score.decorator';

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

@@ -0,0 +1,17 @@
+import {
+  registerDecorator,
+  ValidationOptions,
+} from 'class-validator';
+import { ZSetScoreValidator } from 'src/common/validators';
+
+export function IsNumberOrString(validationOptions?: ValidationOptions) {
+  return (object: any, propertyName: string) => {
+    registerDecorator({
+      name: 'IsNumberOrString',
+      target: object.constructor,
+      propertyName,
+      options: validationOptions,
+      validator: ZSetScoreValidator,
+    });
+  };
+}

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

@@ -1 +1,2 @@
 export * from './redis-string.validator';
+export * from './zset-score.validator';

redisinsight/api/src/common/validators/zset-score.validator.ts

@@ -0,0 +1,17 @@
+import { isNumber } from 'lodash';
+import {
+  ValidationArguments,
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+} from 'class-validator';
+
+@ValidatorConstraint({ name: 'RedisStringValidator', async: true })
+export class ZSetScoreValidator implements ValidatorConstraintInterface {
+  async validate(value: any) {
+    return value === 'inf' || value === '-inf' || isNumber(value);
+  }
+
+  defaultMessage(args: ValidationArguments) {
+    return `${args.property || 'field'} must be a string or a number`;
+  }
+}

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

@@ -9,17 +9,16 @@ import {
   IsNotEmptyObject,
   IsNumber, IsString,
   Min,
-  ValidateNested
+  ValidateNested,
 } from 'class-validator';
 import { Type } from 'class-transformer';
-import { isNumber } from 'lodash';
 import { SortOrder } from 'src/constants';
 import {
   DeleteMembersFromSetDto,
   DeleteMembersFromSetResponse,
 } from 'src/modules/browser/dto/set.dto';
 import { RedisString } from 'src/common/constants';
-import { IsRedisString, RedisStringType } from 'src/common/decorators';
+import { IsRedisString, RedisStringType, IsNumberOrString } from 'src/common/decorators';
 import {
   KeyDto, KeyResponse, KeyWithExpireDto, ScanDataTypeDto,
 } from './keys.dto';
@@ -100,8 +99,8 @@ export class ZSetMemberDto {
     default: 1,
   })
   @IsDefined()
-  @Type((val) => isNumber(val) ? ScoreNumberValidation : ScoreStringValidation)
-  score: number | string;
+  @IsNumberOrString()
+  score: number | 'inf' | '-inf';
 }
 
 export class AddMembersToZSetDto extends KeyDto {

redisinsight/api/test/api/z-set/PATCH-instance-id-zSet.test.ts

@@ -22,9 +22,9 @@ const dataSchema = Joi.object({
   member: Joi.object().keys({
     name: Joi.string().required(),
     // todo: allow(true) - is incorrect but will be transformed to number by BE. Investigate/fix it
-    score: Joi.number().required().allow(true),
+    score: Joi.number().required().allow('inf', '-inf').label('.score'),
   }).messages({
-    'number.base': '{#lavel} must be a number',
+    'number.base': '{#lavel} must be a string or a number',
   }),
 }).strict();
 

redisinsight/api/test/api/z-set/POST-instance-id-zSet-get_members.test.ts

@@ -6,7 +6,8 @@ import {
   requirements,
   generateInvalidDataTestCases,
   validateInvalidDataTestCase,
-  getMainCheckFn, JoiRedisString
+  getMainCheckFn,
+  JoiRedisString,
 } from '../deps';
 const { server, request, constants, rte } = deps;
 
@@ -38,7 +39,7 @@ const responseSchema = Joi.object().keys({
   total: Joi.number().integer().required(),
   members: Joi.array().items(Joi.object().keys({
     name: JoiRedisString.required(),
-    score: Joi.number().required(),
+    score: Joi.number().required().allow('inf', '-inf'),
   })).required(),
 }).required();
 

redisinsight/api/test/api/z-set/POST-instance-id-zSet-search.test.ts

@@ -41,7 +41,7 @@ const responseSchema = Joi.object().keys({
   nextCursor: Joi.number().integer().required(),
   members: Joi.array().items(Joi.object().keys({
     name: JoiRedisString.required(),
-    score: Joi.number().required(),
+    score: Joi.number().required().allow('inf', '-inf'),
   })).required(),
 }).required();
 

redisinsight/api/test/api/z-set/POST-instance-id-zSet.test.ts

@@ -24,7 +24,7 @@ const dataSchema = Joi.object({
     // todo: allow(true) - is incorrect but will be transformed to number by BE. Investigate/fix it
     score: Joi.number().required().allow(true).label('.score'),
   })).messages({
-    'number.base': '{#lavel} must be a number',
+    'number.base': '{#lavel} must be a string or a number',
     'array.sparse': 'members must be either object or array',
     'array.base': 'property {#label} must be either object or array',
   }),