CmsKit - Refactoring for BlogPosts

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<BlogPostCoverImageContainer> BlobContainer;
 
-        protected BlogPostAdminAppService(
+        public BlogPostAdminAppService(
             IRepository<BlogPost, Guid> 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,

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<Guid, CmsUser> , IMultiTenant
+    public class BlogPost : FullAuditedAggregateRootWithUser<Guid, CmsUser>, 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);

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<Blog, Guid>
+    public interface IBlogRepository : IBasicRepository<Blog, Guid>
     {
     }
 }

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogEfCoreRepository.cs

@@ -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<CmsKitDbContext, Blog, Guid>, IBlogRepository
-    {
-        public BlogEfCoreRepository(IDbContextProvider<CmsKitDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/BlogPostEfCoreRepository.cs → 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<CmsKitDbContext, BlogPost, Guid>, IBlogPostRepository
+    public class EfCoreBlogPostRepository : EfCoreRepository<CmsKitDbContext, BlogPost, Guid>, IBlogPostRepository
     {
-        public BlogPostEfCoreRepository(IDbContextProvider<CmsKitDbContext> dbContextProvider) : base(dbContextProvider)
+        public EfCoreBlogPostRepository(IDbContextProvider<CmsKitDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
 

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<ICmsKitDbContext, Blog, Guid>, IBlogRepository
+    {
+        public EfCoreBlogRepository(IDbContextProvider<ICmsKitDbContext> dbContextProvider) : base(dbContextProvider)
+        {
+        }
+    }
+}

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<Tag, EfCoreTagRepository>();
                 options.AddRepository<EntityTag, EfCoreEntityTagRepository>();
                 options.AddRepository<Page, EfCorePageRepository>();
+                options.AddRepository<Blog, EfCoreBlogRepository>();
+                options.AddRepository<BlogPost, EfCoreBlogPostRepository>();
             });
         }
     }

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<Tag> Tags { get; set; }
         DbSet<EntityTag> EntityTags { get; set; }
         DbSet<Page> Pages { get; set; }
+        DbSet<Blog> Blogs { get; set; }
+        DbSet<BlogPost> BlogPosts { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogPostMongoRepository.cs → 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<CmsKitMongoDbContext, BlogPost, Guid>, IBlogPostRepository
+    public class MongoBlogPostRepository : MongoDbRepository<CmsKitMongoDbContext, BlogPost, Guid>, IBlogPostRepository
     {
-        public BlogPostMongoRepository(IMongoDbContextProvider<CmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        public MongoBlogPostRepository(IMongoDbContextProvider<CmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
 

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/BlogMongoRepository.cs → 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<ICmsKitMongoDbContext, Blog, Guid>, IBlogRepository
+    public class MongoBlogRepository : MongoDbRepository<ICmsKitMongoDbContext, Blog, Guid>, IBlogRepository
     {
-        public BlogMongoRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        public MongoBlogRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
     }

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<Tag, MongoTagRepository>();
                 options.AddRepository<EntityTag, MongoEntityTagRepository>();
                 options.AddRepository<Page, MongoPageRepository>();
+                options.AddRepository<Blog, MongoBlogRepository>();
+                options.AddRepository<BlogPost, MongoBlogPostRepository>();
             });
         }
     }