@naturalcycles/abba 1.23.0 → 1.24.0

package/dist/dao/bucket.dao.d.ts

@@ -1,5 +1,10 @@
 import { CommonDao, CommonDB } from '@naturalcycles/db-lib';
-import { Bucket } from '../types';
-export declare class BucketDao extends CommonDao<Bucket> {
+import { Saved } from '@naturalcycles/js-lib';
+import { BaseBucket, Bucket } from '../types';
+type BucketDBM = Saved<BaseBucket> & {
+    data: string | null;
+};
+export declare class BucketDao extends CommonDao<Bucket, BucketDBM> {
 }
 export declare const bucketDao: (db: CommonDB) => BucketDao;
+export {};

package/dist/dao/bucket.dao.js

@@ -8,5 +8,17 @@ exports.BucketDao = BucketDao;
 const bucketDao = (db) => new BucketDao({
     db,
     table: 'Bucket',
+    hooks: {
+        beforeBMToDBM: bm => {
+            return {
+                ...bm,
+                data: bm.data ? JSON.stringify(bm.data) : null,
+            };
+        },
+        beforeDBMToBM: dbm => ({
+            ...dbm,
+            data: dbm.data ? JSON.parse(dbm.data) : null,
+        }),
+    },
 });
 exports.bucketDao = bucketDao;

package/dist/dao/experiment.dao.d.ts

@@ -4,6 +4,7 @@ import { BaseExperiment, Experiment } from '../types';
 type ExperimentDBM = Saved<BaseExperiment> & {
     rules: string | null;
     exclusions: string | null;
+    data: string | null;
 };
 export declare class ExperimentDao extends CommonDao<Experiment, ExperimentDBM> {
 }

package/dist/dao/experiment.dao.js

@@ -18,6 +18,7 @@ const experimentDao = (db) => new ExperimentDao({
             exclusions: bm.exclusions.length
                 ? JSON.stringify(bm.exclusions.map(exclusion => exclusion.toString()))
                 : null,
+            data: bm.data ? JSON.stringify(bm.data) : null,
         }),
         beforeDBMToBM: dbm => ({
             ...dbm,
@@ -29,6 +30,7 @@ const experimentDao = (db) => new ExperimentDao({
             exclusions: (dbm.exclusions &&
                 JSON.parse(dbm.exclusions).map((exclusion) => exclusion.toString())) ||
                 [],
+            data: dbm.data ? JSON.parse(dbm.data) : null,
         }),
     },
 });

package/dist/migrations/init.sql

@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `Experiment` (
     `updated` INT NOT NULL,
     `rules` JSON NULL,
     `exclusions` JSON NULL,
+    `data` JSON NULL,
 
     PRIMARY KEY (`id`),
     UNIQUE INDEX `key_unique` (`key`)

package/dist/types.d.ts

@@ -33,14 +33,17 @@ export type BaseExperiment = BaseDBEntity & {
 export type Experiment = BaseExperiment & {
     rules: SegmentationRule[];
     exclusions: string[];
+    data: AnyObject | null;
 };
 export type ExperimentWithBuckets = Saved<Experiment> & {
     buckets: Saved<Bucket>[];
 };
-export type Bucket = BaseDBEntity & {
+export type BaseBucket = BaseDBEntity & {
     experimentId: string;
     key: string;
     ratio: number;
+};
+export type Bucket = BaseBucket & {
     data: AnyObject | null;
 };
 export type UserAssignment = BaseDBEntity & {

package/package.json

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

package/src/dao/bucket.dao.ts

@@ -1,10 +1,27 @@
 import { CommonDao, CommonDB } from '@naturalcycles/db-lib'
-import { Bucket } from '../types'
+import { Saved } from '@naturalcycles/js-lib'
+import { BaseBucket, Bucket } from '../types'
 
-export class BucketDao extends CommonDao<Bucket> {}
+type BucketDBM = Saved<BaseBucket> & {
+  data: string | null
+}
+
+export class BucketDao extends CommonDao<Bucket, BucketDBM> {}
 
 export const bucketDao = (db: CommonDB): BucketDao =>
   new BucketDao({
     db,
     table: 'Bucket',
+    hooks: {
+      beforeBMToDBM: bm => {
+        return {
+          ...bm,
+          data: bm.data ? JSON.stringify(bm.data) : null,
+        }
+      },
+      beforeDBMToBM: dbm => ({
+        ...dbm,
+        data: dbm.data ? JSON.parse(dbm.data) : null,
+      }),
+    },
   })

package/src/dao/experiment.dao.ts

@@ -5,6 +5,7 @@ import { BaseExperiment, Experiment } from '../types'
 type ExperimentDBM = Saved<BaseExperiment> & {
   rules: string | null
   exclusions: string | null
+  data: string | null
 }
 
 export class ExperimentDao extends CommonDao<Experiment, ExperimentDBM> {}
@@ -22,6 +23,7 @@ export const experimentDao = (db: CommonDB): ExperimentDao =>
         exclusions: bm.exclusions.length
           ? JSON.stringify(bm.exclusions.map(exclusion => exclusion.toString()))
           : null,
+        data: bm.data ? JSON.stringify(bm.data) : null,
       }),
       beforeDBMToBM: dbm => ({
         ...dbm,
@@ -34,6 +36,7 @@ export const experimentDao = (db: CommonDB): ExperimentDao =>
           (dbm.exclusions &&
             JSON.parse(dbm.exclusions).map((exclusion: string | number) => exclusion.toString())) ||
           [],
+        data: dbm.data ? JSON.parse(dbm.data) : null,
       }),
     },
   })

package/src/migrations/init.sql

@@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `Experiment` (
     `updated` INT NOT NULL,
     `rules` JSON NULL,
     `exclusions` JSON NULL,
+    `data` JSON NULL,
 
     PRIMARY KEY (`id`),
     UNIQUE INDEX `key_unique` (`key`)

package/src/types.ts

@@ -36,16 +36,20 @@ export type BaseExperiment = BaseDBEntity & {
 export type Experiment = BaseExperiment & {
   rules: SegmentationRule[]
   exclusions: string[]
+  data: AnyObject | null
 }
 
 export type ExperimentWithBuckets = Saved<Experiment> & {
   buckets: Saved<Bucket>[]
 }
 
-export type Bucket = BaseDBEntity & {
+export type BaseBucket = BaseDBEntity & {
   experimentId: string
   key: string
   ratio: number
+}
+
+export type Bucket = BaseBucket & {
   data: AnyObject | null
 }