From efd8119e02e1087c28ce67ffef2c208412866a05 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 6 Feb 2024 16:23:16 +0800
Subject: [PATCH] reduce sql error

---
 packages/api/src/services/highlights.ts       |  2 +-
 packages/api/src/services/labels.ts           | 10 ++++++----
 packages/api/test/resolvers/highlight.test.ts |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/api/src/services/highlights.ts b/packages/api/src/services/highlights.ts
index 436a3dd1a..ac6b08f0c 100644
--- a/packages/api/src/services/highlights.ts
+++ b/packages/api/src/services/highlights.ts
@@ -180,7 +180,7 @@ export const findHighlightById = async (
   return authTrx(
     async (tx) => {
       const highlightRepo = tx.withRepository(highlightRepository)
-      return highlightRepo.findOneByOrFail({
+      return highlightRepo.findOneBy({
         id: highlightId,
       })
     },
diff --git a/packages/api/src/services/labels.ts b/packages/api/src/services/labels.ts
index c4f8d4d13..33206093d 100644
--- a/packages/api/src/services/labels.ts
+++ b/packages/api/src/services/labels.ts
@@ -187,10 +187,12 @@ export const saveLabelsInHighlight = async (
   )
 
   const highlight = await findHighlightById(highlightId, userId)
-  // update labels in library item
-  await bulkEnqueueUpdateLabels([
-    { libraryItemId: highlight.libraryItemId, userId },
-  ])
+  if (highlight) {
+    // update labels in library item
+    await bulkEnqueueUpdateLabels([
+      { libraryItemId: highlight.libraryItemId, userId },
+    ])
+  }
 }
 
 export const findLabelsByIds = async (
diff --git a/packages/api/test/resolvers/highlight.test.ts b/packages/api/test/resolvers/highlight.test.ts
index 1d839d515..a81602cd1 100644
--- a/packages/api/test/resolvers/highlight.test.ts
+++ b/packages/api/test/resolvers/highlight.test.ts
@@ -295,8 +295,8 @@ describe('Highlights API', () => {
       expect(res.body.data.mergeHighlight.highlight.id).to.eq(newHighlightId)
 
       const highlight = await findHighlightById(newHighlightId, user.id)
-      expect(highlight.labels).to.have.lengthOf(1)
-      expect(highlight.labels?.[0]?.name).to.eq(labelName)
+      expect(highlight?.labels).to.have.lengthOf(1)
+      expect(highlight?.labels?.[0]?.name).to.eq(labelName)
 
       highlightId = newHighlightId
     })