diff --git a/packages/api/src/resolvers/article_saving_request/index.ts b/packages/api/src/resolvers/article_saving_request/index.ts index c99fa94aa..07d40aea5 100644 --- a/packages/api/src/resolvers/article_saving_request/index.ts +++ b/packages/api/src/resolvers/article_saving_request/index.ts @@ -92,6 +92,7 @@ export const articleSavingRequestResolver = authorized< 'author', 'createdAt', 'updatedAt', + 'savedAt', ], relations: { user: true, diff --git a/packages/api/src/routers/content_router.ts b/packages/api/src/routers/content_router.ts index 4d1709d06..d7605eb3a 100644 --- a/packages/api/src/routers/content_router.ts +++ b/packages/api/src/routers/content_router.ts @@ -64,7 +64,7 @@ export function contentRouter() { // generate signed url for each library item const data = await Promise.all( libraryItems.map(async (libraryItem) => { - const filePath = `${userId}/${ + const filePath = `content/${userId}/${ libraryItem.id }.${libraryItem.updatedAt.getTime()}.${format}` diff --git a/packages/api/src/services/reports.ts b/packages/api/src/services/reports.ts index e2aa573d5..33928c4f3 100644 --- a/packages/api/src/services/reports.ts +++ b/packages/api/src/services/reports.ts @@ -11,7 +11,9 @@ export const saveContentDisplayReport = async ( uid: string, input: ReportItemInput ): Promise => { - const item = await findLibraryItemById(input.pageId, uid) + const item = await findLibraryItemById(input.pageId, uid, { + select: ['id', 'readableContent', 'originalContent', 'originalUrl'], + }) if (!item) { logger.info('unable to submit report, item not found', input) return false @@ -53,7 +55,9 @@ export const saveAbuseReport = async ( uid: string, input: ReportItemInput ): Promise => { - const item = await findLibraryItemById(input.pageId, uid) + const item = await findLibraryItemById(input.pageId, uid, { + select: ['id'], + }) if (!item) { logger.info('unable to submit report, item not found', input) return false diff --git a/packages/api/test/resolvers/article.test.ts b/packages/api/test/resolvers/article.test.ts index e5d05e6ae..a9be6ed71 100644 --- a/packages/api/test/resolvers/article.test.ts +++ b/packages/api/test/resolvers/article.test.ts @@ -2345,7 +2345,11 @@ describe('Article API', () => { authToken ).expect(200) - const item = await findLibraryItemById(articleId, user.id) + const item = await findLibraryItemById(articleId, user.id, { + relations: { + labels: true, + }, + }) expect(item?.labels?.map((l) => l.name)).to.eql(['Favorites']) }) }) diff --git a/packages/api/test/resolvers/labels.test.ts b/packages/api/test/resolvers/labels.test.ts index 0dccc54d1..4020e2eaa 100644 --- a/packages/api/test/resolvers/labels.test.ts +++ b/packages/api/test/resolvers/labels.test.ts @@ -293,7 +293,11 @@ describe('Labels API', () => { labelId, }).expect(200) - const updatedItem = await findLibraryItemById(item.id, user.id) + const updatedItem = await findLibraryItemById(item.id, user.id, { + relations: { + labels: true, + }, + }) expect(updatedItem?.labels).not.deep.include(toDeleteLabel) }) }) @@ -545,7 +549,11 @@ describe('Labels API', () => { it('should update the item with the label', async () => { await graphqlRequest(query, authToken).expect(200) - const updatedItem = await findLibraryItemById(item.id, user.id) + const updatedItem = await findLibraryItemById(item.id, user.id, { + relations: { + labels: true, + }, + }) const updatedLabel = updatedItem?.labels?.filter( (l) => l.id === labelId )?.[0]