Merge branch 'dev' into cotur/cms-kit

framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs

@@ -37,7 +37,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var aliyunConfig = args.Configuration.GetAliyunConfiguration();
             var ossClient = GetOssClient(aliyunConfig);
-            if (!args.OverrideExisting && BlobExistsAsync(ossClient, containerName, blobName))
+            if (!args.OverrideExisting && BlobExists(ossClient, containerName, blobName))
             {
                 throw new BlobAlreadyExistsException($"Saving BLOB '{args.BlobName}' does already exists in the container '{containerName}'! Set {nameof(args.OverrideExisting)} if it should be overwritten.");
             }
@@ -57,7 +57,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var ossClient = GetOssClient(args.Configuration);
-            if(!BlobExistsAsync(ossClient, containerName, blobName))
+            if(!BlobExists(ossClient, containerName, blobName))
             {
                 return Task.FromResult(false);
             }
@@ -70,7 +70,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var ossClient = GetOssClient(args.Configuration);
-            return Task.FromResult(BlobExistsAsync(ossClient, containerName, blobName));
+            return Task.FromResult(BlobExists(ossClient, containerName, blobName));
         }
 
         public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
@@ -78,7 +78,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var ossClient = GetOssClient(args.Configuration);
-            if (!BlobExistsAsync(ossClient, containerName, blobName))
+            if (!BlobExists(ossClient, containerName, blobName))
             {
                 return null;
             }
@@ -96,7 +96,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
                 : configuration.ContainerName;
         }
 
