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

add user_id to the sql query to reduce query latency

Browse Source
This commit is contained in:
Hongbo Wu
2023-10-11 16:05:35 +08:00
parent a4aeb40276
commit 30ba22cbbc
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -707,9 +707,9 @@ export const typeaheadSearchResolver = authorized<
TypeaheadSearchSuccess,
TypeaheadSearchError,
QueryTypeaheadSearchArgs
>(async (_obj, { query, first }, { log }) => {
>(async (_obj, { query, first }, { log, uid }) => {
try {
const items = await findLibraryItemsByPrefix(query, first || undefined)
const items = await findLibraryItemsByPrefix(query, uid, first || undefined)
return {
items: items.map((item) => ({

3
packages/api/src/routers/svc/content.ts
View File

@ -71,7 +71,8 @@ export function contentServiceRouter() {
.withRepository(libraryItemRepository)
.createQueryBuilder('item')
.innerJoinAndSelect('item.uploadFile', 'file')
.where('file.id = :fileId', { fileId })
.where('item.user = :userId', { userId: uploadFile.user.id })
.andWhere('file.id = :fileId', { fileId })
.getOne(),
undefined,
uploadFile.user.id

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

@ -379,7 +379,8 @@ export const findLibraryItemByUrl = async (
.leftJoinAndSelect('recommendations.recommender', 'recommender')
.leftJoinAndSelect('recommender.profile', 'profile')
.leftJoinAndSelect('recommendations.group', 'group')
.where('library_item.original_url = :url', { url })
.where('library_item.user_id = :userId', { userId })
.andWhere('library_item.original_url = :url', { url })
.getOne(),
undefined,
userId
@ -485,6 +486,7 @@ export const createLibraryItem = async (
export const findLibraryItemsByPrefix = async (
prefix: string,
userId: string,
limit = 5
): Promise<LibraryItem[]> => {
const prefixWildcard = `${prefix}%`
@ -492,10 +494,11 @@ export const findLibraryItemsByPrefix = async (
return authTrx(async (tx) =>
tx
.createQueryBuilder(LibraryItem, 'library_item')
.where('library_item.title ILIKE :prefix', { prefix: prefixWildcard })
.orWhere('library_item.site_name ILIKE :prefix', {
prefix: prefixWildcard,
})
.where('library_item.user_id = :userId', { userId })
.andWhere(
'(library_item.title ILIKE :prefix OR library_item.site_name ILIKE :prefix)',
{ prefix: prefixWildcard }
)
.orderBy('library_item.savedAt', 'DESC')
.limit(limit)
.getMany()
@ -511,7 +514,8 @@ export const countByCreatedAt = async (
async (tx) =>
tx
.createQueryBuilder(LibraryItem, 'library_item')
.where('library_item.created_at between :startDate and :endDate', {
.where('library_item.user_id = :userId', { userId })
.andWhere('library_item.created_at between :startDate and :endDate', {
startDate,
endDate,
})
@ -608,10 +612,12 @@ export const deleteLibraryItems = async (
)
}
export const deleteLibraryItemByUrl = async (url: string, userId?: string) => {
export const deleteLibraryItemByUrl = async (url: string, userId: string) => {
return authTrx(
async (tx) =>
tx.withRepository(libraryItemRepository).delete({ originalUrl: url }),
tx
.withRepository(libraryItemRepository)
.delete({ originalUrl: url, user: { id: userId } }),
undefined,
userId
)