@naturalcycles/abba 1.22.1 → 1.23.0

package/dist/abba.js

@@ -134,10 +134,12 @@ class Abba {
         const existingAssignments = await this.userAssignmentDao.getBy('userId', userId);
         const existing = existingAssignments.find(a => a.experimentId === experiment.id);
         if (existing) {
+            const bucket = buckets.find(b => b.id === existing.bucketId);
             return {
                 ...existing,
                 experimentKey: experiment.key,
-                bucketKey: buckets.find(b => b.id === existing.bucketId)?.key || null,
+                bucketKey: bucket?.key || null,
+                bucketData: bucket?.data || null,
             };
         }
         // No existing assignment, but we don't want to generate a new one
@@ -153,10 +155,12 @@ class Abba {
         if (!assignment)
             return null;
         const newAssignment = await this.userAssignmentDao.save(assignment);
+        const bucket = buckets.find(b => b.id === newAssignment.bucketId);
         return {
             ...newAssignment,
             experimentKey: experiment.key,
-            bucketKey: buckets.find(b => b.id === newAssignment.bucketId)?.key || null,
+            bucketKey: bucket?.key || null,
+            bucketData: bucket?.data || null,
         };
     }
     /**
@@ -174,6 +178,7 @@ class Abba {
                 ...assignment,
                 experimentKey: experiment.key,
                 bucketKey: bucket?.key || null,
+                bucketData: bucket?.data || null,
             };
         });
     }
@@ -195,10 +200,12 @@ class Abba {
         for (const experiment of availableExperiments) {
             const existing = existingAssignments.find(ua => ua.experimentId === experiment.id);
             if (existing) {
+                const bucket = experiment.buckets.find(b => b.id === existing.bucketId);
                 assignments.push({
                     ...existing,
                     experimentKey: experiment.key,
-                    bucketKey: experiment.buckets.find(b => b.id === existing.bucketId)?.key || null,
+                    bucketKey: bucket?.key || null,
+                    bucketData: bucket?.data || null,
                 });
             }
             else if (!existingOnly && (0, util_1.canGenerateNewAssignments)(experiment, exclusionSet)) {
@@ -206,10 +213,12 @@ class Abba {
                 if (assignment) {
                     const created = this.userAssignmentDao.create(assignment);
                     newAssignments.push(created);
+                    const bucket = experiment.buckets.find(b => b.id === created.bucketId);
                     assignments.push({
                         ...created,
                         experimentKey: experiment.key,
-                        bucketKey: experiment.buckets.find(b => b.id === created.bucketId)?.key || null,
+                        bucketKey: bucket?.key || null,
+                        bucketData: bucket?.data || null,
                     });
                     // Prevent future exclusion clashes
                     experiment.exclusions.forEach(experimentId => exclusionSet.add(experimentId));

package/dist/types.d.ts

@@ -51,6 +51,7 @@ export type UserAssignment = BaseDBEntity & {
 export type GeneratedUserAssignment = Saved<UserAssignment> & {
     experimentKey: string;
     bucketKey: string | null;
+    bucketData: AnyObject | null;
 };
 export type SegmentationData = AnyObject;
 export declare enum AssignmentStatus {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/abba",
-  "version": "1.22.1",
+  "version": "1.23.0",
   "scripts": {
     "prepare": "husky"
   },

package/src/abba.ts

@@ -189,10 +189,12 @@ export class Abba {
     const existingAssignments = await this.userAssignmentDao.getBy('userId', userId)
     const existing = existingAssignments.find(a => a.experimentId === experiment.id)
     if (existing) {
+      const bucket = buckets.find(b => b.id === existing.bucketId)
       return {
         ...existing,
         experimentKey: experiment.key,
-        bucketKey: buckets.find(b => b.id === existing.bucketId)?.key || null,
+        bucketKey: bucket?.key || null,
+        bucketData: bucket?.data || null,
       }
     }
 
@@ -211,10 +213,13 @@ export class Abba {
 
     const newAssignment = await this.userAssignmentDao.save(assignment)
 
+    const bucket = buckets.find(b => b.id === newAssignment.bucketId)
+
     return {
       ...newAssignment,
       experimentKey: experiment.key,
-      bucketKey: buckets.find(b => b.id === newAssignment.bucketId)?.key || null,
+      bucketKey: bucket?.key || null,
+      bucketData: bucket?.data || null,
     }
   }
 
@@ -233,6 +238,7 @@ export class Abba {
         ...assignment,
         experimentKey: experiment.key,
         bucketKey: bucket?.key || null,
+        bucketData: bucket?.data || null,
       }
     })
   }
@@ -265,20 +271,24 @@ export class Abba {
     for (const experiment of availableExperiments) {
       const existing = existingAssignments.find(ua => ua.experimentId === experiment.id)
       if (existing) {
+        const bucket = experiment.buckets.find(b => b.id === existing.bucketId)
         assignments.push({
           ...existing,
           experimentKey: experiment.key,
-          bucketKey: experiment.buckets.find(b => b.id === existing.bucketId)?.key || null,
+          bucketKey: bucket?.key || null,
+          bucketData: bucket?.data || null,
         })
       } else if (!existingOnly && canGenerateNewAssignments(experiment, exclusionSet)) {
         const assignment = generateUserAssignmentData(experiment, userId, segmentationData)
         if (assignment) {
           const created = this.userAssignmentDao.create(assignment)
           newAssignments.push(created)
+          const bucket = experiment.buckets.find(b => b.id === created.bucketId)
           assignments.push({
             ...created,
             experimentKey: experiment.key,
-            bucketKey: experiment.buckets.find(b => b.id === created.bucketId)?.key || null,
+            bucketKey: bucket?.key || null,
+            bucketData: bucket?.data || null,
           })
           // Prevent future exclusion clashes
           experiment.exclusions.forEach(experimentId => exclusionSet.add(experimentId))

package/src/types.ts

@@ -58,6 +58,7 @@ export type UserAssignment = BaseDBEntity & {
 export type GeneratedUserAssignment = Saved<UserAssignment> & {
   experimentKey: string
   bucketKey: string | null
+  bucketData: AnyObject | null
 }
 
 export type SegmentationData = AnyObject