@aneuhold/be-ts-db-lib 3.0.2 → 3.0.3

package/lib/services/MigrationService.ts

@@ -80,374 +80,387 @@ export default class MigrationService {
       `Found ${legacyDocs.length} documents with legacy ObjectId IDs and ${newDocs.length} documents with string IDs.`
     );
 
-    // Delete all existing new docs (with string IDs) to ensure fresh creation
-    if (!dryRun && newDocs.length > 0) {
-      DR.logger.info(`Deleting ${newDocs.length} existing migrated documents...`);
-      const newDocIds = newDocs.map((doc) => doc._id);
-      
-      const userIdsToDelete = users.filter((u) => typeof u._id === 'string').map((u) => u._id);
-      const apiKeyIdsToDelete = apiKeys.filter((k) => typeof k._id === 'string').map((k) => k._id);
-      const taskIdsToDelete = tasks.filter((t) => typeof t._id === 'string').map((t) => t._id);
-      const configIdsToDelete = configs.filter((c) => typeof c._id === 'string').map((c) => c._id);
-      const nonogramItemIdsToDelete = nonogramItems.filter((i) => typeof i._id === 'string').map((i) => i._id);
-      const nonogramUpgradeIdsToDelete = nonogramUpgrades.filter((u) => typeof u._id === 'string').map((u) => u._id);
-
-      if (userIdsToDelete.length > 0) {
-        const result = await (await userRepo.getCollection()).deleteMany({ _id: { $in: userIdsToDelete } });
-        DR.logger.info(`Deleted ${result.deletedCount} users.`);
-      }
-      if (apiKeyIdsToDelete.length > 0) {
-        const result = await (await apiKeyRepo.getCollection()).deleteMany({ _id: { $in: apiKeyIdsToDelete } });
-        DR.logger.info(`Deleted ${result.deletedCount} API keys.`);
-      }
-      if (taskIdsToDelete.length > 0) {
-        const result = await (await taskRepo.getCollection()).deleteMany({ _id: { $in: taskIdsToDelete } });
-        DR.logger.info(`Deleted ${result.deletedCount} tasks.`);
-      }
-      if (configIdsToDelete.length > 0) {
-        const result = await (await configRepo.getCollection()).deleteMany({ _id: { $in: configIdsToDelete } });
-        DR.logger.info(`Deleted ${result.deletedCount} configs.`);
-      }
-      if (nonogramItemIdsToDelete.length > 0) {
-        const result = await (await nonogramItemRepo.getCollection()).deleteMany({ _id: { $in: nonogramItemIdsToDelete } });
-        DR.logger.info(`Deleted ${result.deletedCount} nonogram items.`);
-      }
-      if (nonogramUpgradeIdsToDelete.length > 0) {
-        const result = await (await nonogramUpgradesRepo.getCollection()).deleteMany({ _id: { $in: nonogramUpgradeIdsToDelete } });
-        DR.logger.info(`Deleted ${result.deletedCount} nonogram upgrades.`);
+    // Delete all existing legacy docs (with object IDs)
+    if (legacyDocs.length > 0) {
+      const userIdsToDelete = users.filter((u) => typeof u._id === 'object').map((u) => u._id);
+      const apiKeyIdsToDelete = apiKeys.filter((k) => typeof k._id === 'object').map((k) => k._id);
+      const taskIdsToDelete = tasks.filter((t) => typeof t._id === 'object').map((t) => t._id);
+      const configIdsToDelete = configs.filter((c) => typeof c._id === 'object').map((c) => c._id);
+      const nonogramItemIdsToDelete = nonogramItems
+        .filter((i) => typeof i._id === 'object')
+        .map((i) => i._id);
+      const nonogramUpgradeIdsToDelete = nonogramUpgrades
+        .filter((u) => typeof u._id === 'object')
+        .map((u) => u._id);
+
+      if (!dryRun) {
+        DR.logger.info(`Deleting ${legacyDocs.length} legacy documents...`);
+
+        if (userIdsToDelete.length > 0) {
+          const result = await (
+            await userRepo.getCollection()
+          ).deleteMany({ _id: { $in: userIdsToDelete } });
+          DR.logger.info(`Deleted ${result.deletedCount} users.`);
+        }
+        if (apiKeyIdsToDelete.length > 0) {
+          const result = await (
+            await apiKeyRepo.getCollection()
+          ).deleteMany({ _id: { $in: apiKeyIdsToDelete } });
+          DR.logger.info(`Deleted ${result.deletedCount} API keys.`);
+        }
+        if (taskIdsToDelete.length > 0) {
+          const result = await (
+            await taskRepo.getCollection()
+          ).deleteMany({ _id: { $in: taskIdsToDelete } });
+          DR.logger.info(`Deleted ${result.deletedCount} tasks.`);
+        }
+        if (configIdsToDelete.length > 0) {
+          const result = await (
+            await configRepo.getCollection()
+          ).deleteMany({ _id: { $in: configIdsToDelete } });
+          DR.logger.info(`Deleted ${result.deletedCount} configs.`);
+        }
+        if (nonogramItemIdsToDelete.length > 0) {
+          const result = await (
+            await nonogramItemRepo.getCollection()
+          ).deleteMany({ _id: { $in: nonogramItemIdsToDelete } });
+          DR.logger.info(`Deleted ${result.deletedCount} nonogram items.`);
+        }
+        if (nonogramUpgradeIdsToDelete.length > 0) {
+          const result = await (
+            await nonogramUpgradesRepo.getCollection()
+          ).deleteMany({ _id: { $in: nonogramUpgradeIdsToDelete } });
+          DR.logger.info(`Deleted ${result.deletedCount} nonogram upgrades.`);
+        }
+
+        DR.logger.info('Deletion complete.');
+      } else {
+        DR.logger.info(`Dry run: Would delete ${legacyDocs.length} legacy documents.`);
+        if (userIdsToDelete.length > 0) DR.logger.info(`  - ${userIdsToDelete.length} users`);
+        if (apiKeyIdsToDelete.length > 0)
+          DR.logger.info(`  - ${apiKeyIdsToDelete.length} API keys`);
+        if (taskIdsToDelete.length > 0) DR.logger.info(`  - ${taskIdsToDelete.length} tasks`);
+        if (configIdsToDelete.length > 0) DR.logger.info(`  - ${configIdsToDelete.length} configs`);
+        if (nonogramItemIdsToDelete.length > 0)
+          DR.logger.info(`  - ${nonogramItemIdsToDelete.length} nonogram items`);
+        if (nonogramUpgradeIdsToDelete.length > 0)
+          DR.logger.info(`  - ${nonogramUpgradeIdsToDelete.length} nonogram upgrades`);
       }
-      
-      DR.logger.info('Deletion complete. Starting fresh migration...');
-    } else if (dryRun && newDocs.length > 0) {
-      DR.logger.info(`Dry run: Would delete ${newDocs.length} existing migrated documents.`);
     }
+    // We started with 1204 docs
+  }
+}
 
