From 319b3afddbfc69afbc461326ee7374bed1115c30 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 29 Feb 2024 16:48:16 +0100
Subject: [PATCH] Ensure keys are removed

---
 .../backend-core/src/cache/docWritethrough.ts |  4 +++
 .../src/cache/tests/docWritethrough.spec.ts   | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/packages/backend-core/src/cache/docWritethrough.ts b/packages/backend-core/src/cache/docWritethrough.ts
index 13a85a0d84..bde93182a9 100644
--- a/packages/backend-core/src/cache/docWritethrough.ts
+++ b/packages/backend-core/src/cache/docWritethrough.ts
@@ -96,6 +96,10 @@ export class DocWritethrough {
         }
 
         await this.db.put(doc)
+
+        for (const key of keysToPersist) {
+          await cache.delete(key, { useTenancy: false })
+        }
       }
     )
 
diff --git a/packages/backend-core/src/cache/tests/docWritethrough.spec.ts b/packages/backend-core/src/cache/tests/docWritethrough.spec.ts
index aed87499ee..65e9450f62 100644
--- a/packages/backend-core/src/cache/tests/docWritethrough.spec.ts
+++ b/packages/backend-core/src/cache/tests/docWritethrough.spec.ts
@@ -181,5 +181,33 @@ describe("docWritethrough", () => {
         )
       })
     })
+
+    it("cached values are persisted only once", async () => {
+      await config.doInTenant(async () => {
+        const initialPatch = generatePatchObject(5)
+
+        await docWritethrough.patch(initialPatch)
+        travelForward(WRITE_RATE_MS)
+
+        await docWritethrough.patch({})
+
+        expect(await db.get(documentId)).toEqual(
+          expect.objectContaining(initialPatch)
+        )
+
+        await db.remove(await db.get(documentId))
+
+        travelForward(WRITE_RATE_MS)
+        const extraPatch = generatePatchObject(5)
+        await docWritethrough.patch(extraPatch)
+
+        expect(await db.get(documentId)).toEqual(
+          expect.objectContaining(extraPatch)
+        )
+        expect(await db.get(documentId)).not.toEqual(
+          expect.objectContaining(initialPatch)
+        )
+      })
+    })
   })
 })