@naturalcycles/abba 1.14.0 → 1.15.0

package/dist/dao/experiment.dao.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.experimentDao = exports.ExperimentDao = void 0;
 const db_lib_1 = require("@naturalcycles/db-lib");
+const js_lib_1 = require("@naturalcycles/js-lib");
 class ExperimentDao extends db_lib_1.CommonDao {
 }
 exports.ExperimentDao = ExperimentDao;
@@ -19,9 +20,22 @@ const experimentDao = (db) => new ExperimentDao({
         }),
         beforeDBMToBM: dbm => ({
             ...dbm,
+            startDateIncl: parseMySQLDate(dbm.startDateIncl),
+            endDateExcl: parseMySQLDate(dbm.endDateExcl),
             rules: (dbm.rules && JSON.parse(dbm.rules)) || [],
             exclusions: (dbm.exclusions && JSON.parse(dbm.exclusions)) || [],
         }),
     },
 });
 exports.experimentDao = experimentDao;
+/**
+ * https://nc1.slack.com/archives/CCNTHJT7V/p1682514277002739
+ * MySQL Automatically parses Date fields as Date objects
+ * For simplicity let's not do that by having this function...
+ */
+function parseMySQLDate(date) {
+    // @ts-expect-error
+    if (date instanceof Date)
+        return (0, js_lib_1.localDate)(date).toISODate();
+    return date;
+}

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import { CommonDB } from '@naturalcycles/db-lib';
-import { AnyObject, BaseDBEntity, Saved } from '@naturalcycles/js-lib';
+import { AnyObject, BaseDBEntity, IsoDateString, Saved } from '@naturalcycles/js-lib';
 export interface AbbaConfig {
     db: CommonDB;
 }
@@ -8,8 +8,8 @@ export type BaseExperiment = BaseDBEntity<number> & {
     status: number;
     sampling: number;
     description: string | null;
-    startDateIncl: Date;
-    endDateExcl: Date;
+    startDateIncl: IsoDateString;
+    endDateExcl: IsoDateString;
 };
 export type Experiment = BaseExperiment & {
     rules: SegmentationRule[];

package/dist/util.js

@@ -116,7 +116,7 @@ exports.validateSegmentationRule = validateSegmentationRule;
 const canGenerateNewAssignments = (experiment, exclusionSet) => {
     return (!exclusionSet.has(experiment.id) &&
         experiment.status === types_1.AssignmentStatus.Active &&
-        (0, js_lib_1.localDate)().isBetween((0, js_lib_1.localDate)(experiment.startDateIncl.toISOString()), (0, js_lib_1.localDate)(experiment.endDateExcl.toISOString()), '[)'));
+        (0, js_lib_1.localDate)().isBetween(experiment.startDateIncl, experiment.endDateExcl, '[)'));
 };
 exports.canGenerateNewAssignments = canGenerateNewAssignments;
 /**
@@ -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.0",
+  "version": "1.15.0",
   "scripts": {
     "prepare": "husky install",
     "build": "build",

package/src/dao/experiment.dao.ts

@@ -1,5 +1,5 @@
 import { CommonDao, CommonDB } from '@naturalcycles/db-lib'
-import { Saved } from '@naturalcycles/js-lib'
+import { IsoDateString, localDate, Saved } from '@naturalcycles/js-lib'
 import { BaseExperiment, Experiment } from '../types'
 
 type ExperimentDBM = Saved<BaseExperiment> & {
@@ -24,8 +24,21 @@ export const experimentDao = (db: CommonDB): ExperimentDao =>
       }),
       beforeDBMToBM: dbm => ({
         ...dbm,
+        startDateIncl: parseMySQLDate(dbm.startDateIncl),
+        endDateExcl: parseMySQLDate(dbm.endDateExcl),
         rules: (dbm.rules && JSON.parse(dbm.rules)) || [],
         exclusions: (dbm.exclusions && JSON.parse(dbm.exclusions)) || [],
       }),
     },
   })
+
+/**
+ * https://nc1.slack.com/archives/CCNTHJT7V/p1682514277002739
+ * MySQL Automatically parses Date fields as Date objects
+ * For simplicity let's not do that by having this function...
+ */
+function parseMySQLDate(date: string): IsoDateString {
+  // @ts-expect-error
+  if (date instanceof Date) return localDate(date).toISODate()
+  return date
+}

package/src/types.ts

@@ -1,5 +1,5 @@
 import { CommonDB } from '@naturalcycles/db-lib'
-import { AnyObject, BaseDBEntity, Saved } from '@naturalcycles/js-lib'
+import { AnyObject, BaseDBEntity, IsoDateString, Saved } from '@naturalcycles/js-lib'
 
 export interface AbbaConfig {
   db: CommonDB
@@ -10,8 +10,8 @@ export type BaseExperiment = BaseDBEntity<number> & {
   status: number
   sampling: number
   description: string | null
-  startDateIncl: Date
-  endDateExcl: Date
+  startDateIncl: IsoDateString
+  endDateExcl: IsoDateString
 }
 
 export type Experiment = BaseExperiment & {

package/src/util.ts

@@ -136,11 +136,7 @@ export const canGenerateNewAssignments = (
   return (
     !exclusionSet.has(experiment.id) &&
     experiment.status === AssignmentStatus.Active &&
-    localDate().isBetween(
-      localDate(experiment.startDateIncl.toISOString()),
-      localDate(experiment.endDateExcl.toISOString()),
-      '[)',
-    )
+    localDate().isBetween(experiment.startDateIncl, experiment.endDateExcl, '[)')
   )
 }
 
@@ -154,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))
   })