Browse Source

CmsKit - Change method name as GetOrDefault in IBlogFeaturePublicAppService

pull/7745/head
enisn 6 years ago
parent
commit
8ea55c10f0
  1. 2
      modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogFeaturePublicAppService.cs
  2. 2
      modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogFeaturePublicAppService.cs
  3. 4
      modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogFeaturePublicController.cs
  4. 6
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs
  5. 4
      modules/cms-kit/test/Volo.CmsKit.Application.Tests/Blogs/BlogFeaturePublicAppService_Test.cs

2
modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogFeaturePublicAppService.cs

@ -6,6 +6,6 @@ namespace Volo.CmsKit.Public.Blogs
{ {
public interface IBlogFeaturePublicAppService public interface IBlogFeaturePublicAppService
{ {
Task<BlogFeatureDto> GetAsync(Guid blogId, string featureName); Task<BlogFeatureDto> GetOrDefaultAsync(Guid blogId, string featureName);
} }
} }

2
modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogFeaturePublicAppService.cs

@ -22,7 +22,7 @@ namespace Volo.CmsKit.Public.Blogs
Cache = cache; Cache = cache;
} }
public async Task<BlogFeatureDto> GetAsync(Guid blogId, string featureName) public async Task<BlogFeatureDto> GetOrDefaultAsync(Guid blogId, string featureName)
{ {
return await Cache.GetOrAddAsync( return await Cache.GetOrAddAsync(
$"{blogId}_{featureName}", $"{blogId}_{featureName}",

4
modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogFeaturePublicController.cs

@ -19,9 +19,9 @@ namespace Volo.CmsKit.Public.HttpApi.Volo.CmsKit.Public.Blogs
[HttpGet] [HttpGet]
[Route("{blogId}/{featureName}")] [Route("{blogId}/{featureName}")]
public Task<BlogFeatureDto> GetAsync(Guid blogId, string featureName) public Task<BlogFeatureDto> GetOrDefaultAsync(Guid blogId, string featureName)
{ {
return BlogFeaturePublicAppService.GetAsync(blogId, featureName); return BlogFeaturePublicAppService.GetOrDefaultAsync(blogId, featureName);
} }
} }
} }

6
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml.cs

@ -46,17 +46,17 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Blogs
if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>()) if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>())
{ {
CommentsFeature = await BlogFeaturePublicAppService.GetAsync(BlogPost.BlogId, BlogPostConsts.CommentsFeatureName); CommentsFeature = await BlogFeaturePublicAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.CommentsFeatureName);
} }
if (GlobalFeatureManager.Instance.IsEnabled<ReactionsFeature>()) if (GlobalFeatureManager.Instance.IsEnabled<ReactionsFeature>())
{ {
ReactionsFeature = await BlogFeaturePublicAppService.GetAsync(BlogPost.BlogId, BlogPostConsts.ReactionsFeatureName); ReactionsFeature = await BlogFeaturePublicAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.ReactionsFeatureName);
} }
if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>()) if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>())
{ {
RatingsFeature = await BlogFeaturePublicAppService.GetAsync(BlogPost.BlogId, BlogPostConsts.RatingsFeatureName); RatingsFeature = await BlogFeaturePublicAppService.GetOrDefaultAsync(BlogPost.BlogId, BlogPostConsts.RatingsFeatureName);
} }
} }
} }

4
modules/cms-kit/test/Volo.CmsKit.Application.Tests/Blogs/BlogFeaturePublicAppService_Test.cs

@ -23,7 +23,7 @@ namespace Volo.CmsKit.Blogs
[Fact] [Fact]
public async Task GetAsync_ShouldWorkProperly_WithExistingFeatureName() public async Task GetAsync_ShouldWorkProperly_WithExistingFeatureName()
{ {
var result = await blogFeaturePublicAppService.GetAsync(testData.Blog_Id, testData.BlogFeature_1_FeatureName); var result = await blogFeaturePublicAppService.GetOrDefaultAsync(testData.Blog_Id, testData.BlogFeature_1_FeatureName);
result.ShouldNotBeNull(); result.ShouldNotBeNull();
result.FeatureName.ShouldBe(testData.BlogFeature_1_FeatureName); result.FeatureName.ShouldBe(testData.BlogFeature_1_FeatureName);
@ -33,7 +33,7 @@ namespace Volo.CmsKit.Blogs
public async Task GetAsync_ShouldReturnDefault_WithNonExistingFeatureName() public async Task GetAsync_ShouldReturnDefault_WithNonExistingFeatureName()
{ {
var nonExistingFeatureName = "AnyOtherFeature"; var nonExistingFeatureName = "AnyOtherFeature";
var result = await blogFeaturePublicAppService.GetAsync(testData.Blog_Id, nonExistingFeatureName); var result = await blogFeaturePublicAppService.GetOrDefaultAsync(testData.Blog_Id, nonExistingFeatureName);
var defaultFeature = new BlogFeature(Guid.Empty, nonExistingFeatureName); var defaultFeature = new BlogFeature(Guid.Empty, nonExistingFeatureName);
result.ShouldNotBeNull(); result.ShouldNotBeNull();

Loading…
Cancel
Save