Fixed: Removing from Goodreads shelf when different edition imported

src/NzbDrone.Core/Notifications/Goodreads/Bookshelf/GoodreadsBookshelf.cs

@@ -22,8 +22,21 @@ namespace NzbDrone.Core.Notifications.Goodreads
 
         public override void OnReleaseImport(BookDownloadMessage message)
         {
-            var bookId = message.Book.Editions.Value.Single(x => x.Monitored).ForeignEditionId;
+            var importedBook = message.Book;
-            RemoveBookFromShelves(bookId, Settings.RemoveIds);
+
+            foreach (var shelf in Settings.RemoveIds)
+            {
+                // try to find the edition that we need to remove
+                var listBooks = SearchShelf(shelf, importedBook.AuthorMetadata.Value.Name);
+                var toRemove = listBooks.Where(x => x.Book.WorkId.ToString() == importedBook.ForeignBookId);
+
+                foreach (var listBook in toRemove)
+                {
+                    RemoveBookFromShelves(listBook.Book.Id, shelf);
+                }
+            }
+
+            var bookId = importedBook.Editions.Value.Single(x => x.Monitored).ForeignEditionId;
             AddToShelves(bookId, Settings.AddIds);
         }
 
@@ -104,22 +117,59 @@ namespace NzbDrone.Core.Notifications.Goodreads
             }
         }
 
-        private void RemoveBookFromShelves(string bookId, IEnumerable<string> shelves)
+        private IReadOnlyList<ReviewResource> SearchShelf(string shelf, string query)
         {
-            foreach (var shelf in shelves)
+            List<ReviewResource> results = new ();
+
+            while (true)
             {
-                var req = RequestBuilder()
+                var page = 1;
-                    .Post()
+
-                    .SetSegment("route", "shelf/add_to_shelf.xml")
+                try
-                    .AddFormParameter("name", shelf)
+                {
-                    .AddFormParameter("book_id", bookId)
+                    var builder = RequestBuilder()
-                    .AddFormParameter("a", "remove");
+                        .SetSegment("route", $"review/list.xml")
+                        .AddQueryParam("v", 2)
+                        .AddQueryParam("id", Settings.UserId)
+                        .AddQueryParam("shelf", shelf)
+                        .AddQueryParam("per_page", 200)
+                        .AddQueryParam("page", page++)
+                        .AddQueryParam("search[query]", query);
+
+                    var httpResponse = OAuthExecute(builder);
 
-                // in case not found in shelf
+                    var resource = httpResponse.Deserialize<PaginatedList<ReviewResource>>("reviews");
-                req.SuppressHttpError = true;
 
-                OAuthExecute(req);
+                    results.AddRange(resource.List);
+
+                    if (resource.Pagination.End >= resource.Pagination.TotalItems)
+                    {
+                        break;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Error fetching bookshelves from Goodreads");
+                    return results;
+                }
             }
+
+            return results;
+        }
+
+        private void RemoveBookFromShelves(long bookId, string shelf)
+        {
+            var req = RequestBuilder()
+                .Post()
+                .SetSegment("route", "shelf/add_to_shelf.xml")
+                .AddFormParameter("name", shelf)
+                .AddFormParameter("book_id", bookId)
+                .AddFormParameter("a", "remove");
+
+            // in case not found in shelf
+            req.SuppressHttpError = true;
+
+            OAuthExecute(req);
         }
 
         private void AddToShelves(string bookId, IEnumerable<string> shelves)