From b3200235aab1b22a4c2ab9dbf0eb3c754e38f0c8 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 16 Sep 2026 18:05:19 +0200 Subject: [PATCH 1/5] Cover numeric validation across remaining entities (ReferenceId/int columns) Extends the PR #186 / PR #188 @NumberType + @IsNumber({maxDecimalPlaces:0}) fix to the numeric ReferenceId/int columns still missing it, so a non-numeric string fails class-validator with a clear 400 instead of reaching the MySQL INT column as an HTTP-500: - AttReport.reportGroupSessionId, Grade.reportGroupSessionId - Grade: studentReferenceId, teacherReferenceId, lessonReferenceId - AttendanceCleanupRule: lessonReferenceId, klassReferenceId - StudentKlass: studentReferenceId, klassReferenceId - KnownAbsence: studentReferenceId, lessonReferenceId - Lesson/LessonSchedule/Klass/KlassType: teacherReferenceId - Student.year Bare fields get the full PR #186 pattern (@IsOptional({always:true}) + pair); fields with existing @ValidateIf/@IsNotEmpty/@IsOptional keep them and only gain the @NumberType + @IsNumber pair right before @Column, matching the placement PR #188 used on AttReport. The ValidateIf predicates all include '&& Boolean(field)', so omitted values skip validation and partial updates keep passing. New spec mirrors the CRUD validation pipeline (plainToInstance + validate with CREATE/UPDATE groups): garbage rejected on create and update, integers and numeric strings (NumberType coercion) accepted, partial updates omitting the fields still pass, plus full-payload create scenarios for Grade and Student. --- server/src/db/entities/AttReport.entity.ts | 3 + .../entities/AttendanceCleanupRule.entity.ts | 4 + server/src/db/entities/Grade.entity.ts | 9 ++ server/src/db/entities/Klass.entity.ts | 3 + server/src/db/entities/KlassType.entity.ts | 3 + server/src/db/entities/KnownAbsence.entity.ts | 4 + server/src/db/entities/Lesson.entity.ts | 3 + .../src/db/entities/LessonSchedule.entity.ts | 2 + server/src/db/entities/Student.entity.ts | 7 +- server/src/db/entities/StudentKlass.entity.ts | 4 + .../numeric-referenceid-validation.spec.ts | 121 ++++++++++++++++++ 11 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index e3f95074..502f8489 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -232,6 +232,9 @@ export class AttReport implements IHasUserId { @JoinColumn({ name: 'klassReferenceId' }) klass: Klass; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_report_group_session_id_idx') reportGroupSessionId: number; diff --git a/server/src/db/entities/AttendanceCleanupRule.entity.ts b/server/src/db/entities/AttendanceCleanupRule.entity.ts index 15d6789f..5358f74e 100644 --- a/server/src/db/entities/AttendanceCleanupRule.entity.ts +++ b/server/src/db/entities/AttendanceCleanupRule.entity.ts @@ -72,6 +72,8 @@ export class AttendanceCleanupRule implements IHasUserId { @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) lessonReferenceId: number; @@ -85,6 +87,8 @@ export class AttendanceCleanupRule implements IHasUserId { /** The track/class to PRESERVE (checked via student_klasses membership, not att_reports.klassReferenceId). */ @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) klassReferenceId: number; diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 87f41661..4cae7365 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -105,6 +105,8 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.studentTz) && Boolean(grade.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_student_reference_id_idx') studentReferenceId: number; @@ -117,6 +119,8 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.teacherId) && Boolean(grade.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_teacher_reference_id_idx') teacherReferenceId: number; @@ -143,6 +147,8 @@ export class Grade implements IHasUserId { lessonId: number; @ValidateIf((grade: Grade) => !Boolean(grade.lessonId) && Boolean(grade.lessonReferenceId), { always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_lesson_reference_id_idx') lessonReferenceId: number; @@ -215,6 +221,9 @@ export class Grade implements IHasUserId { @JoinColumn({ name: 'klassReferenceId' }) klass: Klass; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_report_group_session_id_idx') reportGroupSessionId: number; diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index c0b4c46e..e73254c2 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -118,6 +118,9 @@ export class Klass implements IHasUserId { @Column('varchar', { name: 'phone', nullable: true, length: 20 }) phone: string | null; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('klasses_teacher_reference_id_idx') teacherReferenceId: number; diff --git a/server/src/db/entities/KlassType.entity.ts b/server/src/db/entities/KlassType.entity.ts index 4dcd16d7..ad6d2406 100644 --- a/server/src/db/entities/KlassType.entity.ts +++ b/server/src/db/entities/KlassType.entity.ts @@ -77,6 +77,9 @@ export class KlassType implements IHasUserId { @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) teacherReferenceId: number; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 650017ae..12ae8b1b 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -103,6 +103,8 @@ export class KnownAbsence implements IHasUserId { always: true, }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('known_absences_student_reference_id_idx') studentReferenceId: number; @@ -129,6 +131,8 @@ export class KnownAbsence implements IHasUserId { lessonId: number; @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) lessonReferenceId: number; diff --git a/server/src/db/entities/Lesson.entity.ts b/server/src/db/entities/Lesson.entity.ts index 79f9437e..9b1a20fd 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -133,6 +133,9 @@ export class Lesson implements IHasUserId { @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; + @IsOptional({ always: true }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('lessons_teacher_reference_id_idx') teacherReferenceId: number; diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index 052a435a..ebf735af 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -151,6 +151,8 @@ export class LessonSchedule implements IHasUserId { { always: true }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('lesson_schedules_teacher_reference_id_idx') teacherReferenceId: number; diff --git a/server/src/db/entities/Student.entity.ts b/server/src/db/entities/Student.entity.ts index f1434cae..48cb3dfa 100644 --- a/server/src/db/entities/Student.entity.ts +++ b/server/src/db/entities/Student.entity.ts @@ -3,8 +3,8 @@ 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, IsDigitsOnly } from '@shared/utils/validation/class-validator-he'; -import { StringType, BooleanType } from '@shared/utils/entity/class-transformer'; +import { IsNotEmpty, IsUniqueCombination, MaxLength, IsBoolean, IsDigitsOnly, IsNumber } from '@shared/utils/validation/class-validator-he'; +import { StringType, BooleanType, NumberType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; @Index('students_users_idx', ['userId'], {}) @@ -18,6 +18,9 @@ export class Student 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/StudentKlass.entity.ts b/server/src/db/entities/StudentKlass.entity.ts index 5b3455c9..71a07138 100644 --- a/server/src/db/entities/StudentKlass.entity.ts +++ b/server/src/db/entities/StudentKlass.entity.ts @@ -116,6 +116,8 @@ export class StudentKlass implements IHasUserId { always: true, }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) studentReferenceId: number; @@ -131,6 +133,8 @@ export class StudentKlass implements IHasUserId { always: true, }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) klassReferenceId: number; diff --git a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts new file mode 100644 index 00000000..12eec0dd --- /dev/null +++ b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts @@ -0,0 +1,121 @@ +import 'reflect-metadata'; +import { plainToInstance } from 'class-transformer'; +import { validate, ValidationError } from 'class-validator'; +import { CrudValidationGroups } from '@dataui/crud'; +import { Grade } from 'src/db/entities/Grade.entity'; +import { Student } from 'src/db/entities/Student.entity'; +import { AttReport } from 'src/db/entities/AttReport.entity'; +import { AttendanceCleanupRule } from 'src/db/entities/AttendanceCleanupRule.entity'; +import { StudentKlass } from 'src/db/entities/StudentKlass.entity'; +import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity'; +import { Lesson } from 'src/db/entities/Lesson.entity'; +import { LessonSchedule } from 'src/db/entities/LessonSchedule.entity'; +import { Klass } from 'src/db/entities/Klass.entity'; +import { KlassType } from 'src/db/entities/KlassType.entity'; + +/** + * Mirrors the CRUD validation pipeline (@dataui/crud ValidationPipe + + * validateBulk): plainToInstance applies the @Transform/@NumberType + * coercion, class-validator then runs with the CREATE/UPDATE group. + */ +const validateAs = async (entity: any, body: any, group: CrudValidationGroups): Promise => { + const instance = plainToInstance(entity, body); + return validate(instance, { groups: [group] }); +}; + +const errorProps = (errors: ValidationError[]): string[] => errors.map((e) => e.property); + +const errorsOnField = (errors: ValidationError[], field: string): boolean => + errors.some((e) => e.property === field && Boolean(e.constraints)); + +/** + * Every numeric ReferenceId/int column that previously let a non-numeric + * string through class-validator and crash at the MySQL INT column + * (extension of PR #186 / PR #188 to the remaining entities). + */ +const numericFields: Array<{ entity: any; field: string }> = [ + { entity: Grade, field: 'studentReferenceId' }, + { entity: Grade, field: 'teacherReferenceId' }, + { entity: Grade, field: 'lessonReferenceId' }, + { entity: Grade, field: 'reportGroupSessionId' }, + { entity: AttReport, field: 'reportGroupSessionId' }, + { entity: AttendanceCleanupRule, field: 'lessonReferenceId' }, + { entity: AttendanceCleanupRule, field: 'klassReferenceId' }, + { entity: StudentKlass, field: 'studentReferenceId' }, + { entity: StudentKlass, field: 'klassReferenceId' }, + { entity: KnownAbsence, field: 'studentReferenceId' }, + { entity: KnownAbsence, field: 'lessonReferenceId' }, + { entity: Lesson, field: 'teacherReferenceId' }, + { entity: LessonSchedule, field: 'teacherReferenceId' }, + { entity: Klass, field: 'teacherReferenceId' }, + { entity: KlassType, field: 'teacherReferenceId' }, + { entity: Student, field: 'year' }, +]; + +describe('numeric validation on ReferenceId/int columns', () => { + describe.each(numericFields)('$entity.name.$field', ({ entity, field }) => { + it('rejects a non-numeric string on create', async () => { + const errors = await validateAs(entity, { [field]: 'not-a-number' }, CrudValidationGroups.CREATE); + expect(errorsOnField(errors, field)).toBe(true); + }); + + it('rejects a non-numeric string on update', async () => { + const errors = await validateAs(entity, { [field]: 'not-a-number' }, CrudValidationGroups.UPDATE); + expect(errorsOnField(errors, field)).toBe(true); + }); + + it('accepts a valid integer on create and update', async () => { + const createErrors = await validateAs(entity, { [field]: 42 }, CrudValidationGroups.CREATE); + expect(errorsOnField(createErrors, field)).toBe(false); + const updateErrors = await validateAs(entity, { [field]: 42 }, CrudValidationGroups.UPDATE); + expect(errorsOnField(updateErrors, field)).toBe(false); + }); + + it('accepts a numeric string (coerced by NumberType) on create', async () => { + const errors = await validateAs(entity, { [field]: '42' }, CrudValidationGroups.CREATE); + expect(errorsOnField(errors, field)).toBe(false); + }); + + it('passes on a partial update that omits the field', async () => { + const errors = await validateAs(entity, {}, CrudValidationGroups.UPDATE); + expect(errorsOnField(errors, field)).toBe(false); + }); + }); + + describe('Grade create with only valid integers', () => { + it('passes validation cleanly', async () => { + const body = { + userId: 1, + reportDate: '2026-09-09', + studentReferenceId: 5, + teacherReferenceId: 6, + klassReferenceId: 7, + lessonReferenceId: 8, + reportGroupSessionId: 9, + grade: 90, + }; + const errors = await validateAs(Grade, body, CrudValidationGroups.CREATE); + expect(errorProps(errors)).toEqual([]); + }); + }); + + describe('Student create', () => { + it('passes without year (year stays optional)', async () => { + const body = { userId: 1, tz: '1234567890', name: 'test' }; + const errors = await validateAs(Student, body, CrudValidationGroups.CREATE); + expect(errorProps(errors)).toEqual([]); + }); + + it('passes with a valid year integer', async () => { + const body = { userId: 1, tz: '1234567890', name: 'test', year: 2026 }; + const errors = await validateAs(Student, body, CrudValidationGroups.CREATE); + expect(errorProps(errors)).toEqual([]); + }); + + it('rejects a non-numeric year', async () => { + const body = { userId: 1, tz: '1234567890', name: 'test', year: 'not-a-number' }; + const errors = await validateAs(Student, body, CrudValidationGroups.CREATE); + expect(errorProps(errors)).toEqual(['year']); + }); + }); +}); \ No newline at end of file From 9b938a9edeba64e29e8bbbf92dc70d566948f3ec Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 16 Sep 2026 20:20:53 +0200 Subject: [PATCH 2/5] Fix: also cover Grade.klassReferenceId with @NumberType + @IsNumber QA follow-up to PR #190: Grade.klassReferenceId was missed in the initial pass. Same placement as Grade.studentReferenceId/teacherReferenceId; its @ValidateIf predicate already includes '&& Boolean(klassReferenceId)', so partial updates omitting it keep passing. Adds the matching per-field cases to numeric-referenceid-validation.spec.ts (84 -> 89 tests). --- server/src/db/entities/Grade.entity.ts | 2 ++ .../__tests__/numeric-referenceid-validation.spec.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 4cae7365..5c3d8971 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -135,6 +135,8 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.klassId) && Boolean(grade.klassReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_klass_reference_id_idx') klassReferenceId: number; diff --git a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts index 12eec0dd..5df4dc9e 100644 --- a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts +++ b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts @@ -36,6 +36,7 @@ const errorsOnField = (errors: ValidationError[], field: string): boolean => const numericFields: Array<{ entity: any; field: string }> = [ { entity: Grade, field: 'studentReferenceId' }, { entity: Grade, field: 'teacherReferenceId' }, + { entity: Grade, field: 'klassReferenceId' }, { entity: Grade, field: 'lessonReferenceId' }, { entity: Grade, field: 'reportGroupSessionId' }, { entity: AttReport, field: 'reportGroupSessionId' }, From cd6d50ece9d35d466624e9543b7b792ab4026a0d Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 16 Sep 2026 21:30:46 +0200 Subject: [PATCH 3/5] Fix: validate ReferenceId columns whenever present, closing tz/id-sibling bypass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QA found the same bypass PR #188 (db58962) fixed for AttReport in the sibling-gated @ValidateIf predicates: a payload supplying BOTH the tz/id sibling AND referenceId='garbage' made the predicate false, skipping @IsNumber and reaching the MySQL INT column (1366 -> 500). Predicates on every *ReferenceId field now run validation whenever the value is present (field !== undefined && field !== null), regardless of the sibling tz/id field — matching db58962's exact form. The sibling-guarding @ValidateIf blocks (e.g. !Boolean(studentReferenceId) above studentTz) are untouched; @IsNotEmpty/@IsOptional kept as-is. Fields without a @ValidateIf (reportGroupSessionId x2, Student.year, Lesson/Klass/KlassType teacherReferenceId, KnownAbsence.lessonReferenceId, AttendanceCleanupRule ReferenceIds) needed no predicate change. AttReport's four ReferenceId fields also gain the @NumberType + @IsNumber pair on this branch (5ce3752 added it on the unmerged PR #188; without it the predicates had no numeric validator to run, and the required both-present regression test cannot pass). Regression tests added: 'garbage' studentReferenceId rejected even when studentTz is also supplied, for Grade and AttReport (89 -> 91 tests). --- server/src/db/entities/AttReport.entity.ts | 44 ++++++++++++++----- server/src/db/entities/Grade.entity.ts | 16 +++++-- server/src/db/entities/KnownAbsence.entity.ts | 9 ++-- .../src/db/entities/LessonSchedule.entity.ts | 6 ++- server/src/db/entities/StudentKlass.entity.ts | 18 +++++--- .../numeric-referenceid-validation.spec.ts | 16 ++++++- 6 files changed, 81 insertions(+), 28 deletions(-) diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index 502f8489..66b0f05d 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -111,10 +111,15 @@ export class AttReport implements IHasUserId { @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; - @ValidateIf((attReport: AttReport) => !Boolean(attReport.studentTz) && Boolean(attReport.studentReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: AttReport) => attReport.studentReferenceId !== undefined && attReport.studentReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_student_reference_id_idx') studentReferenceId: number; @@ -125,10 +130,15 @@ export class AttReport implements IHasUserId { @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; - @ValidateIf((attReport: AttReport) => !Boolean(attReport.teacherId) && Boolean(attReport.teacherReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: AttReport) => attReport.teacherReferenceId !== undefined && attReport.teacherReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_teacher_reference_id_idx') teacherReferenceId: number; @@ -141,10 +151,15 @@ export class AttReport implements IHasUserId { @Column('int', { name: 'klass_id', nullable: true }) klassId: number | null; - @ValidateIf((attReport: AttReport) => !Boolean(attReport.klassId) && Boolean(attReport.klassReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: AttReport) => attReport.klassReferenceId !== undefined && attReport.klassReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_klass_reference_id_idx') klassReferenceId: number; @@ -156,9 +171,14 @@ export class AttReport implements IHasUserId { @Column('int', { name: 'lesson_id', nullable: true }) lessonId: number; - @ValidateIf((attReport: AttReport) => !Boolean(attReport.lessonId) && Boolean(attReport.lessonReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: AttReport) => attReport.lessonReferenceId !== undefined && attReport.lessonReferenceId !== null, + { + always: true, + }, + ) + @NumberType + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_lesson_reference_id_idx') lessonReferenceId: number; diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 5c3d8971..60120175 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -103,7 +103,9 @@ export class Grade implements IHasUserId { @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; - @ValidateIf((grade: Grade) => !Boolean(grade.studentTz) && Boolean(grade.studentReferenceId), { always: true }) + @ValidateIf((grade: Grade) => grade.studentReferenceId !== undefined && grade.studentReferenceId !== null, { + always: true, + }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @@ -117,7 +119,9 @@ export class Grade implements IHasUserId { @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; - @ValidateIf((grade: Grade) => !Boolean(grade.teacherId) && Boolean(grade.teacherReferenceId), { always: true }) + @ValidateIf((grade: Grade) => grade.teacherReferenceId !== undefined && grade.teacherReferenceId !== null, { + always: true, + }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @@ -133,7 +137,9 @@ export class Grade implements IHasUserId { @Column('int', { name: 'klass_id', nullable: true }) klassId: number | null; - @ValidateIf((grade: Grade) => !Boolean(grade.klassId) && Boolean(grade.klassReferenceId), { always: true }) + @ValidateIf((grade: Grade) => grade.klassReferenceId !== undefined && grade.klassReferenceId !== null, { + always: true, + }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @@ -148,7 +154,9 @@ export class Grade implements IHasUserId { @Column('int', { name: 'lesson_id', nullable: true }) lessonId: number; - @ValidateIf((grade: Grade) => !Boolean(grade.lessonId) && Boolean(grade.lessonReferenceId), { always: true }) + @ValidateIf((grade: Grade) => grade.lessonReferenceId !== undefined && grade.lessonReferenceId !== null, { + always: true, + }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 12ae8b1b..00216e0d 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -99,9 +99,12 @@ export class KnownAbsence implements IHasUserId { @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; - @ValidateIf((attReport: KnownAbsence) => !Boolean(attReport.studentTz) && Boolean(attReport.studentReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: KnownAbsence) => attReport.studentReferenceId !== undefined && attReport.studentReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index ebf735af..9eec2f3c 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -147,8 +147,10 @@ export class LessonSchedule implements IHasUserId { @ValidateIf( (lessonSchedule: LessonSchedule) => - !Boolean(lessonSchedule.teacherId) && Boolean(lessonSchedule.teacherReferenceId), - { always: true }, + lessonSchedule.teacherReferenceId !== undefined && lessonSchedule.teacherReferenceId !== null, + { + always: true, + }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType diff --git a/server/src/db/entities/StudentKlass.entity.ts b/server/src/db/entities/StudentKlass.entity.ts index 71a07138..0e0dc59e 100644 --- a/server/src/db/entities/StudentKlass.entity.ts +++ b/server/src/db/entities/StudentKlass.entity.ts @@ -112,9 +112,12 @@ export class StudentKlass implements IHasUserId { @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; - @ValidateIf((attReport: StudentKlass) => !Boolean(attReport.studentTz) && Boolean(attReport.studentReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: StudentKlass) => attReport.studentReferenceId !== undefined && attReport.studentReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @@ -129,9 +132,12 @@ export class StudentKlass implements IHasUserId { @Column('int', { name: 'klass_id', nullable: true }) klassId: number; - @ValidateIf((attReport: StudentKlass) => !Boolean(attReport.klassId) && Boolean(attReport.klassReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: StudentKlass) => attReport.klassReferenceId !== undefined && attReport.klassReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) diff --git a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts index 5df4dc9e..e8ad7fd8 100644 --- a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts +++ b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts @@ -119,4 +119,18 @@ describe('numeric validation on ReferenceId/int columns', () => { expect(errorProps(errors)).toEqual(['year']); }); }); -}); \ No newline at end of file + + describe('sibling-bypass regression: referenceId validated whenever present', () => { + it('Grade: rejects garbage studentReferenceId even when studentTz is also supplied', async () => { + const body = { studentTz: '1234567890', studentReferenceId: 'garbage', reportDate: '2026-09-16' }; + const errors = await validateAs(Grade, body, CrudValidationGroups.CREATE); + expect(errorsOnField(errors, 'studentReferenceId')).toBe(true); + }); + + it('AttReport: rejects garbage studentReferenceId even when studentTz is also supplied', async () => { + const body = { studentTz: '1234567890', studentReferenceId: 'garbage', reportDate: '2026-09-16' }; + const errors = await validateAs(AttReport, body, CrudValidationGroups.CREATE); + expect(errorsOnField(errors, 'studentReferenceId')).toBe(true); + }); + }); +}); From 7aac8b89d97c5429daaf90f5fe95128745c7abd7 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 23 Sep 2026 04:14:40 +0000 Subject: [PATCH 4/5] Drop redundant @NumberType: shared IsNumber already applies it Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VbiktFWAq7kz13Kz98dAX8 --- server/src/db/entities/AttReport.entity.ts | 5 ----- server/src/db/entities/AttendanceCleanupRule.entity.ts | 2 -- server/src/db/entities/Grade.entity.ts | 5 ----- server/src/db/entities/Klass.entity.ts | 1 - server/src/db/entities/KlassType.entity.ts | 1 - server/src/db/entities/KnownAbsence.entity.ts | 2 -- server/src/db/entities/Lesson.entity.ts | 1 - server/src/db/entities/LessonSchedule.entity.ts | 1 - server/src/db/entities/Student.entity.ts | 3 +-- server/src/db/entities/StudentKlass.entity.ts | 2 -- 10 files changed, 1 insertion(+), 22 deletions(-) diff --git a/server/src/db/entities/AttReport.entity.ts b/server/src/db/entities/AttReport.entity.ts index 66b0f05d..97563a2d 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -118,7 +118,6 @@ export class AttReport implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_student_reference_id_idx') @@ -137,7 +136,6 @@ export class AttReport implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_teacher_reference_id_idx') @@ -158,7 +156,6 @@ export class AttReport implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_klass_reference_id_idx') @@ -177,7 +174,6 @@ export class AttReport implements IHasUserId { always: true, }, ) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_lesson_reference_id_idx') @@ -253,7 +249,6 @@ export class AttReport implements IHasUserId { klass: Klass; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('att_reports_report_group_session_id_idx') diff --git a/server/src/db/entities/AttendanceCleanupRule.entity.ts b/server/src/db/entities/AttendanceCleanupRule.entity.ts index 5358f74e..a849c5c5 100644 --- a/server/src/db/entities/AttendanceCleanupRule.entity.ts +++ b/server/src/db/entities/AttendanceCleanupRule.entity.ts @@ -72,7 +72,6 @@ export class AttendanceCleanupRule implements IHasUserId { @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) lessonReferenceId: number; @@ -87,7 +86,6 @@ export class AttendanceCleanupRule implements IHasUserId { /** The track/class to PRESERVE (checked via student_klasses membership, not att_reports.klassReferenceId). */ @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) klassReferenceId: number; diff --git a/server/src/db/entities/Grade.entity.ts b/server/src/db/entities/Grade.entity.ts index 60120175..3a8f5e2f 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -107,7 +107,6 @@ export class Grade implements IHasUserId { always: true, }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_student_reference_id_idx') @@ -123,7 +122,6 @@ export class Grade implements IHasUserId { always: true, }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_teacher_reference_id_idx') @@ -141,7 +139,6 @@ export class Grade implements IHasUserId { always: true, }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_klass_reference_id_idx') @@ -157,7 +154,6 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => grade.lessonReferenceId !== undefined && grade.lessonReferenceId !== null, { always: true, }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_lesson_reference_id_idx') @@ -232,7 +228,6 @@ export class Grade implements IHasUserId { klass: Klass; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grades_report_group_session_id_idx') diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index e73254c2..2b0bd6e0 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -119,7 +119,6 @@ export class Klass implements IHasUserId { phone: string | null; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('klasses_teacher_reference_id_idx') diff --git a/server/src/db/entities/KlassType.entity.ts b/server/src/db/entities/KlassType.entity.ts index ad6d2406..492e94d5 100644 --- a/server/src/db/entities/KlassType.entity.ts +++ b/server/src/db/entities/KlassType.entity.ts @@ -78,7 +78,6 @@ export class KlassType implements IHasUserId { teacherId: string; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) teacherReferenceId: number; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 00216e0d..6911441b 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -106,7 +106,6 @@ export class KnownAbsence implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('known_absences_student_reference_id_idx') @@ -134,7 +133,6 @@ export class KnownAbsence implements IHasUserId { lessonId: number; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) lessonReferenceId: number; diff --git a/server/src/db/entities/Lesson.entity.ts b/server/src/db/entities/Lesson.entity.ts index 9b1a20fd..41bdad14 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -134,7 +134,6 @@ export class Lesson implements IHasUserId { teacherId: string; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('lessons_teacher_reference_id_idx') diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index 9eec2f3c..2eff958e 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -153,7 +153,6 @@ export class LessonSchedule implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('lesson_schedules_teacher_reference_id_idx') diff --git a/server/src/db/entities/Student.entity.ts b/server/src/db/entities/Student.entity.ts index 48cb3dfa..681a859c 100644 --- a/server/src/db/entities/Student.entity.ts +++ b/server/src/db/entities/Student.entity.ts @@ -4,7 +4,7 @@ import { User } from 'src/db/entities/User.entity'; import { IsOptional } from 'class-validator'; import { CrudValidationGroups } from '@dataui/crud'; import { IsNotEmpty, IsUniqueCombination, MaxLength, IsBoolean, IsDigitsOnly, IsNumber } from '@shared/utils/validation/class-validator-he'; -import { StringType, BooleanType, NumberType } from '@shared/utils/entity/class-transformer'; +import { StringType, BooleanType } from '@shared/utils/entity/class-transformer'; import { CreatedAtColumn, UpdatedAtColumn } from '@shared/utils/entity/column-types.util'; @Index('students_users_idx', ['userId'], {}) @@ -19,7 +19,6 @@ export class Student implements IHasUserId { userId: number; @IsOptional({ always: true }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) year: number; diff --git a/server/src/db/entities/StudentKlass.entity.ts b/server/src/db/entities/StudentKlass.entity.ts index 0e0dc59e..901b78fa 100644 --- a/server/src/db/entities/StudentKlass.entity.ts +++ b/server/src/db/entities/StudentKlass.entity.ts @@ -119,7 +119,6 @@ export class StudentKlass implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) studentReferenceId: number; @@ -139,7 +138,6 @@ export class StudentKlass implements IHasUserId { }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) - @NumberType @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) klassReferenceId: number; From 4185caa94ef84fae1a6854fcb6f1109cfb9748a6 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 23 Sep 2026 04:18:06 +0000 Subject: [PATCH 5/5] Cover remaining numeric ReferenceId fields (Klass, KnownAbsence, LessonSchedule, GradeName) Adds @IsNumber to Klass.klassTypeReferenceId, KnownAbsence.klassReferenceId, LessonSchedule.klassReferenceId/lessonReferenceId and GradeName.klassTypeReferenceId, with the present-value ValidateIf predicate, and extends the regression matrix. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VbiktFWAq7kz13Kz98dAX8 --- server/src/db/entities/GradeName.entity.ts | 1 + server/src/db/entities/Klass.entity.ts | 10 +++++++--- server/src/db/entities/KnownAbsence.entity.ts | 10 +++++++--- server/src/db/entities/LessonSchedule.entity.ts | 15 +++++++++++---- .../numeric-referenceid-validation.spec.ts | 6 ++++++ 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/server/src/db/entities/GradeName.entity.ts b/server/src/db/entities/GradeName.entity.ts index acf93bb3..56391c7d 100644 --- a/server/src/db/entities/GradeName.entity.ts +++ b/server/src/db/entities/GradeName.entity.ts @@ -59,6 +59,7 @@ export class GradeName implements IHasUserId { klassTypeId: number | null; @IsOptional({ always: true }) + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('grade_names_klass_type_reference_id_idx') klassTypeReferenceId: number; diff --git a/server/src/db/entities/Klass.entity.ts b/server/src/db/entities/Klass.entity.ts index 2b0bd6e0..2644668d 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -99,10 +99,14 @@ export class Klass implements IHasUserId { @Column('int', { name: 'klass_type_id', nullable: true }) klassTypeId: number | null; - @ValidateIf((attReport: Klass) => !Boolean(attReport.klassTypeId) && Boolean(attReport.klassTypeReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: Klass) => attReport.klassTypeReferenceId !== undefined && attReport.klassTypeReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('klasses_klass_type_reference_id_idx') klassTypeReferenceId: number; diff --git a/server/src/db/entities/KnownAbsence.entity.ts b/server/src/db/entities/KnownAbsence.entity.ts index 6911441b..a1697497 100644 --- a/server/src/db/entities/KnownAbsence.entity.ts +++ b/server/src/db/entities/KnownAbsence.entity.ts @@ -119,10 +119,14 @@ export class KnownAbsence implements IHasUserId { @Column('int', { name: 'klass_id', nullable: true }) klassId: number | null; - @ValidateIf((attReport: KnownAbsence) => !Boolean(attReport.klassId) && Boolean(attReport.klassReferenceId), { - always: true, - }) + @ValidateIf( + (attReport: KnownAbsence) => attReport.klassReferenceId !== undefined && attReport.klassReferenceId !== null, + { + always: true, + }, + ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) klassReferenceId: number; diff --git a/server/src/db/entities/LessonSchedule.entity.ts b/server/src/db/entities/LessonSchedule.entity.ts index 2eff958e..3669c8e5 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -107,10 +107,14 @@ export class LessonSchedule implements IHasUserId { klassId: number | null; @ValidateIf( - (lessonSchedule: LessonSchedule) => !Boolean(lessonSchedule.klassId) && Boolean(lessonSchedule.klassReferenceId), - { always: true }, + (lessonSchedule: LessonSchedule) => + lessonSchedule.klassReferenceId !== undefined && lessonSchedule.klassReferenceId !== null, + { + always: true, + }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('lesson_schedules_klass_reference_id_idx') klassReferenceId: number; @@ -125,10 +129,13 @@ export class LessonSchedule implements IHasUserId { @ValidateIf( (lessonSchedule: LessonSchedule) => - !Boolean(lessonSchedule.lessonId) && Boolean(lessonSchedule.lessonReferenceId), - { always: true }, + lessonSchedule.lessonReferenceId !== undefined && lessonSchedule.lessonReferenceId !== null, + { + always: true, + }, ) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsNumber({ maxDecimalPlaces: 0 }, { always: true }) @Column({ nullable: true }) @Index('lesson_schedules_lesson_reference_id_idx') lessonReferenceId: number; diff --git a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts index e8ad7fd8..919d1a31 100644 --- a/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts +++ b/server/src/entity-modules/__tests__/numeric-referenceid-validation.spec.ts @@ -12,6 +12,7 @@ import { Lesson } from 'src/db/entities/Lesson.entity'; import { LessonSchedule } from 'src/db/entities/LessonSchedule.entity'; import { Klass } from 'src/db/entities/Klass.entity'; import { KlassType } from 'src/db/entities/KlassType.entity'; +import { GradeName } from 'src/db/entities/GradeName.entity'; /** * Mirrors the CRUD validation pipeline (@dataui/crud ValidationPipe + @@ -51,6 +52,11 @@ const numericFields: Array<{ entity: any; field: string }> = [ { entity: Klass, field: 'teacherReferenceId' }, { entity: KlassType, field: 'teacherReferenceId' }, { entity: Student, field: 'year' }, + { entity: KnownAbsence, field: 'klassReferenceId' }, + { entity: LessonSchedule, field: 'klassReferenceId' }, + { entity: LessonSchedule, field: 'lessonReferenceId' }, + { entity: Klass, field: 'klassTypeReferenceId' }, + { entity: GradeName, field: 'klassTypeReferenceId' }, ]; describe('numeric validation on ReferenceId/int columns', () => {