Merge branch 'master' into auth_passportjs

server/models/BookAuthor.js

@@ -47,10 +47,14 @@ class BookAuthor extends Model {
     book.belongsToMany(author, { through: BookAuthor })
     author.belongsToMany(book, { through: BookAuthor })
 
-    book.hasMany(BookAuthor)
+    book.hasMany(BookAuthor, {
+      onDelete: 'CASCADE'
+    })
     BookAuthor.belongsTo(book)
 
-    author.hasMany(BookAuthor)
+    author.hasMany(BookAuthor, {
+      onDelete: 'CASCADE'
+    })
     BookAuthor.belongsTo(author)
   }
 }

server/models/Feed.js

@@ -176,6 +176,8 @@ class Feed extends Model {
     if (!existingFeed) return false
 
     let hasUpdates = false
+
+    // Remove and update existing feed episodes
     for (const feedEpisode of existingFeed.feedEpisodes) {
       const oldFeedEpisode = oldFeedEpisodes.find(ep => ep.id === feedEpisode.id)
       // Episode removed
@@ -196,6 +198,14 @@ class Feed extends Model {
       }
     }
 
+    // Add new feed episodes
+    for (const episode of oldFeedEpisodes) {
+      if (!existingFeed.feedEpisodes.some(fe => fe.id === episode.id)) {
+        await this.sequelize.models.feedEpisode.createFromOld(feedObj.id, episode)
+        hasUpdates = true
+      }
+    }
+
     let feedHasUpdates = false
     for (const key in feedObj) {
       let existingValue = existingFeed[key]

server/models/FeedEpisode.js

@@ -63,6 +63,19 @@ class FeedEpisode extends Model {
     }
   }
 
+  /**
+   * Create feed episode from old model
+   * 
+   * @param {string} feedId 
+   * @param {Object} oldFeedEpisode 
+   * @returns {Promise<FeedEpisode>}
+   */
+  static createFromOld(feedId, oldFeedEpisode) {
+    const newEpisode = this.getFromOld(oldFeedEpisode)
+    newEpisode.feedId = feedId
+    return this.create(newEpisode)
+  }
+
   static getFromOld(oldFeedEpisode) {
     return {
       id: oldFeedEpisode.id,

server/models/LibraryItem.js

@@ -794,6 +794,9 @@ class LibraryItem extends Model {
         {
           fields: ['libraryId', 'mediaType']
         },
+        {
+          fields: ['libraryId', 'mediaId', 'mediaType']
+        },
         {
           fields: ['birthtime']
         },