From a4fab14dd636c262fa6b9bb066fbe721cea2ff1f Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Wed, 23 Dec 2020 13:35:21 +0300
Subject: [PATCH] refactoring tag and adding mongodb configurations for content

---
 .../Volo/CmsKit/Contents/Content.cs            | 17 ++++++++++++-----
 .../Volo.CmsKit.Domain/Volo/CmsKit/Tags/Tag.cs | 18 +++++++++---------
 .../CmsKit/MongoDB/CmsKitMongoDbContext.cs     |  3 +++
 .../MongoDB/CmsKitMongoDbContextExtensions.cs  |  6 ++++++
 .../Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs |  3 +++
 .../CmsKit/MongoDB/ICmsKitMongoDbContext.cs    |  3 +++
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/Content.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/Content.cs
index 34546f6111..229ad037b0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/Content.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/Content.cs
@@ -2,26 +2,33 @@
 using JetBrains.Annotations;
 using Volo.Abp;
 using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.CmsKit.Contents
 {
-    public class Content : FullAuditedAggregateRoot<Guid>
+    public class Content : FullAuditedAggregateRoot<Guid>, IMultiTenant
     {
-        public string EntityType { get; set; }
+        public virtual Guid? TenantId { get; }
         
-        public string EntityId { get; set; }
+        public virtual string EntityType { get; set; }
         
-        public string Value { get; set; }
+        public virtual string EntityId { get; set; }
+        
+        public virtual string Value { get; set; }
 
         protected Content()
         {
             
         }
-        public Content(Guid id, [NotNull] string entityType, [NotNull] string entityId, [NotNull] string value) : base(id)
+        
+        public Content(Guid id, [NotNull] string entityType, [NotNull] string entityId, [NotNull] string value, Guid? tenantId = null) : base(id)
         {
             EntityType = Check.NotNullOrWhiteSpace(entityType, nameof(entityType), ContentConsts.MaxEntityTypeLength);
             EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId), ContentConsts.MaxEntityIdLength);
             Value = Check.NotNullOrWhiteSpace(value, nameof(value), ContentConsts.MaxValueLength);
+            
+            TenantId = tenantId;
         }
+
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/Tag.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/Tag.cs
index 3ebe06aa58..5f6ac203c0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/Tag.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/Tag.cs
@@ -9,23 +9,23 @@ namespace Volo.CmsKit.Tags
 {
     public class Tag : BasicAggregateRoot<Guid>, IMultiTenant, IHasCreationTime
     {
+        public string Name { get; set; }
+        
+        public string ColorHex { get; set; }
+        
+        public Guid? TenantId { get; }
+        
+        public DateTime CreationTime { get; }
+        
         protected Tag()
         {
         }
 
-        public Tag(
-            [NotNull] string name,
-            [CanBeNull] string colorHex,
-            [NotNull] Guid? tenantId = null)
+        public Tag([NotNull] string name, [CanBeNull] string colorHex, Guid? tenantId = null)
         {
             Name = Check.NotNullOrWhiteSpace(name, nameof(name), TagConsts.MaxNameLength);
             ColorHex = Check.Length(colorHex, nameof(colorHex), TagConsts.MaxColorHexLength);
             TenantId = tenantId;
         }
-
-        public virtual string Name { get; set; }
-        public virtual string ColorHex { get; set; }
-        public Guid? TenantId { get; }
-        public DateTime CreationTime { get; }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
index 09053167f9..dfd6a4e9a7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.Data;
 using Volo.Abp.MongoDB;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
@@ -19,6 +20,8 @@ namespace Volo.CmsKit.MongoDB
 
         public IMongoCollection<Rating> Ratings => Collection<Rating>();
 
+        public IMongoCollection<Content> Contents => Collection<Content>();
+
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {
             base.CreateModel(modelBuilder);
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
index 2dc4c55a71..c996dd9017 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
@@ -2,6 +2,7 @@
 using Volo.Abp;
 using Volo.Abp.MongoDB;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
@@ -41,6 +42,11 @@ namespace Volo.CmsKit.MongoDB
             {
                 x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Ratings";
             });
+            
+            builder.Entity<Content>(x =>
+            {
+                x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Contents";
+            });
         }
     }
 }
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 d479821b38..d6b7ce62e1 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
@@ -3,7 +3,9 @@ using Volo.Abp.Modularity;
 using Volo.Abp.MongoDB;
 using Volo.Abp.Users.MongoDB;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.MongoDB.Comments;
+using Volo.CmsKit.MongoDB.Contents;
 using Volo.CmsKit.MongoDB.Ratings;
 using Volo.CmsKit.MongoDB.Reactions;
 using Volo.CmsKit.MongoDB.Users;
@@ -28,6 +30,7 @@ namespace Volo.CmsKit.MongoDB
                 options.AddRepository<UserReaction, MongoUserReactionRepository>();
                 options.AddRepository<Comment, MongoCommentRepository>();
                 options.AddRepository<Rating, MongoRatingRepository>();
+                options.AddRepository<Content, MongoContentRepository>();
             });
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
index 40914a9720..d86c4ababf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.Data;
 using Volo.Abp.MongoDB;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
@@ -18,5 +19,7 @@ namespace Volo.CmsKit.MongoDB
         IMongoCollection<CmsUser> CmsUsers { get; }
         
         IMongoCollection<Rating> Ratings { get; }
+        
+        IMongoCollection<Content> Contents { get; }
     }
 }