@remit/drizzle-service 0.0.98 → 0.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.98",
+  "version": "0.0.99",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/message.sqlite.test.ts

@@ -249,6 +249,40 @@ describe("DrizzleMessageRepository (sqlite)", () => {
 		});
 	});
 
+	describe("deleteIfPlacement", () => {
+		const GONE_ID = "00000000-0000-0000-2222-00000000000c";
+
+		before(async () => {
+			await repo.create({
+				...BASE_INPUT,
+				messageId: GONE_ID,
+				uid: 9,
+				envelopeId: deriveEnvelopeId(GONE_ID),
+				rootBodyPartId: deriveRootBodyPartId(GONE_ID),
+			});
+		});
+
+		test("keeps the row when its placement no longer matches what was read", async () => {
+			const deleted = await repo.deleteIfPlacement(GONE_ID, {
+				mailboxId: MAILBOX_ID,
+				uid: 8,
+			});
+
+			assert.equal(deleted, false);
+			assert.equal((await repo.get(GONE_ID)).uid, 9);
+		});
+
+		test("deletes the row while its placement still matches", async () => {
+			const deleted = await repo.deleteIfPlacement(GONE_ID, {
+				mailboxId: MAILBOX_ID,
+				uid: 9,
+			});
+
+			assert.equal(deleted, true);
+			await assert.rejects(() => repo.get(GONE_ID));
+		});
+	});
+
 	test("requestReembed queues a forced re-index for each message that still exists", async () => {
 		const movedRows = () =>
 			db

package/src/repos/message.ts

@@ -492,6 +492,27 @@ export class DrizzleMessageRepository implements IMessageRepository {
 		await this.deleteMany([messageId]);
 	}
 
+	async deleteIfPlacement(
+		messageId: string,
+		expected: PlacementPredicate,
+	): Promise<boolean> {
+		return runInTransaction(this.db, async (tx) => {
+			const claimed = await tx
+				.update(messageTable)
+				.set({ updatedAt: Date.now() })
+				.where(
+					and(
+						eq(messageTable.messageId, messageId),
+						...placementTerms(expected),
+					),
+				)
+				.returning({ messageId: messageTable.messageId });
+			if (claimed.length === 0) return false;
+			await deleteMessageSubtree(tx as unknown as SubtreeDb, [messageId]);
+			return true;
+		});
+	}
+
 	async deleteMany(messageIds: string[]): Promise<void> {
 		if (messageIds.length === 0) return;
 		await runInTransaction(this.db, (tx) =>