Skip to content
Merged
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
53 changes: 0 additions & 53 deletions utils/validation/__tests__/class-validator-he.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
IsInt,
MaxCountByUserLimit,
getTranslatedConstraint,
IsDigitsOnly,
} from '../class-validator-he';

describe('class-validator-he', () => {
Expand Down Expand Up @@ -148,56 +147,4 @@ describe('class-validator-he', () => {
expect(getTranslatedConstraint('StudentByYear')).toBe('ืฉื™ื•ืš ืชืœืžื™ื“ื•ืช');
});
});

describe('IsDigitsOnly', () => {
it('should return a function', () => {
expect(IsDigitsOnly()).toBeInstanceOf(Function);
});

it('should not return an error message for undefined, null or an empty string', async () => {
class Test {
@IsDigitsOnly() key: string;
}

const test = new Test();
const result = await validate(test);
expect(result).toEqual([]);

test.key = '';
expect(await validate(test)).toEqual([]);
});

it('should not return an error message for a digits-only string, leading zeros included', async () => {
class Test {
@IsDigitsOnly() key: string;
}

const test = new Test();
test.key = '0123456789';
const result = await validate(test);
expect(result).toEqual([]);
});

it('should return an error message if the value contains letters or symbols', async () => {
class Test {
@IsDigitsOnly() key: string;
}

const test = new Test();
test.key = '12a34';
const result = await validate(test);
expect(result).not.toEqual([]);
});

it('should enforce an optional max length', async () => {
class Test {
@IsDigitsOnly(5) key: string;
}

const test = new Test();
test.key = '123456';
const result = await validate(test);
expect(result).not.toEqual([]);
});
});
});
49 changes: 49 additions & 0 deletions utils/validation/__tests__/is-digits-only.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { validate } from 'class-validator';
import { IsDigitsOnly } from '../is-digits-only';

describe('IsDigitsOnly', () => {
it('should not return an error for undefined, null or an empty string', async () => {
class Test {
@IsDigitsOnly() key: string;
}

const test = new Test();
expect(await validate(test)).toEqual([]);

test.key = '';
expect(await validate(test)).toEqual([]);
});
Comment on lines +5 to +15

it('should not return an error for a digits-only string, leading zeros included', async () => {
class Test {
@IsDigitsOnly() key: string;
}

const test = new Test();
test.key = '0123456789';
expect(await validate(test)).toEqual([]);
});

it('should return an error if the value contains letters or symbols', async () => {
class Test {
@IsDigitsOnly() key: string;
}

const test = new Test();
test.key = '12a34';
expect(await validate(test)).not.toEqual([]);
});

it('should enforce an optional max length', async () => {
class Test {
@IsDigitsOnly(5) key: string;
}

const test = new Test();
test.key = '123456';
expect(await validate(test)).not.toEqual([]);

test.key = '12345';
expect(await validate(test)).toEqual([]);
});
});
23 changes: 2 additions & 21 deletions utils/validation/class-validator-he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import {
ValidationArguments,
Min as _Min,
Max as _Max,
ValidateBy as _ValidateBy,
} from "class-validator";
import { IsUniqueCombination as _IsUniqueCombination } from "./is-unique-combination";
import { GetMaxLimitType, MaxCountByUserLimit as _MaxCountByUserLimit } from "./max-count-by-user-limit";
import { IsUniqueDateRange as _IsUniqueDateRange } from "./is-unique-date-range";
import { IsDigitsOnly as _IsDigitsOnly } from "./is-digits-only";

export const IsNotEmpty = (validationOptions?: ValidationOptions): PropertyDecorator =>
_IsNotEmpty({ ...validationOptions, message: getErrorMessageFunction('ื”ืขืจืš ืฉืœ $property ืœื ื™ื›ื•ืœ ืœื”ื™ื•ืช ืจื™ืง') });
Expand All @@ -41,27 +41,8 @@ export const MaxCountByUserLimit = (entity: Function, getMaxLimit: GetMaxLimitTy
_MaxCountByUserLimit(entity, getMaxLimit, entities, foreignKey, { ...validationOptions, message: getErrorMessageFunction('ืœื ื ื™ืชืŸ ืœื™ืฆื•ืจ ืขื•ื“ ืจืฉื•ืžื•ืช - ื”ื’ื‘ืœืช ื›ืžื•ืช ืœื˜ื‘ืœืช $constraint1') });
export const IsUniqueDateRange = (startDateField: string = 'start_date', endDateField: string = 'end_date', entities: Function[] = [], validationOptions?: ValidationOptions) =>
_IsUniqueDateRange(startDateField, endDateField, entities, { ...validationOptions, message: getErrorMessageFunction('ืงื™ื™ืžืช ื›ื‘ืจ ืจืฉื•ืžื” ืขื ืชืืจื™ื›ื™ื ื—ื•ืคืคื™ื ืœืžืฉืชืžืฉ ื‘ื™ืŸ $constraint1 ืœ$constraint2') });
// Validates a varchar identifier (a TZ/ID number, a business "number") holds digits only.
// Kept as a string column rather than a numeric type so leading zeros survive.
// Blank (undefined/null/'') always passes - presence is @IsNotEmpty's job. An
// optional maxLength also covers fields whose @Column length has no matching
// @MaxLength validator.
export const IsDigitsOnly = (maxLength?: number, validationOptions?: ValidationOptions): PropertyDecorator =>
_ValidateBy(
{
name: 'isDigitsOnly',
constraints: [maxLength],
validator: {
validate: (value: unknown, args: ValidationArguments) => {
if (value === undefined || value === null || value === '') return true;
if (typeof value !== 'string' || !/^\d+$/.test(value)) return false;
const max = args.constraints[0];
return max === undefined || value.length <= max;
},
},
},
{ ...validationOptions, message: getErrorMessageFunction('$property ื—ื™ื™ื‘ ืœื”ื›ื™ืœ ืกืคืจื•ืช ื‘ืœื‘ื“ $value') },
);
_IsDigitsOnly(maxLength, { ...validationOptions, message: getErrorMessageFunction('$property ื—ื™ื™ื‘ ืœื”ื›ื™ืœ ืกืคืจื•ืช ื‘ืœื‘ื“ $value') });

function getErrorMessageFunction(message: string) {
return function (validationArguments: ValidationArguments) {
Expand Down
24 changes: 24 additions & 0 deletions utils/validation/is-digits-only.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator';

export function IsDigitsOnly(maxLength?: number, validationOptions?: ValidationOptions) {
return function (object: Object, propertyName: string) {
registerDecorator({
name: 'IsDigitsOnly',
target: object.constructor,
propertyName: propertyName,
constraints: [maxLength],
options: {
message: '$property must contain digits only',
...validationOptions
},
validator: {
validate(value: any, args: ValidationArguments) {
if (value === undefined || value === null || value === '') return true;
if (typeof value !== 'string' || !/^\d+$/.test(value)) return false;
const max = args.constraints[0];
return max === undefined || value.length <= max;
},
},
});
};
}