diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index b158c3a9f..135e5e845 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -340,29 +340,12 @@ export const createArticleResolver = authorized< } } - let libraryItemToReturn: LibraryItem - - const existingLibraryItem = await findLibraryItemByUrl( - libraryItemToSave.originalUrl, - uid + // create new item in database + const libraryItemToReturn = await createOrUpdateLibraryItem( + libraryItemToSave, + uid, + pubsub ) - articleSavingRequestId = existingLibraryItem?.id || articleSavingRequestId - if (articleSavingRequestId) { - // update existing item's state from processing to succeeded - libraryItemToReturn = await updateLibraryItem( - articleSavingRequestId, - libraryItemToSave as QueryDeepPartialEntity, - uid, - pubsub - ) - } else { - // create new item in database - libraryItemToReturn = await createOrUpdateLibraryItem( - libraryItemToSave, - uid, - pubsub - ) - } await createAndSaveLabelsInLibraryItem( libraryItemToReturn.id, @@ -371,14 +354,6 @@ export const createArticleResolver = authorized< rssFeedUrl ) - log.info( - 'item created in database', - libraryItemToReturn.id, - libraryItemToReturn.originalUrl, - libraryItemToReturn.slug, - libraryItemToReturn.title - ) - return { user, created: true, diff --git a/packages/api/src/services/create_page_save_request.ts b/packages/api/src/services/create_page_save_request.ts index ea5416d3c..733559109 100644 --- a/packages/api/src/services/create_page_save_request.ts +++ b/packages/api/src/services/create_page_save_request.ts @@ -16,12 +16,7 @@ import { libraryItemToArticleSavingRequest, } from '../utils/helpers' import { logger } from '../utils/logger' -import { - countByCreatedAt, - createOrUpdateLibraryItem, - findLibraryItemByUrl, - updateLibraryItem, -} from './library_item' +import { countByCreatedAt, createOrUpdateLibraryItem } from './library_item' interface PageSaveRequest { userId: string @@ -112,42 +107,26 @@ export const createPageSaveRequest = async ({ } url = cleanUrl(url) - // look for existing library item - let libraryItem = await findLibraryItemByUrl(url, userId) - if (!libraryItem) { - logger.info('libraryItem does not exist', { url }) - // create processing item - libraryItem = await createOrUpdateLibraryItem( - { - id: articleSavingRequestId, - user: { id: userId }, - readableContent: SAVING_CONTENT, - itemType: PageType.Unknown, - slug: generateSlug(url), - title: url, - originalUrl: url, - state: LibraryItemState.Processing, - publishedAt, - folder, - subscription, - savedAt, - }, - userId, - pubsub - ) - } - // reset state to processing - if (libraryItem.state !== LibraryItemState.Processing) { - libraryItem = await updateLibraryItem( - libraryItem.id, - { - state: LibraryItemState.Processing, - }, - userId, - pubsub - ) - } + // create processing item + const libraryItem = await createOrUpdateLibraryItem( + { + id: articleSavingRequestId, + user: { id: userId }, + readableContent: SAVING_CONTENT, + itemType: PageType.Unknown, + slug: generateSlug(url), + title: url, + originalUrl: url, + state: LibraryItemState.Processing, + publishedAt, + folder, + subscription, + savedAt, + }, + userId, + pubsub + ) // get priority by checking rate limit if not specified priority = priority || (await getPriorityByRateLimit(userId))