prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dont perform an extra query for isArchived

Browse source
This commit is contained in:
Jackson Harper 2022-03-13 09:00:25 -07:00
parent 4132800d34
commit a874482d11
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/api/src/datalayer/links/index.ts
View file

@ -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)]
}

2
packages/api/src/resolvers/function_resolvers.ts
View file

@ -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,