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
47 changes: 47 additions & 0 deletions server/src/yemot-handler.service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,53 @@ describe('YemotHandlerService — react-admin-nestjs', () => {
expect(result.hungup).toBe(true);
});

it('morning klass — transport lateness saved on the "בוקר" klass, not the base klass', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();

const builder = transportSetup('Morning klass', {
studentKlass: { ...defaultStudentKlass, year },
extraSeeds: {
Klass: [
{ id: 200, userId: 1, key: 1, name: 'ה1', year },
{ id: 201, userId: 1, key: 2, name: 'בוקר ה1', year },
],
StudentKlass: [
{ ...defaultStudentKlass, year },
{ id: 51, userId: 1, studentReferenceId: 100, klassReferenceId: 201, year },
],
KnownAbsence: [],
},
});
respondToTz(builder, '123456789');
respondToTransport(builder, '5');
confirmDeparture(builder, true);
const scenario = builder.systemHangsUp(/success/i).build();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.saved['KnownAbsence']).toHaveLength(1);
expect(result.saved['KnownAbsence'][0].klassReferenceId).toBe(201);
});

it('no morning klass — transport lateness falls back to the student klass', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();

const builder = transportSetup('No morning klass', {
studentKlass: { ...defaultStudentKlass, year },
extraSeeds: { Klass: [{ id: 200, userId: 1, key: 1, name: 'ה1', year }], KnownAbsence: [] },
});
respondToTz(builder, '123456789');
respondToTransport(builder, '5');
confirmDeparture(builder, true);
const scenario = builder.systemHangsUp(/success/i).build();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.saved['KnownAbsence'][0].klassReferenceId).toBe(200);
});

it('past deadline — exactly at 8:50, hangup with CLOSED', async () => {
jest.setSystemTime(israelTimeAt(8, 50));

Expand Down
15 changes: 11 additions & 4 deletions server/src/yemot-handler.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ReportGroup } from './db/entities/ReportGroup.entity';
import { ReportGroupSession } from './db/entities/ReportGroupSession.entity';
import { LessonSchedule } from './db/entities/LessonSchedule.entity';
import { Lesson } from './db/entities/Lesson.entity';
import { Between, In } from 'typeorm';
import { Between, In, Like } from 'typeorm';

const SCHEDULE_MATCH_TOLERANCE_MINUTES = 90;
/**
Expand Down Expand Up @@ -427,14 +427,21 @@ export class YemotHandlerService extends BaseYemotHandlerService {

private async createAbsenceRecord(student: Student, transportation: Transportation) {
const absenceRepo = this.dataSource.getRepository(KnownAbsence);
const studentKlass = await this.dataSource.getRepository(StudentKlass).findOneBy({
const studentKlasses = await this.dataSource.getRepository(StudentKlass).findBy({
userId: this.user.id,
studentReferenceId: student.id,
});
if (!studentKlass) {
if (!studentKlasses.length) {
await this.hangupWithMessageByKey('STUDENT.NO_CLASS');
return;
}
// Transport lateness belongs to the student's morning klass ("בוקר ...") when she has one
const morningKlass = await this.dataSource.getRepository(Klass).findOneBy({
userId: this.user.id,
id: In(studentKlasses.map((sk) => sk.klassReferenceId)),
year: getCurrentHebrewYear(),
name: Like('בוקר%'),
});
const newAbsence = absenceRepo.create({
userId: this.user.id,
studentTz: student.tz,
Expand All @@ -443,7 +450,7 @@ export class YemotHandlerService extends BaseYemotHandlerService {
absnceCount: 1,
isApproved: true,
comment: `איחור של הסעה ${transportation.key}`,
klassReferenceId: studentKlass.klassReferenceId,
klassReferenceId: morningKlass?.id ?? studentKlasses[0].klassReferenceId,
});
await absenceRepo.save(newAbsence);
}
Expand Down
Loading