Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions server/src/db/entities/AttReport.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,14 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('att_reports_student_reference_id_idx')
studentReferenceId: number;
Expand All @@ -125,10 +129,14 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('att_reports_teacher_reference_id_idx')
teacherReferenceId: number;
Expand All @@ -141,10 +149,14 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('att_reports_klass_reference_id_idx')
klassReferenceId: number;
Expand All @@ -156,9 +168,13 @@ 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,
},
)
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('att_reports_lesson_reference_id_idx')
lessonReferenceId: number;
Expand Down Expand Up @@ -232,6 +248,8 @@ export class AttReport implements IHasUserId {
@JoinColumn({ name: 'klassReferenceId' })
klass: Klass;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
Comment thread
buzz-code marked this conversation as resolved.
Resolved
@Column({ nullable: true })
@Index('att_reports_report_group_session_id_idx')
reportGroupSessionId: number;
Expand Down
2 changes: 2 additions & 0 deletions server/src/db/entities/AttendanceCleanupRule.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export class AttendanceCleanupRule implements IHasUserId {

@IsNotEmpty({ groups: [CrudValidationGroups.CREATE] })
@IsOptional({ groups: [CrudValidationGroups.UPDATE] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
lessonReferenceId: number;

Expand All @@ -85,6 +86,7 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
klassReferenceId: number;

Expand Down
22 changes: 18 additions & 4 deletions server/src/db/entities/Grade.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,11 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('grades_student_reference_id_idx')
studentReferenceId: number;
Expand All @@ -115,8 +118,11 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('grades_teacher_reference_id_idx')
teacherReferenceId: number;
Expand All @@ -129,8 +135,11 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('grades_klass_reference_id_idx')
klassReferenceId: number;
Expand All @@ -142,7 +151,10 @@ 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,
})
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('grades_lesson_reference_id_idx')
lessonReferenceId: number;
Expand Down Expand Up @@ -215,6 +227,8 @@ export class Grade implements IHasUserId {
@JoinColumn({ name: 'klassReferenceId' })
klass: Klass;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('grades_report_group_session_id_idx')
reportGroupSessionId: number;
Expand Down
1 change: 1 addition & 0 deletions server/src/db/entities/GradeName.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 9 additions & 3 deletions server/src/db/entities/Klass.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -118,6 +122,8 @@ export class Klass implements IHasUserId {
@Column('varchar', { name: 'phone', nullable: true, length: 20 })
phone: string | null;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
Comment thread
buzz-code marked this conversation as resolved.
Resolved
@Column({ nullable: true })
@Index('klasses_teacher_reference_id_idx')
teacherReferenceId: number;
Expand Down
2 changes: 2 additions & 0 deletions server/src/db/entities/KlassType.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export class KlassType implements IHasUserId {
@Column('varchar', { name: 'teacher_id', length: 10, nullable: true })
teacherId: string;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
teacherReferenceId: number;

Expand Down
21 changes: 15 additions & 6 deletions server/src/db/entities/KnownAbsence.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,14 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('known_absences_student_reference_id_idx')
studentReferenceId: number;
Expand All @@ -115,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;

Expand All @@ -129,6 +137,7 @@ export class KnownAbsence implements IHasUserId {
lessonId: number;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
lessonReferenceId: number;

Expand Down
2 changes: 2 additions & 0 deletions server/src/db/entities/Lesson.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ export class Lesson implements IHasUserId {
@Column('varchar', { name: 'teacher_id', length: 10, nullable: true })
teacherId: string;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('lessons_teacher_reference_id_idx')
teacherReferenceId: number;
Expand Down
22 changes: 16 additions & 6 deletions server/src/db/entities/LessonSchedule.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -147,10 +154,13 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
@Index('lesson_schedules_teacher_reference_id_idx')
teacherReferenceId: number;
Expand Down
4 changes: 3 additions & 1 deletion server/src/db/entities/Student.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, IsDigitsOnly } from '@shared/utils/validation/class-validator-he';
import { IsNotEmpty, IsUniqueCombination, MaxLength, IsBoolean, IsDigitsOnly, IsNumber } 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';

Expand All @@ -18,6 +18,8 @@ export class Student implements IHasUserId {
@Column('int', { name: 'user_id' })
userId: number;

@IsOptional({ always: true })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
year: number;

Expand Down
20 changes: 14 additions & 6 deletions server/src/db/entities/StudentKlass.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,14 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
studentReferenceId: number;

Expand All @@ -127,10 +131,14 @@ 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] })
@IsNumber({ maxDecimalPlaces: 0 }, { always: true })
@Column({ nullable: true })
klassReferenceId: number;

Expand Down
Loading
Loading