CmsKit: CmsRatings updated

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs → modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200826063729_CmsRatings_Added.Designer.cs

@@ -11,7 +11,7 @@ using Volo.CmsKit.EntityFrameworkCore;
 namespace Volo.CmsKit.Migrations
 {
     [DbContext(typeof(UnifiedDbContext))]
-    [Migration("20200825101525_CmsRatings_Added")]
+    [Migration("20200826063729_CmsRatings_Added")]
     partial class CmsRatings_Added
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -973,11 +973,26 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnName("CreatorId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
                     b.Property<short>("StarCount")
                         .HasColumnType("smallint");
 
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.HasKey("Id");
 
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
                     b.ToTable("CmsRatings");
                 });
 

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs → modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200826063729_CmsRatings_Added.cs

@@ -12,14 +12,22 @@ namespace Volo.CmsKit.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(nullable: false),
+                    TenantId = table.Column<Guid>(nullable: true),
+                    EntityType = table.Column<string>(maxLength: 64, nullable: false),
+                    EntityId = table.Column<string>(maxLength: 64, nullable: false),
                     StarCount = table.Column<short>(nullable: false),
-                    CreationTime = table.Column<DateTime>(nullable: false),
+                    CreatorId = table.Column<Guid>(nullable: false),
-                    CreatorId = table.Column<Guid>(nullable: false)
+                    CreationTime = table.Column<DateTime>(nullable: false)
                 },
                 constraints: table =>
                 {
                     table.PrimaryKey("PK_CmsRatings", x => x.Id);
                 });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CmsRatings_TenantId_EntityType_EntityId",
+                table: "CmsRatings",
+                columns: new[] { "TenantId", "EntityType", "EntityId" });
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs

@@ -971,11 +971,26 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnName("CreatorId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
                     b.Property<short>("StarCount")
                         .HasColumnType("smallint");
 
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.HasKey("Id");
 
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
                     b.ToTable("CmsRatings");
                 });
 

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs

@@ -0,0 +1,11 @@
+using Volo.CmsKit.Entities;
+
+namespace Volo.CmsKit.Ratings
+{
+    public static class RatingConsts
+    {
+        public static int MaxEntityTypeLength { get; set; } = CmsEntityConsts.MaxEntityTypeLength;
+
+        public static int MaxEntityIdLength { get; set; } = CmsEntityConsts.MaxEntityIdLength;
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs

@@ -1,5 +1,6 @@
 using System;
 using JetBrains.Annotations;
+using Volo.Abp;
 using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Entities;
 
@@ -7,12 +8,18 @@ namespace Volo.CmsKit.Ratings
 {
     public class Rating : BasicAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator
     {
+        public virtual Guid? TenantId { get; protected set; }
+        
+        public virtual string EntityType { get; protected set; }
+
+        public virtual string EntityId { get; protected set; }
+        
         public virtual short StarCount { get; protected set; }
+        
+        public virtual Guid CreatorId { get; set; }
 
         public virtual DateTime CreationTime { get; set; }
 
-        public virtual Guid CreatorId { get; set; }
-
         protected Rating()
         {
             
@@ -20,13 +27,19 @@ namespace Volo.CmsKit.Ratings
         
         public Rating(
             Guid id,
-            [NotNull] short starCount, 
+            [NotNull] string entityType,
-            Guid creatorId
+            [NotNull] string entityId,
+            short starCount, 
+            Guid creatorId,
+            Guid? tenantId = null
         )
             : base(id)
         {
+            EntityType = Check.NotNullOrWhiteSpace(entityType, nameof(entityType), RatingConsts.MaxEntityTypeLength);
+            EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId), RatingConsts.MaxEntityIdLength);
             StarCount = starCount;
             CreatorId = creatorId;
+            TenantId = tenantId;
         }
     }
 }

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs

@@ -82,6 +82,10 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     r.ConfigureByConvention();
 
                     r.Property(x => x.StarCount).IsRequired();
+                    r.Property(x => x.EntityType).IsRequired().HasMaxLength(RatingConsts.MaxEntityTypeLength);
+                    r.Property(x => x.EntityId).IsRequired().HasMaxLength(RatingConsts.MaxEntityIdLength);
+
+                    r.HasIndex(x => new {x.TenantId, x.EntityType, x.EntityId});
                 });    
             }
         }