@remit/drizzle-service 0.0.79 → 0.0.80

package/package.json

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

package/src/repos/message.test.ts

@@ -277,6 +277,17 @@ describe("DrizzleMessageRepository", () => {
 			assert.equal(rows[0].processedAt, null, "event starts undrained");
 		});
 
+		test("updateUid drops the source uid and keeps the folder Undo restores to", async () => {
+			// `originalUid` says the row's `uid` was recorded under
+			// `originalMailboxId`. The confirmation above makes that untrue, and a
+			// leftover that happens to equal the destination's own uid — two
+			// independent per-folder counters, so a routine collision — reads as an
+			// unsettled placement for the rest of the row's life (#1217).
+			const read = await messageRepo.get(MOVE_MESSAGE_ID);
+			assert.equal(read.originalUid, undefined);
+			assert.equal(read.originalMailboxId, SOURCE_MAILBOX_ID);
+		});
+
 		test("updateForMove throws NotFoundError for unknown messageId", async () => {
 			await assert.rejects(
 				() =>

package/src/repos/message.ts

@@ -574,12 +574,20 @@ export class DrizzleMessageRepository implements IMessageRepository {
 		// re-index would skip them on content hash. Enqueue a move re-index event
 		// in the same transaction as the update; the search-index worker drains it
 		// with force, refreshing the stored mailbox metadata.
+		//
+		// `originalUid` goes with the settle. It exists to say the row's `uid`
+		// was recorded under `originalMailboxId`, and that stops being true here;
+		// left behind it makes the settled row indistinguishable from an
+		// in-flight one whenever the destination's counter happens to hand back
+		// the source's number, which on a young account is most of them (#1217).
+		// `originalMailboxId` stays: Undo restores the message to it.
 		const rows = await runInTransaction(this.db, async (tx) => {
 			const updated = await tx
 				.update(messageTable)
 				.set({
 					uid: newUid,
 					mailboxId: newMailboxId,
+					originalUid: null,
 					status: "active",
 					syncStatus: "synced",
 					updatedAt: Date.now(),