Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3966 from omnivore-app/feature/add-index-for-archived-at

Browse Source 
feature/add index for archived at and folder
This commit is contained in:
Hongbo Wu
2024-05-20 12:08:27 +08:00
committed by GitHub
parent a0284da999 a3fe526c2c
commit b6c150a5cb
7 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/api/src/resolvers/article/index.ts
View File

@ -670,7 +670,7 @@ export const searchResolver = authorized<
SearchSuccess,
SearchError,
QuerySearchArgs
>(async (_obj, params, { uid }) => {
>(async (_obj, params, { uid, log }) => {
const startCursor = params.after || ''
const first = Math.min(params.first || 10, 100) // limit to 100 items

4
packages/api/src/resolvers/function_resolvers.ts
View File

@ -33,6 +33,7 @@ import {
wordsCount,
} from '../utils/helpers'
import { createImageProxyUrl } from '../utils/imageproxy'
import { logger } from '../utils/logger'
import { contentConverter } from '../utils/parser'
import {
generateDownloadSignedUrl,
@ -515,7 +516,8 @@ export const functionResolvers = {
) {
if (item.labels) return item.labels
return ctx.dataLoaders.labels.load(item.id)
const labels = await ctx.dataLoaders.labels.load(item.id)
return labels
},
async recommendations(
item: {

12
packages/api/src/services/library_item.ts
View File

@ -302,12 +302,14 @@ export const buildQueryString = (
case InFilter.ALL:
return null
case InFilter.ARCHIVE:
return "(library_item.state = 'ARCHIVED' or (library_item.state != 'DELETED' and library_item.archived_at is not null))"
return `(library_item.state = 'ARCHIVED'
OR (library_item.state IN ('SUCCEEDED', 'ARCHIVED', 'PROCESSING', 'FAILED', 'CONTENT_NOT_FETCHED')
AND library_item.archived_at IS NOT NULL))`
case InFilter.TRASH:
// return only deleted pages within 14 days
return "(library_item.state = 'DELETED' AND library_item.deleted_at >= now() - interval '14 days')"
return "(library_item.state = 'DELETED' AND library_item.deleted_at >= NOW() - INTERVAL '14 days')"
default: {
let sql = 'library_item.archived_at is null'
let sql = 'library_item.archived_at IS NULL'
if (useFolders) {
const param = `folder_${parameters.length}`
const folderSql = escapeQueryWithParameters(
@ -664,7 +666,9 @@ export const createSearchQueryBuilder = (
}
if (!args.includeDeleted) {
queryBuilder.andWhere("library_item.state <> 'DELETED'")
queryBuilder.andWhere(
"library_item.state IN ('SUCCEEDED', 'ARCHIVED', 'PROCESSING', 'FAILED', 'CONTENT_NOT_FETCHED')"
)
}
if (queryString) {