From abfa15e56fac3648cf8fcad3c1062b27214d9d8f Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 17 Jan 2024 10:04:22 +0800
Subject: [PATCH] revert soft deletes all the labels and highlights attached to
 the deleted item

---
 packages/api/src/services/library_item.ts   | 11 +---------
 packages/api/test/resolvers/article.test.ts | 23 +--------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts
index e56f3c9ef..a5c145cc2 100644
--- a/packages/api/src/services/library_item.ts
+++ b/packages/api/src/services/library_item.ts
@@ -723,12 +723,6 @@ export const softDeleteLibraryItem = async (
         deletedAt: new Date(),
       })
 
-      // delete all labels for this item
-      await tx.getRepository(EntityLabel).delete({ libraryItemId: id })
-
-      // delete all highlights for this item
-      await tx.getRepository(Highlight).delete({ libraryItem: { id } })
-
       return itemRepo.findOneByOrFail({ id })
     },
     undefined,
@@ -751,14 +745,11 @@ export const updateLibraryItem = async (
     async (tx) => {
       const itemRepo = tx.withRepository(libraryItemRepository)
 
-      // reset deletedAt and archivedAt
+      // reset archivedAt
       switch (libraryItem.state) {
         case LibraryItemState.Archived:
           libraryItem.archivedAt = new Date()
           break
-        case LibraryItemState.Deleted:
-          libraryItem.deletedAt = new Date()
-          break
         case LibraryItemState.Processing:
         case LibraryItemState.Succeeded:
           libraryItem.archivedAt = null
diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts
index 5d38e024d..a13f7d52b 100644
--- a/packages/api/test/resolvers/article.test.ts
+++ b/packages/api/test/resolvers/article.test.ts
@@ -711,39 +711,18 @@ describe('Article API', () => {
       }
       const item = await createOrUpdateLibraryItem(itemToSave, user.id)
       itemId = item.id
-
-      await createAndSaveLabelsInLibraryItem(itemId, user.id, [
-        {
-          name: 'test label 2',
-        },
-      ])
-      await createHighlight(
-        {
-          shortId: generateFakeShortId(),
-          user: { id: user.id },
-          quote: 'test quote 2',
-        },
-        itemId,
-        user.id
-      )
     })
 
     after(async () => {
       await deleteLibraryItemById(itemId, user.id)
     })
 
-    it('marks an item as deleted and deletes all the labels and highlights attached to the item', async () => {
+    it('soft deletes the item', async () => {
       await graphqlRequest(setBookmarkQuery(itemId, false), authToken).expect(
         200
       )
       const item = await findLibraryItemById(itemId, user.id)
       expect(item?.state).to.eql(LibraryItemState.Deleted)
-
-      const labels = await findLabelsByLibraryItemId(itemId, user.id)
-      expect(labels).to.be.empty
-
-      const highlights = await findHighlightsByLibraryItemId(itemId, user.id)
-      expect(highlights).to.be.empty
     })
   })