From 6189e85b2cf370bc26c0094e69df64d47fa07b9c Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 15 Jun 2022 09:32:10 +0800 Subject: [PATCH 1/3] Add readAt to article --- packages/api/src/generated/graphql.ts | 2 ++ packages/api/src/generated/schema.graphql | 1 + packages/api/src/schema.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index 881b409da..cec1a2bf5 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -107,6 +107,7 @@ export type Article = { pageType?: Maybe; postedByViewer?: Maybe; publishedAt?: Maybe; + readAt?: Maybe; readingProgressAnchorIndex: Scalars['Int']; readingProgressPercent: Scalars['Float']; savedAt: Scalars['Date']; @@ -3070,6 +3071,7 @@ export type ArticleResolvers, ParentType, ContextType>; postedByViewer?: Resolver, ParentType, ContextType>; publishedAt?: Resolver, ParentType, ContextType>; + readAt?: Resolver, ParentType, ContextType>; readingProgressAnchorIndex?: Resolver; readingProgressPercent?: Resolver; savedAt?: Resolver; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index 0131950e2..d2e31b91e 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -83,6 +83,7 @@ type Article { pageType: PageType postedByViewer: Boolean publishedAt: Date + readAt: Date readingProgressAnchorIndex: Int! readingProgressPercent: Float! savedAt: Date! diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index 3df7dca3b..b892466be 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -351,6 +351,7 @@ const schema = gql` unsubHttpUrl: String state: ArticleSavingRequestStatus language: String + readAt: Date } # Query: article From c5c8763767f79a31bcb17961cc54c39b35ba9f88 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 15 Jun 2022 09:32:53 +0800 Subject: [PATCH 2/3] Add readAt to searchItem --- packages/api/src/elastic/types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/api/src/elastic/types.ts b/packages/api/src/elastic/types.ts index 550c02584..64781f93a 100644 --- a/packages/api/src/elastic/types.ts +++ b/packages/api/src/elastic/types.ts @@ -224,6 +224,7 @@ export interface SearchItem { userId: string state?: ArticleSavingRequestStatus language?: string + readAt?: Date } const keys = ['_id', 'url', 'slug', 'userId', 'uploadFileId', 'state'] as const From de09a36c1cff06b23a613956cd5816726f54849e Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 15 Jun 2022 09:42:38 +0800 Subject: [PATCH 3/3] Add readAt to api response --- packages/api/test/resolvers/article.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts index ae2e8889d..b4a8dc650 100644 --- a/packages/api/test/resolvers/article.test.ts +++ b/packages/api/test/resolvers/article.test.ts @@ -302,6 +302,7 @@ const saveArticleReadingProgressQuery = ( updatedArticle { id readingProgressPercent + readAt } } ... on SaveArticleReadingProgressError { @@ -845,6 +846,8 @@ describe('Article API', () => { res.body.data.saveArticleReadingProgress.updatedArticle .readingProgressPercent ).to.eq(progress) + expect(res.body.data.saveArticleReadingProgress.updatedArticle.readAt) + .not.null }) it('should not allow setting the reading progress lower than current progress', async () => {