From dd875a0c49881bc5353e3faa849ccf0808873774 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Wed, 31 Jan 2018 22:10:43 -0500
Subject: [PATCH] Fixed: CutoffUnmet Search Function not working

Closes #193
---
 .../IndexerSearch/AlbumSearchService.cs       | 42 ++++++++++++++++++-
 .../CutoffUnmetAlbumSearchCommand.cs          | 18 +++-----
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs b/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs
index 71e2a6ff3..af7988d47 100644
--- a/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -14,23 +15,26 @@ using NzbDrone.Core.Music;
 namespace NzbDrone.Core.IndexerSearch
 {
     class AlbumSearchService : IExecute<AlbumSearchCommand>,
-                               IExecute<MissingAlbumSearchCommand>
-                               //IExecute<CutoffUnmetAlbumSearchCommand>
+                               IExecute<MissingAlbumSearchCommand>,
+                               IExecute<CutoffUnmetAlbumSearchCommand>
     {
         private readonly ISearchForNzb _nzbSearchService;
         private readonly IAlbumService _albumService;
+        private readonly IAlbumCutoffService _albumCutoffService;
         private readonly IQueueService _queueService;
         private readonly IProcessDownloadDecisions _processDownloadDecisions;
         private readonly Logger _logger;
 
         public AlbumSearchService(ISearchForNzb nzbSearchService,
             IAlbumService albumService,
+            IAlbumCutoffService albumCutoffService,
             IQueueService queueService,
             IProcessDownloadDecisions processDownloadDecisions,
             Logger logger)
         {
             _nzbSearchService = nzbSearchService;
             _albumService = albumService;
+            _albumCutoffService = albumCutoffService;
             _queueService = queueService;
             _processDownloadDecisions = processDownloadDecisions;
             _logger = logger;
@@ -107,5 +111,39 @@ namespace NzbDrone.Core.IndexerSearch
 
             SearchForMissingAlbums(missing, message.Trigger == CommandTrigger.Manual);
         }
+
+        public void Execute(CutoffUnmetAlbumSearchCommand message)
+        {
+            Expression<Func<Album, bool>> filterExpression;
+
+            if (message.ArtistId.HasValue)
+            {
+                filterExpression = v =>
+                    v.ArtistId == message.ArtistId.Value &&
+                    v.Monitored == true &&
+                    v.Artist.Monitored == true;
+            }
+
+            else
+            {
+                filterExpression = v =>
+                    v.Monitored == true &&
+                    v.Artist.Monitored == true;
+            }
+
+            var albums = _albumCutoffService.AlbumsWhereCutoffUnmet(new PagingSpec<Album>
+            {
+                Page = 1,
+                PageSize = 100000,
+                SortDirection = SortDirection.Ascending,
+                SortKey = "Id",
+                FilterExpression = filterExpression
+            }).Records.ToList();
+
+            var queue = _queueService.GetQueue().Select(q => q.Album.Id);
+            var missing = albums.Where(e => !queue.Contains(e.Id)).ToList();
+
+            SearchForMissingAlbums(missing, message.Trigger == CommandTrigger.Manual);
+        }
     }
 }
diff --git a/src/NzbDrone.Core/IndexerSearch/CutoffUnmetAlbumSearchCommand.cs b/src/NzbDrone.Core/IndexerSearch/CutoffUnmetAlbumSearchCommand.cs
index 65173f037..cd8156357 100644
--- a/src/NzbDrone.Core/IndexerSearch/CutoffUnmetAlbumSearchCommand.cs
+++ b/src/NzbDrone.Core/IndexerSearch/CutoffUnmetAlbumSearchCommand.cs
@@ -1,26 +1,20 @@
-using NzbDrone.Core.Messaging.Commands;
+using NzbDrone.Core.Messaging.Commands;
 
 namespace NzbDrone.Core.IndexerSearch
 {
     public class CutoffUnmetAlbumSearchCommand : Command
     {
-        public int? SeriesId { get; set; }
+        public int? ArtistId { get; set; }
 
-        public override bool SendUpdatesToClient
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SendUpdatesToClient => true;
 
         public CutoffUnmetAlbumSearchCommand()
         {
         }
 
-        public CutoffUnmetAlbumSearchCommand(int seriesId)
+        public CutoffUnmetAlbumSearchCommand(int artistId)
         {
-            SeriesId = seriesId;
+            ArtistId = artistId;
         }
     }
-}
\ No newline at end of file
+}