diff --git a/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs b/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs index 8478ab071..f032f0b12 100644 --- a/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs +++ b/src/NzbDrone.Api/Wanted/MovieCutoffModule.cs @@ -26,11 +26,6 @@ namespace NzbDrone.Api.Wanted pagingSpec.FilterExpression = _movieService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue); - if (pagingResource.FilterKey == null) - { - pagingSpec.FilterExpression = m => m.Monitored == true; - } - var resource = ApplyToPage(_movieCutoffService.MoviesWhereCutoffUnmet, pagingSpec, v => MapToResource(v, true)); return resource; diff --git a/src/NzbDrone.Api/Wanted/MovieMissingModule.cs b/src/NzbDrone.Api/Wanted/MovieMissingModule.cs index 68b2c934a..c48b0c8d2 100644 --- a/src/NzbDrone.Api/Wanted/MovieMissingModule.cs +++ b/src/NzbDrone.Api/Wanted/MovieMissingModule.cs @@ -30,10 +30,6 @@ namespace NzbDrone.Api.Wanted var pagingSpec = pagingResource.MapToPagingSpec("title", SortDirection.Descending); pagingSpec.FilterExpression = _movieService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue); - if (pagingResource.FilterKey != "monitored") - { - pagingSpec.FilterExpression = m => m.Monitored == true; - } var resource = ApplyToPage(_movieService.MoviesWithoutFiles, pagingSpec, v => MapToResource(v, true)); diff --git a/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs index a2c7a2edf..34739e1f5 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs @@ -15,7 +15,7 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests var movie = EnsureMovie(680, "Pulp Fiction", true); EnsureMovieFile(movie, Quality.SDTV); - var result = WantedCutoffUnmet.GetPaged(0, 15, "physicalRelease", "desc"); + var result = WantedCutoffUnmet.GetPaged(0, 15, "physicalRelease", "desc", "monitored", "true"); result.Records.Should().NotBeEmpty(); } @@ -27,7 +27,19 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests var movie = EnsureMovie(680, "Pulp Fiction", false); EnsureMovieFile(movie, Quality.SDTV); - var result = WantedCutoffUnmet.GetPaged(0, 15, "physicalRelease", "desc"); + var result = WantedCutoffUnmet.GetPaged(0, 15, "physicalRelease", "desc", "monitored", "true"); + + result.Records.Should().BeEmpty(); + } + + [Test, Order(1)] + public void cutoff_should_not_have_released_items() + { + EnsureProfileCutoff(1, Quality.HDTV720p); + var movie = EnsureMovie(680, "Pulp Fiction", true); + EnsureMovieFile(movie, Quality.SDTV); + + var result = WantedCutoffUnmet.GetPaged(0, 15, "physicalRelease", "desc", "status", "inCinemas"); result.Records.Should().BeEmpty(); } @@ -55,5 +67,17 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests result.Records.Should().NotBeEmpty(); } + + [Test, Order(2)] + public void cutoff_should_have_released_items() + { + EnsureProfileCutoff(1, Quality.HDTV720p); + var movie = EnsureMovie(680, "Pulp Fiction", false); + EnsureMovieFile(movie, Quality.SDTV); + + var result = WantedCutoffUnmet.GetPaged(0, 15, "physicalRelease", "desc", "status", "released"); + + result.Records.Should().NotBeEmpty(); + } } } diff --git a/src/NzbDrone.Integration.Test/ApiTests/WantedTests/MissingFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/WantedTests/MissingFixture.cs index d13301ae6..3351a12c8 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/WantedTests/MissingFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/WantedTests/MissingFixture.cs @@ -23,7 +23,7 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests { EnsureMovie(680, "Pulp Fiction", true); - var result = WantedMissing.GetPaged(0, 15, "physicalRelease", "desc"); + var result = WantedMissing.GetPaged(0, 15, "physicalRelease", "desc", "monitored", "true"); result.Records.Should().NotBeEmpty(); } @@ -43,7 +43,17 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests { EnsureMovie(680, "Pulp Fiction", false); - var result = WantedMissing.GetPaged(0, 15, "physicalRelease", "desc"); + var result = WantedMissing.GetPaged(0, 15, "physicalRelease", "desc", "monitored", "true"); + + result.Records.Should().BeEmpty(); + } + + [Test, Order(1)] + public void missing_should_not_have_released_items() + { + EnsureMovie(680, "Pulp Fiction", false); + + var result = WantedMissing.GetPaged(0, 15, "physicalRelease", "desc", "status", "inCinemas"); result.Records.Should().BeEmpty(); } @@ -57,5 +67,15 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests result.Records.Should().NotBeEmpty(); } + + [Test, Order(2)] + public void missing_should_have_released_items() + { + EnsureMovie(680, "Pulp Fiction", false); + + var result = WantedMissing.GetPaged(0, 15, "physicalRelease", "desc", "status", "released"); + + result.Records.Should().NotBeEmpty(); + } } }