Extra logging for GV2 UUID migration

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
signalapp · Nov 3, 2021 · 32c1d88 · 32c1d88
1 parent 7f9708f
commit 32c1d88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/ts/sql/migrations/43-gv2-uuid.ts b/ts/sql/migrations/43-gv2-uuid.ts
@@ -37,6 +37,7 @@ export default function updateToSchemaVersion43(
 
   type LegacyConversationType = {
     id: string;
+    groupId: string;
     membersV2?: Array<{
       conversationId: string;
     }>;
@@ -78,6 +79,8 @@ export default function updateToSchemaVersion43(
     const legacy = (convo as unknown) as LegacyConversationType;
     let result = convo;
 
+    const logId = `(${legacy.id}) groupv2(${legacy.groupId})`;
+
     const memberKeys: Array<keyof LegacyConversationType> = [
       'membersV2',
       'pendingMembersV2',
@@ -98,7 +101,7 @@ export default function updateToSchemaVersion43(
           });
           if (!uuid) {
             logger.warn(
-              `updateToSchemaVersion43: ${legacy.id}.${key} UUID not found ` +
+              `updateToSchemaVersion43: ${logId}.${key} UUID not found ` +
                 `for ${member.conversationId}`
             );
             return undefined;
@@ -141,14 +144,14 @@ export default function updateToSchemaVersion43(
       if (oldValue.length !== 0) {
         logger.info(
           `updateToSchemaVersion43: migrated ${oldValue.length} ${key} ` +
-            `entries to ${newValue.length} for ${legacy.id}`
+            `entries to ${newValue.length} for ${logId}`
         );
       }
 
       if (addedByCount > 0) {
         logger.info(
           `updateToSchemaVersion43: migrated ${addedByCount} addedByUserId ` +
-            `in ${key} for ${legacy.id}`
+            `in ${key} for ${logId}`
         );
       }
     }

diff --git a/ts/test-node/sql_migrations_test.ts b/ts/test-node/sql_migrations_test.ts
@@ -626,8 +626,12 @@ describe('SQL migrations test', () => {
       const UUID_B = generateGuid();
       const UUID_C = generateGuid();
 
+      const rawConvoA = { id: 'a', groupId: 'gv2a', uuid: UUID_A };
+      const rawConvoB = { id: 'b', groupId: 'gv2b', uuid: UUID_B };
+
       const rawConvoC = {
         id: 'c',
+        groupId: 'gv2c',
         uuid: UUID_C,
         membersV2: [
           { conversationId: 'a', joinedAtVersion: 1 },
@@ -668,8 +672,8 @@ describe('SQL migrations test', () => {
         INSERT INTO conversations
           (id, uuid, json)
           VALUES
-          ('a', '${UUID_A}', '${JSON.stringify({ id: 'a', uuid: UUID_A })}'),
-          ('b', '${UUID_B}', '${JSON.stringify({ id: 'b', uuid: UUID_B })}'),
+          ('a', '${UUID_A}', '${JSON.stringify(rawConvoA)}'),
+          ('b', '${UUID_B}', '${JSON.stringify(rawConvoB)}'),
           ('c', '${UUID_C}', '${JSON.stringify(rawConvoC)}');
 
         INSERT INTO messages
@@ -714,6 +718,7 @@ describe('SQL migrations test', () => {
       assert.strictEqual(members, `${UUID_A} ${UUID_B}`);
       assert.deepStrictEqual(JSON.parse(convoJSON), {
         id: 'c',
+        groupId: 'gv2c',
         uuid: UUID_C,
         membersV2: [
           { uuid: UUID_A, joinedAtVersion: 1 },