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
2 changes: 1 addition & 1 deletion client/shared
1 change: 1 addition & 0 deletions server/helpers/endpoints.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENDPOINTS="user att_report att_report_with_report_month grade klass klass_type known_absence lesson student_klass student teacher text student_klass_report student_base_klass student_speciality audit_log import_file report_group report_group_session yemot_call mail_address recieved_mail page report_month teacher_report_status teacher_grade_report_status text_by_user student_percent_report att_report_and_grade student_global_report image student_by_year payment_track teacher_salary_report known_absence_with_report_month grade_name attendance_name att_grade_effect grade_effect_by_user abs_count_effect_by_user lesson_klass_name transportation absence_type uploaded_file"
87 changes: 0 additions & 87 deletions server/helpers/test-all-endpoints.sh

This file was deleted.

11 changes: 11 additions & 0 deletions server/src/entity-modules/__tests__/absenceType.config.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { AbsenceType } from 'src/db/entities/AbsenceType.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../absenceType.config';

createEntityConfigTests('AbsenceTypeConfig', config, {
entity: AbsenceType,
expectedExportHeaders: {
count: 4,
first: { value: 'name', label: 'סוג חיסור' },
},
});
21 changes: 21 additions & 0 deletions server/src/entity-modules/__tests__/known-absence.config.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../known-absence.config';

createEntityConfigTests('KnownAbsenceConfig', config, {
entity: KnownAbsence,
expectedJoins: {
student: { eager: false },
lesson: { eager: false },
klass: { eager: false },
absenceType: { eager: false },
},
expectedExportJoins: {
student: { eager: true },
absenceType: { eager: true },
},
expectedExportHeaders: {
count: 11,
first: { value: 'student.name', label: 'תלמידה' },
},
});
19 changes: 19 additions & 0 deletions server/src/entity-modules/__tests__/lesson.config.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Lesson } from 'src/db/entities/Lesson.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../lesson.config';

createEntityConfigTests('LessonConfig', config, {
entity: Lesson,
expectedJoins: {
teacher: { eager: false },
lessonKlassName: { eager: false },
},
expectedExportJoins: {
teacher: { eager: true },
lessonKlassName: { eager: true },
},
expectedExportHeaders: {
count: 7,
first: { value: 'key', label: 'מזהה' },
},
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ReportGroupSession } from 'src/db/entities/ReportGroupSession.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../report-group-session.config';

createEntityConfigTests('ReportGroupSessionConfig', config, {
entity: ReportGroupSession,
expectedJoins: {
reportGroup: { eager: false },
attReports: { eager: false },
grades: { eager: false },
},
});
23 changes: 23 additions & 0 deletions server/src/entity-modules/__tests__/report-group.config.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ReportGroup } from 'src/db/entities/ReportGroup.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../report-group.config';

createEntityConfigTests('ReportGroupConfig', config, {
entity: ReportGroup,
expectedJoins: {
teacher: { eager: false },
lesson: { eager: false },
klass: { eager: false },
sessions: { eager: false },
},
expectedExportJoins: {
teacher: { eager: true },
lesson: { eager: true },
klass: { eager: true },
sessions: { eager: true },
},
expectedExportHeaders: {
count: 8,
first: { value: 'name', label: 'שם' },
},
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { StudentKlassReport } from 'src/db/view-entities/StudentKlassReport.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../student-klass-report.config';

createEntityConfigTests('StudentKlassReportConfig', config, {
entity: StudentKlassReport,
expectedJoins: {
student: { eager: false },
},
expectedExportJoins: {
student: { eager: true },
},
expectedExportHeaders: {
count: 10,
first: { value: 'student.tz', label: 'תז' },
},
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { TeacherGradeReportStatus } from 'src/db/view-entities/TeacherGradeReportStatus.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../teacher-grade-report-status.config';

createEntityConfigTests('TeacherGradeReportStatusConfig', config, {
entity: TeacherGradeReportStatus,
expectedExportHeaders: {
count: 4,
first: { value: 'teacherName', label: 'מורה' },
},
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { TeacherSalaryReport } from 'src/db/view-entities/TeacherSalaryReport.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../teacher-salary-report.config';

createEntityConfigTests('TeacherSalaryReportConfig', config, {
entity: TeacherSalaryReport,
expectedJoins: {
teacher: {},
lesson: {},
klass: {},
reportMonth: {},
},
expectedExportJoins: {
teacher: { eager: true },
klass: { eager: true },
lesson: { eager: true },
reportMonth: { eager: true },
},
expectedExportHeaders: {
count: 6,
first: { value: 'teacher.name', label: 'שם המורה' },
},
});
11 changes: 11 additions & 0 deletions server/src/entity-modules/__tests__/transportation.config.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Transportation } from 'src/db/entities/Transportation.entity';
import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester';
import config from '../transportation.config';

createEntityConfigTests('TransportationConfig', config, {
entity: Transportation,
expectedExportHeaders: {
count: 4,
first: { value: 'key', label: 'שילוט' },
},
});
2 changes: 1 addition & 1 deletion server/test/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('AppController (e2e)', () => {
return request(app.getHttpServer())
.get('/')
.expect(200)
.expect('Hello World!');
.expect(/^Hello World! Server started at /);
});

it('should use SQLite in-memory database for E2E tests', () => {
Expand Down
Loading