Fix api status mapping

packages/api/src/jobs/save_page.ts

@@ -3,10 +3,11 @@ import jwt from 'jsonwebtoken'
 import { promisify } from 'util'
 import { env } from '../env'
 import { redisDataSource } from '../redis_data_source'
-import { savePage, stringToRequestStatus } from '../services/save_page'
+import { savePage } from '../services/save_page'
 import { userRepository } from '../repository/user'
 import { logger } from '../utils/logger'
 import { Readability } from '@omnivore/readability'
+import { ArticleSavingRequestStatus } from '../generated/graphql'
 
 const signToken = promisify(jwt.sign)
 
@@ -356,7 +357,7 @@ export const savePageJob = async (data: Data, attemptsMade: number) => {
         title,
         originalContent: content,
         parseResult: readabilityResult,
-        state: stringToRequestStatus(state),
+        state: state ? (state as ArticleSavingRequestStatus) : undefined,
         labels: labels?.map((name) => {
           return {
             name,

packages/api/src/services/save_page.ts

@@ -62,15 +62,6 @@ const shouldParseInBackend = (input: SavePageInput): boolean => {
   )
 }
 
-export const stringToRequestStatus = (
-  str: string | undefined | null
-): ArticleSavingRequestStatus | null => {
-  if (str && str in ArticleSavingRequestStatus) {
-    return str as ArticleSavingRequestStatus
-  }
-  return null
-}
-
 export const savePage = async (
   input: SavePageInput,
   user: User
@@ -103,7 +94,7 @@ export const savePage = async (
     canonicalUrl: parseResult.canonicalUrl,
     savedAt: input.savedAt ? new Date(input.savedAt) : new Date(),
     publishedAt: input.publishedAt ? new Date(input.publishedAt) : undefined,
-    state: stringToRequestStatus(input.state) || undefined,
+    state: input.state || undefined,
     rssFeedUrl: input.rssFeedUrl,
     folder: input.folder,
   })
@@ -117,7 +108,7 @@ export const savePage = async (
         userId: user.id,
         url: itemToSave.originalUrl,
         articleSavingRequestId: clientRequestId || undefined,
-        state: stringToRequestStatus(input.state) || undefined,
+        state: input.state || undefined,
         labels: input.labels || undefined,
         folder: input.folder || undefined,
       })

packages/api/test/resolvers/article.test.ts

@@ -17,7 +17,7 @@ import {
   PageType,
   SyncUpdatedItemEdge,
   UpdateReason,
-  UploadFileStatus
+  UploadFileStatus,
 } from '../../src/generated/graphql'
 import { getRepository } from '../../src/repository'
 import { createGroup, deleteGroup } from '../../src/services/groups'
@@ -25,7 +25,7 @@ import { createHighlight } from '../../src/services/highlights'
 import {
   createLabel,
   deleteLabels,
-  saveLabelsInLibraryItem
+  saveLabelsInLibraryItem,
 } from '../../src/services/labels'
 import {
   createLibraryItem,
@@ -36,7 +36,7 @@ import {
   deleteLibraryItemsByUserId,
   findLibraryItemById,
   findLibraryItemByUrl,
-  updateLibraryItem
+  updateLibraryItem,
 } from '../../src/services/library_item'
 import { deleteUser } from '../../src/services/user'
 import * as createTask from '../../src/utils/createTask'
@@ -570,23 +570,37 @@ describe('Article API', () => {
         ).expect(200)
 
         // Save a link, then archive it
-        let allLinks = await graphqlRequest(searchQuery('in:inbox'), authToken).expect(
-          200
-        )
+        let allLinks = await graphqlRequest(
+          searchQuery('in:inbox'),
+          authToken
+        ).expect(200)
         const justSavedId = allLinks.body.data.search.edges[0].node.id
         await archiveLink(authToken, justSavedId)
 
         // test the negative case, ensuring the archive link wasn't returned
-        allLinks = await graphqlRequest(searchQuery('in:inbox'), authToken).expect(200)
+        allLinks = await graphqlRequest(
+          searchQuery('in:inbox'),
+          authToken
+        ).expect(200)
         expect(allLinks.body.data.search.edges[0]?.node?.url).to.not.eq(url)
 
         // Now save the link again, and ensure it is returned
         await graphqlRequest(
-          savePageQuery(url, title, originalContent, null, null, generateFakeUuid()),
+          savePageQuery(
+            url,
+            title,
+            originalContent,
+            null,
+            null,
+            generateFakeUuid()
+          ),
           authToken
         ).expect(200)
 
-        allLinks = await graphqlRequest(searchQuery('in:inbox'), authToken).expect(200)
+        allLinks = await graphqlRequest(
+          searchQuery('in:inbox'),
+          authToken
+        ).expect(200)
         expect(allLinks.body.data.search.edges[0].node.id).to.eq(justSavedId)
         expect(allLinks.body.data.search.edges[0].node.url).to.eq(url)
       })
@@ -610,6 +624,7 @@ describe('Article API', () => {
         ).expect(200)
 
         const savedItem = await findLibraryItemByUrl(url, user.id)
+        console.log('savedItem: ', savedItem)
         expect(savedItem?.archivedAt).to.not.be.null
         expect(savedItem?.labels?.map((l) => l.name)).to.eql(labels)
       })
@@ -778,15 +793,20 @@ describe('Article API', () => {
 
     context('when force is true', () => {
       before(async () => {
-        itemId = (await createLibraryItem({
-          user: { id: user.id },
-          originalUrl: 'https://blog.omnivore.app/setBookmarkArticle',
-          slug: 'test-with-omnivore',
-          readableContent: '<p>test</p>',
-          title: 'test title',
-          readingProgressBottomPercent: 100,
-          readingProgressTopPercent: 80,
-        }, user.id)).id
+        itemId = (
+          await createLibraryItem(
+            {
+              user: { id: user.id },
+              originalUrl: 'https://blog.omnivore.app/setBookmarkArticle',
+              slug: 'test-with-omnivore',
+              readableContent: '<p>test</p>',
+              title: 'test title',
+              readingProgressBottomPercent: 100,
+              readingProgressTopPercent: 80,
+            },
+            user.id
+          )
+        ).id
       })
 
       after(async () => {
@@ -2052,20 +2072,23 @@ describe('Article API', () => {
       )
     })
 
-    context('when since is -1000000000-01-01T00:00:00Z from android app', () => {
-      before(() => {
-        since = '-1000000000-01-01T00:00:00Z'
-      })
+    context(
+      'when since is -1000000000-01-01T00:00:00Z from android app',
+      () => {
+        before(() => {
+          since = '-1000000000-01-01T00:00:00Z'
+        })
 
-      it('returns all', async () => {
-        const res = await graphqlRequest(
-          updatesSinceQuery(since),
-          authToken
-        ).expect(200)
+        it('returns all', async () => {
+          const res = await graphqlRequest(
+            updatesSinceQuery(since),
+            authToken
+          ).expect(200)
 
-        expect(res.body.data.updatesSince.edges.length).to.eql(5)
-      })
-    })
+          expect(res.body.data.updatesSince.edges.length).to.eql(5)
+        })
+      }
+    )
 
     context('returns highlights', () => {
       let highlight: Highlight
@@ -2092,9 +2115,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
-        )
+        expect(
+          res.body.data.updatesSince.edges[0].node.highlights[0].type
+        ).to.eq(HighlightType.Highlight)
       })
     })
   })