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
18 changes: 8 additions & 10 deletions server/src/yemot-handler.service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -514,27 +514,25 @@ describe('YemotHandlerService — react-admin-nestjs', () => {
expect(byStudent[102].absCount).toBe(1);
});

it('already reported today for this klass — hangup with SEMINAR.ALREADY_REPORTED', async () => {
it('allows reporting again for the same klass on the same day', async () => {
jest.setSystemTime(israelTimeAt(7, 0));
const year = getCurrentHebrewYear();
const klass = { id: 240, userId: 1, key: 11, name: 'Klass Eleven', year };
const today = new Date();
today.setHours(0, 0, 0, 0);

const builder = teacherSetup('Seminar already reported for klass', {
extraSeeds: {
Klass: [klass],
AttReport: [
{ id: 900, userId: 1, studentReferenceId: 101, klassReferenceId: 240, reportDate: today, absCount: 0 },
],
},
});
const builder = seminarBuilder('Seminar repeated report for klass', klass)
.seed('AttReport', [
{ id: 900, userId: 1, studentReferenceId: 101, klassReferenceId: 240, reportDate: today, absCount: 0 },
]);
startsSeminarCall(builder, '11', '1');
const scenario = builder.systemHangsUp(/already reported/i).build();
finishAbsentStudentEntry(builder);
const scenario = builder.systemHangsUp(/success/i).build();

const result = await runner.run(scenario);
expect(result.passed).toBe(true);
expect(result.hungup).toBe(true);
expect(result.saved['AttReport']).toHaveLength(3);
});

it('schedule matches teacher and resolved klass — sets lessonReferenceId', async () => {
Expand Down
19 changes: 0 additions & 19 deletions server/src/yemot-handler.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,6 @@ export class YemotHandlerService extends BaseYemotHandlerService {
const schedule = await this.getScheduleForTeacherNow(teacher);
const lessonReferenceId = schedule?.klassReferenceId === klass.id ? schedule.lessonReferenceId : undefined;

const alreadyReported = await this.hasReportedTodayForKlass(klass.id);
if (alreadyReported) {
await this.hangupWithMessageByKey('SEMINAR.ALREADY_REPORTED');
return;
}

const roster = await this.getKlassRoster(klass.id);
if (roster.length === 0) {
await this.hangupWithMessageByKey('SEMINAR.NO_STUDENTS_IN_KLASS');
Expand Down Expand Up @@ -207,19 +201,6 @@ export class YemotHandlerService extends BaseYemotHandlerService {
return date.toLocaleDateString('en-CA', { timeZone: 'Asia/Jerusalem' });
}

private async hasReportedTodayForKlass(klassReferenceId: number): Promise<boolean> {
const todayDateOnly = this.getIsraelDateString(new Date());

const existingReport = await this.dataSource.getRepository(AttReport).findOne({
where: {
userId: this.user.id,
klassReferenceId,
reportDate: todayDateOnly as unknown as Date,
},
});
return !!existingReport;
}

private async getKlassRoster(klassReferenceId: number): Promise<StudentKlass[]> {
return this.dataSource.getRepository(StudentKlass).find({
where: {
Expand Down
Loading