Merge pull request #3286 from omnivore-app/fix/highlights-in-update-s…

…ince-api fix type of highlight is null from update since api
omnivore-app · Dec 28, 2023 · 90195f2 · 90195f2 · vercel · Dec 28, 2023
2 parents 02ba27c + 881626d
commit 90195f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
+        )
       })
     })
   })