From 5121670195c1b2c41518ccd9e17c7a8b37dd6ca0 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 20 Jan 2021 16:35:20 +0300 Subject: [PATCH] CmsKit - Refactoring for BlogPosts --- .../CmsKit/Admin/Blogs/BlogPostAdminAppService.cs | 4 ++-- .../Volo/CmsKit/Blogs/BlogPost.cs | 5 +++-- .../Volo/CmsKit/Blogs/IBlogRepository.cs | 2 +- .../Volo/CmsKit/Blogs/BlogEfCoreRepository.cs | 14 -------------- ...reRepository.cs => EfCoreBlogPostRepository.cs} | 4 ++-- .../Volo/CmsKit/Blogs/EfCoreBlogRepository.cs | 14 ++++++++++++++ .../CmsKitEntityFrameworkCoreModule.cs | 3 +++ .../CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs | 3 +++ ...ngoRepository.cs => MongoBlogPostRepository.cs} | 4 ++-- ...ogMongoRepository.cs => MongoBlogRepository.cs} | 4 ++-- .../Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs | 4 ++++ 11 files changed, 36 insertions(+), 25 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogEfCoreRepository.cs rename modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/{BlogPostEfCoreRepository.cs => EfCoreBlogPostRepository.cs} (85%) create mode 100644 modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs rename modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/{BlogPostMongoRepository.cs => MongoBlogPostRepository.cs} (84%) rename modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/{BlogMongoRepository.cs => MongoBlogRepository.cs} (69%) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs index 2677b6c5ac..7ff775f376 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs @@ -28,7 +28,7 @@ namespace Volo.CmsKit.Admin.Blogs protected readonly IBlogPostRepository BlogPostRepository; protected readonly IBlobContainer BlobContainer; - protected BlogPostAdminAppService( + public BlogPostAdminAppService( IRepository repository, IBlogPostManager blogPostManager, IBlogPostRepository blogPostRepository) : base(repository) @@ -36,7 +36,6 @@ namespace Volo.CmsKit.Admin.Blogs BlogPostManager = blogPostManager; BlogPostRepository = blogPostRepository; - GetListPolicyName = CmsKitAdminPermissions.BlogPosts.Default; GetPolicyName = CmsKitAdminPermissions.BlogPosts.Default; CreatePolicyName = CmsKitAdminPermissions.BlogPosts.Create; @@ -57,6 +56,7 @@ namespace Volo.CmsKit.Admin.Blogs var entity = await BlogPostManager .CreateAsync( new BlogPost( + GuidGenerator.Create(), input.BlogId, input.Title, input.UrlSlug, diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs index 73fda09418..ac41adbe2a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs @@ -9,7 +9,7 @@ using Volo.CmsKit.Users; namespace Volo.CmsKit.Blogs { - public class BlogPost : FullAuditedAggregateRootWithUser , IMultiTenant + public class BlogPost : FullAuditedAggregateRootWithUser, IMultiTenant { public Guid BlogId { get; protected set; } @@ -26,10 +26,11 @@ namespace Volo.CmsKit.Blogs } public BlogPost( + Guid id, Guid blogId, [NotNull] string title, [NotNull] string urlSlug, - [CanBeNull] string shortDescription = null) + [CanBeNull] string shortDescription = null) : base(id) { BlogId = blogId; SetTitle(title); diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogRepository.cs index 8ded8b2933..90e59587a2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/IBlogRepository.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Repositories; namespace Volo.CmsKit.Blogs { - public interface IBlogRepository : IRepository + public interface IBlogRepository : IBasicRepository { } } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogEfCoreRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogEfCoreRepository.cs deleted file mode 100644 index db6d5258ca..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogEfCoreRepository.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -using Volo.CmsKit.EntityFrameworkCore; - -namespace Volo.CmsKit.Blogs -{ - public class BlogEfCoreRepository : EfCoreRepository, IBlogRepository - { - public BlogEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogPostEfCoreRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs similarity index 85% rename from modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogPostEfCoreRepository.cs rename to modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs index 96e80b7c90..09445da84d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogPostEfCoreRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogPostRepository.cs @@ -7,9 +7,9 @@ using Volo.CmsKit.EntityFrameworkCore; namespace Volo.CmsKit.Blogs { - public class BlogPostEfCoreRepository : EfCoreRepository, IBlogPostRepository + public class EfCoreBlogPostRepository : EfCoreRepository, IBlogPostRepository { - public BlogPostEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + public EfCoreBlogPostRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) { } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs new file mode 100644 index 0000000000..a43504642c --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogRepository.cs @@ -0,0 +1,14 @@ +using System; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using Volo.CmsKit.EntityFrameworkCore; + +namespace Volo.CmsKit.Blogs +{ + public class EfCoreBlogRepository : EfCoreRepository, IBlogRepository + { + public EfCoreBlogRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs index c995c21dfb..61cd667aed 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs @@ -2,6 +2,7 @@ using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; using Volo.Abp.Users.EntityFrameworkCore; +using Volo.CmsKit.Blogs; using Volo.CmsKit.Comments; using Volo.CmsKit.Contents; using Volo.CmsKit.Pages; @@ -31,6 +32,8 @@ namespace Volo.CmsKit.EntityFrameworkCore options.AddRepository(); options.AddRepository(); options.AddRepository(); + options.AddRepository(); + options.AddRepository(); }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs index a5981fd000..feb1a5aacd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs @@ -1,6 +1,7 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; +using Volo.CmsKit.Blogs; using Volo.CmsKit.Comments; using Volo.CmsKit.Contents; using Volo.CmsKit.Pages; @@ -22,5 +23,7 @@ namespace Volo.CmsKit.EntityFrameworkCore DbSet Tags { get; set; } DbSet EntityTags { get; set; } DbSet Pages { get; set; } + DbSet Blogs { get; set; } + DbSet BlogPosts { get; set; } } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogPostMongoRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs similarity index 84% rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogPostMongoRepository.cs rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs index 63bfc0044f..166eda7f0d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogPostMongoRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs @@ -6,9 +6,9 @@ using Volo.CmsKit.Blogs; namespace Volo.CmsKit.MongoDB.Blogs { - public class BlogPostMongoRepository : MongoDbRepository, IBlogPostRepository + public class MongoBlogPostRepository : MongoDbRepository, IBlogPostRepository { - public BlogPostMongoRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) + public MongoBlogPostRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) { } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogMongoRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs similarity index 69% rename from modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogMongoRepository.cs rename to modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs index 50e900f989..195c29f1f7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogMongoRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogRepository.cs @@ -5,9 +5,9 @@ using Volo.CmsKit.Blogs; namespace Volo.CmsKit.MongoDB.Blogs { - public class BlogMongoRepository : MongoDbRepository, IBlogRepository + public class MongoBlogRepository : MongoDbRepository, IBlogRepository { - public BlogMongoRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) + public MongoBlogRepository(IMongoDbContextProvider dbContextProvider) : base(dbContextProvider) { } } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs index 898b1687a8..b5ef74ac34 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs @@ -2,8 +2,10 @@ using Volo.Abp.Modularity; using Volo.Abp.MongoDB; using Volo.Abp.Users.MongoDB; +using Volo.CmsKit.Blogs; using Volo.CmsKit.Comments; using Volo.CmsKit.Contents; +using Volo.CmsKit.MongoDB.Blogs; using Volo.CmsKit.MongoDB.Comments; using Volo.CmsKit.MongoDB.Contents; using Volo.CmsKit.MongoDB.Pages; @@ -38,6 +40,8 @@ namespace Volo.CmsKit.MongoDB options.AddRepository(); options.AddRepository(); options.AddRepository(); + options.AddRepository(); + options.AddRepository(); }); } }