From a874482d117de9523a5282213ae67d64eff16203 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Sun, 13 Mar 2022 09:00:25 -0700 Subject: [PATCH 1/2] Dont perform an extra query for isArchived --- packages/api/src/datalayer/links/index.ts | 10 +++++++--- packages/api/src/resolvers/function_resolvers.ts | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/api/src/datalayer/links/index.ts b/packages/api/src/datalayer/links/index.ts index 48885a347..36422ef85 100644 --- a/packages/api/src/datalayer/links/index.ts +++ b/packages/api/src/datalayer/links/index.ts @@ -82,6 +82,8 @@ const linkColsWithoutContent = (tx: Knex) => { } const linkCols = (tx: Knex) => { + console.trace('linkCols') + return [ 'omnivore.pages.content', 'omnivore.pages.originalHtml', @@ -410,6 +412,8 @@ class UserArticleModel extends DataModel< tx = this.kx, notNullField: string | null = null ): Promise<[PartialArticle[], number] | null> { + console.log("GETTING PAGINATED") + const { cursor, first, sort, query, readFilter } = args const sortOrder = sort?.order === SortOrder.Ascending ? 'ASC' : 'DESC' @@ -481,9 +485,9 @@ class UserArticleModel extends DataModel< .limit(limit) const rows = await queryPromise - for (const row of rows) { - this.loader.prime(row.id, row) - } + // for (const row of rows) { + // this.loader.prime(row.id, row) + // } return [rows, parseInt(totalCount as string)] } diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts index ffe7f53c8..7542152ee 100644 --- a/packages/api/src/resolvers/function_resolvers.ts +++ b/packages/api/src/resolvers/function_resolvers.ts @@ -369,7 +369,7 @@ export const functionResolvers = { __: unknown, ctx: WithDataSourcesContext & { claims: Claims } ) { - if (article.isArchived) return article.isArchived + if ('isArchived' in article) return article.isArchived if (!ctx.claims?.uid) return false const userArticle = await ctx.models.userArticle.getForUser( ctx.claims.uid, From 78660c886d9ccb74c06443ccb47d83975cde040a Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Sun, 13 Mar 2022 09:06:15 -0700 Subject: [PATCH 2/2] rm debug --- packages/api/src/datalayer/links/index.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/api/src/datalayer/links/index.ts b/packages/api/src/datalayer/links/index.ts index 36422ef85..48885a347 100644 --- a/packages/api/src/datalayer/links/index.ts +++ b/packages/api/src/datalayer/links/index.ts @@ -82,8 +82,6 @@ const linkColsWithoutContent = (tx: Knex) => { } const linkCols = (tx: Knex) => { - console.trace('linkCols') - return [ 'omnivore.pages.content', 'omnivore.pages.originalHtml', @@ -412,8 +410,6 @@ class UserArticleModel extends DataModel< tx = this.kx, notNullField: string | null = null ): Promise<[PartialArticle[], number] | null> { - console.log("GETTING PAGINATED") - const { cursor, first, sort, query, readFilter } = args const sortOrder = sort?.order === SortOrder.Ascending ? 'ASC' : 'DESC' @@ -485,9 +481,9 @@ class UserArticleModel extends DataModel< .limit(limit) const rows = await queryPromise - // for (const row of rows) { - // this.loader.prime(row.id, row) - // } + for (const row of rows) { + this.loader.prime(row.id, row) + } return [rows, parseInt(totalCount as string)] }