From 86a1079d403070e9c629dc313558383677b5d1b0 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 25 Aug 2026 09:36:00 +0000 Subject: [PATCH 1/2] Fix duplicate class-name announcement in seminar call flow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Live feedback: calling from a class's own phone repeated the class name twice back to back ("כיתה יג 1 תשפז" once as its own announcement, then again as the prefix of the teacher-code prompt), and the star-escape instructions were read out on every single teacher-code prompt, including retries. - Class name is now announced exactly once (SEMINAR.KLASS_CONFIRMED), regardless of whether the class was resolved by phone or entered manually - SEMINAR.TEACHER_CODE_PROMPT dropped to a bare "הקישי קוד מורה" - no repeated class name, no escape instructions - The star escape itself still works, just isn't announced anymore Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01HXGT749AjJ6BDgDqvQXQX2 --- ...1787500000000-SimplifyTeacherCodePrompt.ts | 20 +++++++++++++++++++ server/src/yemot-handler.service.test.ts | 4 +++- server/src/yemot-handler.service.ts | 8 ++++---- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 server/src/migrations/1787500000000-SimplifyTeacherCodePrompt.ts 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..1a740597 100644 --- a/server/src/yemot-handler.service.ts +++ b/server/src/yemot-handler.service.ts @@ -104,7 +104,8 @@ export class YemotHandlerService extends BaseYemotHandlerService { if (!klass) { klass = await this.getKlassByInput(); } - const result = await this.getTeacherOrEscape(klass); + await this.sendMessageByKey('SEMINAR.KLASS_CONFIRMED', { klassName: klass.name }); + const result = await this.getTeacherOrEscape(); if (result === 'ESCAPE') { klass = null; continue; @@ -176,9 +177,9 @@ export class YemotHandlerService extends BaseYemotHandlerService { }); } - private async getTeacherOrEscape(klass: Klass): Promise { + private async getTeacherOrEscape(): Promise { while (true) { - const input = await this.askForInputByKey('SEMINAR.TEACHER_CODE_PROMPT', { klassName: klass.name }); + const input = await this.askForInputByKey('SEMINAR.TEACHER_CODE_PROMPT'); if (input === '*') return 'ESCAPE'; const teacher = await this.dataSource.getRepository(Teacher).findOneBy({ userId: this.user.id, number: input }); if (teacher) return teacher; @@ -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; } From 6d6250c20fbdd827922d5b27c3e4e2f1951c9f42 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 25 Aug 2026 09:41:38 +0000 Subject: [PATCH 2/2] Keep passing klassName into the teacher-code prompt Per Copilot review: the default text no longer uses {klassName}, but askForInputByKey only interpolates when values are passed - so a per-tenant override still containing the old placeholder, or a deploy where the app restarts before the migration runs, would read the literal "{klassName}" out loud. Keep passing it; unused placeholders in the current text are simply ignored. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01HXGT749AjJ6BDgDqvQXQX2 --- server/src/yemot-handler.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/yemot-handler.service.ts b/server/src/yemot-handler.service.ts index 1a740597..2ef44a21 100644 --- a/server/src/yemot-handler.service.ts +++ b/server/src/yemot-handler.service.ts @@ -105,7 +105,7 @@ export class YemotHandlerService extends BaseYemotHandlerService { klass = await this.getKlassByInput(); } await this.sendMessageByKey('SEMINAR.KLASS_CONFIRMED', { klassName: klass.name }); - const result = await this.getTeacherOrEscape(); + const result = await this.getTeacherOrEscape(klass); if (result === 'ESCAPE') { klass = null; continue; @@ -177,9 +177,9 @@ export class YemotHandlerService extends BaseYemotHandlerService { }); } - private async getTeacherOrEscape(): Promise { + private async getTeacherOrEscape(klass: Klass): Promise { while (true) { - const input = await this.askForInputByKey('SEMINAR.TEACHER_CODE_PROMPT'); + const input = await this.askForInputByKey('SEMINAR.TEACHER_CODE_PROMPT', { klassName: klass.name }); if (input === '*') return 'ESCAPE'; const teacher = await this.dataSource.getRepository(Teacher).findOneBy({ userId: this.user.id, number: input }); if (teacher) return teacher;