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
10 changes: 1 addition & 9 deletions server/src/__tests__/entities.module.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Test, TestingModule } from '@nestjs/testing';
import { EntitiesModule } from '../entities.module';
import { BaseEntityModule } from '@shared/base-entity/base-entity.module';
import { getMetadataArgsStorage, DataSource } from 'typeorm';
import { TypeOrmModule, getDataSourceToken } from '@nestjs/typeorm';
import { getMetadataArgsStorage } from 'typeorm';

// Mock BaseEntityModule
jest.mock('@shared/base-entity/base-entity.module', () => {
Expand All @@ -18,17 +16,11 @@ jest.mock('@shared/base-entity/base-entity.module', () => {
}),
};

// Export the mock for tests to use
global.MockBaseEntityModule = MockBaseEntityModule;

return {
BaseEntityModule: MockBaseEntityModule,
};
});

// Get the mock from global for test assertions
const MockBaseEntityModule = global.MockBaseEntityModule;

// Import all configs and entities
import userConfig from '../../shared/entities/configs/user.config';
import attReportConfig from '../entity-modules/att-report.config';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import config, { Utils } from '../student-by-year.config';
import { StudentByYear } from 'src/db/view-entities/StudentByYear.entity';
import { DataSource, Repository } from 'typeorm';
import { DataSource } from 'typeorm';
import { Test, TestingModule } from '@nestjs/testing';
import { BaseEntityService } from '@shared/base-entity/base-entity.service';
import { ReportMonthSemester } from 'src/db/entities/ReportMonth.entity';
Expand Down Expand Up @@ -28,7 +28,6 @@ describe('StudentByYear Config', () => {
let service: BaseEntityService<any>;
let module: TestingModule;
let mockDataSource: Partial<DataSource>;
let mockRepository: Repository<any>;
let mockMailService: Partial<MailSendService>;

beforeEach(async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { CrudRequest } from '@dataui/crud';
import { DataSource, In, Repository } from 'typeorm';
import { StudentKlass } from 'src/db/entities/StudentKlass.entity';
import { BulkToPdfReportGenerator } from '@shared/utils/report/bulk-to-pdf.generator';
import { MailerService } from '@nestjs-modules/mailer';
import { MailSendService } from '@shared/utils/mail/mail-send.service';
import { BaseEntityService } from '@shared/base-entity/base-entity.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { Test } from '@nestjs/testing';
import { jest, describe, expect, it, beforeEach } from '@jest/globals';
import { TeacherReportStatus } from 'src/db/view-entities/TeacherReportStatus.entity';
import { DataSource } from 'typeorm';
import { MailSendService } from '@shared/utils/mail/mail-send.service';
import teacherReportFile from 'src/reports/teacherReportFile';
import * as reportGenerator from 'src/reports/reportGenerator';
import config from '../teacher-report-status.config';
import { CrudRequest } from '@dataui/crud';
Expand Down
4 changes: 2 additions & 2 deletions server/src/entity-modules/student-by-year.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class StudentByYearService<T extends Entity | StudentByYear> extends BaseEntityS
label: 'אחוז חיסורים כולל',
};

(data[0] as any).headers = Object.values(headers);
Object.assign(data[0], { headers: Object.values(headers) });
}

private async populateStudentAttendanceByKlass(
Expand Down Expand Up @@ -276,7 +276,7 @@ class StudentByYearService<T extends Entity | StudentByYear> extends BaseEntityS
{ value: 'totalAbsenceRatio', label: 'אחוז חיסורים כולל', numFmt: '0.00%', thresholds: ABSENCE_THRESHOLDS },
];

(data[0] as any).headers = [...Object.values(headers), ...summaryHeaders];
Object.assign(data[0], { headers: [...Object.values(headers), ...summaryHeaders] });
}

private buildBaseWhere(
Expand Down
2 changes: 1 addition & 1 deletion server/src/entity-modules/student-percent-report.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class StudentPercentReportService<T extends Entity | StudentPercentReport> exten
headers['estimation'] = { value: 'estimation', label: 'הערכה' };
headers['comments'] = { value: 'comments', label: 'הערה' };
headers['estimatedAbsPercents'] = { value: 'estimatedAbsPercents', label: 'אחוז חיסור משוער' };
(data[0] as any).headers = Object.values(headers);
Object.assign(data[0], { headers: Object.values(headers) });
}
}
}
Expand Down
Loading