diff --git a/server/src/migrations/1787500000000-SimplifyTeacherCodePrompt.ts b/server/src/migrations/1787500000000-SimplifyTeacherCodePrompt.ts new file mode 100644 index 00000000..c21f8ce1 --- /dev/null +++ b/server/src/migrations/1787500000000-SimplifyTeacherCodePrompt.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class SimplifyTeacherCodePrompt1787500000000 implements MigrationInterface { + private oldValue = 'כיתה {klassName}, הקישי קוד מורה. לבחירת כיתה אחרת הקישי כוכבית וסולמית'; + private newValue = 'הקישי קוד מורה'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + 'UPDATE `texts` SET `value` = ?, `description` = ? WHERE `user_id` = 0 AND `name` = ?', + [this.newValue, this.newValue, 'SEMINAR.TEACHER_CODE_PROMPT'], + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + 'UPDATE `texts` SET `value` = ?, `description` = ? WHERE `user_id` = 0 AND `name` = ?', + [this.oldValue, this.oldValue, 'SEMINAR.TEACHER_CODE_PROMPT'], + ); + } +} diff --git a/server/src/yemot-handler.service.test.ts b/server/src/yemot-handler.service.test.ts index 3c200bef..1f08c8f9 100644 --- a/server/src/yemot-handler.service.test.ts +++ b/server/src/yemot-handler.service.test.ts @@ -279,7 +279,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { { userId: 0, name: 'SEMINAR.STUDENT_NAME_REJECTED', description: '', value: 'Name rejected, try again' }, { userId: 0, name: 'SEMINAR.WELCOME', description: '', value: 'Hello teacher {teacherName}' }, { userId: 0, name: 'SEMINAR.KLASS_CONFIRMED', description: '', value: 'Confirmed klass {klassName}' }, - { userId: 0, name: 'SEMINAR.TEACHER_CODE_PROMPT', description: '', value: 'Enter teacher code for {klassName}' }, + { userId: 0, name: 'SEMINAR.TEACHER_CODE_PROMPT', description: '', value: 'Enter teacher code' }, { userId: 0, name: 'SEMINAR.INVALID_TEACHER_CODE', description: '', value: 'Invalid teacher code, try again' }, ]; const allTexts = [...baseTexts, ...seminarTexts]; @@ -404,6 +404,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { const klass = { id: 280, userId: 1, key: 16, name: 'Klass Sixteen', year, phone: '0501234567' }; const builder = seminarBuilder('Seminar klass phone recognized', klass).seed('AttReport', []); + builder.systemSends(/confirmed klass/i); entersTeacherCode(builder, '1'); welcomesTeacher(builder); finishAbsentStudentEntry(builder); @@ -428,6 +429,7 @@ describe('YemotHandlerService — react-admin-nestjs', () => { StudentKlass: studentKlasses(282, year), }, }).seed('AttReport', []); + builder.systemSends(/confirmed klass/i); ask(builder, TEACHER_CODE_PROMPT, '*'); entersKlass(builder, '18'); entersTeacherCode(builder, '1'); diff --git a/server/src/yemot-handler.service.ts b/server/src/yemot-handler.service.ts index 1e2f9912..2ef44a21 100644 --- a/server/src/yemot-handler.service.ts +++ b/server/src/yemot-handler.service.ts @@ -104,6 +104,7 @@ export class YemotHandlerService extends BaseYemotHandlerService { if (!klass) { klass = await this.getKlassByInput(); } + await this.sendMessageByKey('SEMINAR.KLASS_CONFIRMED', { klassName: klass.name }); const result = await this.getTeacherOrEscape(klass); if (result === 'ESCAPE') { klass = null; @@ -199,7 +200,6 @@ export class YemotHandlerService extends BaseYemotHandlerService { await this.sendMessageByKey('SEMINAR.INVALID_KLASS'); } } - await this.sendMessageByKey('SEMINAR.KLASS_CONFIRMED', { klassName: klass.name }); return klass; }