diff --git a/packages/api/src/entity/library_item.ts b/packages/api/src/entity/library_item.ts index fb92fa618..ef2c339f4 100644 --- a/packages/api/src/entity/library_item.ts +++ b/packages/api/src/entity/library_item.ts @@ -9,6 +9,7 @@ import { OneToMany, OneToOne, PrimaryGeneratedColumn, + Unique, UpdateDateColumn, } from 'typeorm' import { Highlight } from './highlight' diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 942bae7be..451e36a0a 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -88,7 +88,6 @@ import { setFileUploadComplete, } from '../../services/upload_file' import { traceAs } from '../../tracing' -import { Merge } from '../../util' import { analytics } from '../../utils/analytics' import { isSiteBlockedForParse } from '../../utils/blocked' import { enqueueBulkAction } from '../../utils/createTask' @@ -393,10 +392,12 @@ export const getArticleResolver = authorized< tx.withRepository(libraryItemRepository).findOne({ select: selectColumns, where: { + user: { id: uid }, ...where, deletedAt: IsNull(), }, relations: { + labels: true, highlights: { user: true, labels: true,