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
9 changes: 0 additions & 9 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,6 @@ const App = () => (
</TeacherGuard>
}
/>
<Route
path="/in-lesson-report-grade/*"
element={
<TeacherGuard>
{' '}
<InLessonReport gradeMode />{' '}
</TeacherGuard>
}
/>
<Route path="/percent-report-with-dates" element={<TeacherPercentReportWithDatesList />} />
<Route path="/student/student-attendance" element={<TeacherStudentAttendanceList />} />
<Route path="/att_report_with_report_month_lead" element={<LeadTeacherAttReportList />} />
Expand Down
3 changes: 2 additions & 1 deletion client/src/GeneralLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const customMenuItems = [
/>
),
({ permissions }) =>
shouldShowLessonReports(permissions) && (
shouldShowLessonReports(permissions) &&
!isTeacherView(permissions) && (
<MenuItemLink
key="in-lesson-report-grade"
to="/in-lesson-report-grade"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { AttReport } from 'src/db/entities/AttReport.entity';
const mockBaseCreateOne = jest.fn().mockResolvedValue({ id: 1 });
const mockBaseCreateMany = jest.fn().mockResolvedValue([{ id: 1 }]);
const mockBaseConstructor = jest.fn();
const mockGetRelationMetadata = jest.fn();
const mockBaseCreateBuilder = jest.fn().mockResolvedValue('builder');

jest.mock('@shared/base-entity/base-entity.service', () => {
class MockBaseEntityService {
Expand All @@ -32,6 +34,12 @@ jest.mock('@shared/base-entity/base-entity.service', () => {
async doAction(req: any, body: any) {
return 'success';
}
getRelationMetadata(field: string, options: any) {
return mockGetRelationMetadata(field, options);
}
async createBuilder(parsed: any, options: any, many: boolean, withDeleted: boolean) {
return mockBaseCreateBuilder(parsed, options, many, withDeleted);
}
}
return {
BaseEntityService: MockBaseEntityService,
Expand Down Expand Up @@ -89,6 +97,19 @@ describe('att-report-with-report-month.config', () => {
(BaseEntityService as unknown as jest.Mock).mockClear?.();
});

it('createBuilder should resolve the klass relation before the nested klass.klassType filter', async () => {
const options = { query: { join: config.query.join } };
const parsed = { filter: [{ field: 'klass.klassType.teacherReferenceId', operator: '$eq', value: 1 }] };

await expect(service.createBuilder(parsed, options)).resolves.toBe('builder');

expect(mockGetRelationMetadata).toHaveBeenCalledWith('klass', { eager: false });
expect(mockGetRelationMetadata.mock.invocationCallOrder[0]).toBeLessThan(
mockBaseCreateBuilder.mock.invocationCallOrder[0],
);
expect(mockBaseCreateBuilder).toHaveBeenCalledWith(parsed, options, true, false);
});

it('createOne should delegate to AttReport service', async () => {
const req = { options: {}, parsed: {} } as any;
const dto = { reportDate: '2022-01-01' };
Expand Down
11 changes: 10 additions & 1 deletion server/src/entity-modules/att-report-with-report-month.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CrudRequest, Override, CreateManyDto } from '@dataui/crud';
import { CrudRequest, CrudRequestOptions, Override, CreateManyDto } from '@dataui/crud';
import { ParsedRequestParams } from '@dataui/crud-request';
import { In, DeepPartial } from 'typeorm';
import { BaseEntityModuleOptions, Entity } from '@shared/base-entity/interface';
import { IHeader } from '@shared/utils/exporter/types';
Expand Down Expand Up @@ -83,6 +84,14 @@ class AttReportWithReportMonthService<T extends Entity | AttReportWithReportMont
return attReportService;
}

// The lead teacher report filters on `klass.klassType.teacherReferenceId`. Filter validation
// looks up the nested `klass.klassType` relation before `klass` is joined, and crud caches it
// without a join path, so resolve `klass` first.
async createBuilder(parsed: ParsedRequestParams, options: CrudRequestOptions, many = true, withDeleted = false) {
this.getRelationMetadata('klass', options.query.join.klass);
return super.createBuilder(parsed, options, many, withDeleted);
}

@Override()
async createOne(req: CrudRequest<any>, dto: DeepPartial<T>): Promise<T> {
const attReportService = this.getAttReportService();
Expand Down
Loading