Browse Source

refactoring

pull/6996/head
Ahmet 6 years ago
parent
commit
ede633eb4b
  1. 2
      modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs
  2. 7
      modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs
  3. 7
      modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs
  4. 5
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs
  5. 3
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
  6. 3
      modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
  7. 24
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageUrlAlreadyExistException.cs
  8. 22
      modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs

2
modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/IPageAdminAppService.cs

@ -7,8 +7,6 @@ namespace Volo.CmsKit.Admin.Pages
{
public interface IPageAdminAppService : ICrudAppService<PageDto, PageDto, Guid, GetPagesInputDto, CreatePageInputDto, UpdatePageInputDto>
{
Task<bool> ExistsAsync(string url);
Task SetImageAsync(Guid id, RemoteStreamContent content);
Task<RemoteStreamContent> GetImageAsync(Guid id);

7
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs

@ -104,11 +104,6 @@ namespace Volo.CmsKit.Admin.Pages
return ObjectMapper.Map<Page, PageDto>(page);
}
public virtual Task<bool> ExistsAsync(string url)
{
return PageRepository.ExistsAsync(url);
}
[Authorize(CmsKitAdminPermissions.Pages.Update)]
public virtual async Task SetImageAsync(Guid id, RemoteStreamContent content)
{
@ -135,7 +130,7 @@ namespace Volo.CmsKit.Admin.Pages
{
if (await PageRepository.ExistsAsync(url))
{
throw new UserFriendlyException("Url exist");
throw new PageUrlAlreadyExistException(url);
}
}
}

7
modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs

@ -62,13 +62,6 @@ namespace Volo.CmsKit.Admin.Pages
return PageAdminAppService.DeleteAsync(id);
}
[HttpGet]
[Route("exists/{url}")]
public virtual Task<bool> ExistsAsync(string url)
{
return PageAdminAppService.ExistsAsync(url);
}
[HttpPost]
[Authorize(CmsKitAdminPermissions.Pages.Update)]
[Route("image/{id}")]

5
modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/CmsKitErrorCodes.cs

@ -3,5 +3,10 @@
public static class CmsKitErrorCodes
{
public const string TagAlreadyExist = "CmsKit:0001";
public static class Pages
{
public const string UrlAlreadyExist = "CmsKit:Page:0001";
}
}
}

3
modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json

@ -28,6 +28,7 @@
"Undo": "Undo",
"Update": "Update",
"YourComment": "Your comment",
"YourReply": "Your reply"
"YourReply": "Your reply",
"CmsKit:Page:0001": "The given url ({0}) is already exist."
}
}

3
modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json

@ -24,6 +24,7 @@
"Undo": "Geri al",
"Update": "Güncelle",
"YourComment": "Yorumunuz",
"YourReply": "Cevabınız"
"YourReply": "Cevabınız",
"CmsKit:Page:0001": "Girilen url ({0}) kullanımdadır."
}
}

24
modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageUrlAlreadyExistException.cs

@ -0,0 +1,24 @@
using System;
using System.Runtime.Serialization;
using JetBrains.Annotations;
using Volo.Abp;
using Volo.CmsKit.Tags;
namespace Volo.CmsKit.Pages
{
[Serializable]
public class PageUrlAlreadyExistException : BusinessException
{
public PageUrlAlreadyExistException([NotNull] string url)
{
Code = CmsKitErrorCodes.Pages.UrlAlreadyExist;
WithData(nameof(Page.Url), url);
}
public PageUrlAlreadyExistException(SerializationInfo serializationInfo, StreamingContext context)
: base(serializationInfo, context)
{
}
}
}

22
modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs

@ -87,7 +87,9 @@ namespace Volo.CmsKit.Pages
Content = "test-content"
};
await Should.ThrowAsync<Exception>(async () => await _pageAdminAppService.CreateAsync(dto));
var exception = await Should.ThrowAsync<PageUrlAlreadyExistException>(async () => await _pageAdminAppService.CreateAsync(dto));
exception.Code.ShouldBe(CmsKitErrorCodes.Pages.UrlAlreadyExist);
}
[Fact]
@ -119,7 +121,7 @@ namespace Volo.CmsKit.Pages
Content = "my-test-content"
};
await Should.ThrowAsync<Exception>(async () => await _pageAdminAppService.CreateAsync(dto));
await Should.ThrowAsync<PageUrlAlreadyExistException>(async () => await _pageAdminAppService.CreateAsync(dto));
}
[Fact]
@ -161,22 +163,6 @@ namespace Volo.CmsKit.Pages
await Should.ThrowAsync<Exception>(async () => await _pageAdminAppService.UpdateAsync(_data.Page_1_Id, dto));
}
[Fact]
public async Task ShouldBeExistAsync()
{
var doesExist = await _pageAdminAppService.ExistsAsync(_data.Page_1_Url);
doesExist.ShouldBeTrue();
}
[Fact]
public async Task ShouldNotBeExistAsync()
{
var doesExist = await _pageAdminAppService.ExistsAsync(_data.Page_1_Url+ "+");
doesExist.ShouldBeFalse();
}
[Fact]
public async Task ShouldDeleteAsync()
{

Loading…
Cancel
Save