imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7024 from abpframework/tag-refactoring

Browse Source 
CMS Kit - Tag Refactoring
pull/6926/head^2
Ahmet Çotur 5 years ago committed by GitHub
parent a75b26cc30 0f78630889
commit 6c474a2609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 64 additions and 103 deletions
Show Stats Download Patch File Download Diff File

8
modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagAdminController.cs
Unescape View File

@ -2,13 +2,21 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.GlobalFeatures;
using Volo.CmsKit.Admin.Tags; using Volo.CmsKit.Admin.Tags;
using Volo.CmsKit.GlobalFeatures;
using Volo.CmsKit.Permissions; using Volo.CmsKit.Permissions;
using Volo.CmsKit.Tags; using Volo.CmsKit.Tags;
namespace Volo.CmsKit.Admin.Tags namespace Volo.CmsKit.Admin.Tags
{ {
[RequiresGlobalFeature(typeof(TagsFeature))]
[RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
[Area("cms-kit")]
[Authorize(CmsKitAdminPermissions.Tags.Default)]
[Route("api/cms-kit-admin/tags")]
public class TagAdminController : CmsKitAdminController, ITagAdminAppService public class TagAdminController : CmsKitAdminController, ITagAdminAppService
{ {
protected ITagAdminAppService TagAdminAppService { get; } protected ITagAdminAppService TagAdminAppService { get; }

20
modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
Unescape View File

@ -41,8 +41,8 @@ namespace Volo.CmsKit.EntityFrameworkCore
b.ConfigureByConvention(); b.ConfigureByConvention();
b.ConfigureAbpUser(); b.ConfigureAbpUser();
b.HasIndex(x => new {x.TenantId, x.UserName}); b.HasIndex(x => new { x.TenantId, x.UserName });
b.HasIndex(x => new {x.TenantId, x.Email}); b.HasIndex(x => new { x.TenantId, x.Email });
}); });
} }
@ -93,7 +93,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
r.Property(x => x.EntityType).IsRequired().HasMaxLength(RatingConsts.MaxEntityTypeLength); r.Property(x => x.EntityType).IsRequired().HasMaxLength(RatingConsts.MaxEntityTypeLength);
r.Property(x => x.EntityId).IsRequired().HasMaxLength(RatingConsts.MaxEntityIdLength); r.Property(x => x.EntityId).IsRequired().HasMaxLength(RatingConsts.MaxEntityIdLength);
r.HasIndex(x => new {x.TenantId, x.EntityType, x.EntityId, x.CreatorId}); r.HasIndex(x => new { x.TenantId, x.EntityType, x.EntityId, x.CreatorId });
}); });
} }
@ -109,7 +109,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
b.Property(x => x.EntityId).IsRequired().HasMaxLength(ContentConsts.MaxEntityIdLength); b.Property(x => x.EntityId).IsRequired().HasMaxLength(ContentConsts.MaxEntityIdLength);
b.Property(x => x.Value).IsRequired().HasMaxLength(ContentConsts.MaxValueLength); b.Property(x => x.Value).IsRequired().HasMaxLength(ContentConsts.MaxValueLength);
b.HasIndex(x => new {x.TenantId, x.EntityType, x.EntityId}); b.HasIndex(x => new { x.TenantId, x.EntityType, x.EntityId });
}); });
} }
@ -124,7 +124,11 @@ namespace Volo.CmsKit.EntityFrameworkCore
b.Property(x => x.EntityType).IsRequired().HasMaxLength(TagConsts.MaxEntityTypeLength); b.Property(x => x.EntityType).IsRequired().HasMaxLength(TagConsts.MaxEntityTypeLength);
b.Property(x => x.Name).IsRequired().HasMaxLength(TagConsts.MaxNameLength); b.Property(x => x.Name).IsRequired().HasMaxLength(TagConsts.MaxNameLength);
b.HasIndex(x => new {x.TenantId, x.Name}); b.HasIndex(x => new
{
x.TenantId,
x.Name
});
}); });
builder.Entity<EntityTag>(b => builder.Entity<EntityTag>(b =>
@ -133,12 +137,12 @@ namespace Volo.CmsKit.EntityFrameworkCore
b.ConfigureByConvention(); b.ConfigureByConvention();
b.HasKey(x => new {x.EntityId, x.TagId}); b.HasKey(x => new { x.EntityId, x.TagId });
b.Property(x => x.EntityId).IsRequired(); b.Property(x => x.EntityId).IsRequired();
b.Property(x => x.TagId).IsRequired(); b.Property(x => x.TagId).IsRequired();
b.HasIndex(x => new {x.TenantId, x.EntityId, x.TagId}); b.HasIndex(x => new { x.TenantId, x.EntityId, x.TagId });
}); });
} }
@ -154,7 +158,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
b.Property(x => x.Url).IsRequired().HasMaxLength(PageConsts.MaxUrlLength); b.Property(x => x.Url).IsRequired().HasMaxLength(PageConsts.MaxUrlLength);
b.Property(x => x.Description).HasMaxLength(PageConsts.MaxDescriptionLength); b.Property(x => x.Description).HasMaxLength(PageConsts.MaxDescriptionLength);
b.HasIndex(x => new {x.TenantId, x.Url}); b.HasIndex(x => new { x.TenantId, x.Url });
}); });
} }
} }

