From c1ba9b8017cdd2ea51e00f04bb250631fe156629 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 8 Feb 2024 10:15:05 +0800
Subject: [PATCH] fix tests

---
 packages/api/src/entity/library_item.ts     | 1 -
 packages/api/src/repository/library_item.ts | 4 ++--
 packages/api/src/services/library_item.ts   | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/entity/library_item.ts b/packages/api/src/entity/library_item.ts
index b7054097d..f5c15d42e 100644
--- a/packages/api/src/entity/library_item.ts
+++ b/packages/api/src/entity/library_item.ts
@@ -9,7 +9,6 @@ import {
   OneToMany,
   OneToOne,
   PrimaryGeneratedColumn,
-  Unique,
   UpdateDateColumn,
 } from 'typeorm'
 import { Highlight } from './highlight'
diff --git a/packages/api/src/repository/library_item.ts b/packages/api/src/repository/library_item.ts
index d22b89fb0..39d69d57e 100644
--- a/packages/api/src/repository/library_item.ts
+++ b/packages/api/src/repository/library_item.ts
@@ -1,5 +1,5 @@
 import { DeepPartial } from 'typeorm'
-import { getColumnsDbName } from '.'
+import { getColumns, getColumnsDbName } from '.'
 import { appDataSource } from '../data_source'
 import { LibraryItem } from '../entity/library_item'
 import { keysToCamelCase, wordsCount } from '../utils/helpers'
@@ -53,7 +53,7 @@ export const libraryItemRepository = appDataSource
         .orUpdate(overwrites, conflictColumns, {
           skipUpdateIfNoValuesChanged: true,
         })
-        .returning(columns)
+        .returning(getColumns(this))
         .getQueryAndParameters()
 
       // this is a workaround for the typeorm bug which quotes the md5 function
diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts
index 630f53cd3..f838834f0 100644
--- a/packages/api/src/services/library_item.ts
+++ b/packages/api/src/services/library_item.ts
@@ -1034,7 +1034,8 @@ export const deleteLibraryItems = async (
   userId?: string
 ) => {
   return authTrx(
-    async (tx) => tx.withRepository(libraryItemRepository).remove(items),
+    async (tx) =>
+      tx.withRepository(libraryItemRepository).delete(items.map((i) => i.id)),
     undefined,
     userId
   )