Fix empty podcast and empty book queries when cleaning db on init

advplyr · Sep 17, 2023 · 87eaace · 87eaace
1 parent 3ad4f05
commit 87eaace
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/server/Database.js b/server/Database.js
@@ -666,7 +666,11 @@ class Database {
   async cleanDatabase() {
     // Remove invalid Podcast records
     const podcastsWithNoLibraryItem = await this.podcastModel.findAll({
-      where: Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM libraryItems li WHERE li.mediaId = podcast.id)`), 0)
+      include: {
+        model: this.libraryItemModel,
+        required: false
+      },
+      where: { '$libraryItem.id$': null }
     })
     for (const podcast of podcastsWithNoLibraryItem) {
       Logger.warn(`Found podcast "${podcast.title}" with no libraryItem - removing it`)
@@ -675,7 +679,11 @@ class Database {
 
     // Remove invalid Book records
     const booksWithNoLibraryItem = await this.bookModel.findAll({
-      where: Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM libraryItems li WHERE li.mediaId = book.id)`), 0)
+      include: {
+        model: this.libraryItemModel,
+        required: false
+      },
+      where: { '$libraryItem.id$': null }
     })
     for (const book of booksWithNoLibraryItem) {
       Logger.warn(`Found book "${book.title}" with no libraryItem - removing it`)
@@ -684,13 +692,11 @@ class Database {
 
     // Remove empty series
     const emptySeries = await this.seriesModel.findAll({
-      include: [
-        {
-          model: this.bookSeriesModel,
-          required: false
-        }
-      ],
-      where:{ '$bookSeries.id$': null }
+      include: {
+        model: this.bookSeriesModel,
+        required: false
+      },
+      where: { '$bookSeries.id$': null }
     })
     for (const series of emptySeries) {
       Logger.warn(`Found series "${series.name}" with no books - removing it`)