From 0b68e13bcef75129fd0f9c1bfa355420052cf683 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Thu, 12 Sep 2024 15:33:38 +0200
Subject: [PATCH] fix: ensure published entries are fully deleted (#4265)

---
 .../src/operations/entry/index.ts             |  2 +-
 .../contentAPI/contentEntriesDeletion.test.ts | 73 +++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 packages/api-headless-cms/__tests__/contentAPI/contentEntriesDeletion.test.ts

diff --git a/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts b/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts
index 96d25211a96..99c9a1642aa 100644
--- a/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts
+++ b/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts
@@ -900,7 +900,7 @@ export const createEntriesStorageOperations = (
                 })
             );
             esItems.push(
-                entity.deleteBatch({
+                esEntity.deleteBatch({
                     PK: partitionKey,
                     SK: createPublishedSortKey()
                 })
diff --git a/packages/api-headless-cms/__tests__/contentAPI/contentEntriesDeletion.test.ts b/packages/api-headless-cms/__tests__/contentAPI/contentEntriesDeletion.test.ts
new file mode 100644
index 00000000000..a9e9c988e57
--- /dev/null
+++ b/packages/api-headless-cms/__tests__/contentAPI/contentEntriesDeletion.test.ts
@@ -0,0 +1,73 @@
+import { useTestModelHandler } from "~tests/testHelpers/useTestModelHandler";
+import { identityA } from "./security/utils";
+
+describe("Content entries - Entry Deletion", () => {
+    const { manage, read } = useTestModelHandler({
+        identity: identityA
+    });
+
+    beforeEach(async () => {
+        await manage.setup();
+    });
+
+    test("MANAGE/READ GraphQL APIs should reflect revision deletions correctly", async () => {
+        const { data: revision1 } = await manage.createTestEntry({ data: { title: "Revision 1" } });
+
+        const { data: revision2 } = await manage.createTestEntryFrom({
+            revision: revision1.id,
+            data: { title: "Revision 2" }
+        });
+
+        const { data: revision3 } = await manage.createTestEntryFrom({
+            revision: revision2.id,
+            data: { title: "Revision 3" }
+        });
+
+        await manage.publishTestEntry({
+            revision: revision3.id
+        });
+
+        let { data: manageEntriesList } = await manage.listTestEntries();
+        let { data: readEntriesList } = await read.listTestEntries();
+
+        expect(manageEntriesList).toHaveLength(1);
+        expect(manageEntriesList).toMatchObject([
+            { id: revision3.id, title: "Revision 3", meta: { status: "published" } }
+        ]);
+
+        expect(readEntriesList).toHaveLength(1);
+        expect(readEntriesList).toMatchObject([{ id: revision3.id, title: "Revision 3" }]);
+
+        await manage.deleteTestEntry({ revision: revision3.id });
+
+        ({ data: manageEntriesList } = await manage.listTestEntries());
+        ({ data: readEntriesList } = await read.listTestEntries());
+
+        expect(manageEntriesList).toHaveLength(1);
+        expect(manageEntriesList).toMatchObject([
+            { id: revision2.id, title: "Revision 2", meta: { status: "draft" } }
+        ]);
+
+        expect(readEntriesList).toHaveLength(0);
+
+        await manage.deleteTestEntry({ revision: revision2.id });
+
+        ({ data: manageEntriesList } = await manage.listTestEntries());
+        ({ data: readEntriesList } = await read.listTestEntries());
+
+        expect(manageEntriesList).toHaveLength(1);
+        expect(manageEntriesList).toMatchObject([
+            { id: revision1.id, title: "Revision 1", meta: { status: "draft" } }
+        ]);
+
+        expect(readEntriesList).toHaveLength(0);
+
+        await manage.deleteTestEntry({ revision: revision1.id });
+
+        ({ data: manageEntriesList } = await manage.listTestEntries());
+        ({ data: readEntriesList } = await read.listTestEntries());
+
+        expect(manageEntriesList).toHaveLength(0);
+        expect(readEntriesList).toHaveLength(0);
+    });
+});