npm - @aneuhold/be-ts-db-lib - Versions diffs - 4.2.18 → 4.2.19 - Mend

@aneuhold/be-ts-db-lib 4.2.18 → 4.2.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/CHANGELOG.md +11 -0
package/lib/repositories/common/UserRepository.d.ts +6 -0
package/lib/repositories/common/UserRepository.d.ts.map +1 -1
package/lib/repositories/common/UserRepository.js +12 -0
package/lib/repositories/common/UserRepository.js.map +1 -1
package/lib/repositories/common/UserRepository.ts +13 -0
package/lib/services/MigrationService.d.ts.map +1 -1
package/lib/services/MigrationService.js +17 -352
package/lib/services/MigrationService.js.map +1 -1
package/lib/services/MigrationService.ts +18 -425
package/package.json +2 -2

package/CHANGELOG.md CHANGED Viewed

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+## 🔖 [4.2.19] (2026-03-18)
+### ✅ Added
+- Added `UserRepository.getUserByRefreshTokenHash()` to look up a user by a SHA-256 hashed refresh token stored in `auth.refreshTokenHashes`.
+### 🏗️ Changed
+- `MigrationService` updated to backfill `auth.refreshTokenHashes` for users missing the field; removed the previous large ObjectId-to-UUID migration logic.
 ## 🔖 [4.2.18] (2026-03-15)
 ### ✅ Added
