From 5964d827c812a8b0c363ad2a574b9ffd95ad9f38 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 22 Jan 2024 11:04:11 +0800
Subject: [PATCH] fix tests

---
 packages/api/src/repository/library_item.ts | 17 ++++
 packages/api/src/routers/svc/following.ts   |  3 +
 packages/api/src/services/library_item.ts   | 90 +++++++--------------
 packages/api/test/db.ts                     |  2 +-
 4 files changed, 52 insertions(+), 60 deletions(-)

diff --git a/packages/api/src/repository/library_item.ts b/packages/api/src/repository/library_item.ts
index 1e7e3d708..2b8b1ee97 100644
--- a/packages/api/src/repository/library_item.ts
+++ b/packages/api/src/repository/library_item.ts
@@ -1,9 +1,26 @@
+import { DeepPartial } from 'typeorm'
 import { appDataSource } from '../data_source'
 import { LibraryItem } from '../entity/library_item'
+import { wordsCount } from '../utils/helpers'
 
 export const libraryItemRepository = appDataSource
   .getRepository(LibraryItem)
   .extend({
+    save(libraryItem: DeepPartial<LibraryItem>) {
+      return this.createQueryBuilder()
+        .insert()
+        .values({
+          ...libraryItem,
+          wordCount:
+            libraryItem.wordCount ??
+            wordsCount(libraryItem.readableContent || ''),
+        })
+        .orIgnore() // ignore if the item already exists
+        .returning('*')
+        .execute()
+        .then((result) => result.generatedMaps[0] as LibraryItem)
+    },
+
     findById(id: string) {
       return this.findOneBy({ id })
     },
diff --git a/packages/api/src/routers/svc/following.ts b/packages/api/src/routers/svc/following.ts
index b6e0a595f..261dbf4ee 100644
--- a/packages/api/src/routers/svc/following.ts
+++ b/packages/api/src/routers/svc/following.ts
@@ -137,9 +137,12 @@ export function followingServiceRouter() {
       )
 
       logger.info('RSS label added to the item')
+
       return res.sendStatus(200)
     }
 
     res.sendStatus(200)
   })
+
+  return router
 }
diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts
index 6084e50ac..a3b87140b 100644
--- a/packages/api/src/services/library_item.ts
+++ b/packages/api/src/services/library_item.ts
@@ -12,12 +12,11 @@ import { redisDataSource } from '../redis_data_source'
 import {
   authTrx,
   getColumns,
-  isUniqueViolation,
   queryBuilderToRawSql,
   valuesToRawSql,
 } from '../repository'
 import { libraryItemRepository } from '../repository/library_item'
-import { setRecentlySavedItemInRedis, wordsCount } from '../utils/helpers'
+import { setRecentlySavedItemInRedis } from '../utils/helpers'
 import { logger } from '../utils/logger'
 import { parseSearchQuery } from '../utils/search'
 
@@ -808,69 +807,42 @@ export const createLibraryItems = async (
 }
 
 export const createLibraryItem = async (
-  libraryItem: DeepPartial<LibraryItem> & { originalUrl: string },
+  libraryItem: DeepPartial<LibraryItem>,
   userId: string,
   pubsub = createPubSubClient(),
   skipPubSub = false
 ): Promise<LibraryItem> => {
-  try {
-    const newLibraryItem = await authTrx(
-      async (tx) =>
-        tx.withRepository(libraryItemRepository).save({
-          ...libraryItem,
-          wordCount:
-            libraryItem.wordCount ??
-            wordsCount(libraryItem.readableContent || ''),
-        }),
-      undefined,
-      userId
+  const newLibraryItem = await authTrx(
+    async (tx) => tx.withRepository(libraryItemRepository).save(libraryItem),
+    undefined,
+    userId
+  )
+
+  // set recently saved item in redis if redis is enabled
+  if (redisDataSource.redisClient) {
+    await setRecentlySavedItemInRedis(
+      redisDataSource.redisClient,
+      userId,
+      newLibraryItem.originalUrl
     )
-    logger.info('item created', { url: libraryItem.originalUrl })
-
-    // set recently saved item in redis if redis is enabled
-    if (redisDataSource.redisClient) {
-      await setRecentlySavedItemInRedis(
-        redisDataSource.redisClient,
-        userId,
-        newLibraryItem.originalUrl
-      )
-    }
-
-    if (skipPubSub) {
-      return newLibraryItem
-    }
-
-    await pubsub.entityCreated<DeepPartial<LibraryItem>>(
-      EntityType.PAGE,
-      {
-        ...newLibraryItem,
-        // don't send original content and readable content
-        originalContent: undefined,
-        readableContent: undefined,
-      },
-      userId
-    )
-
-    return newLibraryItem
-  } catch (error) {
-    if (isUniqueViolation(error)) {
-      logger.info('item already created', { url: libraryItem.originalUrl })
-
-      const existingItem = await findLibraryItemByUrl(
-        libraryItem.originalUrl,
-        userId
-      )
-
-      if (!existingItem) {
-        throw new Error(`Item not found for url: ${libraryItem.originalUrl}`)
-      }
-
-      return existingItem
-    }
-
-    logger.error('error creating item', error)
-    throw error
   }
+
+  if (skipPubSub) {
+    return newLibraryItem
+  }
+
+  await pubsub.entityCreated<DeepPartial<LibraryItem>>(
+    EntityType.PAGE,
+    {
+      ...newLibraryItem,
+      // don't send original content and readable content
+      originalContent: undefined,
+      readableContent: undefined,
+    },
+    userId
+  )
+
+  return newLibraryItem
 }
 
 export const findLibraryItemsByPrefix = async (
diff --git a/packages/api/test/db.ts b/packages/api/test/db.ts
index d7ed692d9..26a02e965 100644
--- a/packages/api/test/db.ts
+++ b/packages/api/test/db.ts
@@ -106,7 +106,7 @@ export const createTestLibraryItem = async (
   userId: string,
   labels?: Label[]
 ): Promise<LibraryItem> => {
-  const item: DeepPartial<LibraryItem> = {
+  const item = {
     user: { id: userId },
     title: 'test title',
     originalContent: '<p>test content</p>',