Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(database): keep id-keyed chat states when re-keying
Yudhi Armyndharisfa4fbc4eed37
diff --git a/src/database/migrations/1786500000000-ReKeyChatStatesBySessionId.ts b/src/database/migrations/1786500000000-ReKeyChatStatesBySessionId.tsindex 99fea815d..66e80e19b 100644--- a/src/database/migrations/1786500000000-ReKeyChatStatesBySessionId.ts+++ b/src/database/migrations/1786500000000-ReKeyChatStatesBySessionId.ts@@ -12,14 +12,16 @@ import { MigrationInterface, QueryRunner } from 'typeorm';* Idempotent: after a successful run no `sessionId` matches a session name, so a re-run updates* nothing. Rows whose key matches no session are left alone (they belong to a deleted session and* nothing reads them either way), and a row whose target key is already taken is skipped rather than- * violating the (sessionId, chatId) primary key.+ * violating the (sessionId, chatId) primary key. A key that already is a session's id is left alone+ * even when another session is named after it: a database built by synchronize holds id-keyed rows+ * before this migration first runs.*/export class ReKeyChatStatesBySessionId1786500000000 implements MigrationInterface {name = 'ReKeyChatStatesBySessionId1786500000000';public async up(queryRunner: QueryRunner): Promise<void> {if (!(await queryRunner.hasTable('chat_states'))) return;- await queryRunner.query(ReKeyChatStatesBySessionId1786500000000.rekey('name', 'id'));+ await queryRunner.query(ReKeyChatStatesBySessionId1786500000000.rekey('name', 'id', { skipAlreadyKeyed: true }));}public async down(queryRunner: QueryRunner): Promise<void> {diff --git a/src/database/rekey-chat-states-migration.spec.ts b/src/database/rekey-chat-states-migration.spec.tsindex 5c796eff0..49b31d265 100644--- a/src/database/rekey-chat-states-migration.spec.ts+++ b/src/database/rekey-chat-states-migration.spec.ts@@ -59,6 +59,23 @@ describe('ReKeyChatStatesBySessionId migration', () => {expect(await states()).toEqual([{ sessionId: ALICE_ID, chatId: '[email protected]' }]);});+ it('keeps a row already keyed by a session id when another session is named after that id', async () => {+ // A database built by synchronize holds id-keyed rows before this migration ever runs.+ await queryRunner.query(`UPDATE sessions SET "name" = ? WHERE "id" = ?`, [ALICE_ID, BOB_ID]);+ await queryRunner.query(+ `INSERT INTO chat_states ("sessionId", "chatId", "archived") VALUES (?, '[email protected]', 1), ('alice', '[email protected]', 1)`,+ [ALICE_ID],+ );++ await migration.up(queryRunner);+ await migration.up(queryRunner);++ expect(await states()).toEqual([+ { sessionId: ALICE_ID, chatId: '[email protected]' },+ { sessionId: ALICE_ID, chatId: '[email protected]' },+ ]);+ });+it('leaves rows of a deleted session untouched', async () => {await queryRunner.query(`INSERT INTO chat_states ("sessionId", "chatId") VALUES ('gone', '[email protected]')`);