From 881626d35a35ae9bfc6306812158db6a618c8bf8 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 28 Dec 2023 16:55:23 +0800
Subject: [PATCH] fix type of highlight is null from update since api

---
 packages/api/src/resolvers/function_resolvers.ts | 4 +++-
 packages/api/test/resolvers/article.test.ts      | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 847091706..7c4616ea1 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -27,6 +27,7 @@ import { findLabelsByLibraryItemId } from '../services/labels'
 import { findRecommendationsByLibraryItemId } from '../services/recommendation'
 import { findUploadFileById } from '../services/upload_file'
 import {
+  highlightDataToHighlight,
   isBase64Image,
   recommandationDataToRecommendation,
   validatedDate,
@@ -451,7 +452,8 @@ export const functionResolvers = {
       if (item.highlights) return item.highlights
 
       if (item.highlightAnnotations && item.highlightAnnotations.length > 0) {
-        return findHighlightsByLibraryItemId(item.id, ctx.uid)
+        const highlights = await findHighlightsByLibraryItemId(item.id, ctx.uid)
+        return highlights.map(highlightDataToHighlight)
       }
 
       return []
diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts
index a47c46083..f2421e38a 100644
--- a/packages/api/test/resolvers/article.test.ts
+++ b/packages/api/test/resolvers/article.test.ts
@@ -13,6 +13,7 @@ import { User } from '../../src/entity/user'
 import {
   ArticleSavingRequestStatus,
   BulkActionType,
+  HighlightType,
   PageType,
   SyncUpdatedItemEdge,
   UpdateReason,
@@ -1963,6 +1964,7 @@ describe('Article API', () => {
                 pageType
                 highlights {
                   id
+                  type
                 }
               }
               itemID
@@ -2084,6 +2086,9 @@ describe('Article API', () => {
         expect(res.body.data.updatesSince.edges[0].node.highlights[0].id).to.eq(
           highlight.id
         )
+        expect(res.body.data.updatesSince.edges[0].node.highlights[0].type).to.eq(
+          HighlightType.Highlight
+        )
       })
     })
   })