13
modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Tags/GetRelatedTagsInput.cs
Unescape View File

@ -1,13 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace Volo.CmsKit.Public.Tags
{
public class GetRelatedTagsInput
{
[Required]
public string EntityType { get; set; }
[Required]
public string EntityId { get; set; }
}
}

4
modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Tags/ITagAppService.cs
Unescape View File

@ -7,6 +7,6 @@ namespace Volo.CmsKit.Public.Tags
{ {
public interface ITagAppService : IApplicationService public interface ITagAppService : IApplicationService
{ {
Task<List<TagDto>> GetAllRelatedTagsAsync(GetRelatedTagsInput input); Task<List<TagDto>> GetAllRelatedTagsAsync(string entityType, string entityId);
} }
} }

19
modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Tags/TagAppService.cs
Unescape View File

@ -9,28 +9,21 @@ namespace Volo.CmsKit.Public.Tags
{ {
public class TagAppService : CmsKitAppServiceBase, ITagAppService public class TagAppService : CmsKitAppServiceBase, ITagAppService
{ {
protected readonly ITagManager TagManager;
protected readonly ITagRepository TagRepository; protected readonly ITagRepository TagRepository;
protected readonly IEntityTagRepository EntityTagRepository;
public TagAppService( public TagAppService(ITagRepository tagRepository)
ITagManager tagManager,
ITagRepository tagRepository,
IEntityTagRepository entityTagRepository)
{ {
TagManager = tagManager;
TagRepository = tagRepository; TagRepository = tagRepository;
EntityTagRepository = entityTagRepository;
} }
public virtual async Task<List<TagDto>> GetAllRelatedTagsAsync(GetRelatedTagsInput input) public virtual async Task<List<TagDto>> GetAllRelatedTagsAsync(string entityType, string entityId)
{ {
var entities = await TagRepository.GetAllRelatedTagsAsync( var entities = await TagRepository.GetAllRelatedTagsAsync(
input.EntityType, entityType,
input.EntityId, entityId,
CurrentTenant.Id); CurrentTenant.Id);
return ObjectMapper.Map<List<Tag>, List<TagDto>>(entities); return ObjectMapper.Map<List<Tag>, List<TagDto>>(entities);
} }
} }
} }

27
modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Tags/TagController.cs
Unescape View File

