@naturalcycles/abba 1.14.1 → 1.15.1

package/dist/abba.js

@@ -62,7 +62,7 @@ class Abba {
         if (experiment.status === types_1.AssignmentStatus.Active) {
             (0, util_1.validateTotalBucketRatio)(buckets);
         }
-        const updatedExperiment = await this.experimentDao.save(experiment);
+        const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' });
         const updatedBuckets = await this.bucketDao.saveBatch(buckets.map(b => ({ ...b, experimentId: experiment.id })));
         await this.updateExclusions(updatedExperiment.id, updatedExperiment.exclusions);
         return {
@@ -90,7 +90,7 @@ class Abba {
                 requiresUpdating.push(experiment);
             }
         });
-        await this.experimentDao.saveBatch(requiresUpdating);
+        await this.experimentDao.saveBatch(requiresUpdating, { saveMethod: 'update' });
     }
     /**
      * Delete an experiment. Removes all user assignments and buckets.

package/dist/dao/experiment.dao.js

@@ -11,7 +11,6 @@ const experimentDao = (db) => new ExperimentDao({
     table: 'Experiment',
     createId: false,
     idType: 'number',
-    assignGeneratedIds: true,
     hooks: {
         beforeBMToDBM: bm => ({
             ...bm,

package/dist/util.js

@@ -126,6 +126,10 @@ exports.canGenerateNewAssignments = canGenerateNewAssignments;
 const getUserExclusionSet = (experiments, existingAssignments) => {
     const exclusionSet = new Set();
     existingAssignments.forEach(assignment => {
+        // Users who are excluded from an experiment due to sampling
+        // should not prevent potential assignment to other mutually exclusive experiments
+        if (assignment.bucketId === null)
+            return;
         const experiment = experiments.find(e => e.id === assignment.experimentId);
         experiment?.exclusions.forEach(experimentId => exclusionSet.add(experimentId));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/abba",
-  "version": "1.14.1",
+  "version": "1.15.1",
   "scripts": {
     "prepare": "husky install",
     "build": "build",

package/src/abba.ts

@@ -92,7 +92,7 @@ export class Abba {
       validateTotalBucketRatio(buckets)
     }
 
-    const updatedExperiment = await this.experimentDao.save(experiment)
+    const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' })
     const updatedBuckets = await this.bucketDao.saveBatch(
       buckets.map(b => ({ ...b, experimentId: experiment.id })),
     )
@@ -132,7 +132,7 @@ export class Abba {
       }
     })
 
-    await this.experimentDao.saveBatch(requiresUpdating)
+    await this.experimentDao.saveBatch(requiresUpdating, { saveMethod: 'update' })
   }
 
   /**

package/src/dao/experiment.dao.ts

@@ -13,9 +13,8 @@ export const experimentDao = (db: CommonDB): ExperimentDao =>
   new ExperimentDao({
     db,
     table: 'Experiment',
-    createId: false, // mysql auto_increment is used instead
+    createId: false, // Always provided on create
     idType: 'number',
-    assignGeneratedIds: true,
     hooks: {
       beforeBMToDBM: bm => ({
         ...bm,

package/src/util.ts

@@ -150,6 +150,10 @@ export const getUserExclusionSet = (
 ): ExclusionSet => {
   const exclusionSet: ExclusionSet = new Set()
   existingAssignments.forEach(assignment => {
+    // Users who are excluded from an experiment due to sampling
+    // should not prevent potential assignment to other mutually exclusive experiments
+    if (assignment.bucketId === null) return
+
     const experiment = experiments.find(e => e.id === assignment.experimentId)
     experiment?.exclusions.forEach(experimentId => exclusionSet.add(experimentId))
   })