@naturalcycles/abba 2.1.1 → 2.3.0

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.
@@ -121,7 +127,7 @@ export class Abba {
         await this.experimentDao.saveBatch(requiresUpdating, { saveMethod: 'update' });
     }
     async softDeleteExperiment(experimentId) {
-        await this.experimentDao.patchById(experimentId, { deleted: true, exclusions: [] }, { saveMethod: 'update' });
+        await this.experimentDao.patchById(experimentId, { deleted: true, status: AssignmentStatus.Inactive, exclusions: [] }, { saveMethod: 'update' });
         await this.updateExclusions(experimentId, []);
     }
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/abba",
   "type": "module",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

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 })
+      }
+    })
   }
 
   /**
@@ -187,7 +194,7 @@ export class Abba {
   async softDeleteExperiment(experimentId: string): Promise<void> {
     await this.experimentDao.patchById(
       experimentId,
-      { deleted: true, exclusions: [] },
+      { deleted: true, status: AssignmentStatus.Inactive, exclusions: [] },
       { saveMethod: 'update' },
     )
     await this.updateExclusions(experimentId, [])