Merge branch 'dev'

Conflicts:
	modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs

framework/src/Volo.Abp.Ddd.Domain/Microsoft/Extensions/DependencyInjection/ServiceCollectionRepositoryExtensions.cs

@@ -7,32 +7,36 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionRepositoryExtensions
     {
-        public static IServiceCollection AddDefaultRepository(this IServiceCollection services, Type entityType, Type repositoryImplementationType)
+        public static IServiceCollection AddDefaultRepository(
+            this IServiceCollection services,
+            Type entityType,
+            Type repositoryImplementationType,
+            bool replaceExisting = false)
         {
             //IReadOnlyBasicRepository<TEntity>
             var readOnlyBasicRepositoryInterface = typeof(IReadOnlyBasicRepository<>).MakeGenericType(entityType);
             if (readOnlyBasicRepositoryInterface.IsAssignableFrom(repositoryImplementationType))
             {
-                services.TryAddTransient(readOnlyBasicRepositoryInterface, repositoryImplementationType);
+                RegisterService(services, readOnlyBasicRepositoryInterface, repositoryImplementationType, replaceExisting);
 
                 //IReadOnlyRepository<TEntity>
                 var readOnlyRepositoryInterface = typeof(IReadOnlyRepository<>).MakeGenericType(entityType);
                 if (readOnlyRepositoryInterface.IsAssignableFrom(repositoryImplementationType))
                 {
-                    services.TryAddTransient(readOnlyRepositoryInterface, repositoryImplementationType);
+                    RegisterService(services, readOnlyRepositoryInterface, repositoryImplementationType, replaceExisting);
                 }
 
                 //IBasicRepository<TEntity>
                 var basicRepositoryInterface = typeof(IBasicRepository<>).MakeGenericType(entityType);
                 if (basicRepositoryInterface.IsAssignableFrom(repositoryImplementationType))
                 {
-                    services.TryAddTransient(basicRepositoryInterface, repositoryImplementationType);
+                    RegisterService(services, basicRepositoryInterface, repositoryImplementationType, replaceExisting);
 
                     //IRepository<TEntity>
                     var repositoryInterface = typeof(IRepository<>).MakeGenericType(entityType);
                     if (repositoryInterface.IsAssignableFrom(repositoryImplementationType))
                     {
-                        services.TryAddTransient(repositoryInterface, repositoryImplementationType);
+                        RegisterService(services, repositoryInterface, repositoryImplementationType, replaceExisting);
                     }
                 }
             }
@@ -44,26 +48,26 @@ namespace Microsoft.Extensions.DependencyInjection
                 var readOnlyBasicRepositoryInterfaceWithPk = typeof(IReadOnlyBasicRepository<,>).MakeGenericType(entityType, primaryKeyType);
                 if (readOnlyBasicRepositoryInterfaceWithPk.IsAssignableFrom(repositoryImplementationType))
                 {
-                    services.TryAddTransient(readOnlyBasicRepositoryInterfaceWithPk, repositoryImplementationType);
+                    RegisterService(services, readOnlyBasicRepositoryInterfaceWithPk, repositoryImplementationType, replaceExisting);
 
                     //IReadOnlyRepository<TEntity, TKey>
                     var readOnlyRepositoryInterfaceWithPk = typeof(IReadOnlyRepository<,>).MakeGenericType(entityType, primaryKeyType);
                     if (readOnlyRepositoryInterfaceWithPk.IsAssignableFrom(repositoryImplementationType))
                     {
-                        services.TryAddTransient(readOnlyRepositoryInterfaceWithPk, repositoryImplementationType);
+                        RegisterService(services, readOnlyRepositoryInterfaceWithPk, repositoryImplementationType, replaceExisting);
                     }
 
                     //IBasicRepository<TEntity, TKey>
                     var basicRepositoryInterfaceWithPk = typeof(IBasicRepository<,>).MakeGenericType(entityType, primaryKeyType);
                     if (basicRepositoryInterfaceWithPk.IsAssignableFrom(repositoryImplementationType))
                     {
-                        services.TryAddTransient(basicRepositoryInterfaceWithPk, repositoryImplementationType);
+                        RegisterService(services, basicRepositoryInterfaceWithPk, repositoryImplementationType, replaceExisting);
 
                         //IRepository<TEntity, TKey>
                         var repositoryInterfaceWithPk = typeof(IRepository<,>).MakeGenericType(entityType, primaryKeyType);
                         if (repositoryInterfaceWithPk.IsAssignableFrom(repositoryImplementationType))
                         {
-                            services.TryAddTransient(repositoryInterfaceWithPk, repositoryImplementationType);
+                            RegisterService(services, repositoryInterfaceWithPk, repositoryImplementationType, replaceExisting);
                         }
                     }
                 }
@@ -71,5 +75,21 @@ namespace Microsoft.Extensions.DependencyInjection
 
             return services;
         }
+        
+        private static void RegisterService(
+            IServiceCollection services,
+            Type serviceType,
+            Type implementationType,
+            bool replaceExisting)
+        {
+            if (replaceExisting)
+            {
+                services.Replace(ServiceDescriptor.Transient(serviceType, implementationType));
+            }
+            else
+            {
+                services.TryAddTransient(serviceType, implementationType);
+            }
+        }
     }
 }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/AbpRepositoryConventionalRegistrar.cs

