From 735a03d87aef85d3fa0dd736535b319825667811 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 8 Sep 2026 18:21:42 +0000 Subject: [PATCH 1/5] Add numeric validation to Excel-uploaded fields missing it Audit of every entity reachable via Excel import (UI import button and mail-attachment auto-import) found two gaps where a string value would pass class-validator and crash at the DB layer instead of returning a clear validation error: - year: number columns on AbsenceType, AttReport, Grade, Klass, KnownAbsence, Lesson, LessonSchedule, ReportMonth, Teacher, Transportation had no validation decorators at all. - ReportGroup (teacherReferenceId, lessonReferenceId, klassReferenceId, year) and ReportGroupSession (reportGroupId) had @NumberType (a transform) but no @IsNumber (the actual validator). All other numeric fields already followed the established @NumberType + @IsNumber pattern (see StudentKlass.year for the existing correct example). Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_016mY7oyUH46UtvEKekiF7fT --- server/src/db/entities/AbsenceType.entity.ts | 3 +++ server/src/db/entities/AttReport.entity.ts | 3 +++ server/src/db/entities/Grade.entity.ts | 3 +++ server/src/db/entities/Klass.entity.ts | 3 +++ server/src/db/entities/KnownAbsence.entity.ts | 3 +++ server/src/db/entities/Lesson.entity.ts | 3 +++ server/src/db/entities/LessonSchedule.entity.ts | 3 +++ server/src/db/entities/ReportGroup.entity.ts | 11 ++++++++++- server/src/db/entities/ReportGroupSession.entity.ts | 3 ++- server/src/db/entities/ReportMonth.entity.ts | 7 +++++-- server/src/db/entities/Teacher.entity.ts | 7 +++++-- server/src/db/entities/Transportation.entity.ts | 3 +++ 12 files changed, 46 insertions(+), 6 deletions(-) diff --git a/server/src/db/entities/AbsenceType.entity.ts b/server/src/db/entities/AbsenceType.entity.ts index 138f3f1e..6eb22829 100644 --- a/server/src/db/entities/AbsenceType.entity.ts +++ b/server/src/db/entities/AbsenceType.entity.ts @@ -24,6 +24,9 @@ export class AbsenceType implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index b175d996..998fb24a 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -99,6 +99,9 @@ export class AttReport implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 62fc924d..7ca03487 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -91,6 +91,9 @@ export class Grade implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index 02ee89ee..b97aae84 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -64,6 +64,9 @@ export class Klass implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 2ffb1a0e..c1cd5a06 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -87,6 +87,9 @@ export class KnownAbsence implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/Lesson.entity.ts b/server/src/db/entities/Lesson.entity.ts index 1370c31d..aec48f73 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -83,6 +83,9 @@ export class Lesson implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index 50303541..5d256ccb 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -74,6 +74,9 @@ export class LessonSchedule implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/ReportGroup.entity.ts b/server/src/db/entities/ReportGroup.entity.ts index 1100f040..f4a35b58 100644 --- a/server/src/db/entities/ReportGroup.entity.ts +++ b/server/src/db/entities/ReportGroup.entity.ts @@ -16,8 +16,9 @@ import { Teacher } from './Teacher.entity'; import { Lesson } from './Lesson.entity'; import { Klass } from './Klass.entity'; import { ReportGroupSession } from './ReportGroupSession.entity'; +import { IsOptional } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he'; import { StringType, NumberType } from '@shared/utils/entity/class-transformer'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { LongTextColumn } from '@shared/utils/entity/column-types.util'; @@ -53,22 +54,30 @@ export class ReportGroup implements IHasUserId { @LongTextColumn({ nullable: true }) signatureData: string; // ONE signature for entire group + @IsOptional({ always: true }) @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('report_groups_teacher_reference_id_idx') teacherReferenceId: number; + @IsOptional({ always: true }) @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('report_groups_lesson_reference_id_idx') lessonReferenceId: number; + @IsOptional({ always: true }) @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('report_groups_klass_reference_id_idx') klassReferenceId: number; + @IsOptional({ always: true }) @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/ReportGroupSession.entity.ts b/server/src/db/entities/ReportGroupSession.entity.ts index ca5e29d5..dc8ce9f7 100644 --- a/server/src/db/entities/ReportGroupSession.entity.ts +++ b/server/src/db/entities/ReportGroupSession.entity.ts @@ -14,7 +14,7 @@ import { ReportGroup } from './ReportGroup.entity'; import { AttReport } from './AttReport.entity'; import { Grade } from './Grade.entity'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsDate } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsDate, IsNumber } from '@shared/utils/validation/class-validator-he'; import { StringType, NumberType, DateType } from '@shared/utils/entity/class-transformer'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { cleanDateFields, cleanTimeFields } from '@shared/utils/entity/deafultValues.util'; @@ -38,6 +38,7 @@ export class ReportGroupSession { userId: number; @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @Column() reportGroupId: number; diff --git a/server/src/db/entities/ReportMonth.entity.ts b/server/src/db/entities/ReportMonth.entity.ts index 1a3a334a..69e48d6c 100644 --- a/server/src/db/entities/ReportMonth.entity.ts +++ b/server/src/db/entities/ReportMonth.entity.ts @@ -1,8 +1,8 @@ import { CrudValidationGroups } from '@dataui/crud'; import { IsOptional } from 'class-validator'; import { BeforeInsert, BeforeUpdate, Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'; -import { IsDate, IsNotEmpty, IsUniqueDateRange, MaxLength } from '@shared/utils/validation/class-validator-he'; -import { DateType, StringType } from '@shared/utils/entity/class-transformer'; +import { IsDate, IsNotEmpty, IsNumber, IsUniqueDateRange, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, DateColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; @@ -61,6 +61,9 @@ export class ReportMonth { @Column({ default: ReportMonthSemester.fullYear }) semester: ReportMonthSemester; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/Teacher.entity.ts b/server/src/db/entities/Teacher.entity.ts index 706743bd..353696d4 100644 --- a/server/src/db/entities/Teacher.entity.ts +++ b/server/src/db/entities/Teacher.entity.ts @@ -4,8 +4,8 @@ import { User } from 'src/db/entities/User.entity'; import { IsArray, IsEmail, IsOptional } from 'class-validator'; import { Transform } from 'class-transformer'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsUniqueCombination, MaxLength } from '@shared/utils/validation/class-validator-he'; -import { StringType } from '@shared/utils/entity/class-transformer'; +import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; @Index('teachers_users_idx', ['userId'], {}) @@ -29,6 +29,9 @@ export class Teacher implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/Transportation.entity.ts b/server/src/db/entities/Transportation.entity.ts index 892ea30a..dde92631 100644 --- a/server/src/db/entities/Transportation.entity.ts +++ b/server/src/db/entities/Transportation.entity.ts @@ -24,6 +24,9 @@ export class Transportation implements IHasUserId { @Column('int', { name: 'user_id' }) userId: number; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; From 55d12806545ce7c632be943786665e3d84b95c0e Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 8 Sep 2026 18:45:06 +0000 Subject: [PATCH 2/5] Add digits-only validation to TZ/ID varchar fields used in Excel import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Teacher.tz/number, Student.tz/studentNumber, and the studentTz/teacherId business-key fields on Grade, AttReport, KnownAbsence, StudentKlass, Klass, Lesson, LessonSchedule and KlassType are varchar (kept as strings to preserve leading zeros in Israeli ID numbers), so they were out of scope for the earlier numeric-column fix. They still had no format validation though — some were missing @MaxLength entirely (Klass, Lesson, KlassType teacherId had zero validators) — so a non-digit or oversized value would only surface as a raw DB error. Added a new IsDigitsOnly validator (server/src/utils/validation) that: - passes through undefined/null/'' (presence stays @IsNotEmpty's job) - rejects anything but digits when a value is present - optionally enforces max length, for the fields missing @MaxLength Kept local to this repo per its own guidance (server/shared is a separate submodule) rather than extending class-validator-he.ts. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_016mY7oyUH46UtvEKekiF7fT --- server/src/db/entities/AttReport.entity.ts | 5 +++ server/src/db/entities/Grade.entity.ts | 5 +++ server/src/db/entities/Klass.entity.ts | 3 ++ server/src/db/entities/KlassType.entity.ts | 3 ++ server/src/db/entities/KnownAbsence.entity.ts | 3 ++ server/src/db/entities/Lesson.entity.ts | 3 ++ .../src/db/entities/LessonSchedule.entity.ts | 3 ++ server/src/db/entities/Student.entity.ts | 3 ++ server/src/db/entities/StudentKlass.entity.ts | 2 + server/src/db/entities/Teacher.entity.ts | 3 ++ .../__tests__/numeric-string.util.spec.ts | 45 +++++++++++++++++++ .../utils/validation/numeric-string.util.ts | 31 +++++++++++++ 12 files changed, 109 insertions(+) create mode 100644 server/src/utils/validation/__tests__/numeric-string.util.spec.ts create mode 100644 server/src/utils/validation/numeric-string.util.ts diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index 998fb24a..f93176b9 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -27,6 +27,7 @@ import { DateType, NumberType, StringType } from '@shared/utils/entity/class-tra import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { ReportGroupSession } from './ReportGroupSession.entity'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('att_users_idx', ['userId'], {}) @Index( @@ -107,6 +108,8 @@ export class AttReport implements IHasUserId { @ValidateIf((attReport: AttReport) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; @@ -120,6 +123,8 @@ export class AttReport implements IHasUserId { @ValidateIf((attReport: AttReport) => !Boolean(attReport.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 7ca03487..0c4844b8 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -27,6 +27,7 @@ import { DateType, NumberType, StringType } from '@shared/utils/entity/class-tra import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { ReportGroupSession } from './ReportGroupSession.entity'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('grades_users_idx', ['userId'], {}) @Index('grades_user_year_idx', ['userId', 'year'], {}) @@ -99,6 +100,8 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; @@ -110,6 +113,8 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index b97aae84..0a1f9686 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -20,6 +20,7 @@ import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength } from '@shared/ut import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('klasses_users_idx', ['userId'], {}) @Index(['userId', 'key', 'year'], { unique: true }) @@ -107,6 +108,8 @@ export class Klass implements IHasUserId { @Index('klasses_klass_type_reference_id_idx') klassTypeReferenceId: number; + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'teacher_id', nullable: true, length: 10 }) teacherId: string | null; diff --git a/server/src/db/entities/KlassType.entity.ts b/server/src/db/entities/KlassType.entity.ts index 94d239eb..3b3de389 100644 --- a/server/src/db/entities/KlassType.entity.ts +++ b/server/src/db/entities/KlassType.entity.ts @@ -18,6 +18,7 @@ import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity import { Teacher } from './Teacher.entity'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; export enum KlassTypeEnum { baseKlass = 'כיתת אם', @@ -73,6 +74,8 @@ export class KlassType implements IHasUserId { @Index('klass_types_klassTypeEnum_idx') klassTypeEnum: KlassTypeEnum; + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index c1cd5a06..2546f01e 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -27,6 +27,7 @@ import { BooleanType, DateType, NumberType, StringType } from '@shared/utils/ent import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { CreatedAtColumn, DateColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; import { FileData } from '@shared/entities/Image.entity'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('known_users_idx', ['userId'], {}) @Index(['studentReferenceId', 'year']) @@ -95,6 +96,8 @@ export class KnownAbsence implements IHasUserId { @ValidateIf((attReport: KnownAbsence) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; diff --git a/server/src/db/entities/Lesson.entity.ts b/server/src/db/entities/Lesson.entity.ts index aec48f73..b24777be 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -35,6 +35,7 @@ import { cleanDateFields } from '@shared/utils/entity/deafultValues.util'; import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { CreatedAtColumn, JsonColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('lessons_users_idx', ['userId'], {}) @Index(['userId', 'key', 'year'], { unique: true }) @@ -128,6 +129,8 @@ export class Lesson implements IHasUserId { }) klassReferenceIdsJson: string; + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index 5d256ccb..a0473984 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -22,6 +22,7 @@ import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { cleanDateFields, cleanTimeFields } from '@shared/utils/entity/deafultValues.util'; import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('lesson_schedules_users_idx', ['userId'], {}) @Index('lesson_schedules_teacher_date_idx', ['userId', 'teacherReferenceId', 'scheduleDate'], {}) @@ -141,6 +142,8 @@ export class LessonSchedule implements IHasUserId { @ValidateIf((lessonSchedule: LessonSchedule) => !Boolean(lessonSchedule.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/Student.entity.ts b/server/src/db/entities/Student.entity.ts index 3e75d8eb..bd07b4f8 100644 --- a/server/src/db/entities/Student.entity.ts +++ b/server/src/db/entities/Student.entity.ts @@ -6,6 +6,7 @@ import { CrudValidationGroups } from '@dataui/crud'; import { IsNotEmpty, IsUniqueCombination, MaxLength, IsBoolean } from '@shared/utils/validation/class-validator-he'; import { StringType, BooleanType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('students_users_idx', ['userId'], {}) @Index(['userId', 'tz', 'year'], { unique: true }) @@ -23,6 +24,7 @@ export class Student implements IHasUserId { @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @StringType @IsUniqueCombination(['userId'], [Student, User], { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @@ -31,6 +33,7 @@ export class Student implements IHasUserId { @IsOptional({ always: true }) @MaxLength(20, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @StringType @IsUniqueCombination(['userId'], [Student, User], { always: true }) @Column('varchar', { name: 'student_number', nullable: true, length: 20 }) diff --git a/server/src/db/entities/StudentKlass.entity.ts b/server/src/db/entities/StudentKlass.entity.ts index f23a9fe9..6a7f1b91 100644 --- a/server/src/db/entities/StudentKlass.entity.ts +++ b/server/src/db/entities/StudentKlass.entity.ts @@ -25,6 +25,7 @@ import { StudentByYear } from '../view-entities/StudentByYear.entity'; import { PaymentTrack } from '@shared/entities/PaymentTrack.entity'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('student_klasses_users_idx', ['userId'], {}) @Index('student_klasses_user_year_idx', ['userId', 'year'], {}) @@ -107,6 +108,7 @@ export class StudentKlass implements IHasUserId { @ValidateIf((attReport: StudentKlass) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @StringType @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; diff --git a/server/src/db/entities/Teacher.entity.ts b/server/src/db/entities/Teacher.entity.ts index 353696d4..aade335e 100644 --- a/server/src/db/entities/Teacher.entity.ts +++ b/server/src/db/entities/Teacher.entity.ts @@ -7,6 +7,7 @@ import { CrudValidationGroups } from '@dataui/crud'; import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength } from '@shared/utils/validation/class-validator-he'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; +import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('teachers_users_idx', ['userId'], {}) @Index(['userId', 'tz', 'year'], { unique: true }) @@ -38,6 +39,7 @@ export class Teacher implements IHasUserId { @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @StringType @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @IsUniqueCombination(['userId'], [Teacher, User], { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @Column('varchar', { name: 'tz', length: 10 }) @@ -65,6 +67,7 @@ export class Teacher implements IHasUserId { @IsOptional({ always: true }) @StringType @MaxLength(10, { always: true }) + @IsDigitsOnly(undefined, { always: true }) @IsUniqueCombination(['userId'], [Teacher, User], { always: true }) @Column('varchar', { name: 'number', nullable: true, length: 10 }) number: string | null; diff --git a/server/src/utils/validation/__tests__/numeric-string.util.spec.ts b/server/src/utils/validation/__tests__/numeric-string.util.spec.ts new file mode 100644 index 00000000..fae8f7cc --- /dev/null +++ b/server/src/utils/validation/__tests__/numeric-string.util.spec.ts @@ -0,0 +1,45 @@ +import { validateSync } from 'class-validator'; +import { IsDigitsOnly } from '../numeric-string.util'; + +class Sample { + @IsDigitsOnly() + value: string; +} + +class SampleWithMaxLength { + @IsDigitsOnly(5) + value: string; +} + +const errorsFor = (value: any, target = Sample) => { + const instance = new (target as any)(); + instance.value = value; + return validateSync(instance); +}; + +describe('IsDigitsOnly', () => { + it('passes for undefined, null and empty string (blank is not this validator\'s job)', () => { + expect(errorsFor(undefined)).toHaveLength(0); + expect(errorsFor(null)).toHaveLength(0); + expect(errorsFor('')).toHaveLength(0); + }); + + it('passes for a digits-only string, leading zeros included', () => { + expect(errorsFor('0123456789')).toHaveLength(0); + }); + + it('fails for letters or symbols', () => { + expect(errorsFor('12a34')).toHaveLength(1); + expect(errorsFor('123-456')).toHaveLength(1); + expect(errorsFor('abc')).toHaveLength(1); + }); + + it('fails for a non-string value', () => { + expect(errorsFor(12345)).toHaveLength(1); + }); + + it('enforces an optional max length', () => { + expect(errorsFor('12345', SampleWithMaxLength)).toHaveLength(0); + expect(errorsFor('123456', SampleWithMaxLength)).toHaveLength(1); + }); +}); diff --git a/server/src/utils/validation/numeric-string.util.ts b/server/src/utils/validation/numeric-string.util.ts new file mode 100644 index 00000000..d9add5e8 --- /dev/null +++ b/server/src/utils/validation/numeric-string.util.ts @@ -0,0 +1,31 @@ +import { ValidateBy, ValidationArguments, ValidationOptions } from 'class-validator'; + +const DIGITS_ONLY_REGEX = /^\d+$/; + +/** + * Validates that a varchar identifier field (a TZ/ID number or a business + * "number") contains digits only. Kept as a string column (not a numeric + * type) so leading zeros aren't lost. + * + * Blank (undefined/null/'') always passes here — presence is @IsNotEmpty's + * job. Optionally also enforces a max length, for fields whose @Column + * length has no matching @MaxLength validator yet. + */ +export function IsDigitsOnly(maxLength?: number, validationOptions?: ValidationOptions): PropertyDecorator { + return ValidateBy( + { + name: 'isDigitsOnly', + constraints: [maxLength], + validator: { + validate: (value: unknown, args: ValidationArguments) => { + if (value === undefined || value === null || value === '') return true; + if (typeof value !== 'string' || !DIGITS_ONLY_REGEX.test(value)) return false; + const max = args.constraints[0]; + return max === undefined || value.length <= max; + }, + defaultMessage: () => 'יש להזין ספרות בלבד', + }, + }, + validationOptions, + ); +} From 96c1264601876014e16bb1b3805dbc4a47f514e4 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 8 Sep 2026 20:03:28 +0000 Subject: [PATCH 3/5] Fix CI: bare MaxLength rejected undefined, breaking optional fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit class-validator's MaxLength (like IsNumberString before it) returns false for any non-string value, undefined included — it isn't blank-tolerant. Pairing it directly on teacherId/studentTz fields that have no value in a given request (a create that leaves teacherId blank, a partial update that doesn't touch studentTz) made those requests fail validation outright, which is exactly what broke the klass_type E2E create test in CI. Fold the length check into IsDigitsOnly's own maxLength parameter instead (already blank-tolerant by design) and drop the standalone @MaxLength on the fields where I'd added it fresh (Grade, AttReport, KnownAbsence studentTz/teacherId; Klass, Lesson, LessonSchedule, KlassType teacherId). Fields that already had a working @MaxLength before this change (Teacher, Student, StudentKlass) are untouched. Verified with a standalone class-validator run: create/update payloads that omit these fields validate clean again, and a non-digit value still gets rejected. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_016mY7oyUH46UtvEKekiF7fT --- server/src/db/entities/AttReport.entity.ts | 6 ++---- server/src/db/entities/Grade.entity.ts | 6 ++---- server/src/db/entities/Klass.entity.ts | 3 +-- server/src/db/entities/KlassType.entity.ts | 3 +-- server/src/db/entities/KnownAbsence.entity.ts | 3 +-- server/src/db/entities/Lesson.entity.ts | 3 +-- server/src/db/entities/LessonSchedule.entity.ts | 3 +-- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index f93176b9..60a6b342 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -108,8 +108,7 @@ export class AttReport implements IHasUserId { @ValidateIf((attReport: AttReport) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; @@ -123,8 +122,7 @@ export class AttReport implements IHasUserId { @ValidateIf((attReport: AttReport) => !Boolean(attReport.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 0c4844b8..1f8e3873 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -100,8 +100,7 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; @@ -113,8 +112,7 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index 0a1f9686..3a2ae873 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -108,8 +108,7 @@ export class Klass implements IHasUserId { @Index('klasses_klass_type_reference_id_idx') klassTypeReferenceId: number; - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', nullable: true, length: 10 }) teacherId: string | null; diff --git a/server/src/db/entities/KlassType.entity.ts b/server/src/db/entities/KlassType.entity.ts index 3b3de389..08de7859 100644 --- a/server/src/db/entities/KlassType.entity.ts +++ b/server/src/db/entities/KlassType.entity.ts @@ -74,8 +74,7 @@ export class KlassType implements IHasUserId { @Index('klass_types_klassTypeEnum_idx') klassTypeEnum: KlassTypeEnum; - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 2546f01e..ebf57a3f 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -96,8 +96,7 @@ export class KnownAbsence implements IHasUserId { @ValidateIf((attReport: KnownAbsence) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; diff --git a/server/src/db/entities/Lesson.entity.ts b/server/src/db/entities/Lesson.entity.ts index b24777be..fa76a468 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -129,8 +129,7 @@ export class Lesson implements IHasUserId { }) klassReferenceIdsJson: string; - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index a0473984..c984e9f4 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -142,8 +142,7 @@ export class LessonSchedule implements IHasUserId { @ValidateIf((lessonSchedule: LessonSchedule) => !Boolean(lessonSchedule.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @MaxLength(10, { always: true }) - @IsDigitsOnly(undefined, { always: true }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; From 10cd29f38c8dd8e76abbd0a94eae207d62980c9c Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 8 Sep 2026 20:10:18 +0000 Subject: [PATCH 4/5] Fix: reportGroupId IsNumber(always:true) broke partial updates Copilot review flagged it (PR #186): @IsNumber({always:true}) with no matching @IsOptional for the UPDATE group meant a PATCH that doesn't touch reportGroupId (e.g. updating just topic) failed validation on the resulting undefined value. Added @IsOptional({groups:[UPDATE]}), matching the create-required/update-optional pattern used elsewhere (e.g. Klass.key). CREATE still rejects missing/non-numeric values; UPDATE now passes when the field is simply not part of the payload. Verified directly against class-validator: CREATE without/garbage reportGroupId still fails, UPDATE omitting it now passes, UPDATE with a bad value still fails. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_016mY7oyUH46UtvEKekiF7fT --- server/src/db/entities/ReportGroupSession.entity.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/db/entities/ReportGroupSession.entity.ts b/server/src/db/entities/ReportGroupSession.entity.ts index dc8ce9f7..aada579f 100644 --- a/server/src/db/entities/ReportGroupSession.entity.ts +++ b/server/src/db/entities/ReportGroupSession.entity.ts @@ -13,6 +13,7 @@ import { import { ReportGroup } from './ReportGroup.entity'; import { AttReport } from './AttReport.entity'; import { Grade } from './Grade.entity'; +import { IsOptional } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; import { IsNotEmpty, IsDate, IsNumber } from '@shared/utils/validation/class-validator-he'; import { StringType, NumberType, DateType } from '@shared/utils/entity/class-transformer'; @@ -37,6 +38,7 @@ export class ReportGroupSession { @Column() userId: number; + @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) From 3305603470670157a34a12788f01e25784dcbc2d Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 9 Sep 2026 12:21:27 +0000 Subject: [PATCH 5/5] Move IsDigitsOnly into nra-server, following its conventions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per feedback: this validator belongs alongside the other Hebrew-message class-validator wrappers in shared/utils/validation/class-validator-he.ts, not as a one-off local file. Moved it there (buzz-code/nra-server#53, merged), bumped the server/shared submodule pointer, and switched every entity that used the local src/utils/validation/numeric-string.util import over to the shared one. Deleted the local file and its test — the equivalent test now lives in nra-server's own class-validator-he.spec.ts. No behavior change: same validator, same call sites, now using the shared getErrorMessageFunction/translationDict machinery for its error message instead of a hardcoded string. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_016mY7oyUH46UtvEKekiF7fT --- server/shared | 2 +- server/src/db/entities/AttReport.entity.ts | 3 +- server/src/db/entities/Grade.entity.ts | 3 +- server/src/db/entities/Klass.entity.ts | 3 +- server/src/db/entities/KlassType.entity.ts | 3 +- server/src/db/entities/KnownAbsence.entity.ts | 3 +- server/src/db/entities/Lesson.entity.ts | 2 +- .../src/db/entities/LessonSchedule.entity.ts | 3 +- server/src/db/entities/Student.entity.ts | 3 +- server/src/db/entities/StudentKlass.entity.ts | 3 +- server/src/db/entities/Teacher.entity.ts | 3 +- .../__tests__/numeric-string.util.spec.ts | 45 ------------------- .../utils/validation/numeric-string.util.ts | 31 ------------- 13 files changed, 11 insertions(+), 96 deletions(-) delete mode 100644 server/src/utils/validation/__tests__/numeric-string.util.spec.ts delete mode 100644 server/src/utils/validation/numeric-string.util.ts diff --git a/server/shared b/server/shared index 77111ca9..642725f1 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 77111ca9f9997c86d672d1d58bfc14f77654ed42 +Subproject commit 642725f14b760e4d79968ec533275d42c9988364 diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index 60a6b342..e3f95074 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -20,14 +20,13 @@ import { User } from './User.entity'; import { KlassType } from './KlassType.entity'; import { IsOptional, ValidateIf } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsNumber, MaxLength, IsDate, IsPositive } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, MaxLength, IsDate, IsPositive, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { fillDefaultReportDateValue } from '@shared/utils/entity/deafultValues.util'; import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { ReportGroupSession } from './ReportGroupSession.entity'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('att_users_idx', ['userId'], {}) @Index( diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 1f8e3873..87f41661 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -20,14 +20,13 @@ import { KlassType } from './KlassType.entity'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { fillDefaultReportDateValue } from '@shared/utils/entity/deafultValues.util'; import { IsOptional, ValidateIf } from 'class-validator'; -import { IsDate, IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsDate, IsNotEmpty, IsNumber, MaxLength, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { CrudValidationGroups } from '@dataui/crud'; import { StudentBaseKlass } from '../view-entities/StudentBaseKlass.entity'; import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { ReportGroupSession } from './ReportGroupSession.entity'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('grades_users_idx', ['userId'], {}) @Index('grades_user_year_idx', ['userId', 'year'], {}) diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index 3a2ae873..c0b4c46e 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -16,11 +16,10 @@ import { User } from './User.entity'; import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity/foreignKey.util'; import { IsOptional, ValidateIf } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('klasses_users_idx', ['userId'], {}) @Index(['userId', 'key', 'year'], { unique: true }) diff --git a/server/src/db/entities/KlassType.entity.ts b/server/src/db/entities/KlassType.entity.ts index 08de7859..4dcd16d7 100644 --- a/server/src/db/entities/KlassType.entity.ts +++ b/server/src/db/entities/KlassType.entity.ts @@ -13,12 +13,11 @@ import { IHasUserId } from '@shared/base-entity/interface'; import { User } from 'src/db/entities/User.entity'; import { IsOptional } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, MaxLength, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity/foreignKey.util'; import { Teacher } from './Teacher.entity'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; export enum KlassTypeEnum { baseKlass = 'כיתת אם', diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index ebf57a3f..650017ae 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -15,7 +15,7 @@ import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity import { Student } from './Student.entity'; import { IsOptional, ValidateIf } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsBoolean, IsDate, IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsBoolean, IsDate, IsNotEmpty, IsNumber, MaxLength, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { fillDefaultReportDateValue } from '@shared/utils/entity/deafultValues.util'; import { Klass } from './Klass.entity'; @@ -27,7 +27,6 @@ import { BooleanType, DateType, NumberType, StringType } from '@shared/utils/ent import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { CreatedAtColumn, DateColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; import { FileData } from '@shared/entities/Image.entity'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('known_users_idx', ['userId'], {}) @Index(['studentReferenceId', 'year']) diff --git a/server/src/db/entities/Lesson.entity.ts b/server/src/db/entities/Lesson.entity.ts index fa76a468..79f9437e 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -29,13 +29,13 @@ import { IsUniqueCombination, MaxLength, Min, + IsDigitsOnly, } from '@shared/utils/validation/class-validator-he'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { cleanDateFields } from '@shared/utils/entity/deafultValues.util'; import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { LessonKlassName } from '../view-entities/LessonKlassName.entity'; import { CreatedAtColumn, JsonColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('lessons_users_idx', ['userId'], {}) @Index(['userId', 'key', 'year'], { unique: true }) diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index c984e9f4..052a435a 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -17,12 +17,11 @@ import { User } from './User.entity'; import { findOneAndAssignReferenceId, getDataSource } from '@shared/utils/entity/foreignKey.util'; import { IsOptional, ValidateIf } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsNumber, MaxLength, IsDate } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, MaxLength, IsDate, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { cleanDateFields, cleanTimeFields } from '@shared/utils/entity/deafultValues.util'; import { DateType, NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('lesson_schedules_users_idx', ['userId'], {}) @Index('lesson_schedules_teacher_date_idx', ['userId', 'teacherReferenceId', 'scheduleDate'], {}) diff --git a/server/src/db/entities/Student.entity.ts b/server/src/db/entities/Student.entity.ts index bd07b4f8..f1434cae 100644 --- a/server/src/db/entities/Student.entity.ts +++ b/server/src/db/entities/Student.entity.ts @@ -3,10 +3,9 @@ import { IHasUserId } from '@shared/base-entity/interface'; import { User } from 'src/db/entities/User.entity'; import { IsOptional } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsUniqueCombination, MaxLength, IsBoolean } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsUniqueCombination, MaxLength, IsBoolean, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { StringType, BooleanType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('students_users_idx', ['userId'], {}) @Index(['userId', 'tz', 'year'], { unique: true }) diff --git a/server/src/db/entities/StudentKlass.entity.ts b/server/src/db/entities/StudentKlass.entity.ts index 6a7f1b91..5b3455c9 100644 --- a/server/src/db/entities/StudentKlass.entity.ts +++ b/server/src/db/entities/StudentKlass.entity.ts @@ -18,14 +18,13 @@ import { KlassType } from './KlassType.entity'; import { Teacher } from './Teacher.entity'; import { IsOptional, ValidateIf } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsNumber, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, MaxLength, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { fillDefaultYearValue } from '@shared/utils/entity/year.util'; import { MaxCountByUserLimit } from '@shared/utils/validation/max-count-by-user-limit'; import { StudentByYear } from '../view-entities/StudentByYear.entity'; import { PaymentTrack } from '@shared/entities/PaymentTrack.entity'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('student_klasses_users_idx', ['userId'], {}) @Index('student_klasses_user_year_idx', ['userId', 'year'], {}) diff --git a/server/src/db/entities/Teacher.entity.ts b/server/src/db/entities/Teacher.entity.ts index aade335e..5a25941f 100644 --- a/server/src/db/entities/Teacher.entity.ts +++ b/server/src/db/entities/Teacher.entity.ts @@ -4,10 +4,9 @@ import { User } from 'src/db/entities/User.entity'; import { IsArray, IsEmail, IsOptional } from 'class-validator'; import { Transform } from 'class-transformer'; import { CrudValidationGroups } from '@dataui/crud'; -import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength } from '@shared/utils/validation/class-validator-he'; +import { IsNotEmpty, IsNumber, IsUniqueCombination, MaxLength, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; import { NumberType, StringType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; -import { IsDigitsOnly } from 'src/utils/validation/numeric-string.util'; @Index('teachers_users_idx', ['userId'], {}) @Index(['userId', 'tz', 'year'], { unique: true }) diff --git a/server/src/utils/validation/__tests__/numeric-string.util.spec.ts b/server/src/utils/validation/__tests__/numeric-string.util.spec.ts deleted file mode 100644 index fae8f7cc..00000000 --- a/server/src/utils/validation/__tests__/numeric-string.util.spec.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { validateSync } from 'class-validator'; -import { IsDigitsOnly } from '../numeric-string.util'; - -class Sample { - @IsDigitsOnly() - value: string; -} - -class SampleWithMaxLength { - @IsDigitsOnly(5) - value: string; -} - -const errorsFor = (value: any, target = Sample) => { - const instance = new (target as any)(); - instance.value = value; - return validateSync(instance); -}; - -describe('IsDigitsOnly', () => { - it('passes for undefined, null and empty string (blank is not this validator\'s job)', () => { - expect(errorsFor(undefined)).toHaveLength(0); - expect(errorsFor(null)).toHaveLength(0); - expect(errorsFor('')).toHaveLength(0); - }); - - it('passes for a digits-only string, leading zeros included', () => { - expect(errorsFor('0123456789')).toHaveLength(0); - }); - - it('fails for letters or symbols', () => { - expect(errorsFor('12a34')).toHaveLength(1); - expect(errorsFor('123-456')).toHaveLength(1); - expect(errorsFor('abc')).toHaveLength(1); - }); - - it('fails for a non-string value', () => { - expect(errorsFor(12345)).toHaveLength(1); - }); - - it('enforces an optional max length', () => { - expect(errorsFor('12345', SampleWithMaxLength)).toHaveLength(0); - expect(errorsFor('123456', SampleWithMaxLength)).toHaveLength(1); - }); -}); diff --git a/server/src/utils/validation/numeric-string.util.ts b/server/src/utils/validation/numeric-string.util.ts deleted file mode 100644 index d9add5e8..00000000 --- a/server/src/utils/validation/numeric-string.util.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { ValidateBy, ValidationArguments, ValidationOptions } from 'class-validator'; - -const DIGITS_ONLY_REGEX = /^\d+$/; - -/** - * Validates that a varchar identifier field (a TZ/ID number or a business - * "number") contains digits only. Kept as a string column (not a numeric - * type) so leading zeros aren't lost. - * - * Blank (undefined/null/'') always passes here — presence is @IsNotEmpty's - * job. Optionally also enforces a max length, for fields whose @Column - * length has no matching @MaxLength validator yet. - */ -export function IsDigitsOnly(maxLength?: number, validationOptions?: ValidationOptions): PropertyDecorator { - return ValidateBy( - { - name: 'isDigitsOnly', - constraints: [maxLength], - validator: { - validate: (value: unknown, args: ValidationArguments) => { - if (value === undefined || value === null || value === '') return true; - if (typeof value !== 'string' || !DIGITS_ONLY_REGEX.test(value)) return false; - const max = args.constraints[0]; - return max === undefined || value.length <= max; - }, - defaultMessage: () => 'יש להזין ספרות בלבד', - }, - }, - validationOptions, - ); -}