-        private bool BlobExistsAsync(IOss ossClient,string containerName, string blobName)
+        private bool BlobExists(IOss ossClient,string containerName, string blobName)
         {
             // Make sure Blob Container exists.
             return ossClient.DoesBucketExist(containerName) &&

framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProviderConfiguration.cs

@@ -81,7 +81,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
         /// </summary>
         public string ContainerName
         {
-            get => _containerConfiguration.GetConfiguration<string>(AliyunBlobProviderConfigurationNames.ContainerName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(AliyunBlobProviderConfigurationNames.ContainerName);
             set => _containerConfiguration.SetConfiguration(AliyunBlobProviderConfigurationNames.ContainerName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 

framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProviderConfiguration.cs

@@ -81,7 +81,7 @@ namespace Volo.Abp.BlobStoring.Aws
         /// </summary>
         public string ContainerName
         {
-            get => _containerConfiguration.GetConfiguration<string>(AwsBlobProviderConfigurationNames.ContainerName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(AwsBlobProviderConfigurationNames.ContainerName);
             set => _containerConfiguration.SetConfiguration(AwsBlobProviderConfigurationNames.ContainerName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 

framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProviderConfiguration.cs

@@ -16,7 +16,7 @@
         /// </summary>
         public string ContainerName
         {
-            get => _containerConfiguration.GetConfiguration<string>(AzureBlobProviderConfigurationNames.ContainerName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(AzureBlobProviderConfigurationNames.ContainerName);
             set => _containerConfiguration.SetConfiguration(AzureBlobProviderConfigurationNames.ContainerName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 

framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs

@@ -4,7 +4,7 @@
     {
         public string BucketName
         {
-            get => _containerConfiguration.GetConfiguration<string>(MinioBlobProviderConfigurationNames.BucketName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(MinioBlobProviderConfigurationNames.BucketName);
             set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.BucketName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 
@@ -42,7 +42,7 @@
         {
             get => _containerConfiguration.GetConfigurationOrDefault(MinioBlobProviderConfigurationNames.WithSSL, false);
             set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.WithSSL, value);
-        } 
+        }
 
         /// <summary>
         ///Default value: false.

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml

@@ -8,7 +8,7 @@
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
-@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Tags
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
 @model IndexModel
 @inject IStringLocalizer<AbpUiResource> Localizer
 <h1 class="text-center">CMS Kit DEMO</h1>

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/ITagAdminAppService.cs

@@ -0,0 +1,10 @@
+using System;
+using Volo.Abp.Application.Services;
+using Volo.CmsKit.Tags;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public interface ITagAdminAppService : ICrudAppService<TagDto, Guid, TagGetListInput, TagCreateDto, TagUpdateDto>
+    {
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagCreateDto.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public class TagCreateDto
+    {
+        [Required]
+        public string EntityType { get; set; }
+        [Required]
+        public string Name { get; set; }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagGetListInput.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Application.Dtos;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public class TagGetListInput : PagedAndSortedResultRequestDto
+    {
+        public string Filter { get; set; }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagUpdateDto.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public class TagUpdateDto
+    {
+        [Required]
+        public string Name { get; set; }
+    }
+}

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

@@ -0,0 +1,25 @@
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Localization;
+using Volo.CmsKit.Localization;
+
+namespace Volo.CmsKit.Permissions
+{
+    public class CmsKitAdminPermissionDefinitionProvider : PermissionDefinitionProvider
+    {
+        public override void Define(IPermissionDefinitionContext context)
+        {
+            var cmsGroup = context.GetGroupOrNull(CmsKitAdminPermissions.GroupName) ?? context.AddGroup(CmsKitAdminPermissions.GroupName, L("Permission:CmsKit"));
+
+            cmsGroup
+                .AddPermission(CmsKitAdminPermissions.Tags.Default, L("Permission:TagManagement"))
+                    .AddChild(CmsKitAdminPermissions.Tags.Create, L("Permission:TagManagement.Create"))
+                    .AddChild(CmsKitAdminPermissions.Tags.Update, L("Permission:TagManagement.Update"))
+                    .AddChild(CmsKitAdminPermissions.Tags.Delete, L("Permission:TagManagement.Delete"));
+        }
+
+        private static LocalizableString L(string name)
+        {
+            return LocalizableString.Create<CmsKitResource>(name);
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+using Volo.Abp.Reflection;
+
+namespace Volo.CmsKit.Permissions
+{
+    public class CmsKitAdminPermissions
+    {
+        public const string GroupName = "CmsKit";
+        public static class Tags
+        {
+            public const string Default = GroupName + ".Tags";
+            public const string Create = Default + ".Create";
+            public const string Update = Default + ".Update";
+            public const string Delete = Default + ".Delete";
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+using Volo.CmsKit.Admin.Tags;
+using Volo.CmsKit.Permissions;
+using Volo.CmsKit.Tags;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    [Authorize(CmsKitAdminPermissions.Tags.Default)]
+    public class TagAdminAppService :
+        CrudAppService<
+            Tag,
+            TagDto,
+            Guid,
+            TagGetListInput,
+            TagCreateDto,
+            TagUpdateDto>,
+        ITagAdminAppService
+    {
+        protected ITagManager TagManager { get; }
+
+        public TagAdminAppService(
+            IRepository<Tag, Guid> repository,
+            ITagManager tagManager) : base(repository)
+        {
+            TagManager = tagManager;
+
+            GetListPolicyName = CmsKitAdminPermissions.Tags.Default;
+            GetPolicyName = CmsKitAdminPermissions.Tags.Default;
+            CreatePolicyName = CmsKitAdminPermissions.Tags.Create;
+            UpdatePolicyName = CmsKitAdminPermissions.Tags.Update;
+            DeletePolicyName = CmsKitAdminPermissions.Tags.Delete;
+        }
+
+        [Authorize(CmsKitAdminPermissions.Tags.Create)]
+        public override async Task<TagDto> CreateAsync(TagCreateDto input)
+        {
+            var tag = await TagManager.InsertAsync(
+                GuidGenerator.Create(),
+                input.EntityType,
+                input.Name,
+                CurrentTenant?.Id);
+            
+            return MapToGetOutputDto(tag);
+        }
+
+        [Authorize(CmsKitAdminPermissions.Tags.Update)]
+        public override async Task<TagDto> UpdateAsync(Guid id, TagUpdateDto input)
+        {
+            var tag = await TagManager.UpdateAsync(
+                id,
+                input.Name);
+
+            return MapToGetOutputDto(tag);
+        }
+        protected override IQueryable<Tag> CreateFilteredQuery(TagGetListInput input)
+        {
+            return base.CreateFilteredQuery(input)
+                    .WhereIf(
+                        !input.Filter.IsNullOrEmpty(),
+                        x =>
+                            x.Name.ToLower().Contains(input.Filter) ||
+                            x.EntityType.ToLower().Contains(input.Filter));
+        }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagController.cs

@@ -0,0 +1,56 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.CmsKit.Admin.Tags;
+using Volo.CmsKit.Permissions;
+using Volo.CmsKit.Tags;
+
+namespace Volo.CmsKit.Admin.Tags
+{
+    public class TagController : CmsKitAdminController, ITagAdminAppService
+    {
+        protected ITagAdminAppService TagAdminAppService { get; }
+
+        public TagController(ITagAdminAppService tagAdminAppService)
+        {
+            TagAdminAppService = tagAdminAppService;
+        }
+
+        [HttpPost]
+        [Authorize(CmsKitAdminPermissions.Tags.Create)]
+        public Task<TagDto> CreateAsync(TagCreateDto input)
+        {
+            return TagAdminAppService.CreateAsync(input);
+        }
+
+        [HttpDelete("{id}")]
+        [Authorize(CmsKitAdminPermissions.Tags.Delete)]
+        public Task DeleteAsync(Guid id)
+        {
+            return TagAdminAppService.DeleteAsync(id);
+        }
+
+        [HttpGet("{id}")]
+        [Authorize(CmsKitAdminPermissions.Tags.Default)]
+        public Task<TagDto> GetAsync(Guid id)
+        {
+            return TagAdminAppService.GetAsync(id);
+        }
+
+        [HttpGet]
+        [Authorize(CmsKitAdminPermissions.Tags.Default)]
+        public Task<PagedResultDto<TagDto>> GetListAsync(TagGetListInput input)
+        {
+            return TagAdminAppService.GetListAsync(input);
+        }
+
+        [HttpPut("{id}")]
+        [Authorize(CmsKitAdminPermissions.Tags.Update)]
+        public Task<TagDto> UpdateAsync(Guid id, [FromBody] TagUpdateDto input)
+        {
+            return TagAdminAppService.UpdateAsync(id, input);
+        }
+    }
+}

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

@@ -1,22 +1,29 @@
 {
   "culture": "en",
   "texts": {
-    "PickYourReaction": "Pick your reaction",
+    "CommentAuthorizationExceptionMessage": "Those comments are not allowed for public display.",
-    "YourComment": "Your comment",
-    "YourReply": "Your reply",
     "Comments": "Comments",
-    "Send": "Send",
     "Delete": "Delete",
-    "Reply": "Reply",
-    "Update": "Update",
     "Edit": "Edit",
     "LoginToAddComment": "Login to add comment",
+    "LoginToRate": "Login to rate",
     "LoginToReply": "Login to reply",
     "MessageDeletionConfirmationMessage": "This comment will be deleted completely.",
-    "CommentAuthorizationExceptionMessage": "Those comments are not allowed for public display.",
+    "Permission:CmsKit": "CmsKit",
-    "Undo": "Undo",
+    "Permission:TagManagement": "Tag Management",
+    "Permission:TagManagement.Create": "Create Tag",
+    "Permission:TagManagement.Delete": "Delete Tag",
+    "Permission:TagManagement.Update": "Update Tag",
+    "PickYourReaction": "Pick your reaction",
     "RatingUndoMessage": "Your rating will be undo.",
-    "LoginToRate": "Login to rate",
+    "Reply": "Reply",
-    "Star": "Star"
+    "Send": "Send",
+    "Star": "Star",
+    "TagDeletionConfirmationMessage": "Are you sure to delete '{0}' tag?",
+    "Tags": "Tags",
+    "Undo": "Undo",
+    "Update": "Update",
+    "YourComment": "Your comment",
+    "YourReply": "Your reply"
   }
 }

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

@@ -1,22 +1,29 @@
 {
   "culture": "tr",
   "texts": {
-    "PickYourReaction": "Tepkinizi seçin",
+    "CommentAuthorizationExceptionMessage": "Bu yorumları görebilmek için yetki gerekir.",
-    "YourComment": "Yorumunuz",
-    "YourReply": "Cevabınız",
     "Comments": "Yorumlar",
-    "Send": "Gönder",
     "Delete": "Sil",
-    "Reply": "Cevapla",
-    "Update": "Güncelle",
     "Edit": "Düzenle",
     "LoginToAddComment": "Yorum yapmak için giriş yap",
+    "LoginToRate": "Oylamak için giriş yapın",
     "LoginToReply": "Cevap vermek için giriş yap",
     "MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir",
-    "CommentAuthorizationExceptionMessage": "Bu yorumları görebilmek için yetki gerekir.",
+    "Permission:CmsKit": "CmsKit",
-    "Undo": "Geri al",
+    "Permission:TagManagement": "Etiket Yönetimi",
+    "Permission:TagManagement.Create": "Etiket Oluşturma",
+    "Permission:TagManagement.Delete": "Etiket Silme",
+    "Permission:TagManagement.Update": "Etiket Güncelleme",
+    "PickYourReaction": "Tepkinizi seçin",
     "RatingUndoMessage": "Oylamanız geri alınacak.",
-    "LoginToRate": "Oylamak için giriş yapın",
+    "Reply": "Cevapla",
-    "Star": "Yıldız"
+    "Send": "Gönder",
+    "Star": "Yıldız",
+    "TagDeletionConfirmationMessage": "'{0}' etiketini silmek istediğinize emin misiniz?",
+    "Tags": "Etiketler",
+    "Undo": "Geri al",
+    "Update": "Güncelle",
+    "YourComment": "Yorumunuz",
+    "YourReply": "Cevabınız"
   }
 }

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(
+                new Tag(
-                                id,
+                    id,
-                                entityType,
+                    entityType,
-                                name,
+                    name,
-                                tenantId),
+                    tenantId),
-                            cancellationToken: cancellationToken);
+                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);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Tags/GetRelatedTagsInput.cs → modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Tags/GetRelatedTagsInput.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations;
 
-namespace Volo.CmsKit.Tags
+namespace Volo.CmsKit.Public.Tags
 {
     public class GetRelatedTagsInput
     {

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Tags/ITagAppService.cs → modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Tags/ITagAppService.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
+using Volo.CmsKit.Tags;
 
-namespace Volo.CmsKit.Tags
+namespace Volo.CmsKit.Public.Tags
 {
     public interface ITagAppService : IApplicationService
     {

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Tags/TagAppService.cs → modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Tags/TagAppService.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
+using Volo.CmsKit.Tags;
 
-namespace Volo.CmsKit.Tags
+namespace Volo.CmsKit.Public.Tags
 {
     public class TagAppService : CmsKitAppServiceBase, ITagAppService
     {
@@ -13,7 +15,7 @@ namespace Volo.CmsKit.Tags
 
         public TagAppService(
             ITagManager tagManager,
-            ITagRepository tagRepository, 
+            ITagRepository tagRepository,
             IEntityTagRepository entityTagRepository)
         {
             TagManager = tagManager;

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/Controllers/Tags/TagController.cs → modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Tags/TagController.cs

@@ -1,15 +1,15 @@
-using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
 using Volo.CmsKit.Tags;
 
-namespace Volo.CmsKit.Controllers.Tags
+namespace Volo.CmsKit.Public.Tags
 {
     [RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
     [Area("cms-kit")]
     [Route("api/cms-kit/tags")]
-    public class TagController : CmsKitControllerBase, ITagAppService
+    public class TagController : CmsKitPublicControllerBase, ITagAppService
     {
         protected readonly ITagAppService TagAppService;
 

modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml

@@ -1,4 +1,4 @@
-@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Tags
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
 
 @model TagViewComponent.TagViewModel
 

modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs

@@ -5,9 +5,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.CmsKit.Public.Tags;
 using Volo.CmsKit.Tags;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Tags
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
 {
     [ViewComponent(Name = "CmsTags")]
     public class TagViewComponent : AbpViewComponent

modules/cms-kit/test/Volo.CmsKit.Application.Tests/Tags/TagAppService_Tests.cs

@@ -0,0 +1,78 @@
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using System.Threading.Tasks;
+using Volo.Abp.Clients;
+using Volo.Abp.Users;
+using Volo.Abp.Validation;
+using Volo.CmsKit.Public.Tags;
+using Xunit;
+
+namespace Volo.CmsKit.Tags
+{
+    public class TagAppService_Tests : CmsKitApplicationTestBase
+    {
+        private readonly ITagAppService _tagAppService;
+        private ICurrentUser _currentUser;
+        private readonly CmsKitTestData _cmsKitTestData;
+
+        public TagAppService_Tests()
+        {
+            _tagAppService = GetRequiredService<ITagAppService>();
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            _currentUser = Substitute.For<ICurrentUser>();
+            services.AddSingleton(_currentUser);
+        }
+
+        [Fact]
+        public async Task GetAllRelatedTagsAsync()
+        {
+            var list = await _tagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput
+            {
+                EntityType = _cmsKitTestData.Content_1_EntityType,
+                EntityId = _cmsKitTestData.EntityId1
+            });
+
+            list.ShouldNotBeEmpty();
+            list.Count.ShouldBe(2);
+        }
+
+        [Fact]
+        public async Task ShouldntGet_GetAllRelatedTagsAsync()
+        {
+            var list = await _tagAppService.GetAllRelatedTagsAsync(new GetRelatedTagsInput
+            {
+                EntityType = "any_other_type",
+                EntityId = "1"
+            });
+
+            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
+                }));
+        }
+    }
+}