@@ -6,6 +6,9 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Domain.Repositories
 {
+    /* Repositories are not injected by class by default.
+     * This class specializes repository registration to apply this rule.
+     */
     public class AbpRepositoryConventionalRegistrar : DefaultConventionalRegistrar
     {
         public static bool ExposeRepositoryClasses { get; set; }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs

@@ -20,7 +20,7 @@ namespace Volo.Abp.Domain.Repositories
         {
             foreach (var customRepository in Options.CustomRepositories)
             {
-                Options.Services.AddDefaultRepository(customRepository.Key, customRepository.Value);
+                Options.Services.AddDefaultRepository(customRepository.Key, customRepository.Value, replaceExisting: true);
             }
 
             if (Options.RegisterDefaultRepositories)

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateUpdateBlogPostDto.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs

@@ -5,7 +5,7 @@ using Volo.CmsKit.Blogs;
 
 namespace Volo.CmsKit.Admin.Blogs
 {
-    public class CreateUpdateBlogPostDto
+    public class CreateBlogPostDto
     {
         [Required]
         public Guid BlogId { get; set; }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/IBlogPostAdminAppService.cs

@@ -11,7 +11,8 @@ namespace Volo.CmsKit.Admin.Blogs
             BlogPostDto,
             Guid,
             PagedAndSortedResultRequestDto,
-            CreateUpdateBlogPostDto>
+            CreateBlogPostDto,
+            UpdateBlogPostDto>
     {
         Task<BlogPostDto> GetBySlugAsync(string blogSlug, string slug);
 

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs

@@ -0,0 +1,24 @@
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Validation;
+using Volo.CmsKit.Blogs;
+
+namespace Volo.CmsKit.Admin.Blogs
+{
+    public class UpdateBlogPostDto
+    {
+        [Required]
+        [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxTitleLength))]
+        public string Title { get; set; }
+
+        [Required]
+        [DynamicStringLength(
+            typeof(BlogPostConsts),
+            nameof(BlogPostConsts.MaxSlugLength),
+            nameof(BlogPostConsts.MinSlugLength))]
+        public string Slug { get; set; }
+
+        [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]
+        public string ShortDescription { get; set; }
+
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs

@@ -23,7 +23,8 @@ namespace Volo.CmsKit.Admin.Blogs
             BlogPostDto,
             Guid,
             PagedAndSortedResultRequestDto,
-            CreateUpdateBlogPostDto>
+            CreateBlogPostDto,
+            UpdateBlogPostDto>
         , IBlogPostAdminAppService
     {
         protected readonly IBlogPostManager BlogPostManager;
@@ -63,7 +64,7 @@ namespace Volo.CmsKit.Admin.Blogs
         }
 
         [Authorize(CmsKitAdminPermissions.BlogPosts.Create)]
-        public override async Task<BlogPostDto> CreateAsync(CreateUpdateBlogPostDto input)
+        public override async Task<BlogPostDto> CreateAsync(CreateBlogPostDto input)
         {
             _ = await UserLookupService.GetByIdAsync(CurrentUser.GetId());
 
@@ -80,7 +81,7 @@ namespace Volo.CmsKit.Admin.Blogs
         }
 
         [Authorize(CmsKitAdminPermissions.BlogPosts.Update)]
-        public override async Task<BlogPostDto> UpdateAsync(Guid id, CreateUpdateBlogPostDto input)
+        public override async Task<BlogPostDto> UpdateAsync(Guid id, UpdateBlogPostDto input)
         {
             var blogPost = await BlogPostRepository.GetAsync(id);
 

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

@@ -34,6 +34,8 @@ namespace Volo.CmsKit.Admin
             CreateMap<ContentUpdateDto, Content>(MemberList.Source);
 
             CreateMap<BlogPost, BlogPostDto>(MemberList.Destination);
+            CreateMap<CreateBlogPostDto, BlogPost>(MemberList.Source);
+            CreateMap<UpdateBlogPostDto, BlogPost>(MemberList.Source);
 
             CreateMap<Blog, BlogDto>(MemberList.Destination)
                 .ReverseMap();

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Blogs/BlogPostAdminController.cs

@@ -31,7 +31,7 @@ namespace Volo.CmsKit.Admin.Blogs
 
         [HttpPost]
         [Authorize(CmsKitAdminPermissions.BlogPosts.Create)]
-        public virtual Task<BlogPostDto> CreateAsync(CreateUpdateBlogPostDto input)
+        public virtual Task<BlogPostDto> CreateAsync(CreateBlogPostDto input)
         {
             return BlogPostAdminAppService.CreateAsync(input);
         }
@@ -107,7 +107,7 @@ namespace Volo.CmsKit.Admin.Blogs
         [HttpPut]
         [Route("{id}")]
         [Authorize(CmsKitAdminPermissions.BlogPosts.Update)]
-        public virtual Task<BlogPostDto> UpdateAsync(Guid id, CreateUpdateBlogPostDto input)
+        public virtual Task<BlogPostDto> UpdateAsync(Guid id, UpdateBlogPostDto input)
         {
             return BlogPostAdminAppService.UpdateAsync(id, input);
         }

modules/cms-kit/test/Volo.CmsKit.Application.Tests/Blogs/BlogPostAdminAppService_Tests.cs

@@ -31,7 +31,7 @@ namespace Volo.CmsKit.Blogs
             var slug = "my-awesome-new-post";
             var shortDescription = "This blog is all about awesomeness 🤗!";
 
-            var created = await blogPostAdminAppService.CreateAsync(new CreateUpdateBlogPostDto
+            var created = await blogPostAdminAppService.CreateAsync(new CreateBlogPostDto
             {
                 BlogId = cmsKitTestData.Blog_Id,
                 Title = title,
@@ -55,7 +55,7 @@ namespace Volo.CmsKit.Blogs
             var slug = "another-my-awesome-new-post";
             var shortDescription = "This blog is all about awesomeness 🤗!";
 
-            var dto = new CreateUpdateBlogPostDto
+            var dto = new CreateBlogPostDto
             {
                 // Non-existing Id
                 BlogId = Guid.NewGuid(),
@@ -137,9 +137,8 @@ namespace Volo.CmsKit.Blogs
             var title = "[Solved] Another Blog Post";
             var slug = "another-short-blog-post";
 
-            await blogPostAdminAppService.UpdateAsync(cmsKitTestData.BlogPost_2_Id, new CreateUpdateBlogPostDto
+            await blogPostAdminAppService.UpdateAsync(cmsKitTestData.BlogPost_2_Id, new UpdateBlogPostDto
             {
-                BlogId = cmsKitTestData.Blog_Id,
                 ShortDescription = shortDescription,
                 Title = title,
                 Slug = slug,
@@ -152,31 +151,11 @@ namespace Volo.CmsKit.Blogs
             blogPost.Slug.ShouldBe(slug);
         }
 
-        [Fact]
-        public async Task UpdateAsync_ShouldThrowException_WhileChangingWithNonExistingBlogId()
-        {
-            var nonExistingId = Guid.NewGuid();
-
-            var dto = new CreateUpdateBlogPostDto
-            {
-                BlogId = nonExistingId,
-                Title = cmsKitTestData.Page_2_Title,
-                Slug = cmsKitTestData.BlogPost_2_Slug
-            };
-
-            var exception = await Should.ThrowAsync<EntityNotFoundException>(async () =>
-                                await blogPostAdminAppService.UpdateAsync(cmsKitTestData.BlogPost_2_Id, dto));
-
-            exception.EntityType.ShouldBe(typeof(Blog));
-            exception.Id.ShouldBe(nonExistingId);
-        }
-
         [Fact]
         public async Task UpdateAsync_ShouldThrowException_WhileUpdatingWithAlreadyExistingSlug()
         {
-            var dto = new CreateUpdateBlogPostDto
+            var dto = new UpdateBlogPostDto
             {
-                BlogId = cmsKitTestData.Blog_Id,
                 Title = "Some new title",
                 Slug = cmsKitTestData.BlogPost_1_Slug
             };