From c52d2f0f560ce7f8e86c414a8c159d9c9e17727d Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 4 Apr 2023 11:00:13 +0800
Subject: [PATCH] Fix pageType to be null in updatesSince api response

---
 packages/api/src/elastic/highlights.ts      | 10 ++++++----
 packages/api/src/resolvers/article/index.ts |  3 ++-
 packages/api/test/resolvers/article.test.ts |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/api/src/elastic/highlights.ts b/packages/api/src/elastic/highlights.ts
index 207db8cc5..440e49baa 100644
--- a/packages/api/src/elastic/highlights.ts
+++ b/packages/api/src/elastic/highlights.ts
@@ -1,14 +1,15 @@
+import { ResponseError } from '@elastic/elasticsearch/lib/errors'
+import { EntityType } from '../datalayer/pubsub'
+import { SortBy, SortOrder, SortParams } from '../utils/search'
+import { client, INDEX_ALIAS } from './index'
 import {
   Highlight,
   Page,
   PageContext,
+  PageType,
   SearchItem,
   SearchResponse,
 } from './types'
-import { ResponseError } from '@elastic/elasticsearch/lib/errors'
-import { client, INDEX_ALIAS } from './index'
-import { SortBy, SortOrder, SortParams } from '../utils/search'
-import { EntityType } from '../datalayer/pubsub'
 
 export const addHighlightToPage = async (
   id: string,
@@ -241,6 +242,7 @@ export const searchHighlights = async (
           ...highlight,
           ...hit._source,
           pageId: hit._id,
+          pageType: PageType.Highlights,
         })
       })
     })
diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts
index 8a7c242d7..b87709e9a 100644
--- a/packages/api/src/resolvers/article/index.ts
+++ b/packages/api/src/resolvers/article/index.ts
@@ -946,7 +946,7 @@ export const searchResolver = authorized<
         originalArticleUrl: r.url,
         publishedAt: validatedDate(r.publishedAt),
         ownedByViewer: r.userId === claims.uid,
-        pageType: r.pageType || PageType.Highlights,
+        pageType: r.pageType || PageType.Unknown,
         siteIcon,
       } as SearchItem,
       cursor: endCursor,
@@ -1058,6 +1058,7 @@ export const updatesSinceResolver = authorized<
             p.pageType === PageType.File
               ? ContentReader.Pdf
               : ContentReader.Web,
+          pageType: p.pageType || PageType.Unknown,
         } as SearchItem,
         cursor: endCursor,
         itemID: p.id,
diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts
index 4e0440a8d..90047d3f7 100644
--- a/packages/api/test/resolvers/article.test.ts
+++ b/packages/api/test/resolvers/article.test.ts
@@ -1064,6 +1064,7 @@ describe('Article API', () => {
                 id
                 createdAt
                 updatedAt
+                pageType
               }
               itemID
               updateReason