Browse Source

code refactorings requested at code review session.

pull/6872/head
Ilkay Ilknur 6 years ago
parent
commit
1872fd28f9
  1. 0
      modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminRemoteServiceConsts.cs
  2. 5
      modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs
  3. 12
      modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
  4. 23
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagManager.cs

0
modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitPublicRemoteServiceConsts.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminRemoteServiceConsts.cs

5
modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs

@ -12,10 +12,5 @@ namespace Volo.CmsKit.Permissions
public const string Update = Default + ".Update";
public const string Delete = Default + ".Delete";
}
public static string[] GetAll()
{
return ReflectionHelper.GetPublicConstantsRecursively(typeof(CmsKitAdminPermissions));
}
}
}

12
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs

@ -12,6 +12,7 @@ using Volo.CmsKit.Tags;
namespace Volo.CmsKit.Admin.Tags
{
[Authorize(CmsKitAdminPermissions.Tags.Default)]
public class TagAdminAppService :
CrudAppService<
Tag,
@ -40,28 +41,29 @@ namespace Volo.CmsKit.Admin.Tags
[Authorize(CmsKitAdminPermissions.Tags.Create)]
public override async Task<TagDto> CreateAsync(TagCreateDto input)
{
var inserted = await TagManager.InsertAsync(
var tag = await TagManager.InsertAsync(
GuidGenerator.Create(),
input.EntityType,
input.Name,
CurrentTenant?.Id);
return MapToGetOutputDto(inserted);
return MapToGetOutputDto(tag);
}
[Authorize(CmsKitAdminPermissions.Tags.Update)]
public override async Task<TagDto> UpdateAsync(Guid id, TagUpdateDto input)
{
var updated = await TagManager.UpdateAsync(
var tag = await TagManager.UpdateAsync(
id,
input.Name);
return MapToGetOutputDto(updated);
return MapToGetOutputDto(tag);
}
protected override IQueryable<Tag> CreateFilteredQuery(TagGetListInput input)
{
return base.CreateFilteredQuery(input)
.WhereIf(
!string.IsNullOrEmpty(input.Filter),
!input.Filter.IsNullOrEmpty(),
x =>
x.Name.ToLower().Contains(input.Filter) ||
x.EntityType.ToLower().Contains(input.Filter));

23
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagManager.cs

@ -45,12 +45,12 @@ namespace Volo.CmsKit.Tags
}
return await _tagRepository.InsertAsync(
new Tag(
id,
entityType,
name,
tenantId),
cancellationToken: cancellationToken);
new Tag(
id,
entityType,
name,
tenantId),
cancellationToken: cancellationToken);
}
public async Task<Tag> UpdateAsync(
@ -59,15 +59,16 @@ namespace Volo.CmsKit.Tags
CancellationToken cancellationToken = default)
{
var entity = await _tagRepository.GetAsync(id, cancellationToken: cancellationToken);
if (name != entity.Name && await _tagRepository.AnyAsync(entity.EntityType, name, entity.TenantId, cancellationToken))
if (name != entity.Name &&
await _tagRepository.AnyAsync(entity.EntityType, name, entity.TenantId, cancellationToken))
{
throw new BusinessException(message: "Tag already exist!"); // Already Exist
}
entity.SetName(name);
return await _tagRepository.UpdateAsync(entity);
return await _tagRepository.UpdateAsync(entity, cancellationToken: cancellationToken);
}
}
}
}
Loading…
Cancel
Save