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/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..e3f95074 100644 --- a/server/src/db/entities/AttReport.entity.ts +++ b/server/src/db/entities/AttReport.entity.ts @@ -20,7 +20,7 @@ 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'; @@ -99,11 +99,15 @@ 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; @ValidateIf((attReport: AttReport) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; @@ -117,6 +121,7 @@ export class AttReport implements IHasUserId { @ValidateIf((attReport: AttReport) => !Boolean(attReport.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @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 62fc924d..87f41661 100644 --- a/server/src/db/entities/Grade.entity.ts +++ b/server/src/db/entities/Grade.entity.ts @@ -20,7 +20,7 @@ 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'; @@ -91,11 +91,15 @@ 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; @ValidateIf((grade: Grade) => !Boolean(grade.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'student_tz', length: 10, nullable: true }) studentTz: string; @@ -107,6 +111,7 @@ export class Grade implements IHasUserId { @ValidateIf((grade: Grade) => !Boolean(grade.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @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 02ee89ee..c0b4c46e 100644 --- a/server/src/db/entities/Klass.entity.ts +++ b/server/src/db/entities/Klass.entity.ts @@ -16,7 +16,7 @@ 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'; @@ -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; @@ -104,6 +107,7 @@ export class Klass implements IHasUserId { @Index('klasses_klass_type_reference_id_idx') klassTypeReferenceId: number; + @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 94d239eb..4dcd16d7 100644 --- a/server/src/db/entities/KlassType.entity.ts +++ b/server/src/db/entities/KlassType.entity.ts @@ -13,7 +13,7 @@ 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'; @@ -73,6 +73,7 @@ export class KlassType implements IHasUserId { @Index('klass_types_klassTypeEnum_idx') klassTypeEnum: KlassTypeEnum; + @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 2ffb1a0e..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'; @@ -87,11 +87,15 @@ 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; @ValidateIf((attReport: KnownAbsence) => !Boolean(attReport.studentReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @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 1370c31d..79f9437e 100644 --- a/server/src/db/entities/Lesson.entity.ts +++ b/server/src/db/entities/Lesson.entity.ts @@ -29,6 +29,7 @@ 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'; @@ -83,6 +84,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; @@ -125,6 +129,7 @@ export class Lesson implements IHasUserId { }) klassReferenceIdsJson: string; + @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 50303541..052a435a 100644 --- a/server/src/db/entities/LessonSchedule.entity.ts +++ b/server/src/db/entities/LessonSchedule.entity.ts @@ -17,7 +17,7 @@ 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'; @@ -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; @@ -138,6 +141,7 @@ export class LessonSchedule implements IHasUserId { @ValidateIf((lessonSchedule: LessonSchedule) => !Boolean(lessonSchedule.teacherReferenceId), { always: true }) @IsNotEmpty({ groups: [CrudValidationGroups.CREATE] }) + @IsDigitsOnly(10, { always: true }) @Column('varchar', { name: 'teacher_id', length: 10, nullable: true }) teacherId: string; 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..aada579f 100644 --- a/server/src/db/entities/ReportGroupSession.entity.ts +++ b/server/src/db/entities/ReportGroupSession.entity.ts @@ -13,8 +13,9 @@ 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 } 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'; @@ -37,7 +38,9 @@ export class ReportGroupSession { @Column() userId: number; + @IsOptional({ groups: [CrudValidationGroups.UPDATE] }) @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/Student.entity.ts b/server/src/db/entities/Student.entity.ts index 3e75d8eb..f1434cae 100644 --- a/server/src/db/entities/Student.entity.ts +++ b/server/src/db/entities/Student.entity.ts @@ -3,7 +3,7 @@ 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'; @@ -23,6 +23,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 +32,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..5b3455c9 100644 --- a/server/src/db/entities/StudentKlass.entity.ts +++ b/server/src/db/entities/StudentKlass.entity.ts @@ -18,7 +18,7 @@ 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'; @@ -107,6 +107,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 706743bd..5a25941f 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, 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'; @Index('teachers_users_idx', ['userId'], {}) @@ -29,12 +29,16 @@ 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; @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 }) @@ -62,6 +66,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/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;