Skip to content
Merged

fix #69

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/users/api/search.adjacent.users.query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ export class SearchAdjacentUsersQuery extends OmitType(
) {
@IsRange()
@IsOptional()
@ApiProperty({ name: "age", type: "string", pattern: "^(\\d+),(\\d+)$", required: false })
@ApiProperty({ name: "age", type: "string", pattern: "^(\\d+)-(\\d+)$", required: false })
age?: [number, number];
}
2 changes: 1 addition & 1 deletion src/users/dto/search.users.filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class SearchUsersFilters {
@IsNumber({}, { each: true })
@IsRange()
@IsOptional()
@ApiProperty({ type: "string", pattern: "^(\\d+),(\\d+)$", required: false })
@ApiProperty({ type: "string", pattern: "^(\\d+)-(\\d+)$", required: false })
experience?: RangeObject;

@ArrayMinSize(1)
Expand Down
1 change: 0 additions & 1 deletion src/utils/decorator/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from "./http.decorators";
export * from "./is-pair";
export * from "./is-range";
10 changes: 0 additions & 10 deletions src/utils/decorator/is-pair.ts

This file was deleted.

5 changes: 2 additions & 3 deletions src/utils/decorator/is-range.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Matches, registerDecorator, ValidationArguments, ValidationOptions } from "class-validator";
import { registerDecorator, ValidationArguments, ValidationOptions } from "class-validator";
import { applyDecorators } from "@nestjs/common";
import { Transform } from "class-transformer";

Expand All @@ -20,9 +20,8 @@ function __IsRange(validationOptions?: ValidationOptions) {

export function IsRange (options?: ValidationOptions) {
return applyDecorators(
Matches(/^(\d+),(\d+)$/),
Transform(({ value }) =>
value && value.split(',')
value && value.split('-')
.map(s => Number(s.trim()))
),
__IsRange(options),
Expand Down
9 changes: 9 additions & 0 deletions src/utils/range/range.object.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
import { ApiProperty } from "@nestjs/swagger";
import { IsNumber, IsOptional } from "class-validator";

export class RangeObject {
@IsNumber()
@IsOptional()
@ApiProperty({ type: "number", required: false })
lower?: number;

@IsNumber()
@IsOptional()
@ApiProperty({ type: "number", required: false })
upper?: number;

static fromRange(range: [number, number]): RangeObject {
Expand Down