Browse Source

CmsKit - Convert Slug Normalizataion to static method from extension method

pull/7955/head
enisn 6 years ago
parent
commit
816b7eca88
  1. 1
      modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs
  2. 1
      modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs
  3. 2
      modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationAutoMapperProfile.cs
  4. 3
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs
  5. 3
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs
  6. 6
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs
  7. 6
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/SlugNormalizer.cs
  8. 1
      modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs
  9. 3
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
  10. 3
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
  11. 3
      modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
  12. 6
      modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs
  13. 27
      modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Blogs/SlugExtensions_Tests.cs

1
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

1
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

2
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;

3
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);
}
}
}

3
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)

6
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<BlogPost> CreateAsync(

6
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Extensions/SlugExtensions.cs → 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());
}

1
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;

3
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;

3
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;

3
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;

6
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

27
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);

Loading…
Cancel
Save