diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs index 174278d829..24d5c1d894 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs @@ -1,7 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; using Volo.Abp.Validation; -using Volo.CmsKit.Contents; using Volo.CmsKit.Pages; namespace Volo.CmsKit.Admin.Pages diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs index eff3cb2919..58dbd71516 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs @@ -1,7 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; using Volo.Abp.Validation; -using Volo.CmsKit.Contents; using Volo.CmsKit.Pages; namespace Volo.CmsKit.Admin.Pages diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationAutoMapperProfile.cs index 976a3d0e4e..aff12d05c1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationAutoMapperProfile.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationAutoMapperProfile.cs @@ -1,7 +1,5 @@ using AutoMapper; using Volo.CmsKit.Blogs; -using Volo.CmsKit.Contents; -using Volo.CmsKit.Pages; using Volo.CmsKit.Tags; using Volo.CmsKit.Users; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs index 7a63e7dbf7..9d800abbdb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs @@ -3,7 +3,6 @@ using System; using Volo.Abp; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -using Volo.CmsKit.Blogs.Extensions; namespace Volo.CmsKit.Blogs { @@ -38,7 +37,7 @@ namespace Volo.CmsKit.Blogs { Check.NotNullOrWhiteSpace(slug, nameof(slug), BlogConsts.MaxNameLength); - Slug = slug.NormalizeSlug(); + Slug = SlugNormalizer.Normalize(slug); } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs index 251a9c2895..4f45894af8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs @@ -3,7 +3,6 @@ using System; using Volo.Abp; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -using Volo.CmsKit.Blogs.Extensions; using Volo.CmsKit.Users; namespace Volo.CmsKit.Blogs @@ -61,7 +60,7 @@ namespace Volo.CmsKit.Blogs { Check.NotNullOrWhiteSpace(slug, nameof(slug), BlogPostConsts.MaxSlugLength, BlogPostConsts.MinSlugLength); - Slug = slug.NormalizeSlug(); + Slug = SlugNormalizer.Normalize(slug); } public virtual void SetShortDescription(string shortDescription) 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 05241bab48..c49c0537b3 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 @@ -12,13 +12,17 @@ namespace Volo.CmsKit.Blogs { protected IBlogPostRepository BlogPostRepository { get; } protected IBlogRepository BlogRepository { get; } + protected IDefaultBlogFeatureProvider BlogFeatureProvider { get; } + public BlogPostManager( IBlogPostRepository blogPostRepository, - IBlogRepository blogRepository) + IBlogRepository blogRepository, + IDefaultBlogFeatureProvider blogFeatureProvider) { BlogPostRepository = blogPostRepository; BlogRepository = blogRepository; + BlogFeatureProvider = blogFeatureProvider; } public virtual async Task CreateAsync( diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Extensions/SlugExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs similarity index 51% rename from modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Extensions/SlugExtensions.cs rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs index 4934dc56de..30b23e4ba4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Extensions/SlugExtensions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs @@ -1,12 +1,12 @@ using Slugify; using Unidecode.NET; -namespace Volo.CmsKit.Blogs.Extensions +namespace Volo.CmsKit { - public static class SlugExtensions + public static class SlugNormalizer { static readonly SlugHelper SlugHelper = new (); - public static string NormalizeSlug(this string value) //TODO: Should not be an extension method. + public static string Normalize(string value) { return SlugHelper.GenerateSlug(value?.Unidecode()); } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs index 0bbb9ea58b..dd8e11f1f0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs @@ -4,7 +4,6 @@ using Volo.Abp.Modularity; using Volo.Abp.Users.EntityFrameworkCore; using Volo.CmsKit.Blogs; using Volo.CmsKit.Comments; -using Volo.CmsKit.Contents; using Volo.CmsKit.MediaDescriptors; using Volo.CmsKit.Pages; using Volo.CmsKit.Ratings; diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs index 4d8f86b823..7034b37f98 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs @@ -1,9 +1,8 @@ using MongoDB.Driver; using Volo.Abp.Data; using Volo.Abp.MongoDB; -using Volo.CmsKit.Comments; -using Volo.CmsKit.Contents; using Volo.CmsKit.Blogs; +using Volo.CmsKit.Comments; using Volo.CmsKit.MediaDescriptors; using Volo.CmsKit.Pages; using Volo.CmsKit.Ratings; diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs index 8585f988f9..e96ed841a8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs @@ -1,9 +1,8 @@ using System; using Volo.Abp; using Volo.Abp.MongoDB; -using Volo.CmsKit.Comments; -using Volo.CmsKit.Contents; using Volo.CmsKit.Blogs; +using Volo.CmsKit.Comments; using Volo.CmsKit.MediaDescriptors; using Volo.CmsKit.Pages; using Volo.CmsKit.Ratings; diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs index 5110bca501..1dbbfc0f98 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs @@ -1,9 +1,8 @@ using MongoDB.Driver; using Volo.Abp.Data; using Volo.Abp.MongoDB; -using Volo.CmsKit.Comments; -using Volo.CmsKit.Contents; using Volo.CmsKit.Blogs; +using Volo.CmsKit.Comments; using Volo.CmsKit.MediaDescriptors; using Volo.CmsKit.Pages; using Volo.CmsKit.Ratings; diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs index 766c482ddd..60ee25f28d 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs @@ -1,10 +1,8 @@ -using System; +using Shouldly; +using System; using System.Linq; using System.Threading.Tasks; -using Shouldly; -using Volo.Abp.Uow; using Volo.CmsKit.Admin.Pages; -using Volo.CmsKit.Contents; using Xunit; namespace Volo.CmsKit.Pages diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs index 3eb7ee52f7..268cfbab71 100644 --- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs +++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Shouldly; using Xunit; -using Volo.CmsKit.Blogs.Extensions; -using Shouldly; -using Unidecode.NET; namespace Volo.CmsKit.Blogs { @@ -20,7 +13,7 @@ namespace Volo.CmsKit.Blogs var expected = "my-awesome-name"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -33,7 +26,7 @@ namespace Volo.CmsKit.Blogs var expected = "my-perfect-title-v.2"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -47,7 +40,7 @@ namespace Volo.CmsKit.Blogs var expected = "are-you-gonna-die"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -61,7 +54,7 @@ namespace Volo.CmsKit.Blogs var expected = "we-machines-challenge"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -75,7 +68,7 @@ namespace Volo.CmsKit.Blogs var expected = "go-and-code-part-2"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -89,7 +82,7 @@ namespace Volo.CmsKit.Blogs var expected = "moe-klassnoe-nazvanie"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -103,7 +96,7 @@ namespace Volo.CmsKit.Blogs var expected = "ozel-turkce-karakterler-gusioc"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -117,7 +110,7 @@ namespace Volo.CmsKit.Blogs var expected = "wo-de-zhen-bang-tou-xian"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected); @@ -131,7 +124,7 @@ namespace Volo.CmsKit.Blogs var expected = "lets-rock"; // Act - var actual = name.NormalizeSlug(); + var actual = SlugNormalizer.Normalize(name); // Assert actual.ShouldBe(expected);