@naturalcycles/abba 2.2.0 → 2.3.2

package/dist/abba.d.ts

@@ -18,9 +18,10 @@ export declare class Abba {
     getAllExperimentsWithBucketsNoCache(opts?: GetAllExperimentsOpts): Promise<ExperimentWithBuckets[]>;
     getUserExperiments(userId: string): Promise<UserExperiment[]>;
     /**
-     * Updates all user assignments with a given userId with the provided userId.
+     * Changes all user assignments from one userId to another, as long as no
+     * assignment for a given experiment already exists with the new userId.
      */
-    updateUserId(oldId: string, newId: string): Promise<void>;
+    mergeAssignmentsForUserIds(fromUserId: string, intoUserId: string): Promise<void>;
     /**
      * Creates a new experiment.
      * Cold method.

package/dist/abba.js

@@ -58,11 +58,17 @@ export class Abba {
         });
     }
     /**
-     * Updates all user assignments with a given userId with the provided userId.
+     * Changes all user assignments from one userId to another, as long as no
+     * assignment for a given experiment already exists with the new userId.
      */
-    async updateUserId(oldId, newId) {
-        const query = this.userAssignmentDao.query().filterEq('userId', oldId);
-        await this.userAssignmentDao.patchByQuery(query, { userId: newId });
+    async mergeAssignmentsForUserIds(fromUserId, intoUserId) {
+        const fromAssignments = await this.userAssignmentDao.getBy('userId', fromUserId);
+        const existingIntoAssignments = await this.userAssignmentDao.getBy('userId', intoUserId);
+        await pMap(fromAssignments, async (from) => {
+            if (!existingIntoAssignments.some(into => into.experimentId === from.experimentId)) {
+                await this.userAssignmentDao.patch(from, { userId: intoUserId });
+            }
+        });
     }
     /**
      * Creates a new experiment.

package/package.json

@@ -1,28 +1,17 @@
 {
   "name": "@naturalcycles/abba",
   "type": "module",
-  "version": "2.2.0",
-  "scripts": {
-    "prepare": "husky",
-    "build": "dev-lib build",
-    "test": "dev-lib test",
-    "lint": "dev-lib lint",
-    "bt": "dev-lib bt",
-    "lbt": "dev-lib lbt"
-  },
+  "version": "2.3.2",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^14",
-    "semver": "^7"
+    "semver": "^7",
+    "tslib": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^18",
-    "@types/node": "^22",
-    "@types/semver": "^7",
-    "@vitest/coverage-v8": "^3",
-    "tsx": "^4",
-    "vitest": "^3"
+    "@naturalcycles/dev-lib": "*",
+    "@types/semver": "^7"
   },
   "files": [
     "dist",
@@ -35,11 +24,12 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
-    "access": "restricted"
+    "access": "public"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/NaturalCycles/abba"
+    "url": "git@github.com:NaturalCycles/js-libs.git",
+    "directory": "packages/abba"
   },
   "engines": {
     "node": ">=22.10.0"
@@ -47,5 +37,13 @@
   "description": "AB test assignment configuration tool for Node.js",
   "author": "Natural Cycles Team",
   "license": "MIT",
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
+  "scripts": {
+    "build": "dev-lib build",
+    "test": "dev-lib test",
+    "lint": "dev-lib lint",
+    "bt": "dev-lib bt",
+    "clean": "dev-lib clean",
+    "typecheck": "dev-lib typecheck",
+    "check": "dev-lib check"
+  }
+}

package/src/abba.ts

@@ -94,11 +94,18 @@ export class Abba {
   }
 
   /**
-   * Updates all user assignments with a given userId with the provided userId.
+   * Changes all user assignments from one userId to another, as long as no
+   * assignment for a given experiment already exists with the new userId.
    */
-  async updateUserId(oldId: string, newId: string): Promise<void> {
-    const query = this.userAssignmentDao.query().filterEq('userId', oldId)
-    await this.userAssignmentDao.patchByQuery(query, { userId: newId })
+  async mergeAssignmentsForUserIds(fromUserId: string, intoUserId: string): Promise<void> {
+    const fromAssignments = await this.userAssignmentDao.getBy('userId', fromUserId)
+    const existingIntoAssignments = await this.userAssignmentDao.getBy('userId', intoUserId)
+
+    await pMap(fromAssignments, async from => {
+      if (!existingIntoAssignments.some(into => into.experimentId === from.experimentId)) {
+        await this.userAssignmentDao.patch(from, { userId: intoUserId })
+      }
+    })
   }
 
   /**