@naturalcycles/abba 1.10.0 → 1.11.0

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,
         };
     }
@@ -158,7 +156,6 @@ class Abba {
             if (existing) {
                 assignments.push({
                     ...existing,
-                    experimentName: experiment.name,
                     bucketKey: experiment.buckets.find(i => i.id === existing.bucketId)?.key || null,
                 });
             }

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.11.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,
     }
   }
@@ -224,7 +222,6 @@ export class Abba {
       if (existing) {
         assignments.push({
           ...existing,
-          experimentName: experiment.name,
           bucketKey: experiment.buckets.find(i => i.id === existing.bucketId)?.key || null,
         })
       }

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
 }