@naturalcycles/abba 1.18.2 → 1.18.4

package/dist/abba.js

@@ -12,7 +12,7 @@ const util_1 = require("./util");
 /**
  * 10 minutes
  */
-const CACHE_TTL = 600000; // 10 minutes
+const CACHE_TTL = 600_000; // 10 minutes
 class Abba {
     constructor(cfg) {
         this.cfg = cfg;
@@ -64,9 +64,7 @@ class Abba {
         }
         const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' });
         const updatedBuckets = await (0, js_lib_1.pMap)(buckets, async (bucket) => {
-            // Don't save batch with a single saveMethod because the cascade will delete all user assignments
-            const saveMethod = bucket.id ? 'update' : 'insert';
-            return await this.bucketDao.save({ ...bucket, experimentId: updatedExperiment.id }, { saveMethod });
+            return await this.bucketDao.save({ ...bucket, experimentId: updatedExperiment.id }, { saveMethod: bucket.id ? 'update' : undefined });
         });
         await this.updateExclusions(updatedExperiment.id, updatedExperiment.exclusions);
         return {
@@ -101,6 +99,12 @@ class Abba {
      * Cold method.
      */
     async deleteExperiment(experimentId) {
+        const userAssignmentDeleteQuery = this.userAssignmentDao
+            .query()
+            .filterEq('experimentId', experimentId);
+        await this.userAssignmentDao.deleteByQuery(userAssignmentDeleteQuery);
+        const bucketDeleteQuery = this.bucketDao.query().filterEq('experimentId', experimentId);
+        await this.bucketDao.deleteByQuery(bucketDeleteQuery);
         await this.experimentDao.deleteById(experimentId);
         await this.updateExclusions(experimentId, []);
     }
@@ -236,5 +240,5 @@ class Abba {
 }
 exports.Abba = Abba;
 tslib_1.__decorate([
-    (0, js_lib_1._AsyncMemo)({ cacheFactory: () => new nodejs_lib_1.LRUMemoCache({ ttl: CACHE_TTL, max: 1 }) })
+    (0, js_lib_1._Memo)({ cacheFactory: () => new nodejs_lib_1.LRUMemoCache({ ttl: CACHE_TTL, max: 1 }) })
 ], Abba.prototype, "getAllExperiments", null);

package/dist/migrations/init.sql

@@ -42,10 +42,10 @@ CREATE TABLE IF NOT EXISTS `UserAssignment` (
 ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- AddForeignKey
-ALTER TABLE `Bucket` ADD CONSTRAINT `Bucket_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `Bucket` ADD CONSTRAINT `Bucket_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`);
 
 -- AddForeignKey
-ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_bucketId_fkey` FOREIGN KEY (`bucketId`) REFERENCES `Bucket`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_bucketId_fkey` FOREIGN KEY (`bucketId`) REFERENCES `Bucket`(`id`);
 
 -- AddForeignKey
-ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`);

package/package.json

@@ -1,10 +1,8 @@
 {
   "name": "@naturalcycles/abba",
-  "version": "1.18.2",
+  "version": "1.18.4",
   "scripts": {
-    "prepare": "husky install",
-    "build": "build",
-    "build-prod": "build-prod"
+    "prepare": "husky"
   },
   "dependencies": {
     "@naturalcycles/db-lib": "^9.1.0",

package/src/abba.ts

@@ -1,4 +1,4 @@
-import { _assert, _AsyncMemo, _shuffle, pMap } from '@naturalcycles/js-lib'
+import { _assert, _Memo, _shuffle, pMap } from '@naturalcycles/js-lib'
 import { LRUMemoCache } from '@naturalcycles/nodejs-lib'
 import { bucketDao } from './dao/bucket.dao'
 import { experimentDao } from './dao/experiment.dao'
@@ -38,7 +38,7 @@ export class Abba {
    * Returns all experiments.
    * Cached (see CACHE_TTL)
    */
-  @_AsyncMemo({ cacheFactory: () => new LRUMemoCache({ ttl: CACHE_TTL, max: 1 }) })
+  @_Memo({ cacheFactory: () => new LRUMemoCache({ ttl: CACHE_TTL, max: 1 }) })
   async getAllExperiments(): Promise<ExperimentWithBuckets[]> {
     return await this.getAllExperimentsNoCache()
   }
@@ -92,11 +92,9 @@ export class Abba {
 
     const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' })
     const updatedBuckets = await pMap(buckets, async bucket => {
-      // Don't save batch with a single saveMethod because the cascade will delete all user assignments
-      const saveMethod = bucket.id ? 'update' : 'insert'
       return await this.bucketDao.save(
         { ...bucket, experimentId: updatedExperiment.id },
-        { saveMethod },
+        { saveMethod: bucket.id ? 'update' : undefined },
       )
     })
 
@@ -143,6 +141,14 @@ export class Abba {
    * Cold method.
    */
   async deleteExperiment(experimentId: string): Promise<void> {
+    const userAssignmentDeleteQuery = this.userAssignmentDao
+      .query()
+      .filterEq('experimentId', experimentId)
+    await this.userAssignmentDao.deleteByQuery(userAssignmentDeleteQuery)
+
+    const bucketDeleteQuery = this.bucketDao.query().filterEq('experimentId', experimentId)
+    await this.bucketDao.deleteByQuery(bucketDeleteQuery)
+
     await this.experimentDao.deleteById(experimentId)
     await this.updateExclusions(experimentId, [])
   }

package/src/migrations/init.sql

@@ -42,10 +42,10 @@ CREATE TABLE IF NOT EXISTS `UserAssignment` (
 ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- AddForeignKey
-ALTER TABLE `Bucket` ADD CONSTRAINT `Bucket_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `Bucket` ADD CONSTRAINT `Bucket_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`);
 
 -- AddForeignKey
-ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_bucketId_fkey` FOREIGN KEY (`bucketId`) REFERENCES `Bucket`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_bucketId_fkey` FOREIGN KEY (`bucketId`) REFERENCES `Bucket`(`id`);
 
 -- AddForeignKey
-ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`);

package/src/util.ts

@@ -31,7 +31,7 @@ export const generateUserAssignmentData = (
     userId,
     experimentId: experiment.id,
     bucketId: bucket?.id || null,
-  }
+  } as UserAssignment
 }
 
 /**