@naturalcycles/abba 2.1.0 → 2.1.1

package/dist/abba.js

@@ -121,7 +121,7 @@ export class Abba {
         await this.experimentDao.saveBatch(requiresUpdating, { saveMethod: 'update' });
     }
     async softDeleteExperiment(experimentId) {
-        await this.experimentDao.patchById(experimentId, { deleted: true, exclusions: [] });
+        await this.experimentDao.patchById(experimentId, { deleted: true, exclusions: [] }, { saveMethod: 'update' });
         await this.updateExclusions(experimentId, []);
     }
     /**
@@ -135,12 +135,8 @@ export class Abba {
         const hasBeenInactiveFor15Mins = experiment.status === AssignmentStatus.Inactive &&
             localTime(experiment.updated).isOlderThan(15, 'minute');
         _assert(hasBeenInactiveFor15Mins, 'Experiment must be inactive for at least 15 minutes before deletion');
-        const userAssignmentDeleteQuery = this.userAssignmentDao
-            .query()
-            .filterEq('experimentId', experimentId);
-        await this.userAssignmentDao.deleteByQuery(userAssignmentDeleteQuery, { chunkSize: 50000 });
-        const bucketDeleteQuery = this.bucketDao.query().filterEq('experimentId', experimentId);
-        await this.bucketDao.deleteByQuery(bucketDeleteQuery);
+        await this.userAssignmentDao.deleteByExperimentId(experimentId);
+        await this.bucketDao.deleteByExperimentId(experimentId);
         await this.experimentDao.deleteById(experimentId);
         await this.updateExclusions(experimentId, []);
     }

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

@@ -6,6 +6,7 @@ type BucketDBM = BaseBucket & {
 };
 export declare class BucketDao extends CommonDao<Bucket, BucketDBM> {
     getByExperimentId(experimentId: string): Promise<Bucket[]>;
+    deleteByExperimentId(experimentId: string): Promise<void>;
 }
 export declare function bucketDao(db: CommonDB): BucketDao;
 export {};

package/dist/dao/bucket.dao.js

@@ -3,6 +3,9 @@ export class BucketDao extends CommonDao {
     async getByExperimentId(experimentId) {
         return await this.query().filterEq('experimentId', experimentId).runQuery();
     }
+    async deleteByExperimentId(experimentId) {
+        await this.query().filterEq('experimentId', experimentId).deleteByQuery();
+    }
 }
 export function bucketDao(db) {
     return new BucketDao({

package/dist/dao/userAssignment.dao.d.ts

@@ -4,6 +4,7 @@ import type { UserAssignment } from '../types.js';
 export declare class UserAssignmentDao extends CommonDao<UserAssignment> {
     getUserAssignmentByExperimentId(userId: string, experimentId: string): Promise<UserAssignment | null>;
     getUserAssigmentsByExperimentIds(userId: string, experimentIds: string[]): Promise<UserAssignment[]>;
+    deleteByExperimentId(experimentId: string): Promise<void>;
     getCountByExperimentId(experimentId: string): Promise<number>;
     getCountByBucketId(bucketId: string): Promise<number>;
 }

package/dist/dao/userAssignment.dao.js

@@ -9,6 +9,9 @@ export class UserAssignmentDao extends CommonDao {
         const query = this.query().filterEq('userId', userId).filterIn('experimentId', experimentIds);
         return await this.runQuery(query);
     }
+    async deleteByExperimentId(experimentId) {
+        await this.query().filterEq('experimentId', experimentId).deleteByQuery();
+    }
     async getCountByExperimentId(experimentId) {
         return await this.query().filterEq('experimentId', experimentId).runQueryCount();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/abba",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/abba.ts

@@ -185,7 +185,11 @@ export class Abba {
   }
 
   async softDeleteExperiment(experimentId: string): Promise<void> {
-    await this.experimentDao.patchById(experimentId, { deleted: true, exclusions: [] })
+    await this.experimentDao.patchById(
+      experimentId,
+      { deleted: true, exclusions: [] },
+      { saveMethod: 'update' },
+    )
     await this.updateExclusions(experimentId, [])
   }
 
@@ -206,14 +210,8 @@ export class Abba {
       'Experiment must be inactive for at least 15 minutes before deletion',
     )
 
-    const userAssignmentDeleteQuery = this.userAssignmentDao
-      .query()
-      .filterEq('experimentId', experimentId)
-    await this.userAssignmentDao.deleteByQuery(userAssignmentDeleteQuery, { chunkSize: 50000 })
-
-    const bucketDeleteQuery = this.bucketDao.query().filterEq('experimentId', experimentId)
-    await this.bucketDao.deleteByQuery(bucketDeleteQuery)
-
+    await this.userAssignmentDao.deleteByExperimentId(experimentId)
+    await this.bucketDao.deleteByExperimentId(experimentId)
     await this.experimentDao.deleteById(experimentId)
     await this.updateExclusions(experimentId, [])
   }

package/src/dao/bucket.dao.ts

@@ -10,6 +10,10 @@ export class BucketDao extends CommonDao<Bucket, BucketDBM> {
   async getByExperimentId(experimentId: string): Promise<Bucket[]> {
     return await this.query().filterEq('experimentId', experimentId).runQuery()
   }
+
+  async deleteByExperimentId(experimentId: string): Promise<void> {
+    await this.query().filterEq('experimentId', experimentId).deleteByQuery()
+  }
 }
 
 export function bucketDao(db: CommonDB): BucketDao {

package/src/dao/userAssignment.dao.ts

@@ -20,6 +20,10 @@ export class UserAssignmentDao extends CommonDao<UserAssignment> {
     return await this.runQuery(query)
   }
 
+  async deleteByExperimentId(experimentId: string): Promise<void> {
+    await this.query().filterEq('experimentId', experimentId).deleteByQuery()
+  }
+
   async getCountByExperimentId(experimentId: string): Promise<number> {
     return await this.query().filterEq('experimentId', experimentId).runQueryCount()
   }