diff --git a/server/src/yemot-handler.service.test.ts b/server/src/yemot-handler.service.test.ts index b2dcb684..b6075671 100644 --- a/server/src/yemot-handler.service.test.ts +++ b/server/src/yemot-handler.service.test.ts @@ -39,7 +39,7 @@ function askForKlass(builder: YemotScenarioBuilder, klassKey: string): YemotScen } function rejectKlass(builder: YemotScenarioBuilder, klassKey: string): YemotScenarioBuilder { - return builder.systemAsks(/enter klass number/i).userResponds(klassKey).systemSends(/invalid klass/i); + return askForKlass(builder, klassKey).systemSends(/invalid klass/i); } function welcomesTeacher(builder: YemotScenarioBuilder): YemotScenarioBuilder { @@ -306,18 +306,30 @@ describe('YemotHandlerService — react-admin-nestjs', () => { { id: 503, userId: 1, studentReferenceId: 103, klassReferenceId, year }, ]; + // Common seed setup shared by tests that need a recognized teacher with a klass roster. + function seminarBuilder( + name: string, + klass: { id: number; year: number }, + permissions: Record = { seminarAttendanceYemot: true }, + ): YemotScenarioBuilder { + return new YemotScenarioBuilder(name) + .seed('User', [seminarUser(permissions)]) + .seed('Teacher', [teacher]) + .seed('Klass', [klass]) + .seed('Student', roster()) + .seed('StudentKlass', studentKlasses(klass.id, klass.year)) + .seed('Text', allTexts); + } + it('happy path with lessonSignature permission — creates a ReportGroup/Session and AttReport rows', async () => { jest.setSystemTime(israelTimeAt(7, 0)); const year = getCurrentHebrewYear(); const klass = { id: 200, userId: 1, key: 7, name: 'Klass Seven', year }; - const builder = new YemotScenarioBuilder('Seminar happy path with report group') - .seed('User', [seminarUser({ seminarAttendanceYemot: true, lessonSignature: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(200, year)) - .seed('Text', allTexts) + const builder = seminarBuilder('Seminar happy path with report group', klass, { + seminarAttendanceYemot: true, + lessonSignature: true, + }) .seed('AttReport', []) .seed('ReportGroup', []) .seed('ReportGroupSession', []); @@ -354,13 +366,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 210, userId: 1, key: 8, name: 'Klass Eight', year }; - const builder = new YemotScenarioBuilder('Seminar happy path without report group') - .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(210, year)) - .seed('Text', allTexts) + const builder = seminarBuilder('Seminar happy path without report group', klass) .seed('AttReport', []) .seed('ReportGroup', []) .seed('ReportGroupSession', []); @@ -400,13 +406,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 220, userId: 1, key: 9, name: 'Klass Nine', year }; - const builder = new YemotScenarioBuilder('Seminar invalid klass retry') - .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(220, year)) - .seed('Text', allTexts); + const builder = seminarBuilder('Seminar invalid klass retry', klass); welcomesTeacher(builder); rejectKlass(builder, '99'); entersKlass(builder, '9'); @@ -422,13 +422,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 230, userId: 1, key: 10, name: 'Klass Ten', year }; - const builder = new YemotScenarioBuilder('Seminar invalid student number retry') - .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(230, year)) - .seed('Text', allTexts); + const builder = seminarBuilder('Seminar invalid student number retry', klass); startsSeminarCall(builder, '10'); rejectStudentNumber(builder, '999'); reportAbsentStudent(builder, '11'); @@ -444,14 +438,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 235, userId: 1, key: 15, name: 'Klass Fifteen', year }; - const builder = new YemotScenarioBuilder('Seminar name confirmation rejected') - .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(235, year)) - .seed('Text', allTexts) - .seed('AttReport', []); + const builder = seminarBuilder('Seminar name confirmation rejected', klass).seed('AttReport', []); startsSeminarCall(builder, '15'); rejectAbsentStudentName(builder, '11'); reportAbsentStudent(builder, '12'); @@ -497,10 +484,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const today = new Date(); today.setHours(0, 0, 0, 0); - const builder = new YemotScenarioBuilder('Seminar auto-detected schedule') - .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) + const builder = seminarBuilder('Seminar auto-detected schedule', klass) .seed('LessonSchedule', [ { userId: 1, @@ -512,9 +496,6 @@ describe('YemotHandlerService — react-admin-nestjs', () => { startTime: '07:00', }, ]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(260, year)) - .seed('Text', allTexts) .seed('AttReport', []); welcomesTeacher(builder); finishAbsentStudentEntry(builder); @@ -536,14 +517,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const year = getCurrentHebrewYear(); const klass = { id: 270, userId: 1, key: 14, name: 'Klass Fourteen', year }; - const builder = new YemotScenarioBuilder('Seminar no schedule fallback') - .seed('User', [seminarUser({ seminarAttendanceYemot: true })]) - .seed('Teacher', [teacher]) - .seed('Klass', [klass]) - .seed('Student', roster()) - .seed('StudentKlass', studentKlasses(270, year)) - .seed('Text', allTexts) - .seed('AttReport', []); + const builder = seminarBuilder('Seminar no schedule fallback', klass).seed('AttReport', []); startsSeminarCall(builder, '14'); finishAbsentStudentEntry(builder); const scenario = builder.systemHangsUp(/success/i).build();