@remit/drizzle-service 0.0.37 → 0.0.38

package/package.json

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

package/src/repos/i4-message-flag-push.test.ts

@@ -122,6 +122,26 @@ describe("MessageFlagPushRepo (relational counterpart to MessageFlagPushService)
 		assert.equal(found?.state, "pending");
 	});
 
+	test("put resets createdAt too — a stale createdAt would misread as a stuck deferred marker later", async () => {
+		const input = seedInput();
+		const first = await repo.put(input);
+
+		await new Promise((resolve) => setTimeout(resolve, 5));
+
+		const second = await repo.put(
+			seedInput({
+				messageId: input.messageId,
+				flagName: input.flagName,
+				operation: "remove",
+			}),
+		);
+
+		assert.ok(
+			second.createdAt > first.createdAt,
+			"a replacing put must start a fresh lifecycle, not inherit the row it replaces",
+		);
+	});
+
 	test("put is idempotent — a later flip of the SAME field replaces the marker", async () => {
 		const messageId = randomId();
 		const flagName = "\\Seen";

package/src/repos/i4-message-flag-push.ts

@@ -64,9 +64,14 @@ export class MessageFlagPushRepo {
 		input: PutMessageFlagPushInput,
 	): Promise<MessageFlagPushItem> => {
 		const now = Date.now();
-		// A fresh put ALWAYS resets state to `pending` (the field's default) —
-		// a new flip decision starts a new lifecycle regardless of whatever
-		// state the row it replaces was in.
+		// A fresh put ALWAYS resets state to `pending` AND createdAt to now — a
+		// new flip decision starts a genuinely new lifecycle regardless of
+		// whatever state (or age) the row it replaces was in. The conflict path
+		// must reset createdAt explicitly: onConflictDoUpdate only touches the
+		// columns named in `set`, so an omission here would let a replacing put
+		// silently inherit the original row's createdAt (its age then misreads
+		// as a stuck deferred marker elsewhere — see flag-push.ts's defer-max
+		// check, which measures a marker's age off exactly this field).
 		const [row] = await this.db
 			.insert(messageFlagPushTable)
 			.values({
@@ -83,6 +88,7 @@ export class MessageFlagPushRepo {
 					mailboxId: input.mailboxId,
 					operation: input.operation,
 					state: DEFAULT_STATE,
+					createdAt: now,
 					updatedAt: now,
 				},
 			})

package/src/repos/message.ts

@@ -94,6 +94,9 @@ function toMessageItem(row: typeof messageTable.$inferSelect): MessageItem {
 		...(row.placementDecidedAt !== null
 			? { placementDecidedAt: row.placementDecidedAt }
 			: {}),
+		...(row.spamReport !== null
+			? { spamReport: row.spamReport as MessageItem["spamReport"] }
+			: {}),
 	};
 }
 
@@ -193,6 +196,7 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			placementVerdict: input.placementVerdict ?? null,
 			filterMove: input.filterMove ?? null,
 			placementDecidedAt: input.placementDecidedAt ?? null,
+			spamReport: input.spamReport ?? null,
 			createdAt: now,
 			updatedAt: now,
 		};
@@ -388,6 +392,9 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			...(input.messageIdHeader !== undefined
 				? { messageIdHeader: input.messageIdHeader }
 				: {}),
+			...(input.spamReport !== undefined
+				? { spamReport: input.spamReport }
+				: {}),
 			updatedAt: now,
 		};
 
@@ -432,6 +439,28 @@ export class DrizzleMessageRepository implements IMessageRepository {
 		return this.get(messageId);
 	}
 
+	async clearSpamReport(
+		messageId: string,
+	): ReturnType<IMessageRepository["clearSpamReport"]> {
+		const now = Date.now();
+		await this.db
+			.update(messageTable)
+			.set({ spamReport: null, updatedAt: now })
+			.where(eq(messageTable.messageId, messageId));
+		return this.get(messageId);
+	}
+
+	async clearOriginalMailboxId(
+		messageId: string,
+	): ReturnType<IMessageRepository["clearOriginalMailboxId"]> {
+		const now = Date.now();
+		await this.db
+			.update(messageTable)
+			.set({ originalMailboxId: null, originalUid: null, updatedAt: now })
+			.where(eq(messageTable.messageId, messageId));
+		return this.get(messageId);
+	}
+
 	async delete(messageId: string): Promise<void> {
 		await this.deleteMany([messageId]);
 	}