${UNPARSEABLE_CONTENT}
` diff --git a/packages/api/src/routers/svc/pdf_attachments.ts b/packages/api/src/routers/svc/pdf_attachments.ts index 4fcba0176..c408d821b 100644 --- a/packages/api/src/routers/svc/pdf_attachments.ts +++ b/packages/api/src/routers/svc/pdf_attachments.ts @@ -155,6 +155,7 @@ export function pdfAttachmentsRouter() { slug: generateSlug(title), id: '', createdAt: new Date(), + savedAt: new Date(), readingProgressPercent: 0, readingProgressAnchorIndex: 0, state: ArticleSavingRequestStatus.Succeeded, diff --git a/packages/api/src/services/create_page_save_request.ts b/packages/api/src/services/create_page_save_request.ts index 4c0170012..295e955a3 100644 --- a/packages/api/src/services/create_page_save_request.ts +++ b/packages/api/src/services/create_page_save_request.ts @@ -14,7 +14,7 @@ import { ArticleSavingRequestStatus, Page, PageType } from '../elastic/types' import { createPubSubClient, PubsubClient } from '../datalayer/pubsub' import normalizeUrl from 'normalize-url' -const SAVING_DESCRIPTION = 'Your link is being saved...' +const SAVING_CONTENT = 'Your link is being saved...' const isPrivateIP = privateIpLib.default @@ -107,8 +107,7 @@ export const createPageSaveRequest = async ( const page: Page = { id: articleSavingRequestId, userId, - content: SAVING_DESCRIPTION, - createdAt: new Date(), + content: SAVING_CONTENT, hash: '', pageType: PageType.Unknown, readingProgressAnchorIndex: 0, @@ -118,7 +117,8 @@ export const createPageSaveRequest = async ( url, taskName: createdTaskName, state: ArticleSavingRequestStatus.Processing, - description: SAVING_DESCRIPTION, + createdAt: new Date(), + savedAt: new Date(), } const pageId = await createPage(page, { pubsub, uid: userId }) diff --git a/packages/api/src/services/save_email.ts b/packages/api/src/services/save_email.ts index 9088fa0e8..e62175c47 100644 --- a/packages/api/src/services/save_email.ts +++ b/packages/api/src/services/save_email.ts @@ -66,6 +66,7 @@ export const saveEmail = async ( publishedAt: validatedDate(parseResult.parsedContent?.publishedDate), slug: slug, createdAt: new Date(), + savedAt: new Date(), readingProgressAnchorIndex: 0, readingProgressPercent: 0, subscription: input.author, diff --git a/packages/api/src/services/save_file.ts b/packages/api/src/services/save_file.ts index b8cf39307..874ca8e1d 100644 --- a/packages/api/src/services/save_file.ts +++ b/packages/api/src/services/save_file.ts @@ -94,6 +94,7 @@ export const saveFile = async ( userId: saver.id, id: input.clientRequestId, createdAt: new Date(), + savedAt: new Date(), readingProgressPercent: 0, readingProgressAnchorIndex: 0, state: ArticleSavingRequestStatus.Succeeded, diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts index f54cc351e..e6fd79110 100644 --- a/packages/api/src/services/save_page.ts +++ b/packages/api/src/services/save_page.ts @@ -91,10 +91,11 @@ export const savePage = async ( hash: stringToHash(parseResult.parsedContent?.content || input.url), image: parseResult.parsedContent?.previewImage, publishedAt: validatedDate(parseResult.parsedContent?.publishedDate), - createdAt: new Date(), readingProgressPercent: 0, readingProgressAnchorIndex: 0, state: ArticleSavingRequestStatus.Succeeded, + createdAt: new Date(), + savedAt: new Date(), } const existingPage = await getPageByParam({ diff --git a/packages/api/test/elastic/index.test.ts b/packages/api/test/elastic/index.test.ts index 7815db81b..c313ad556 100644 --- a/packages/api/test/elastic/index.test.ts +++ b/packages/api/test/elastic/index.test.ts @@ -46,6 +46,7 @@ describe('elastic api', () => { slug: 'test slug', createdAt: new Date(), updatedAt: new Date(), + savedAt: new Date(), readingProgressPercent: 100, readingProgressAnchorIndex: 0, url: 'https://blog.omnivore.app/p/getting-started-with-omnivore', @@ -98,6 +99,7 @@ describe('elastic api', () => { slug: 'test', createdAt: new Date(), updatedAt: new Date(), + savedAt: new Date(), readingProgressPercent: 0, readingProgressAnchorIndex: 0, url: 'https://blog.omnivore.app/testUrl', @@ -202,6 +204,7 @@ describe('elastic api', () => { content: 'test', slug: 'test', createdAt: new Date(createdAt), + savedAt: new Date(), readingProgressPercent: 0, readingProgressAnchorIndex: 0, url: 'https://blog.omnivore.app/testCount', diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts index c6b4e10fe..be28848cd 100644 --- a/packages/api/test/resolvers/article.test.ts +++ b/packages/api/test/resolvers/article.test.ts @@ -434,7 +434,7 @@ describe('Article API', () => { pageId, { state: ArticleSavingRequestStatus.Processing, - createdAt: new Date(Date.now() - 1000 * 60), + savedAt: new Date(Date.now() - 1000 * 60), }, ctx ) @@ -731,6 +731,7 @@ describe('Article API', () => { title: 'test title', content: 'test
', createdAt: new Date(), + savedAt: new Date(), url: 'https://blog.omnivore.app/setBookmarkArticle', slug: 'test-with-omnivore', readingProgressPercent: 0, diff --git a/packages/api/test/resolvers/article_saving_request.test.ts b/packages/api/test/resolvers/article_saving_request.test.ts index 43cb5cfa8..cc8aabc1e 100644 --- a/packages/api/test/resolvers/article_saving_request.test.ts +++ b/packages/api/test/resolvers/article_saving_request.test.ts @@ -96,7 +96,7 @@ describe('ArticleSavingRequest API', () => { const page = await getPageById( res.body.data.createArticleSavingRequest.articleSavingRequest.id ) - expect(page?.description).to.eq('Your link is being saved...') + expect(page?.content).to.eq('Your link is being saved...') }) it('returns an error if the url is invalid', async () => { diff --git a/packages/api/test/util.ts b/packages/api/test/util.ts index d235a2c66..8f1bab161 100644 --- a/packages/api/test/util.ts +++ b/packages/api/test/util.ts @@ -51,6 +51,7 @@ export const createTestElasticPage = async ( title: 'test title', content: 'test content
', createdAt: new Date(), + savedAt: new Date(), url: 'https://example.com/test-url', slug: 'test-with-omnivore', labels: labels,