-    // Now create the actual map
-    const mapFromObjectIdToUUID = new Map<string, UUID>();
-
-    const newUsersToCreate: User[] = [];
-    const newApiKeysToCreate: ApiKey[] = [];
-    const newTasksToCreate: DashboardTask[] = [];
-    const newConfigsToCreate: DashboardUserConfig[] = [];
-    const newNonogramItemsToCreate: NonogramKatanaItem[] = [];
-    const newNonogramUpgradesToCreate: NonogramKatanaUpgrade[] = [];
-
-    /**
-     * Gets a UUID for a given legacy ObjectId. If one already exists in the map,
-     * it is returned. Otherwise, a new one is generated and added to the map.
-     */
-    const getUUID = (oldId: ObjectId): UUID => {
-      const oldIdStr = oldId.toString();
-      if (mapFromObjectIdToUUID.has(oldIdStr)) {
-        return mapFromObjectIdToUUID.get(oldIdStr);
-      }
-      const newId = uuidv7();
-      mapFromObjectIdToUUID.set(oldIdStr, newId);
-      return newId;
-    };
+async function Migration2025UUID() {
+  // Now create the actual map
+  const mapFromObjectIdToUUID = new Map<string, UUID>();
 
-    // Create a map of UUID to documents
-    const mapFromUUIDToDocument = new Map<UUID, any>();
-
-    const verifyDoc = (oldDoc: any, newDoc: any) => {
-      const oldJson = JSON.stringify(oldDoc, null, 2);
-      const newJson = JSON.stringify(newDoc, null, 2);
-      const oldLines = oldJson.split('\n').length;
-      const newLines = newJson.split('\n').length;
-      if (newLines !== oldLines + 1) {
-        DR.logger.warn(
-          `Line count mismatch for ${oldDoc.docType || 'doc'} ${oldDoc._id}: Old=${oldLines}, New=${newLines}.`
-        );
-      }
-    };
-    
-    function createNewDoc(oldDoc) {
-      if (mapFromObjectIdToUUID.has(oldDoc._id.toString()) && mapFromUUIDToDocument.has(mapFromObjectIdToUUID.get(oldDoc._id.toString()))) {
-        console.warn(
-          `Skipping document ${oldDoc._id} as it was already migrated.` +
+  const newUsersToCreate: User[] = [];
+  const newApiKeysToCreate: ApiKey[] = [];
+  const newTasksToCreate: DashboardTask[] = [];
+  const newConfigsToCreate: DashboardUserConfig[] = [];
+  const newNonogramItemsToCreate: NonogramKatanaItem[] = [];
+  const newNonogramUpgradesToCreate: NonogramKatanaUpgrade[] = [];
+
+  /**
+   * Gets a UUID for a given legacy ObjectId. If one already exists in the map,
+   * it is returned. Otherwise, a new one is generated and added to the map.
+   */
+  const getUUID = (oldId: ObjectId): UUID => {
+    const oldIdStr = oldId.toString();
+    if (mapFromObjectIdToUUID.has(oldIdStr)) {
+      return mapFromObjectIdToUUID.get(oldIdStr);
+    }
+    const newId = uuidv7();
+    mapFromObjectIdToUUID.set(oldIdStr, newId);
+    return newId;
+  };
+
+  // Create a map of UUID to documents
+  const mapFromUUIDToDocument = new Map<UUID, any>();
+
+  const verifyDoc = (oldDoc: any, newDoc: any) => {
+    const oldJson = JSON.stringify(oldDoc, null, 2);
+    const newJson = JSON.stringify(newDoc, null, 2);
+    const oldLines = oldJson.split('\n').length;
+    const newLines = newJson.split('\n').length;
+    if (newLines !== oldLines + 1) {
+      DR.logger.warn(
+        `Line count mismatch for ${oldDoc.docType || 'doc'} ${oldDoc._id}: Old=${oldLines}, New=${newLines}.`
+      );
+    }
+  };
+
+  function createNewDoc(oldDoc) {
+    if (
+      mapFromObjectIdToUUID.has(oldDoc._id.toString()) &&
+      mapFromUUIDToDocument.has(mapFromObjectIdToUUID.get(oldDoc._id.toString()))
+    ) {
+      console.warn(
+        `Skipping document ${oldDoc._id} as it was already migrated.` +
           ` The created document is ${JSON.stringify(mapFromUUIDToDocument.get(mapFromObjectIdToUUID.get(oldDoc._id.toString())))}`
-        );
-        return;
-      }
-      const newDocId = getUUID(oldDoc._id);
-      const newDoc = DocumentService.deepCopy(oldDoc);
-      newDoc._id = newDocId;
-      newDoc.oldOId = oldDoc._id.toString();
-      mapFromUUIDToDocument.set(newDocId, newDoc);
-      return newDoc;
+      );
+      return;
     }
+    const newDocId = getUUID(oldDoc._id);
+    const newDoc = DocumentService.deepCopy(oldDoc);
+    newDoc._id = newDocId;
+    newDoc.oldOId = oldDoc._id.toString();
+    mapFromUUIDToDocument.set(newDocId, newDoc);
+    return newDoc;
+  }
 
-    // Filter to only legacy users with the chosen usernames
-    const userNames = ['demoUser1', 'demoUser2', "testUser", "testUser2"];
-    // const userNames = ["testUser"];
-    const legacyUsers = users.filter((u) => userNames.includes(u.userName) && typeof u._id === 'object');
-    DR.logger.info(`Found ${legacyUsers.length} legacy users to migrate.`);
-    
-    // First, create all user documents and generate their UUIDs that way relationships between
-    // users in the collaborators field can be mapped correctly.
-    legacyUsers.forEach((oldUserDoc) => {
-      const newUser = createNewDoc(oldUserDoc);
-      if (!newUser) return;
-      verifyDoc(oldUserDoc, newUser);
-      newUsersToCreate.push(newUser);
+  // Filter to only legacy users with the chosen usernames
+  // const userNames = ['demoUser1', 'demoUser2', "testUser", "testUser2"];
+  // const userNames = ["testUser"];
+  // const legacyUsers = users.filter((u) => userNames.includes(u.userName) && typeof u._id === 'object');
+  const legacyUsers = users.filter((u) => typeof u._id === 'object');
+  DR.logger.info(`Found ${legacyUsers.length} legacy users to migrate.`);
+
+  // First, create all user documents and generate their UUIDs that way relationships between
+  // users in the collaborators field can be mapped correctly.
+  legacyUsers.forEach((oldUserDoc) => {
+    const newUser = createNewDoc(oldUserDoc);
+    if (!newUser) return;
+    verifyDoc(oldUserDoc, newUser);
+    newUsersToCreate.push(newUser);
+  });
+
+  // Create the function that will flesh out new documents for a given user document
+  function createNewDocsForUser(oldUserDoc: User) {
+    const oldUserIdStr = oldUserDoc._id.toString();
+    const newUserId = getUUID(oldUserDoc._id);
+
+    // 1. Create new API keys
+    const userApiKeys = apiKeys.filter((k) => k.userId.toString() === oldUserIdStr);
+    userApiKeys.forEach((oldKey) => {
+      const newKey = createNewDoc(oldKey);
+      if (!newKey) return;
+      newKey.userId = newUserId;
+      verifyDoc(oldKey, newKey);
+      newApiKeysToCreate.push(newKey);
     });
 
-    // Create the function that will flesh out new documents for a given user document
-    function createNewDocsForUser(oldUserDoc: User) {
-      const oldUserIdStr = oldUserDoc._id.toString();
-      const newUserId = getUUID(oldUserDoc._id);
-
-      // 1. Create new API keys
-      const userApiKeys = apiKeys.filter((k) => k.userId.toString() === oldUserIdStr);
-      userApiKeys.forEach((oldKey) => {
-        const newKey = createNewDoc(oldKey);
-        if (!newKey) return;
-        newKey.userId = newUserId;
-        verifyDoc(oldKey, newKey);
-        newApiKeysToCreate.push(newKey);
-      });
+    // 2. Create new Tasks
+    const userTasks = tasks.filter((t) => t.userId.toString() === oldUserIdStr);
 
-      // 2. Create new Tasks
-      const userTasks = tasks.filter(
-        (t) => t.userId.toString() === oldUserIdStr
-      );
+    const taskChildrenMap = new Map<string, DashboardTask[]>();
+    const rootTasks: DashboardTask[] = [];
+    const userTaskIds = new Set(userTasks.map((t) => t._id.toString()));
 
-      const taskChildrenMap = new Map<string, DashboardTask[]>();
-      const rootTasks: DashboardTask[] = [];
-      const userTaskIds = new Set(userTasks.map((t) => t._id.toString()));
+    userTasks.forEach((task) => {
+      const pId = task.parentTaskId?.toString();
+      if (pId && userTaskIds.has(pId)) {
+        if (!taskChildrenMap.has(pId)) {
+          taskChildrenMap.set(pId, []);
+        }
+        taskChildrenMap.get(pId).push(task);
+      } else {
+        rootTasks.push(task);
+      }
+    });
 
-      userTasks.forEach((task) => {
-        const pId = task.parentTaskId?.toString();
-        if (pId && userTaskIds.has(pId)) {
-          if (!taskChildrenMap.has(pId)) {
-            taskChildrenMap.set(pId, []);
-          }
-          taskChildrenMap.get(pId).push(task);
-        } else {
-          rootTasks.push(task);
+    const queue = [...rootTasks];
+    while (queue.length > 0) {
+      const oldTask = queue.shift()!;
+      const newTask = createNewDoc(oldTask);
+
+      if (newTask) {
+        newTask.userId = newUserId;
+
+        // Map user IDs in tags keys
+        const newTags: any = {};
+        Object.keys(oldTask.tags).forEach((tagUserId) => {
+          const newTagUserId = getUUID(tagUserId);
+          newTags[newTagUserId] = oldTask.tags[tagUserId];
+        });
+        newTask.tags = newTags;
+
+        // Map user IDs in filterSettings keys
+        const newFilterSettings: any = {};
+        Object.keys(oldTask.filterSettings).forEach((fsUserId) => {
+          const newFsUserId = getUUID(fsUserId);
+          newFilterSettings[newFsUserId] = {
+            ...oldTask.filterSettings[fsUserId],
+            userId: newFsUserId
+          };
+        });
+        newTask.filterSettings = newFilterSettings;
+
+        // Map user IDs in sortSettings keys
+        const newSortSettings: any = {};
+        Object.keys(oldTask.sortSettings).forEach((ssUserId) => {
+          const newSsUserId = getUUID(ssUserId);
+          newSortSettings[newSsUserId] = {
+            ...oldTask.sortSettings[ssUserId],
+            userId: newSsUserId
+          };
+        });
+        newTask.sortSettings = newSortSettings;
+
+        newTask.sharedWith = oldTask.sharedWith.map((id: any) => getUUID(id));
+        if (oldTask.assignedTo) {
+          newTask.assignedTo = getUUID(oldTask.assignedTo);
+        }
+        if (oldTask.parentTaskId) {
+          newTask.parentTaskId = getUUID(oldTask.parentTaskId);
+        }
+        if (oldTask.parentRecurringTaskInfo) {
+          newTask.parentRecurringTaskInfo = {
+            ...oldTask.parentRecurringTaskInfo,
+            taskId: getUUID(oldTask.parentRecurringTaskInfo.taskId)
+          };
         }
-      });
 
-      const queue = [...rootTasks];
-      while (queue.length > 0) {
-        const oldTask = queue.shift()!;
-        const newTask = createNewDoc(oldTask);
-
-        if (newTask) {
-          newTask.userId = newUserId;
-
-          // Map user IDs in tags keys
-          const newTags: any = {};
-          Object.keys(oldTask.tags).forEach((tagUserId) => {
-            const newTagUserId = getUUID(tagUserId);
-            newTags[newTagUserId] = oldTask.tags[tagUserId];
-          });
-          newTask.tags = newTags;
-
-          // Map user IDs in filterSettings keys
-          const newFilterSettings: any = {};
-          Object.keys(oldTask.filterSettings).forEach((fsUserId) => {
-            const newFsUserId = getUUID(fsUserId);
-            newFilterSettings[newFsUserId] = {
-              ...oldTask.filterSettings[fsUserId],
-              userId: newFsUserId
-            };
-          });
-          newTask.filterSettings = newFilterSettings;
-
-          // Map user IDs in sortSettings keys
-          const newSortSettings: any = {};
-          Object.keys(oldTask.sortSettings).forEach((ssUserId) => {
-            const newSsUserId = getUUID(ssUserId);
-            newSortSettings[newSsUserId] = {
-              ...oldTask.sortSettings[ssUserId],
-              userId: newSsUserId
-            };
-          });
-          newTask.sortSettings = newSortSettings;
+        verifyDoc(oldTask, newTask);
+        newTasksToCreate.push(newTask);
+      }
 
-          newTask.sharedWith = oldTask.sharedWith.map((id: any) => getUUID(id));
-          if (oldTask.assignedTo) {
-            newTask.assignedTo = getUUID(oldTask.assignedTo);
-          }
-          if (oldTask.parentTaskId) {
-            newTask.parentTaskId = getUUID(oldTask.parentTaskId);
-          }
-          if (oldTask.parentRecurringTaskInfo) {
-            newTask.parentRecurringTaskInfo = {
-              ...oldTask.parentRecurringTaskInfo,
-              taskId: getUUID(oldTask.parentRecurringTaskInfo.taskId)
+      const children = taskChildrenMap.get(oldTask._id.toString());
+      if (children) {
+        queue.push(...children);
+      }
+    }
+
+    // 3. Create new Configs
+    const userConfigs = configs.filter((c) => c.userId.toString() === oldUserIdStr);
+    userConfigs.forEach((oldConfig) => {
+      const newConfig = createNewDoc(oldConfig);
+      if (!newConfig) return;
+      newConfig.userId = newUserId;
+      newConfig.collaborators = (oldConfig.collaborators || []).map((id) => getUUID(id));
+      if (newConfig.taskListSortSettings) {
+        Object.entries(newConfig.taskListSortSettings).forEach(
+          ([category, settings]: [string, any]) => {
+            const newSettings = {
+              userId: getUUID(settings.userId),
+              sortList: settings.sortList
             };
+            newConfig.taskListSortSettings[category] = newSettings;
           }
-
-          verifyDoc(oldTask, newTask);
-          newTasksToCreate.push(newTask);
-        }
-
-        const children = taskChildrenMap.get(oldTask._id.toString());
-        if (children) {
-          queue.push(...children);
-        }
+        );
       }
-
-      // 3. Create new Configs
-      const userConfigs = configs.filter((c) => c.userId.toString() === oldUserIdStr);
-      userConfigs.forEach((oldConfig) => {
-        const newConfig = createNewDoc(oldConfig);
-        if (!newConfig) return;
-        newConfig.userId = newUserId;
-        newConfig.collaborators = (oldConfig.collaborators || []).map((id) =>
-          getUUID(id)
+      if (newConfig.taskListFilterSettings) {
+        Object.entries(newConfig.taskListFilterSettings).forEach(
+          ([category, settings]: [string, any]) => {
+            const newSettings = {
+              ...settings,
+              userId: getUUID(settings.userId)
+            };
+            newConfig.taskListFilterSettings[category] = newSettings;
+          }
         );
-        if (newConfig.taskListSortSettings) {
-          Object.entries(newConfig.taskListSortSettings).forEach(
-            ([category, settings]: [string, any]) => {
-              const newSettings = {
-                userId: getUUID(settings.userId),
-                sortList: settings.sortList
-              };
-              newConfig.taskListSortSettings[category] = newSettings;
-            }
-          );
-        }
-        if (newConfig.taskListFilterSettings) {
-          Object.entries(newConfig.taskListFilterSettings).forEach(
-            ([category, settings]: [string, any]) => {
-              const newSettings = {
-                ...settings,
-                userId: getUUID(settings.userId)
-              };
-              newConfig.taskListFilterSettings[category] = newSettings;
-            }
-          );
-        }
-        verifyDoc(oldConfig, newConfig);
-        newConfigsToCreate.push(newConfig);
-      });
-
-      // 4. Nonogram Items
-      const userNonogramItems = nonogramItems.filter((i) => i.userId.toString() === oldUserIdStr);
-      userNonogramItems.forEach((oldItem) => {
-        const newItem = createNewDoc(oldItem);
-        if (!newItem) return;
-        newItem.userId = newUserId;
-        verifyDoc(oldItem, newItem);
-        newNonogramItemsToCreate.push(newItem);
-      });
+      }
+      verifyDoc(oldConfig, newConfig);
+      newConfigsToCreate.push(newConfig);
+    });
 
-      // 5. Nonogram Upgrades
-      const userNonogramUpgrades = nonogramUpgrades.filter((u) => u.userId.toString() === oldUserIdStr);
-      userNonogramUpgrades.forEach((oldUpgrade) => {
-        const newUpgrade = createNewDoc(oldUpgrade);
-        if (!newUpgrade) return;
-        newUpgrade.userId = newUserId;
-        verifyDoc(oldUpgrade, newUpgrade);
-        newNonogramUpgradesToCreate.push(newUpgrade);
-      });
-    }
+    // 4. Nonogram Items
+    const userNonogramItems = nonogramItems.filter((i) => i.userId.toString() === oldUserIdStr);
+    userNonogramItems.forEach((oldItem) => {
+      const newItem = createNewDoc(oldItem);
+      if (!newItem) return;
+      newItem.userId = newUserId;
+      verifyDoc(oldItem, newItem);
+      newNonogramItemsToCreate.push(newItem);
+    });
 
-    // Now create related documents for each user
-    legacyUsers.forEach((u) => createNewDocsForUser(u));
-
-    const legacyUserIds = new Set(legacyUsers.map((u) => u._id.toString()));
-    const expectedUsers = legacyUsers.length;
-    const expectedApiKeys = apiKeys.filter((k) =>
-      legacyUserIds.has(k.userId.toString())
-    ).length;
-    const expectedTasks = tasks.filter((t) =>
-      legacyUserIds.has(t.userId.toString())
-    ).length;
-    const expectedConfigs = configs.filter((c) =>
-      legacyUserIds.has(c.userId.toString())
-    ).length;
-    const expectedNonogramItems = nonogramItems.filter((i) =>
-      legacyUserIds.has(i.userId.toString())
-    ).length;
-    const expectedNonogramUpgrades = nonogramUpgrades.filter((u) =>
-      legacyUserIds.has(u.userId.toString())
-    ).length;
-
-    if (newUsersToCreate.length !== expectedUsers) {
-      DR.logger.error(
-        `Expected ${expectedUsers} users, but prepped ${newUsersToCreate.length}.`
-      );
-    }
-    if (newApiKeysToCreate.length !== expectedApiKeys) {
-      DR.logger.error(
-        `Expected ${expectedApiKeys} API keys, but prepped ${newApiKeysToCreate.length}.`
-      );
-    }
-    if (newTasksToCreate.length !== expectedTasks) {
-      DR.logger.error(
-        `Expected ${expectedTasks} tasks, but prepped ${newTasksToCreate.length}.`
-      );
-    }
-    if (newConfigsToCreate.length !== expectedConfigs) {
-      DR.logger.error(
-        `Expected ${expectedConfigs} configs, but prepped ${newConfigsToCreate.length}.`
-      );
-    }
-    if (newNonogramItemsToCreate.length !== expectedNonogramItems) {
-      DR.logger.error(
-        `Expected ${expectedNonogramItems} nonogram items, but prepped ${newNonogramItemsToCreate.length}.`
-      );
-    }
-    if (newNonogramUpgradesToCreate.length !== expectedNonogramUpgrades) {
-      DR.logger.error(
-        `Expected ${expectedNonogramUpgrades} nonogram upgrades, but prepped ${newNonogramUpgradesToCreate.length}.`
-      );
-    }
+    // 5. Nonogram Upgrades
+    const userNonogramUpgrades = nonogramUpgrades.filter(
+      (u) => u.userId.toString() === oldUserIdStr
+    );
+    userNonogramUpgrades.forEach((oldUpgrade) => {
+      const newUpgrade = createNewDoc(oldUpgrade);
+      if (!newUpgrade) return;
+      newUpgrade.userId = newUserId;
+      verifyDoc(oldUpgrade, newUpgrade);
+      newNonogramUpgradesToCreate.push(newUpgrade);
+    });
+  }
 
-    DR.logger.info(`Prepped ${newUsersToCreate.length} new users.`);
-    DR.logger.info(`Prepped ${newApiKeysToCreate.length} new API keys.`);
-    DR.logger.info(`Prepped ${newTasksToCreate.length} new tasks.`);
-    DR.logger.info(`Prepped ${newConfigsToCreate.length} new configs.`);
-    DR.logger.info(
-      `Prepped ${newNonogramItemsToCreate.length} new nonogram items.`
+  // Now create related documents for each user
+  legacyUsers.forEach((u) => createNewDocsForUser(u));
+
+  const legacyUserIds = new Set(legacyUsers.map((u) => u._id.toString()));
+  const expectedUsers = legacyUsers.length;
+  const expectedApiKeys = apiKeys.filter((k) => legacyUserIds.has(k.userId.toString())).length;
+  const expectedTasks = tasks.filter((t) => legacyUserIds.has(t.userId.toString())).length;
+  const expectedConfigs = configs.filter((c) => legacyUserIds.has(c.userId.toString())).length;
+  const expectedNonogramItems = nonogramItems.filter((i) =>
+    legacyUserIds.has(i.userId.toString())
+  ).length;
+  const expectedNonogramUpgrades = nonogramUpgrades.filter((u) =>
+    legacyUserIds.has(u.userId.toString())
+  ).length;
+
+  if (newUsersToCreate.length !== expectedUsers) {
+    DR.logger.error(`Expected ${expectedUsers} users, but prepped ${newUsersToCreate.length}.`);
+  }
+  if (newApiKeysToCreate.length !== expectedApiKeys) {
+    DR.logger.error(
+      `Expected ${expectedApiKeys} API keys, but prepped ${newApiKeysToCreate.length}.`
     );
-    DR.logger.info(
-      `Prepped ${newNonogramUpgradesToCreate.length} new nonogram upgrades.`
+  }
+  if (newTasksToCreate.length !== expectedTasks) {
+    DR.logger.error(`Expected ${expectedTasks} tasks, but prepped ${newTasksToCreate.length}.`);
+  }
+  if (newConfigsToCreate.length !== expectedConfigs) {
+    DR.logger.error(
+      `Expected ${expectedConfigs} configs, but prepped ${newConfigsToCreate.length}.`
     );
-    DR.logger.info(`In total, prepped ${
+  }
+  if (newNonogramItemsToCreate.length !== expectedNonogramItems) {
+    DR.logger.error(
+      `Expected ${expectedNonogramItems} nonogram items, but prepped ${newNonogramItemsToCreate.length}.`
+    );
+  }
+  if (newNonogramUpgradesToCreate.length !== expectedNonogramUpgrades) {
+    DR.logger.error(
+      `Expected ${expectedNonogramUpgrades} nonogram upgrades, but prepped ${newNonogramUpgradesToCreate.length}.`
+    );
+  }
+
+  DR.logger.info(`Prepped ${newUsersToCreate.length} new users.`);
+  DR.logger.info(`Prepped ${newApiKeysToCreate.length} new API keys.`);
+  DR.logger.info(`Prepped ${newTasksToCreate.length} new tasks.`);
+  DR.logger.info(`Prepped ${newConfigsToCreate.length} new configs.`);
+  DR.logger.info(`Prepped ${newNonogramItemsToCreate.length} new nonogram items.`);
+  DR.logger.info(`Prepped ${newNonogramUpgradesToCreate.length} new nonogram upgrades.`);
+  DR.logger.info(
+    `In total, prepped ${
       newUsersToCreate.length +
       newApiKeysToCreate.length +
       newTasksToCreate.length +
       newConfigsToCreate.length +
       newNonogramItemsToCreate.length +
       newNonogramUpgradesToCreate.length
-    } documents for insertion.`);
+    } documents for insertion.`
+  );
 
-    if (!dryRun) {
-      DR.logger.info('Dry run is false. Inserting documents into DB...');
-      if (newUsersToCreate.length > 0) {
-        await (await userRepo.getCollection()).insertMany(newUsersToCreate);
-      }
-      if (newApiKeysToCreate.length > 0) {
-        await (await apiKeyRepo.getCollection()).insertMany(newApiKeysToCreate);
-      }
-      if (newTasksToCreate.length > 0) {
-        await (await taskRepo.getCollection()).insertMany(newTasksToCreate);
-      }
-      if (newConfigsToCreate.length > 0) {
-        await (await configRepo.getCollection()).insertMany(newConfigsToCreate);
-      }
-      if (newNonogramItemsToCreate.length > 0) {
-        await (
-          await nonogramItemRepo.getCollection()
-        ).insertMany(newNonogramItemsToCreate);
-      }
-      if (newNonogramUpgradesToCreate.length > 0) {
-        await (
-          await nonogramUpgradesRepo.getCollection()
-        ).insertMany(newNonogramUpgradesToCreate);
-      }
-      DR.logger.info('Insertion complete.');
-    } else {
-      DR.logger.info('Dry run is true. Skipping DB insertion.');
+  if (!dryRun) {
+    DR.logger.info('Dry run is false. Inserting documents into DB...');
+    if (newUsersToCreate.length > 0) {
+      await(await userRepo.getCollection()).insertMany(newUsersToCreate);
     }
-
-    return;
+    if (newApiKeysToCreate.length > 0) {
+      await(await apiKeyRepo.getCollection()).insertMany(newApiKeysToCreate);
+    }
+    if (newTasksToCreate.length > 0) {
+      await(await taskRepo.getCollection()).insertMany(newTasksToCreate);
+    }
+    if (newConfigsToCreate.length > 0) {
+      await(await configRepo.getCollection()).insertMany(newConfigsToCreate);
+    }
+    if (newNonogramItemsToCreate.length > 0) {
+      await(await nonogramItemRepo.getCollection()).insertMany(newNonogramItemsToCreate);
+    }
+    if (newNonogramUpgradesToCreate.length > 0) {
+      await(await nonogramUpgradesRepo.getCollection()).insertMany(newNonogramUpgradesToCreate);
+    }
+    DR.logger.info('Insertion complete.');
+  } else {
+    DR.logger.info('Dry run is true. Skipping DB insertion.');
   }
 
-  // We started with 1204 docs
+  return;
 }