@@ -338,6 +348,7 @@ Updated dependencies: now requires `@aneuhold/core-ts-db-lib@^3.0.0`, `@aneuhold
 <!-- Link References -->
+[4.2.19]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.18...be-ts-db-lib-v4.2.19
 [4.2.18]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.17...be-ts-db-lib-v4.2.18
 [4.2.17]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.16...be-ts-db-lib-v4.2.17
 [4.2.16]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.15...be-ts-db-lib-v4.2.16

package/lib/repositories/common/UserRepository.d.ts CHANGED Viewed

@@ -14,6 +14,12 @@ export default class UserRepository extends BaseRepository<User> {
      */
     static getRepo(): UserRepository;
     getUserCTOByUsername(userName: string): Promise<UserCTO | null>;
+    /**
+     * Finds a user that has a refresh token with the given SHA-256 hash.
+     *
+     * @param tokenHash - The SHA-256 hash of the refresh token.
+     */
+    getUserByRefreshTokenHash(tokenHash: string): Promise<User | null>;
     getUserCTOsByIds(userIds: UUID[]): Promise<UserCTO[]>;
 }
 //# sourceMappingURL=UserRepository.d.ts.map

package/lib/repositories/common/UserRepository.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"UserRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAalD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,cAAc,CAAC,IAAI,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAW;IAEzC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAA6B;IAE7D,OAAO;IAIP,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAclC;;OAEG;IACH,MAAM,CAAC,OAAO,IAAI,cAAc;IAO1B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;~~IAW/D~~,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAO5D"}
1	+ {"version":3,"file":"UserRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAalD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,cAAc,CAAC,IAAI,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAW;IAEzC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAA6B;IAE7D,OAAO;IAIP,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAclC;;OAEG;IACH,MAAM,CAAC,OAAO,IAAI,cAAc;IAO1B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAWrE;;;;OAIG;IACG,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAQlE,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAO5D"}

package/lib/repositories/common/UserRepository.js CHANGED Viewed

@@ -52,6 +52,18 @@ export default class UserRepository extends BaseRepository {
         }
         return null;
     }
+    /**
+     * Finds a user that has a refresh token with the given SHA-256 hash.
+     *
+     * @param tokenHash - The SHA-256 hash of the refresh token.
+     */
+    async getUserByRefreshTokenHash(tokenHash) {
+        const collection = await this.getCollection();
+        const result = await collection.findOne({
+            'auth.refreshTokenHashes.tokenHash': tokenHash
+        });
+        return result;
+    }
     async getUserCTOsByIds(userIds) {
         const users = await this.getList(userIds);
         return users.map((user) => ({

package/lib/repositories/common/UserRepository.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"UserRepository.js","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"UserRepository.js","sourceRoot":"","sources":["../../../src/repositories/common/UserRepository.ts"],"names":[],"mappings":"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"}

package/lib/repositories/common/UserRepository.ts CHANGED Viewed

@@ -61,6 +61,19 @@ export default class UserRepository extends BaseRepository<User> {
     return null;
   }
+  /**
+   * Finds a user that has a refresh token with the given SHA-256 hash.
+   *
+   * @param tokenHash - The SHA-256 hash of the refresh token.
+   */
+  async getUserByRefreshTokenHash(tokenHash: string): Promise<User | null> {
+    const collection = await this.getCollection();
+    const result = await collection.findOne({
+      'auth.refreshTokenHashes.tokenHash': tokenHash
+    });
+    return result;
+  }
   async getUserCTOsByIds(userIds: UUID[]): Promise<UserCTO[]> {
     const users = await this.getList(userIds);
     return users.map((user) => ({

package/lib/services/MigrationService.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MigrationService.d.ts","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"~~AAoBA~~;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;WACU,SAAS,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;~~CAkHtD~~"}
1	+ {"version":3,"file":"MigrationService.d.ts","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;WACU,SAAS,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAoCtD"}

package/lib/services/MigrationService.js CHANGED Viewed

@@ -1,14 +1,7 @@
 /* eslint-disable */
 // @ts-nocheck
-import { ApiKey, DashboardTask, DashboardUserConfig, DocumentService, NonogramKatanaItem, NonogramKatanaUpgrade, User } from '@aneuhold/core-ts-db-lib';
 import { DR } from '@aneuhold/core-ts-lib';
-import { v7 as uuidv7 } from 'uuid';
-import ApiKeyRepository from '../repositories/common/ApiKeyRepository.js';
 import UserRepository from '../repositories/common/UserRepository.js';
-import DashboardNonogramKatanaItemRepository from '../repositories/dashboard/DashboardNonogramKatanaItemRepository.js';
-import DashboardNonogramKatanaUpgradeRepository from '../repositories/dashboard/DashboardNonogramKatanaUpgradeRepository.js';
-import DashboardTaskRepository from '../repositories/dashboard/DashboardTaskRepository.js';
-import DashboardUserConfigRepository from '../repositories/dashboard/DashboardUserConfigRepository.js';
 /**
  * A service for migrating the DB to a new state after an existing document
  * change.
@@ -28,358 +21,30 @@ export default class MigrationService {
      */
     static async migrateDb(dryRun = false) {
         DR.logger.info('Starting migration...');
-        // 1. Load all documents
         const userRepo = UserRepository.getRepo();
-        const apiKeyRepo = ApiKeyRepository.getRepo();
-        const taskRepo = DashboardTaskRepository.getRepo();
-        const configRepo = DashboardUserConfigRepository.getRepo();
-        const nonogramItemRepo = DashboardNonogramKatanaItemRepository.getRepo();
-        const nonogramUpgradesRepo = DashboardNonogramKatanaUpgradeRepository.getRepo();
         const users = await userRepo.getAll();
-        const apiKeys = await apiKeyRepo.getAll();
-        const tasks = await taskRepo.getAll();
-        const configs = await configRepo.getAll();
-        const nonogramItems = await nonogramItemRepo.getAll();
-        const nonogramUpgrades = await nonogramUpgradesRepo.getAll();
-        DR.logger.info(`Loaded ${users.length} users, ${apiKeys.length} API keys, ${tasks.length} tasks, ${configs.length} configs, ${nonogramItems.length} nonogram items, and ${nonogramUpgrades.length} nonogram upgrades.`);
-        const countObjectIds = (docs) => {
-            docs.forEach((doc) => {
-                // Get the type of the _id field
-                console.log(`Document ID type: ${typeof doc._id}, value: ${doc._id}`);
-            });
-        };
-        // Create a map of document IDs to new UUIDs
-        const allDocs = [
-            ...users,
-            ...apiKeys,
-            ...tasks,
-            ...configs,
-            ...nonogramItems,
-            ...nonogramUpgrades
-        ];
-        const legacyDocs = allDocs.filter((doc) => typeof doc._id === 'object');
-        const newDocs = allDocs.filter((doc) => typeof doc._id === 'string');
-        DR.logger.info(`Found ${legacyDocs.length} documents with legacy ObjectId IDs and ${newDocs.length} documents with string IDs.`);
-        // 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`);
-            }
-        }
-        // We started with 1204 docs
-    }
-}
-async function Migration2025UUID() {
-    // Now create the actual map
-    const mapFromObjectIdToUUID = new Map();
-    const newUsersToCreate = [];
-    const newApiKeysToCreate = [];
-    const newTasksToCreate = [];
-    const newConfigsToCreate = [];
-    const newNonogramItemsToCreate = [];
-    const newNonogramUpgradesToCreate = [];
-    /**
-     * 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) => {
-        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();
-    const verifyDoc = (oldDoc, newDoc) => {
-        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())))}`);
+        // Add refreshTokenHashes to users that don't have it yet
+        const usersToUpdate = users.filter((user) => !user.auth.refreshTokenHashes);
+        DR.logger.info(`Found ${usersToUpdate.length} of ${users.length} users missing auth.refreshTokenHashes.`);
+        if (usersToUpdate.length === 0) {
+            DR.logger.success('No migration needed.');
             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');
-    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)
+        if (dryRun) {
+            DR.logger.info('Dry run: Would update the following users:');
+            usersToUpdate.forEach((user) => {
+                DR.logger.info(`  - ${user.userName} (${user._id})`);
+            });
             return;
-        verifyDoc(oldUserDoc, newUser);
-        newUsersToCreate.push(newUser);
-    });
-    // Create the function that will flesh out new documents for a given user document
-    function createNewDocsForUser(oldUserDoc) {
-        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);
-        const taskChildrenMap = new Map();
-        const rootTasks = [];
-        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);
-            }
-        });
-        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 = {};
-                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 = {};
-                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 = {};
-                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) => 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)
-                    };
-                }
-                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.taskListSortSettings) {
-                Object.entries(newConfig.taskListSortSettings).forEach(([category, settings]) => {
-                    const newSettings = {
-                        userId: getUUID(settings.userId),
-                        sortList: settings.sortList
-                    };
-                    newConfig.taskListSortSettings[category] = newSettings;
-                });
-            }
-            if (newConfig.taskListFilterSettings) {
-                Object.entries(newConfig.taskListFilterSettings).forEach(([category, settings]) => {
-                    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);
-        });
-        // 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);
-        });
-    }
-    // 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}.`);
-    }
-    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.`);
-    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);
+        for (const user of usersToUpdate) {
+            await userRepo.update({
+                _id: user._id,
+                auth: { ...user.auth, refreshTokenHashes: [] }
+            });
+            DR.logger.info(`Updated user ${user.userName} (${user._id})`);
         }
-        DR.logger.info('Insertion complete.');
-    }
-    else {
-        DR.logger.info('Dry run is true. Skipping DB insertion.');
+        DR.logger.success(`Migration complete. Updated ${usersToUpdate.length} users.`);
     }
-    return;
 }
 //# sourceMappingURL=MigrationService.js.map

package/lib/services/MigrationService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MigrationService.js","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"MigrationService.js","sourceRoot":"","sources":["../../src/services/MigrationService.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,cAAc;AACd,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,cAAc,MAAM,0CAA0C,CAAC;AAEtE;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK;QACnC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QAEtC,yDAAyD;QACzD,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5E,EAAE,CAAC,MAAM,CAAC,IAAI,CACZ,SAAS,aAAa,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,yCAAyC,CAC1F,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;YAC7D,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC7B,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,QAAQ,CAAC,MAAM,CAAC;gBACpB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE;aAC/C,CAAC,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAChE,CAAC;QAED,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,+BAA+B,aAAa,CAAC,MAAM,SAAS,CAAC,CAAC;IAClF,CAAC;CACF"}

package/lib/services/MigrationService.ts CHANGED Viewed

@@ -1,22 +1,7 @@
 /* eslint-disable */
 // @ts-nocheck
-import {
-  ApiKey,
-  DashboardTask,
-  DashboardUserConfig,
-  DocumentService,
-  NonogramKatanaItem,
-  NonogramKatanaUpgrade,
-  User
-} from '@aneuhold/core-ts-db-lib';
 import { DR } from '@aneuhold/core-ts-lib';
-import { v7 as uuidv7 } from 'uuid';
-import ApiKeyRepository from '../repositories/common/ApiKeyRepository.js';
 import UserRepository from '../repositories/common/UserRepository.js';
-import DashboardNonogramKatanaItemRepository from '../repositories/dashboard/DashboardNonogramKatanaItemRepository.js';
-import DashboardNonogramKatanaUpgradeRepository from '../repositories/dashboard/DashboardNonogramKatanaUpgradeRepository.js';
-import DashboardTaskRepository from '../repositories/dashboard/DashboardTaskRepository.js';
-import DashboardUserConfigRepository from '../repositories/dashboard/DashboardUserConfigRepository.js';
 /**
  * A service for migrating the DB to a new state after an existing document
@@ -38,429 +23,37 @@ export default class MigrationService {
   static async migrateDb(dryRun = false): Promise<void> {
     DR.logger.info('Starting migration...');
-    // 1. Load all documents
     const userRepo = UserRepository.getRepo();
-    const apiKeyRepo = ApiKeyRepository.getRepo();
-    const taskRepo = DashboardTaskRepository.getRepo();
-    const configRepo = DashboardUserConfigRepository.getRepo();
-    const nonogramItemRepo = DashboardNonogramKatanaItemRepository.getRepo();
-    const nonogramUpgradesRepo = DashboardNonogramKatanaUpgradeRepository.getRepo();
     const users = await userRepo.getAll();
-    const apiKeys = await apiKeyRepo.getAll();
-    const tasks = await taskRepo.getAll();
-    const configs = await configRepo.getAll();
-    const nonogramItems = await nonogramItemRepo.getAll();
-    const nonogramUpgrades = await nonogramUpgradesRepo.getAll();
-    DR.logger.info(
-      `Loaded ${users.length} users, ${apiKeys.length} API keys, ${tasks.length} tasks, ${configs.length} configs, ${nonogramItems.length} nonogram items, and ${nonogramUpgrades.length} nonogram upgrades.`
-    );
-    const countObjectIds = (docs: any[]) => {
-      docs.forEach((doc) => {
-        // Get the type of the _id field
-        console.log(`Document ID type: ${typeof doc._id}, value: ${doc._id}`);
-      });
-    };
-    // Create a map of document IDs to new UUIDs
-    const allDocs = [
-      ...users,
-      ...apiKeys,
-      ...tasks,
-      ...configs,
-      ...nonogramItems,
-      ...nonogramUpgrades
-    ];
-    const legacyDocs = allDocs.filter((doc) => typeof doc._id === 'object');
-    const newDocs = allDocs.filter((doc) => typeof doc._id === 'string');
+    // Add refreshTokenHashes to users that don't have it yet
+    const usersToUpdate = users.filter((user) => !user.auth.refreshTokenHashes);
     DR.logger.info(
-      `Found ${legacyDocs.length} documents with legacy ObjectId IDs and ${newDocs.length} documents with string IDs.`
+      `Found ${usersToUpdate.length} of ${users.length} users missing auth.refreshTokenHashes.`
     );
-    // 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`);
-      }
-    }
-    // We started with 1204 docs
-  }
-}
-async function Migration2025UUID() {
-  // 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;
-  };
-  // 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}.`
-      );
+    if (usersToUpdate.length === 0) {
+      DR.logger.success('No migration needed.');
+      return;
     }
-  };
-  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())))}`
-      );
+    if (dryRun) {
+      DR.logger.info('Dry run: Would update the following users:');
+      usersToUpdate.forEach((user) => {
+        DR.logger.info(`  - ${user.userName} (${user._id})`);
+      });
       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');
-  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);
-    });
-    // 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()));
-    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)
-          };
-        }
-        verifyDoc(oldTask, newTask);
-        newTasksToCreate.push(newTask);
-      }
-      const children = taskChildrenMap.get(oldTask._id.toString());
-      if (children) {
-        queue.push(...children);
-      }
+    for (const user of usersToUpdate) {
+      await userRepo.update({
+        _id: user._id,
+        auth: { ...user.auth, refreshTokenHashes: [] }
+      });
+      DR.logger.info(`Updated user ${user.userName} (${user._id})`);
     }
-    // 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;
-          }
-        );
-      }
-      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);
-    });
-    // 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);
-    });
-  }
-  // 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}.`
-    );
-  }
-  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.`
-  );
-  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.');
+    DR.logger.success(`Migration complete. Updated ${usersToUpdate.length} users.`);
   }
-  return;
 }

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "@aneuhold/be-ts-db-lib",
   "author": "Anton G. Neuhold Jr.",
   "license": "MIT",
-  "version": "4.2.18",
+  "version": "4.2.19",
   "description": "A backend database library meant to actually interact with various databases in personal projects",
   "packageManager": "pnpm@10.25.0",
   "type": "module",
@@ -58,7 +58,7 @@
     "MongoDB"
   ],
   "dependencies": {
-    "@aneuhold/be-ts-lib": "^3.1.5",
+    "@aneuhold/be-ts-lib": "^3.1.6",
     "@aneuhold/core-ts-db-lib": "^5.0.1",
     "@aneuhold/core-ts-lib": "^2.4.3",
     "bson": "^7.0.0",