fix accidental overdeletion

a-type · Apr 12, 2024 · 2add1d9 · 2add1d9
1 parent a3000f6
commit 2add1d9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.changeset/eighty-toes-dream.md b/.changeset/eighty-toes-dream.md
@@ -0,0 +1,5 @@
+---
+'@verdant-web/server': patch
+---
+
+Important: fixes accidental operation deletion in rebasing logic
diff --git a/packages/server/src/storage/sql/SqlOperations.ts b/packages/server/src/storage/sql/SqlOperations.ts
@@ -136,14 +136,15 @@ export class SqlOperations implements OperationStorage {
 		libraryId: string,
 		operations: Operation[],
 	): Promise<void> => {
-		await this.db
-			.deleteFrom('OperationHistory')
-			.where('libraryId', '=', libraryId)
-			.where(
-				'oid',
-				'in',
-				operations.map((o) => o.oid),
-			)
-			.execute();
+		await this.db.transaction().execute(async (tx) => {
+			for (const item of operations) {
+				await tx
+					.deleteFrom('OperationHistory')
+					.where('libraryId', '=', libraryId)
+					.where('oid', '=', item.oid)
+					.where('timestamp', '=', item.timestamp)
+					.execute();
+			}
+		});
 	};
 }