From 653aede0b7376420d02f45677c7f1591dbb4fd8e Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 25 Oct 2023 13:31:58 +0300 Subject: [PATCH] Rename instances of Profile to QualityProfile --- .../Profiles/QualityProfileServiceFixture.cs | 16 +++++++-------- .../Qualities/QualityProfileRepository.cs | 4 ++-- .../Qualities/QualityProfileService.cs | 20 +++++++++---------- ...or.cs => QualityProfileExistsValidator.cs} | 6 +++--- .../ApiTests/SeriesEditorFixture.cs | 2 +- .../WantedTests/CutoffUnmetFixture.cs | 8 ++++---- .../IntegrationTestBase.cs | 10 +++++----- .../ImportLists/ImportListController.cs | 4 ++-- src/Sonarr.Api.V3/Series/SeriesController.cs | 4 ++-- 9 files changed, 37 insertions(+), 37 deletions(-) rename src/NzbDrone.Core/Validation/{ProfileExistsValidator.cs => QualityProfileExistsValidator.cs} (76%) diff --git a/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs b/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs index 4c776af57..fae7da081 100644 --- a/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Profiles/QualityProfileServiceFixture.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.Profiles Subject.Handle(new ApplicationStartedEvent()); - Mocker.GetMock() + Mocker.GetMock() .Verify(v => v.Insert(It.IsAny()), Times.Exactly(6)); } @@ -42,13 +42,13 @@ namespace NzbDrone.Core.Test.Profiles // We don't want to keep adding them back if a user deleted them on purpose. public void Init_should_skip_if_any_profiles_already_exist() { - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.All()) .Returns(Builder.CreateListOfSize(2).Build().ToList()); Subject.Handle(new ApplicationStartedEvent()); - Mocker.GetMock() + Mocker.GetMock() .Verify(v => v.Insert(It.IsAny()), Times.Never()); } @@ -65,11 +65,11 @@ namespace NzbDrone.Core.Test.Profiles .Build().ToList(); Mocker.GetMock().Setup(c => c.GetAllSeries()).Returns(seriesList); - Mocker.GetMock().Setup(c => c.Get(profile.Id)).Returns(profile); + Mocker.GetMock().Setup(c => c.Get(profile.Id)).Returns(profile); Assert.Throws(() => Subject.Delete(profile.Id)); - Mocker.GetMock().Verify(c => c.Delete(It.IsAny()), Times.Never()); + Mocker.GetMock().Verify(c => c.Delete(It.IsAny()), Times.Never()); } [Test] @@ -84,7 +84,7 @@ namespace NzbDrone.Core.Test.Profiles Subject.Delete(1); - Mocker.GetMock().Verify(c => c.Delete(1), Times.Once()); + Mocker.GetMock().Verify(c => c.Delete(1), Times.Once()); } [Test] @@ -103,7 +103,7 @@ namespace NzbDrone.Core.Test.Profiles .Random(1) .Build().ToList(); - Mocker.GetMock().Setup(c => c.Get(profile.Id)).Returns(profile); + Mocker.GetMock().Setup(c => c.Get(profile.Id)).Returns(profile); Mocker.GetMock().Setup(c => c.GetAllSeries()).Returns(seriesList); Mocker.GetMock() @@ -112,7 +112,7 @@ namespace NzbDrone.Core.Test.Profiles Assert.Throws(() => Subject.Delete(1)); - Mocker.GetMock().Verify(c => c.Delete(It.IsAny()), Times.Never()); + Mocker.GetMock().Verify(c => c.Delete(It.IsAny()), Times.Never()); } } } diff --git a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs index 65b82eb75..c824d30e5 100644 --- a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs +++ b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileRepository.cs @@ -6,12 +6,12 @@ using NzbDrone.Core.Messaging.Events; namespace NzbDrone.Core.Profiles.Qualities { - public interface IProfileRepository : IBasicRepository + public interface IQualityProfileRepository : IBasicRepository { bool Exists(int id); } - public class QualityProfileRepository : BasicRepository, IProfileRepository + public class QualityProfileRepository : BasicRepository, IQualityProfileRepository { private readonly ICustomFormatService _customFormatService; diff --git a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs index ae7446511..67b7dc18f 100644 --- a/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs +++ b/src/NzbDrone.Core/Profiles/Qualities/QualityProfileService.cs @@ -28,19 +28,19 @@ namespace NzbDrone.Core.Profiles.Qualities IHandle, IHandle { - private readonly IProfileRepository _profileRepository; + private readonly IQualityProfileRepository _qualityProfileRepository; private readonly IImportListFactory _importListFactory; private readonly ICustomFormatService _formatService; private readonly ISeriesService _seriesService; private readonly Logger _logger; - public QualityProfileService(IProfileRepository profileRepository, + public QualityProfileService(IQualityProfileRepository qualityProfileRepository, IImportListFactory importListFactory, ICustomFormatService formatService, ISeriesService seriesService, Logger logger) { - _profileRepository = profileRepository; + _qualityProfileRepository = qualityProfileRepository; _importListFactory = importListFactory; _formatService = formatService; _seriesService = seriesService; @@ -49,38 +49,38 @@ namespace NzbDrone.Core.Profiles.Qualities public QualityProfile Add(QualityProfile profile) { - return _profileRepository.Insert(profile); + return _qualityProfileRepository.Insert(profile); } public void Update(QualityProfile profile) { - _profileRepository.Update(profile); + _qualityProfileRepository.Update(profile); } public void Delete(int id) { if (_seriesService.GetAllSeries().Any(c => c.QualityProfileId == id) || _importListFactory.All().Any(c => c.QualityProfileId == id)) { - var profile = _profileRepository.Get(id); + var profile = _qualityProfileRepository.Get(id); throw new QualityProfileInUseException(profile.Name); } - _profileRepository.Delete(id); + _qualityProfileRepository.Delete(id); } public List All() { - return _profileRepository.All().ToList(); + return _qualityProfileRepository.All().ToList(); } public QualityProfile Get(int id) { - return _profileRepository.Get(id); + return _qualityProfileRepository.Get(id); } public bool Exists(int id) { - return _profileRepository.Exists(id); + return _qualityProfileRepository.Exists(id); } public void Handle(ApplicationStartedEvent message) diff --git a/src/NzbDrone.Core/Validation/ProfileExistsValidator.cs b/src/NzbDrone.Core/Validation/QualityProfileExistsValidator.cs similarity index 76% rename from src/NzbDrone.Core/Validation/ProfileExistsValidator.cs rename to src/NzbDrone.Core/Validation/QualityProfileExistsValidator.cs index b8dceb294..81d458b0b 100644 --- a/src/NzbDrone.Core/Validation/ProfileExistsValidator.cs +++ b/src/NzbDrone.Core/Validation/QualityProfileExistsValidator.cs @@ -3,16 +3,16 @@ using NzbDrone.Core.Profiles.Qualities; namespace NzbDrone.Core.Validation { - public class ProfileExistsValidator : PropertyValidator + public class QualityProfileExistsValidator : PropertyValidator { private readonly IQualityProfileService _qualityProfileService; - public ProfileExistsValidator(IQualityProfileService qualityProfileService) + public QualityProfileExistsValidator(IQualityProfileService qualityProfileService) { _qualityProfileService = qualityProfileService; } - protected override string GetDefaultMessageTemplate() => "QualityProfile does not exist"; + protected override string GetDefaultMessageTemplate() => "Quality Profile does not exist"; protected override bool IsValid(PropertyValidatorContext context) { diff --git a/src/NzbDrone.Integration.Test/ApiTests/SeriesEditorFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/SeriesEditorFixture.cs index 7293ce97e..0faaa429a 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/SeriesEditorFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/SeriesEditorFixture.cs @@ -11,7 +11,7 @@ namespace NzbDrone.Integration.Test.ApiTests { private void GivenExistingSeries() { - WaitForCompletion(() => Profiles.All().Count > 0); + WaitForCompletion(() => QualityProfiles.All().Count > 0); foreach (var title in new[] { "90210", "Dexter" }) { diff --git a/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs index 1b4a2b61d..97dff6948 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/WantedTests/CutoffUnmetFixture.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests [Order(1)] public void cutoff_should_have_monitored_items() { - EnsureProfileCutoff(1, Quality.HDTV720p, true); + EnsureQualityProfileCutoff(1, Quality.HDTV720p, true); var series = EnsureSeries(266189, "The Blacklist", true); EnsureEpisodeFile(series, 1, 1, Quality.SDTV); @@ -25,7 +25,7 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests [Order(1)] public void cutoff_should_not_have_unmonitored_items() { - EnsureProfileCutoff(1, Quality.HDTV720p, true); + EnsureQualityProfileCutoff(1, Quality.HDTV720p, true); var series = EnsureSeries(266189, "The Blacklist", false); EnsureEpisodeFile(series, 1, 1, Quality.SDTV); @@ -38,7 +38,7 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests [Order(1)] public void cutoff_should_have_series() { - EnsureProfileCutoff(1, Quality.HDTV720p, true); + EnsureQualityProfileCutoff(1, Quality.HDTV720p, true); var series = EnsureSeries(266189, "The Blacklist", true); EnsureEpisodeFile(series, 1, 1, Quality.SDTV); @@ -52,7 +52,7 @@ namespace NzbDrone.Integration.Test.ApiTests.WantedTests [Order(2)] public void cutoff_should_have_unmonitored_items() { - EnsureProfileCutoff(1, Quality.HDTV720p, true); + EnsureQualityProfileCutoff(1, Quality.HDTV720p, true); var series = EnsureSeries(266189, "The Blacklist", false); EnsureEpisodeFile(series, 1, 1, Quality.SDTV); diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index a1c086790..3e8a8a2b0 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -49,7 +49,7 @@ namespace NzbDrone.Integration.Test public LogsClient Logs; public ClientBase NamingConfig; public NotificationClient Notifications; - public ClientBase Profiles; + public ClientBase QualityProfiles; public ReleaseClient Releases; public ReleasePushClient ReleasePush; public ClientBase RootFolders; @@ -113,7 +113,7 @@ namespace NzbDrone.Integration.Test Logs = new LogsClient(RestClient, ApiKey); NamingConfig = new ClientBase(RestClient, ApiKey, "config/naming"); Notifications = new NotificationClient(RestClient, ApiKey); - Profiles = new ClientBase(RestClient, ApiKey); + QualityProfiles = new ClientBase(RestClient, ApiKey); Releases = new ReleaseClient(RestClient, ApiKey); ReleasePush = new ReleasePushClient(RestClient, ApiKey); RootFolders = new ClientBase(RestClient, ApiKey); @@ -317,10 +317,10 @@ namespace NzbDrone.Integration.Test return result.EpisodeFile; } - public QualityProfileResource EnsureProfileCutoff(int profileId, Quality cutoff, bool upgradeAllowed) + public QualityProfileResource EnsureQualityProfileCutoff(int profileId, Quality cutoff, bool upgradeAllowed) { var needsUpdate = false; - var profile = Profiles.Get(profileId); + var profile = QualityProfiles.Get(profileId); if (profile.Cutoff != cutoff.Id) { @@ -336,7 +336,7 @@ namespace NzbDrone.Integration.Test if (needsUpdate) { - profile = Profiles.Put(profile); + profile = QualityProfiles.Put(profile); } return profile; diff --git a/src/Sonarr.Api.V3/ImportLists/ImportListController.cs b/src/Sonarr.Api.V3/ImportLists/ImportListController.cs index 8ea3887dd..542158d6a 100644 --- a/src/Sonarr.Api.V3/ImportLists/ImportListController.cs +++ b/src/Sonarr.Api.V3/ImportLists/ImportListController.cs @@ -11,13 +11,13 @@ namespace Sonarr.Api.V3.ImportLists public static readonly ImportListResourceMapper ResourceMapper = new (); public static readonly ImportListBulkResourceMapper BulkResourceMapper = new (); - public ImportListController(IImportListFactory importListFactory, ProfileExistsValidator profileExistsValidator) + public ImportListController(IImportListFactory importListFactory, QualityProfileExistsValidator qualityProfileExistsValidator) : base(importListFactory, "importlist", ResourceMapper, BulkResourceMapper) { Http.Validation.RuleBuilderExtensions.ValidId(SharedValidator.RuleFor(s => s.QualityProfileId)); SharedValidator.RuleFor(c => c.RootFolderPath).IsValidPath(); - SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(profileExistsValidator); + SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(qualityProfileExistsValidator); } } } diff --git a/src/Sonarr.Api.V3/Series/SeriesController.cs b/src/Sonarr.Api.V3/Series/SeriesController.cs index 2622aa7ba..1a920a6e0 100644 --- a/src/Sonarr.Api.V3/Series/SeriesController.cs +++ b/src/Sonarr.Api.V3/Series/SeriesController.cs @@ -58,7 +58,7 @@ namespace Sonarr.Api.V3.Series SeriesExistsValidator seriesExistsValidator, SeriesAncestorValidator seriesAncestorValidator, SystemFolderValidator systemFolderValidator, - ProfileExistsValidator profileExistsValidator, + QualityProfileExistsValidator qualityProfileExistsValidator, SeriesFolderAsRootFolderValidator seriesFolderAsRootFolderValidator) : base(signalRBroadcaster) { @@ -83,7 +83,7 @@ namespace Sonarr.Api.V3.Series .SetValidator(systemFolderValidator) .When(s => !s.Path.IsNullOrWhiteSpace()); - SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(profileExistsValidator); + SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(qualityProfileExistsValidator); PostValidator.RuleFor(s => s.Path).IsValidPath().When(s => s.RootFolderPath.IsNullOrWhiteSpace()); PostValidator.RuleFor(s => s.RootFolderPath)