@naturalcycles/abba 1.10.0 → 1.12.0

package/dist/abba.d.ts

@@ -54,10 +54,10 @@ export declare class Abba {
     getAllExistingUserAssignments(userId: string): Promise<Saved<UserAssignment>[]>;
     /**
      * Generate user assignments for all active experiments.
-     * Will return any existing and attempt to generate any new assignments.
+     * Will return any existing and attempt to generate any new assignments if existingOnly is false.
      * Hot method.
      */
-    generateUserAssignments(userId: string, segmentationData: SegmentationData): Promise<GeneratedUserAssignment[]>;
+    generateUserAssignments(userId: string, segmentationData: SegmentationData, existingOnly?: boolean): Promise<GeneratedUserAssignment[]>;
     /**
      * Get assignment statistics for an experiment.
      * Cold method.

package/dist/abba.js

@@ -100,13 +100,12 @@ class Abba {
     async getUserAssignment(experimentId, userId, existingOnly, segmentationData) {
         const existing = await this.getExistingUserAssignment(experimentId, userId);
         if (existing) {
-            const experiment = await this.experimentDao.requireById(experimentId);
-            const bucket = await this.bucketDao.getById(existing.bucketId || undefined);
-            return {
-                ...existing,
-                experimentName: experiment.name,
-                bucketKey: bucket?.key || null,
-            };
+            let bucketKey = null;
+            if (existing.bucketId) {
+                const { key } = await this.bucketDao.requireById(existing.bucketId);
+                bucketKey = key;
+            }
+            return { ...existing, bucketKey };
         }
         if (existingOnly)
             return null;
@@ -121,7 +120,6 @@ class Abba {
         const saved = await this.userAssignmentDao.save(assignment);
         return {
             ...saved,
-            experimentName: experiment.name,
             bucketKey: buckets.find(b => b.id === saved.bucketId)?.key || null,
         };
     }
@@ -135,34 +133,35 @@ class Abba {
     }
     /**
      * Generate user assignments for all active experiments.
-     * Will return any existing and attempt to generate any new assignments.
+     * Will return any existing and attempt to generate any new assignments if existingOnly is false.
      * Hot method.
      */
-    async generateUserAssignments(userId, segmentationData) {
+    async generateUserAssignments(userId, segmentationData, existingOnly = false) {
         const experiments = await this.getActiveExperiments(); // cached
-        const existingAssignments = await this.getAllExistingUserAssignments(userId);
-        const newAssignments = [];
-        for (const experiment of experiments) {
-            const existing = existingAssignments.find(ua => ua.experimentId === experiment.id);
-            if (!existing) {
-                const assignment = this.generateUserAssignmentData(experiment, userId, segmentationData);
-                if (assignment) {
-                    newAssignments.push(assignment);
-                }
-            }
-        }
-        existingAssignments.push(...(await this.userAssignmentDao.saveBatch(newAssignments)));
         const assignments = [];
+        const newAssignments = [];
+        const existingAssignments = await this.getAllExistingUserAssignments(userId);
         for (const experiment of experiments) {
             const existing = existingAssignments.find(ua => ua.experimentId === experiment.id);
             if (existing) {
                 assignments.push({
                     ...existing,
-                    experimentName: experiment.name,
-                    bucketKey: experiment.buckets.find(i => i.id === existing.bucketId)?.key || null,
+                    bucketKey: experiment.buckets.find(b => b.id === existing.bucketId)?.key || null,
                 });
             }
+            else if (!existingOnly) {
+                const assignment = this.generateUserAssignmentData(experiment, userId, segmentationData);
+                if (assignment) {
+                    const created = this.userAssignmentDao.create(assignment);
+                    newAssignments.push(created);
+                    assignments.push({
+                        ...created,
+                        bucketKey: experiment.buckets.find(b => b.id === created.bucketId)?.key || null,
+                    });
+                }
+            }
         }
+        await this.userAssignmentDao.saveBatch(newAssignments);
         return assignments;
     }
     /**

package/dist/migrations/init.sql

@@ -13,7 +13,6 @@ CREATE TABLE IF NOT EXISTS `Bucket` (
 -- CreateTable
 CREATE TABLE IF NOT EXISTS `Experiment` (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `name` VARCHAR(191) NOT NULL,
     `status` INTEGER NOT NULL,
     `sampling` INTEGER NOT NULL,
     `description` VARCHAR(240) NULL,

package/dist/types.d.ts

@@ -4,7 +4,7 @@ export interface AbbaConfig {
     db: CommonDB;
 }
 export declare type BaseExperiment = BaseDBEntity<number> & {
-    name: string;
+    id: number;
     status: number;
     sampling: number;
     description: string | null;
@@ -31,7 +31,6 @@ export declare type UserAssignment = BaseDBEntity<number> & {
     bucketId: number | null;
 };
 export declare type GeneratedUserAssignment = Saved<UserAssignment> & {
-    experimentName: string;
     bucketKey: string | null;
 };
 export declare type SegmentationData = Record<string, string | boolean | number>;

package/package.json

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

package/src/abba.ts

@@ -97,7 +97,7 @@ export class Abba {
     return {
       ...(experiment as Saved<Experiment>),
       buckets: await this.bucketDao.saveBatch(
-        buckets.map(b => ({ ...b, experimentId: experiment.id! })),
+        buckets.map(b => ({ ...b, experimentId: experiment.id })),
       ),
     }
   }
@@ -150,13 +150,12 @@ export class Abba {
     const existing = await this.getExistingUserAssignment(experimentId, userId)
 
     if (existing) {
-      const experiment = await this.experimentDao.requireById(experimentId)
-      const bucket = await this.bucketDao.getById(existing.bucketId || undefined)
-      return {
-        ...existing,
-        experimentName: experiment.name,
-        bucketKey: bucket?.key || null,
+      let bucketKey = null
+      if (existing.bucketId) {
+        const { key } = await this.bucketDao.requireById(existing.bucketId)
+        bucketKey = key
       }
+      return { ...existing, bucketKey }
     }
 
     if (existingOnly) return null
@@ -179,7 +178,6 @@ export class Abba {
 
     return {
       ...saved,
-      experimentName: experiment.name,
       bucketKey: buckets.find(b => b.id === saved.bucketId)?.key || null,
     }
   }
@@ -195,40 +193,41 @@ export class Abba {
 
   /**
    * Generate user assignments for all active experiments.
-   * Will return any existing and attempt to generate any new assignments.
+   * Will return any existing and attempt to generate any new assignments if existingOnly is false.
    * Hot method.
    */
   async generateUserAssignments(
     userId: string,
     segmentationData: SegmentationData,
+    existingOnly = false,
   ): Promise<GeneratedUserAssignment[]> {
     const experiments = await this.getActiveExperiments() // cached
-    const existingAssignments = await this.getAllExistingUserAssignments(userId)
 
+    const assignments: GeneratedUserAssignment[] = []
     const newAssignments: UserAssignment[] = []
-    for (const experiment of experiments) {
-      const existing = existingAssignments.find(ua => ua.experimentId === experiment.id)
-      if (!existing) {
-        const assignment = this.generateUserAssignmentData(experiment, userId, segmentationData)
-        if (assignment) {
-          newAssignments.push(assignment)
-        }
-      }
-    }
-
-    existingAssignments.push(...(await this.userAssignmentDao.saveBatch(newAssignments)))
+    const existingAssignments = await this.getAllExistingUserAssignments(userId)
 
-    const assignments: GeneratedUserAssignment[] = []
     for (const experiment of experiments) {
       const existing = existingAssignments.find(ua => ua.experimentId === experiment.id)
       if (existing) {
         assignments.push({
           ...existing,
-          experimentName: experiment.name,
-          bucketKey: experiment.buckets.find(i => i.id === existing.bucketId)?.key || null,
+          bucketKey: experiment.buckets.find(b => b.id === existing.bucketId)?.key || null,
         })
+      } else if (!existingOnly) {
+        const assignment = this.generateUserAssignmentData(experiment, userId, segmentationData)
+        if (assignment) {
+          const created = this.userAssignmentDao.create(assignment)
+          newAssignments.push(created)
+          assignments.push({
+            ...created,
+            bucketKey: experiment.buckets.find(b => b.id === created.bucketId)?.key || null,
+          })
+        }
       }
     }
+
+    await this.userAssignmentDao.saveBatch(newAssignments)
     return assignments
   }
 

package/src/migrations/init.sql

@@ -13,7 +13,6 @@ CREATE TABLE IF NOT EXISTS `Bucket` (
 -- CreateTable
 CREATE TABLE IF NOT EXISTS `Experiment` (
     `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `name` VARCHAR(191) NOT NULL,
     `status` INTEGER NOT NULL,
     `sampling` INTEGER NOT NULL,
     `description` VARCHAR(240) NULL,

package/src/types.ts

@@ -14,7 +14,7 @@ export interface AbbaConfig {
 }
 
 export type BaseExperiment = BaseDBEntity<number> & {
-  name: string
+  id: number
   status: number
   sampling: number
   description: string | null
@@ -47,7 +47,6 @@ export type UserAssignment = BaseDBEntity<number> & {
 }
 
 export type GeneratedUserAssignment = Saved<UserAssignment> & {
-  experimentName: string
   bucketKey: string | null
 }