@ -1,27 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.CmsKit.Tags;
namespace Volo.CmsKit.Public.Tags
{
[RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
[Area("cms-kit")]
[Route("api/cms-kit/tags")]
public class TagController : CmsKitPublicControllerBase, ITagAppService
{
protected readonly ITagAppService TagAppService;
public TagController(ITagAppService tagAppService)
{
TagAppService = tagAppService;
}
[HttpGet]
public Task<List<TagDto>> GetAllRelatedTagsAsync(GetRelatedTagsInput input)
{
return TagAppService.GetAllRelatedTagsAsync(input);
}
}
}

31
modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Tags/TagPublicController.cs
Unescape View File

@ -0,0 +1,31 @@
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.GlobalFeatures;
using Volo.CmsKit.GlobalFeatures;
using Volo.CmsKit.Tags;
namespace Volo.CmsKit.Public.Tags
{
[RequiresGlobalFeature(typeof(TagsFeature))]
[RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
[Area("cms-kit")]
[Route("api/cms-kit-public/tags")]
public class TagPublicController : CmsKitPublicControllerBase, ITagAppService
{
protected readonly ITagAppService TagAppService;
public TagPublicController(ITagAppService tagAppService)
{
TagAppService = tagAppService;
}
[HttpGet]
[Route("{entityType}/{entityId}")]
public Task<List<TagDto>> GetAllRelatedTagsAsync(string entityType, string entityId)
{
return TagAppService.GetAllRelatedTagsAsync(entityType, entityId);
}
}
}

6
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs
Unescape View File

@ -24,11 +24,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
string entityType, string entityType,
string entityId) string entityId)
{ {
var tagDtos = await TagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput var tagDtos = await TagAppService.GetAllRelatedTagsAsync(entityType, entityId);
{
EntityId = entityId,
EntityType = entityType
});
var viewModel = new TagViewModel var viewModel = new TagViewModel
{ {

39
modules/cms-kit/test/Volo.CmsKit.Application.Tests/Tags/TagPublicAppService_Tests.cs
Unescape View File

@ -2,9 +2,7 @@
using NSubstitute; using NSubstitute;
using Shouldly; using Shouldly;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Clients;
using Volo.Abp.Users; using Volo.Abp.Users;
using Volo.Abp.Validation;
using Volo.CmsKit.Public.Tags; using Volo.CmsKit.Public.Tags;
using Xunit; using Xunit;
@ -31,11 +29,8 @@ namespace Volo.CmsKit.Tags
[Fact] [Fact]
public async Task GetAllRelatedTagsAsync() public async Task GetAllRelatedTagsAsync()
{ {
var list = await _tagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput var list = await _tagAppService.GetAllRelatedTagsAsync(_cmsKitTestData.Content_1_EntityType,
{ _cmsKitTestData.EntityId1);
EntityType = _cmsKitTestData.Content_1_EntityType,
EntityId = _cmsKitTestData.EntityId1
});
list.ShouldNotBeEmpty(); list.ShouldNotBeEmpty();
list.Count.ShouldBe(2); list.Count.ShouldBe(2);
@ -44,35 +39,9 @@ namespace Volo.CmsKit.Tags
[Fact] [Fact]
public async Task ShouldntGet_GetAllRelatedTagsAsync() public async Task ShouldntGet_GetAllRelatedTagsAsync()
{ {
var list = await _tagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput var list = await _tagAppService.GetAllRelatedTagsAsync("any_other_type", "1");
{
EntityType = "any_other_type",
EntityId = "1"
});
list.ShouldBeEmpty(); list.ShouldBeEmpty();
} }
[Fact]
public async Task GetRelatedTagsAsync_ShouldThrowValidationException_WithoutEntityType()
{
await Assert.ThrowsAsync<AbpValidationException>(async () =>
await _tagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput
{
EntityType = null,
EntityId = _cmsKitTestData.EntityId1
}));
}
[Fact]
public async Task GetRelatedTagsAsync_ShouldThrowValidationException_WithoutEntityId()
{
await Assert.ThrowsAsync<AbpValidationException>(async () =>
await _tagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput
{
EntityType = null,
EntityId = _cmsKitTestData.EntityId1
}));
}
} }
} }
Write Preview
Loading…
Cancel
Save