Merge pull request #7848 from abpframework/cms-kit/tag-media-refactor…

…ings CMS Kit - Tag and media refactorings
abpframework · Feb 26, 2021 · 336271d · 336271d
2 parents 9203dc6 + f5917ec
commit 336271d
Show file tree

Hide file tree

Showing 22 changed files with 202 additions and 206 deletions.
diff --git a/...-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/EntityTagAdminAppService.cs b/...-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/EntityTagAdminAppService.cs
@@ -8,15 +8,15 @@ namespace Volo.CmsKit.Admin.Tags
     public class EntityTagAdminAppService : CmsKitAdminAppServiceBase, IEntityTagAdminAppService
     {
         protected ITagDefinitionStore TagDefinitionStore { get; }
-        protected IEntityTagManager EntityTagManager { get; }
-        protected ITagManager TagManager { get; }
+        protected EntityTagManager EntityTagManager { get; }
+        protected TagManager TagManager { get; }
         protected ITagRepository TagRepository { get; }
         protected IEntityTagRepository EntityTagRepository { get; }
 
         public EntityTagAdminAppService(
             ITagDefinitionStore tagDefinitionStore,
-            IEntityTagManager entityTagManager,
-            ITagManager tagManager,
+            EntityTagManager entityTagManager,
+            TagManager tagManager,
             ITagRepository tagRepository,
             IEntityTagRepository entityTagRepository)
         {
@@ -29,11 +29,11 @@ public class EntityTagAdminAppService : CmsKitAdminAppServiceBase, IEntityTagAdm
 
         public virtual async Task AddTagToEntityAsync(EntityTagCreateDto input)
         {
-            var definition = await TagDefinitionStore.GetTagEntityTypeDefinitionsAsync(input.EntityType);
+            var definition = await TagDefinitionStore.GetTagEntityTypeDefinitionAsync(input.EntityType);
 
             await CheckPolicyAsync(definition.CreatePolicy);
 
-            var tag = await TagManager.GetOrAddAsync(input.EntityType, input.TagName, CurrentTenant?.Id);
+            var tag = await TagManager.GetOrAddAsync(input.EntityType, input.TagName);
 
             await EntityTagManager.AddTagToEntityAsync(
                 tag.Id,
@@ -44,7 +44,7 @@ public virtual async Task AddTagToEntityAsync(EntityTagCreateDto input)
 
         public virtual async Task RemoveTagFromEntityAsync(EntityTagRemoveDto input)
         {
-            var definition = await TagDefinitionStore.GetTagEntityTypeDefinitionsAsync(input.EntityType);
+            var definition = await TagDefinitionStore.GetTagEntityTypeDefinitionAsync(input.EntityType);
 
             await CheckPolicyAsync(definition.DeletePolicy);
 
@@ -57,24 +57,11 @@ public virtual async Task RemoveTagFromEntityAsync(EntityTagRemoveDto input)
 
         public virtual async Task SetEntityTagsAsync(EntityTagSetDto input)
         {
-            var definition = await TagDefinitionStore.GetTagEntityTypeDefinitionsAsync(input.EntityType);
+            var definition = await TagDefinitionStore.GetTagEntityTypeDefinitionAsync(input.EntityType);
 
             await CheckPolicyAsync(definition.UpdatePolicy);
 
-            var existingTags =
-                await TagRepository.GetAllRelatedTagsAsync(input.EntityType, input.EntityId, CurrentTenant?.Id);
-
-            var deletedTags = existingTags.Where(x => !input.Tags.Contains(x.Name)).ToList();
-            var addedTags = input.Tags.Where(x => !existingTags.Any(a => a.Name == x));
-
-            await EntityTagRepository.DeleteManyAsync(deletedTags.Select(s => s.Id).ToArray());
-
-            foreach (var addedTag in addedTags)
-            {
-                var tag = await TagManager.GetOrAddAsync(input.EntityType, addedTag, CurrentTenant?.Id);
-
-                await EntityTagManager.AddTagToEntityAsync(tag.Id, input.EntityType, input.EntityId, CurrentTenant?.Id);
-            }
+            await EntityTagManager.SetEntityTagsAsync(input.EntityType, input.EntityId, input.Tags);
         }
     }
-}
+}
diff --git a/...es/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs b/...es/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
@@ -22,17 +22,19 @@ public class TagAdminAppService :
             TagUpdateDto>,
         ITagAdminAppService
     {
-        protected ITagManager TagManager { get; }
-
+        protected TagManager TagManager { get; }
+        protected ITagDefinitionStore TagDefinitionStore { get; }
         protected IStringLocalizerFactory StringLocalizerFactory { get; }
 
         public TagAdminAppService(
             IRepository<Tag, Guid> repository,
-            ITagManager tagManager,
+            TagManager tagManager,
+            ITagDefinitionStore tagDefinitionStore,
             IStringLocalizerFactory stringLocalizerFactory) : base(repository)
         {
             TagManager = tagManager;
-           StringLocalizerFactory = stringLocalizerFactory;
+            TagDefinitionStore = tagDefinitionStore;
+            StringLocalizerFactory = stringLocalizerFactory;
 
             GetListPolicyName = CmsKitAdminPermissions.Tags.Default;
             GetPolicyName = CmsKitAdminPermissions.Tags.Default;
@@ -44,12 +46,13 @@ public class TagAdminAppService :
         [Authorize(CmsKitAdminPermissions.Tags.Create)]
         public override async Task<TagDto> CreateAsync(TagCreateDto input)
         {
-            var tag = await TagManager.InsertAsync(
+            var tag = await TagManager.CreateAsync(
                 GuidGenerator.Create(),
                 input.EntityType,
-                input.Name,
-                CurrentTenant?.Id);
-
+                input.Name);
+
+            await Repository.InsertAsync(tag);
+
             return await MapToGetOutputDtoAsync(tag);
         }
 
@@ -60,11 +63,14 @@ public override async Task<TagDto> UpdateAsync(Guid id, TagUpdateDto input)
                 id,
                 input.Name);
 
+            await Repository.UpdateAsync(tag);
+
             return await MapToGetOutputDtoAsync(tag);
         }
-        protected override IQueryable<Tag> CreateFilteredQuery(TagGetListInput input)
+
+        protected override async Task<IQueryable<Tag>> CreateFilteredQueryAsync(TagGetListInput input)
         {
-            return base.CreateFilteredQuery(input)
+            return (await base.CreateFilteredQueryAsync(input))
                     .WhereIf(
                         !input.Filter.IsNullOrEmpty(),
                         x =>
@@ -74,7 +80,7 @@ protected override IQueryable<Tag> CreateFilteredQuery(TagGetListInput input)
 
         public virtual async Task<List<TagDefinitionDto>> GetTagDefinitionsAsync()
         {
-            var definitions = await TagManager.GetTagDefinitionsAsync();
+            var definitions = await TagDefinitionStore.GetTagEntityTypeDefinitionListAsync();
 
             return definitions
                         .Select(s => 

diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Tags/TagAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Tags/TagAppService.cs
@@ -20,8 +20,7 @@ public virtual async Task<List<TagDto>> GetAllRelatedTagsAsync(string entityType
         {
             var entities = await TagRepository.GetAllRelatedTagsAsync(
                 entityType,
-                entityId,
-                CurrentTenant.Id);
+                entityId);
 
             return ObjectMapper.Map<List<Tag>, List<TagDto>>(entities);
         }

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/MediaDescriptor.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/MediaDescriptor.cs
@@ -33,7 +33,7 @@ public MediaDescriptor(Guid id, string name, string mimeType, long size, Guid? t
 
         public void SetName(string name)
         {
-            if (!name.IsValidMediaFileName())
+            if (!MediaDescriptorCheck.IsValidMediaFileName(name))
             {
                 throw new InvalidMediaDescriptorNameException(name);
             }

diff --git a/...s/Extensions/MediaDescriptorExtensions.cs → .../MediaDescriptors/MediaDescriptorCheck.cs b/...s/Extensions/MediaDescriptorExtensions.cs → .../MediaDescriptors/MediaDescriptorCheck.cs
@@ -3,9 +3,9 @@
 
 namespace Volo.CmsKit.MediaDescriptors.Extensions
 {
-    public static class MediaDescriptorExtensions
+    public static class MediaDescriptorCheck
     {
-        public static bool IsValidMediaFileName(this string name)
+        public static bool IsValidMediaFileName(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
             {

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/CmsKitTagOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/CmsKitTagOptions.cs
@@ -5,6 +5,6 @@ namespace Volo.CmsKit.Tags
     public class CmsKitTagOptions
     {
         [NotNull]
-        public TagEntityTypeDefinitionDictionary EntityTypes { get; } = new TagEntityTypeDefinitionDictionary();
+        public TagEntityTypeDefinitions EntityTypes { get; } = new TagEntityTypeDefinitions();
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/DefaultTagDefinitionStore.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/DefaultTagDefinitionStore.cs
@@ -24,7 +24,7 @@ public DefaultTagDefinitionStore(IOptions<CmsKitTagOptions> options)
         /// <param name="entityType">EntityType to get definition.</param>
         /// <exception cref="EntityNotTaggableException">Thrown when EntityType is not configured as taggable.</exception>
         /// <exception cref="InvalidOperationException">More than one element satisfies the condition in predicate.</exception>
-        public virtual Task<TagEntityTypeDefiniton> GetTagEntityTypeDefinitionsAsync([NotNull] string entityType)
+        public virtual Task<TagEntityTypeDefiniton> GetTagEntityTypeDefinitionAsync([NotNull] string entityType)
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
 

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityNotTaggableException.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityNotTaggableException.cs
@@ -1,19 +1,13 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
+using System.Runtime.Serialization;
 using Volo.Abp;
 
 namespace Volo.CmsKit.Tags
 {
     [Serializable]
     public class EntityNotTaggableException : BusinessException
     {
-        public EntityNotTaggableException(
-            string code = null,
-            string message = null,
-            string details = null,
-            Exception innerException = null,
-            LogLevel logLevel = LogLevel.Warning) 
-            : base(code, message, details, innerException, logLevel)
+        public EntityNotTaggableException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context)
         {
         }
 

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityTagManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityTagManager.cs
@@ -1,22 +1,30 @@
 using JetBrains.Annotations;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Services;
 
 namespace Volo.CmsKit.Tags
 {
-    public class EntityTagManager : DomainService, IEntityTagManager
+    public class EntityTagManager : DomainService
     {
         protected IEntityTagRepository EntityTagRepository { get; }
+        protected ITagRepository TagRepository { get; }
         protected ITagDefinitionStore TagDefinitionStore { get; }
+        protected TagManager TagManager { get; }
 
         public EntityTagManager(
             IEntityTagRepository entityTagRepository,
-            ITagDefinitionStore tagDefinitionStore)
+            ITagRepository tagRepository,
+            ITagDefinitionStore tagDefinitionStore,
+            TagManager tagManager)
         {
             EntityTagRepository = entityTagRepository;
+            TagRepository = tagRepository;
             TagDefinitionStore = tagDefinitionStore;
+            TagManager = tagManager;
         }
 
         public virtual async Task<EntityTag> AddTagToEntityAsync(
@@ -45,5 +53,23 @@ public class EntityTagManager : DomainService, IEntityTagManager
             var entityTag = await EntityTagRepository.FindAsync(tagId, entityId, tenantId, cancellationToken);
             await EntityTagRepository.DeleteAsync(entityTag, cancellationToken: cancellationToken);
         }
+
+        public async Task SetEntityTagsAsync(string entityType, string entityId, List<string> tags)
+        {
+            var existingTags =
+              await TagRepository.GetAllRelatedTagsAsync(entityType, entityId);
+
+            var deletedTags = existingTags.Where(x => !tags.Contains(x.Name)).ToList();
+            var addedTags = tags.Where(x => !existingTags.Any(a => a.Name == x));
+
+            await EntityTagRepository.DeleteManyAsync(deletedTags.Select(s => s.Id).ToArray());
+
+            foreach (var addedTag in addedTags)
+            {
+                var tag = await TagManager.GetOrAddAsync(entityType, addedTag);
+
+                await AddTagToEntityAsync(tag.Id, entityType, entityId, CurrentTenant?.Id);
+            }
+        }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/IEntityTagManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/IEntityTagManager.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagDefinitionStore.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagDefinitionStore.cs
@@ -8,7 +8,7 @@ public interface ITagDefinitionStore
     {
         Task<List<TagEntityTypeDefiniton>> GetTagEntityTypeDefinitionListAsync();
 
-        Task<TagEntityTypeDefiniton> GetTagEntityTypeDefinitionsAsync([NotNull] string entityType);
+        Task<TagEntityTypeDefiniton> GetTagEntityTypeDefinitionAsync([NotNull] string entityType);
 
         Task<bool> IsDefinedAsync([NotNull] string entityType);
     }

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagManager.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/ITagRepository.cs
@@ -12,25 +12,21 @@ public interface ITagRepository : IBasicRepository<Tag, Guid>
         Task<Tag> GetAsync(
             [NotNull] string entityType,
             [NotNull] string name,
-            Guid? tenantId = null,
             CancellationToken cancellationToken = default);
 
         Task<bool> AnyAsync(
             [NotNull] string entityType,
             [NotNull] string name,
-            Guid? tenantId = null,
             CancellationToken cancellationToken = default);
 
         Task<Tag> FindAsync(
             [NotNull] string entityType,
             [NotNull] string name,
-            Guid? tenantId = null,
             CancellationToken cancellationToken = default);
 
         Task<List<Tag>> GetAllRelatedTagsAsync(
             [NotNull] string entityType,
             [NotNull] string entityId,
-            Guid? tenantId = null,
             CancellationToken cancellationToken = default); 
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagEntityTypeDefinitionDictionary.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagEntityTypeDefinitionDictionary.cs
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagEntityTypeDefinitions.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/TagEntityTypeDefinitions.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace Volo.CmsKit.Tags
+{
+    public class TagEntityTypeDefinitions : List<TagEntityTypeDefiniton>
+    {
+    }
+}