From 349ce8b7fdf3dff369f02f3f5a53d3dec18c87c8 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 24 Feb 2021 13:47:52 +0300 Subject: [PATCH] CmsKit - Remove interfaces of BlogPostManager & BlogFeatureManager --- .../Admin/Blogs/BlogFeatureAdminAppService.cs | 4 ++-- .../Admin/Blogs/BlogPostAdminAppService.cs | 4 ++-- .../Volo/CmsKit/Blogs/BlogFeatureManager.cs | 2 +- .../Volo/CmsKit/Blogs/BlogPostManager.cs | 6 ++--- .../Volo/CmsKit/Blogs/IBlogFeatureManager.cs | 17 -------------- .../Volo/CmsKit/Blogs/IBlogPostManager.cs | 22 ------------------- .../Blogs/BlogPostManager_Tests.cs | 4 ++-- .../CmsKitDataSeedContributor.cs | 4 ++-- 8 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogFeatureManager.cs delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogPostManager.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogFeatureAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogFeatureAdminAppService.cs index c712ea5048..a8e84e8867 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogFeatureAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogFeatureAdminAppService.cs @@ -18,13 +18,13 @@ namespace Volo.CmsKit.Admin.Blogs { protected IBlogFeatureRepository BlogFeatureRepository { get; } - protected IBlogFeatureManager BlogFeatureManager { get; } + protected BlogFeatureManager BlogFeatureManager { get; } protected IDistributedEventBus EventBus { get; } public BlogFeatureAdminAppService( IBlogFeatureRepository blogFeatureRepository, - IBlogFeatureManager blogFeatureManager, + BlogFeatureManager blogFeatureManager, IDistributedEventBus eventBus) { BlogFeatureRepository = blogFeatureRepository; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs index fbe4e38e40..306c80f328 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs @@ -21,7 +21,7 @@ namespace Volo.CmsKit.Admin.Blogs public class BlogPostAdminAppService: CmsKitAppServiceBase, IBlogPostAdminAppService { protected IRepository Repository { get; } - protected IBlogPostManager BlogPostManager { get; } + protected BlogPostManager BlogPostManager { get; } protected IBlogPostRepository BlogPostRepository { get; } protected IBlogRepository BlogRepository { get; } protected IBlobContainer BlobContainer { get; } @@ -29,7 +29,7 @@ namespace Volo.CmsKit.Admin.Blogs public BlogPostAdminAppService( IRepository repository, - IBlogPostManager blogPostManager, + BlogPostManager blogPostManager, IBlogPostRepository blogPostRepository, IBlogRepository blogRepository, IBlobContainer blobContainer, diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogFeatureManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogFeatureManager.cs index c5f9d825de..44ecdda45d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogFeatureManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogFeatureManager.cs @@ -8,7 +8,7 @@ using Volo.Abp.Uow; namespace Volo.CmsKit.Blogs { - public class BlogFeatureManager : DomainService, IBlogFeatureManager + public class BlogFeatureManager : DomainService { protected IBlogFeatureRepository BlogFeatureRepository { get; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs index 4936b08c73..4312e75b9c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs @@ -8,7 +8,7 @@ using Volo.CmsKit.Users; namespace Volo.CmsKit.Blogs { - public class BlogPostManager : DomainService, IBlogPostManager + public class BlogPostManager : DomainService { protected IBlogPostRepository BlogPostRepository { get; } protected IBlogRepository BlogRepository { get; } @@ -64,7 +64,7 @@ namespace Volo.CmsKit.Blogs blogPost.SetSlug(newSlug); } - private async Task CheckSlugExistenceAsync(Guid blogId, string slug) + protected virtual async Task CheckSlugExistenceAsync(Guid blogId, string slug) { if (await BlogPostRepository.SlugExistsAsync(blogId, slug)) { @@ -72,7 +72,7 @@ namespace Volo.CmsKit.Blogs } } - private async Task CheckBlogExistenceAsync(Guid blogId) + protected virtual async Task CheckBlogExistenceAsync(Guid blogId) { if (!await BlogRepository.ExistsAsync(blogId)) throw new EntityNotFoundException(typeof(Blog), blogId); diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogFeatureManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogFeatureManager.cs deleted file mode 100644 index 74ffefafd4..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogFeatureManager.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.Domain.Services; -using Volo.CmsKit.Blogs; - -namespace Volo.CmsKit.Blogs -{ - public interface IBlogFeatureManager : IDomainService - { - Task> GetListAsync(Guid blogId); - - Task SetAsync(Guid blogId, string featureName, bool isEnabled); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogPostManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogPostManager.cs deleted file mode 100644 index 227999aa7a..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogPostManager.cs +++ /dev/null @@ -1,22 +0,0 @@ -using JetBrains.Annotations; -using System; -using System.Threading.Tasks; -using Volo.CmsKit.Users; - -namespace Volo.CmsKit.Blogs -{ - public interface IBlogPostManager - { - Task CreateAsync( - [NotNull] CmsUser author, - [NotNull] Blog blog, - [NotNull] string title, - [NotNull] string slug, - [CanBeNull] string shortDescription = null, - [CanBeNull] Guid? tenantId = null); - - Task UpdateAsync(BlogPost blogPost); - - Task SetSlugUrlAsync(BlogPost blogPost, [NotNull] string newSlug); - } -} diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/BlogPostManager_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/BlogPostManager_Tests.cs index 7d2f859b0c..200b0128d4 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/BlogPostManager_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/BlogPostManager_Tests.cs @@ -14,7 +14,7 @@ namespace Volo.CmsKit.Blogs { public class BlogPostManager_Tests : CmsKitDomainTestBase { - private readonly IBlogPostManager blogPostManager; + private readonly BlogPostManager blogPostManager; private readonly IGuidGenerator guidGenerator; private readonly IBlogPostRepository blogPostRepository; private readonly IBlogRepository blogRepository; @@ -23,7 +23,7 @@ namespace Volo.CmsKit.Blogs public BlogPostManager_Tests() { - blogPostManager = GetRequiredService(); + blogPostManager = GetRequiredService(); guidGenerator = GetRequiredService(); blogPostRepository = GetRequiredService(); blogRepository = GetRequiredService(); diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs index 4215c7cf6a..a6f4b10aa8 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs @@ -41,7 +41,7 @@ namespace Volo.CmsKit private readonly IBlogRepository _blogRepository; private readonly IBlogFeatureRepository _blogFeatureRepository; private readonly IBlogPostRepository _blogPostRepository; - private readonly IBlogPostManager _blogPostManager; + private readonly BlogPostManager _blogPostManager; private readonly IOptions _options; private readonly IOptions _tagOptions; private readonly IMediaDescriptorRepository _mediaDescriptorRepository; @@ -61,7 +61,7 @@ namespace Volo.CmsKit IPageRepository pageRepository, IBlogRepository blogRepository, IBlogPostRepository blogPostRepository, - IBlogPostManager blogPostmanager, + BlogPostManager blogPostmanager, IBlogFeatureRepository blogFeatureRepository, IEntityTagManager entityTagManager, IOptions options,