From d50f9a72c575b28b9240a6360811d852f2e928db Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Mon, 24 Aug 2020 14:21:09 +0300
Subject: [PATCH 01/17] Rating widget created

---
 .../CmsKitPublicWidgetsController.cs          |  6 ++++
 .../Shared/Components/Rating/Default.cshtml   | 27 ++++++++++++++
 .../Rating/RatingScriptBundleContributor.cs   | 13 +++++++
 .../Rating/RatingStyleBundleContributor.cs    | 13 +++++++
 .../Components/Rating/RatingViewComponent.cs  | 20 +++++++++++
 .../Shared/Components/Rating/default.css      | 35 +++++++++++++++++++
 .../Shared/Components/Rating/default.js       |  1 +
 .../Volo.CmsKit.Public.Web.csproj             |  4 +++
 8 files changed, 119 insertions(+)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
index c130ebefca..7cc9c410c4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting;
+using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating;
 using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection;
 
 namespace Volo.CmsKit.Public.Web.Controllers
@@ -16,5 +17,10 @@ namespace Volo.CmsKit.Public.Web.Controllers
         {
             return Task.FromResult((IActionResult)ViewComponent(typeof(CommentingViewComponent), new {entityType, entityId}));
         }
+
+        public Task<IActionResult> Rating()
+        {
+            return Task.FromResult((IActionResult) ViewComponent(typeof(RatingViewComponent)));
+        }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
new file mode 100644
index 0000000000..f9cd651ff1
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -0,0 +1,27 @@
+@using Volo.Abp.Users
+@inject ICurrentUser CurrentUser
+
+@if (CurrentUser.IsAuthenticated)
+{
+    <div class="my-simple-widget">
+        <h2>My Simple Widget</h2>
+        <p>This is a simple widget!</p>
+    </div>
+}
+
+<div class="rate">
+    <input type="radio" id="star5" name="rate" value="5"/>
+    <label for="star5" title="5 stars"></label>
+
+    <input type="radio" id="star4" name="rate" value="4"/>
+    <label for="star4" title="4 stars"></label>
+
+    <input type="radio" id="star3" name="rate" value="3"/>
+    <label for="star3" title="3 stars"></label>
+
+    <input type="radio" id="star2" name="rate" value="2"/>
+    <label for="star2" title="2 stars"></label>
+
+    <input type="radio" id="star1" name="rate" value="1"/>
+    <label for="star1" title="1 star"></label>
+</div>
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs
new file mode 100644
index 0000000000..a57ff8294f
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
+{
+    public class RatingScriptBundleContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/Pages/CmsKit/Shared/Components/Rating/default.js");
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs
new file mode 100644
index 0000000000..dc82f1f5da
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
+{
+    public class RatingStyleBundleContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/Pages/CmsKit/Shared/Components/Rating/default.css");
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
new file mode 100644
index 0000000000..f77759ac20
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
+{
+    [ViewComponent(Name = "CmsRating")]
+    [Widget(
+        StyleTypes = new[] {typeof(RatingStyleBundleContributor)},
+        ScriptTypes = new[] {typeof(RatingScriptBundleContributor)},
+        RefreshUrl = "/CmsKitPublicWidgets/Rating"
+    )]
+    public class RatingViewComponent : AbpViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            return View("~/Pages/CmsKit/Shared/Components/Rating/Default.cshtml");
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
new file mode 100644
index 0000000000..0dc4780ee9
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
@@ -0,0 +1,35 @@
+.rate {
+    float: left;
+    height: 46px;
+    padding: 0 10px;
+}
+.rate:not(:checked) > input {
+    position:absolute;
+    top:-9999px;
+}
+.rate:not(:checked) > label {
+    float:right;
+    width:1em;
+    overflow:hidden;
+    white-space:nowrap;
+    cursor:pointer;
+    font-size:30px;
+    color:#ccc;
+}
+.rate:not(:checked) > label:before {
+    content: '★ ';
+}
+.rate > input:checked ~ label {
+    color: #ffc700;
+}
+.rate:not(:checked) > label:hover,
+.rate:not(:checked) > label:hover ~ label {
+    color: #deb217;
+}
+.rate > input:checked + label:hover,
+.rate > input:checked + label:hover ~ label,
+.rate > input:checked ~ label:hover,
+.rate > input:checked ~ label:hover ~ label,
+.rate > label:hover ~ input:checked ~ label {
+    color: #c59b08;
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
index 6d2f8ff303..3d52f544e0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
@@ -27,6 +27,10 @@
     <EmbeddedResource Include="Components\**\*.css" />
     <Content Remove="Components\**\*.js" />
     <Content Remove="Components\**\*.css" />
+    <Content Update="Pages\CmsKit\Shared\Components\Rating\Default.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
   </ItemGroup>
 
 </Project>

From 12011ffe03e12f0508c75c1a2122a22473894640 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Tue, 25 Aug 2020 11:39:43 +0300
Subject: [PATCH 02/17] CmsKit: Created CmsRating

---
 .../20200825083332_Rating_Added.Designer.cs   | 1220 +++++++++
 .../Migrations/20200825083332_Rating_Added.cs |   31 +
 .../UnifiedDbContextModelSnapshot.cs          | 2414 +++++++++--------
 .../GlobalFeatures/GlobalCmsKitFeatures.cs    |    3 +
 .../CmsKit/GlobalFeatures/RatingsFeature.cs   |   18 +
 .../Volo/CmsKit/Ratings/IRatingRepository.cs  |   10 +
 .../Volo/CmsKit/Ratings/Rating.cs             |   32 +
 .../CmsKitDbContextModelCreatingExtensions.cs |   13 +
 .../CmsKitEntityFrameworkCoreModule.cs        |    2 +
 .../CmsKit/Ratings/EfCoreRatingRepository.cs  |   14 +
 10 files changed, 2561 insertions(+), 1196 deletions(-)
 create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs
 create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/RatingsFeature.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs
new file mode 100644
index 0000000000..8a69c9cb89
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs
@@ -0,0 +1,1220 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Migrations
+{
+    [DbContext(typeof(UnifiedDbContext))]
+    [Migration("20200825083332_Rating_Added")]
+    partial class Rating_Added
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+                .HasAnnotation("ProductVersion", "3.1.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasColumnType("nvarchar(96)")
+                        .HasMaxLength(96);
+
+                    b.Property<string>("BrowserInfo")
+                        .HasColumnName("BrowserInfo")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasColumnName("ClientIpAddress")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ClientName")
+                        .HasColumnName("ClientName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Comments")
+                        .HasColumnName("Comments")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnName("Exceptions")
+                        .HasColumnType("nvarchar(4000)")
+                        .HasMaxLength(4000);
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HttpMethod")
+                        .HasColumnName("HttpMethod")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnName("HttpStatusCode")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnName("ImpersonatorTenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnName("ImpersonatorUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("TenantName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Url")
+                        .HasColumnName("Url")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnName("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("UserName")
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnName("ExecutionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MethodName")
+                        .HasColumnName("MethodName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Parameters")
+                        .HasColumnName("Parameters")
+                        .HasColumnType("nvarchar(2000)")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("ServiceName")
+                        .HasColumnName("ServiceName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogActions");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnName("ChangeTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnName("ChangeType")
+                        .HasColumnType("tinyint");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnName("EntityId")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("EntityTypeFullName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("AbpEntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("NewValue")
+                        .HasColumnName("NewValue")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("OriginalValue")
+                        .HasColumnName("OriginalValue")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasColumnName("PropertyName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("PropertyTypeFullName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("AbpEntityPropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpClaimTypes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("AbpRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AbpRoleClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
+                        .HasDefaultValue(0);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("AbpUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AbpUserClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(196)")
+                        .HasMaxLength(196);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("AbpUserLogins");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("OrganizationUnitId", "UserId");
+
+                    b.HasIndex("UserId", "OrganizationUnitId");
+
+                    b.ToTable("AbpUserOrganizationUnits");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("AbpUserRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AbpUserTokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnName("Code")
+                        .HasColumnType("nvarchar(95)")
+                        .HasMaxLength(95);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnName("DisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("AbpOrganizationUnits");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("OrganizationUnitId", "RoleId");
+
+                    b.HasIndex("RoleId", "OrganizationUnitId");
+
+                    b.ToTable("AbpOrganizationUnitRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpPermissionGrants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpSettings");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("AbpTenants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.HasKey("TenantId", "Name");
+
+                    b.ToTable("AbpTenantConnectionStrings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .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<Guid?>("RepliedCommentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "RepliedCommentId");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsComments");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<short>("Star")
+                        .HasColumnType("smallint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CmsRatings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .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<string>("ReactionName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(32)")
+                        .HasMaxLength(32);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "ReactionName");
+
+                    b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
+
+                    b.ToTable("CmsUserReactions");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Email");
+
+                    b.HasIndex("TenantId", "UserName");
+
+                    b.ToTable("CmsUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("OrganizationUnits")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("ParentId");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
+                        .WithMany("ConnectionStrings")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs
new file mode 100644
index 0000000000..e6b7a3dfb3
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs
@@ -0,0 +1,31 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.CmsKit.Migrations
+{
+    public partial class Rating_Added : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CmsRatings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(nullable: false),
+                    Star = table.Column<short>(nullable: false),
+                    CreationTime = table.Column<DateTime>(nullable: false),
+                    CreatorId = table.Column<Guid>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CmsRatings", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CmsRatings");
+        }
+    }
+}
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
index 931ed2b852..0fd87d6cc2 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
@@ -1,1196 +1,1218 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.CmsKit.EntityFrameworkCore;
-
-namespace Volo.CmsKit.Migrations
-{
-    [DbContext(typeof(UnifiedDbContext))]
-    partial class UnifiedDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
-                .HasAnnotation("ProductVersion", "3.1.6")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ApplicationName")
-                        .HasColumnName("ApplicationName")
-                        .HasColumnType("nvarchar(96)")
-                        .HasMaxLength(96);
-
-                    b.Property<string>("BrowserInfo")
-                        .HasColumnName("BrowserInfo")
-                        .HasColumnType("nvarchar(512)")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("ClientId")
-                        .HasColumnName("ClientId")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ClientIpAddress")
-                        .HasColumnName("ClientIpAddress")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ClientName")
-                        .HasColumnName("ClientName")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("Comments")
-                        .HasColumnName("Comments")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<string>("CorrelationId")
-                        .HasColumnName("CorrelationId")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Exceptions")
-                        .HasColumnName("Exceptions")
-                        .HasColumnType("nvarchar(4000)")
-                        .HasMaxLength(4000);
-
-                    b.Property<int>("ExecutionDuration")
-                        .HasColumnName("ExecutionDuration")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("ExecutionTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("HttpMethod")
-                        .HasColumnName("HttpMethod")
-                        .HasColumnType("nvarchar(16)")
-                        .HasMaxLength(16);
-
-                    b.Property<int?>("HttpStatusCode")
-                        .HasColumnName("HttpStatusCode")
-                        .HasColumnType("int");
-
-                    b.Property<Guid?>("ImpersonatorTenantId")
-                        .HasColumnName("ImpersonatorTenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("ImpersonatorUserId")
-                        .HasColumnName("ImpersonatorUserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("TenantName")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Url")
-                        .HasColumnName("Url")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnName("UserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("UserName")
-                        .HasColumnName("UserName")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("TenantId", "ExecutionTime");
-
-                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
-
-                    b.ToTable("AbpAuditLogs");
-                });
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("AuditLogId")
-                        .HasColumnName("AuditLogId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<int>("ExecutionDuration")
-                        .HasColumnName("ExecutionDuration")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("ExecutionTime")
-                        .HasColumnName("ExecutionTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("MethodName")
-                        .HasColumnName("MethodName")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("Parameters")
-                        .HasColumnName("Parameters")
-                        .HasColumnType("nvarchar(2000)")
-                        .HasMaxLength(2000);
-
-                    b.Property<string>("ServiceName")
-                        .HasColumnName("ServiceName")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AuditLogId");
-
-                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
-
-                    b.ToTable("AbpAuditLogActions");
-                });
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("AuditLogId")
-                        .HasColumnName("AuditLogId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("ChangeTime")
-                        .HasColumnName("ChangeTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<byte>("ChangeType")
-                        .HasColumnName("ChangeType")
-                        .HasColumnType("tinyint");
-
-                    b.Property<string>("EntityId")
-                        .IsRequired()
-                        .HasColumnName("EntityId")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<Guid?>("EntityTenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("EntityTypeFullName")
-                        .IsRequired()
-                        .HasColumnName("EntityTypeFullName")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AuditLogId");
-
-                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
-
-                    b.ToTable("AbpEntityChanges");
-                });
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("EntityChangeId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("NewValue")
-                        .HasColumnName("NewValue")
-                        .HasColumnType("nvarchar(512)")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("OriginalValue")
-                        .HasColumnName("OriginalValue")
-                        .HasColumnType("nvarchar(512)")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("PropertyName")
-                        .IsRequired()
-                        .HasColumnName("PropertyName")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("PropertyTypeFullName")
-                        .IsRequired()
-                        .HasColumnName("PropertyTypeFullName")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("EntityChangeId");
-
-                    b.ToTable("AbpEntityPropertyChanges");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<string>("Description")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("IsStatic")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Regex")
-                        .HasColumnType("nvarchar(512)")
-                        .HasMaxLength(512);
-
-                    b.Property<string>("RegexDescription")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<bool>("Required")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("ValueType")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("AbpClaimTypes");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("IsDefault")
-                        .HasColumnName("IsDefault")
-                        .HasColumnType("bit");
-
-                    b.Property<bool>("IsPublic")
-                        .HasColumnName("IsPublic")
-                        .HasColumnType("bit");
-
-                    b.Property<bool>("IsStatic")
-                        .HasColumnName("IsStatic")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("NormalizedName");
-
-                    b.ToTable("AbpRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("nvarchar(1024)")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid>("RoleId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RoleId");
-
-                    b.ToTable("AbpRoleClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<int>("AccessFailedCount")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("AccessFailedCount")
-                        .HasColumnType("int")
-                        .HasDefaultValue(0);
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnName("Email")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<bool>("EmailConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("EmailConfirmed")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("IsDeleted")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("IsDeleted")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<bool>("LockoutEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("LockoutEnabled")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTimeOffset?>("LockoutEnd")
-                        .HasColumnType("datetimeoffset");
-
-                    b.Property<string>("Name")
-                        .HasColumnName("Name")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("NormalizedEmail")
-                        .IsRequired()
-                        .HasColumnName("NormalizedEmail")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("NormalizedUserName")
-                        .IsRequired()
-                        .HasColumnName("NormalizedUserName")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PasswordHash")
-                        .HasColumnName("PasswordHash")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnName("PhoneNumber")
-                        .HasColumnType("nvarchar(16)")
-                        .HasMaxLength(16);
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("PhoneNumberConfirmed")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("SecurityStamp")
-                        .IsRequired()
-                        .HasColumnName("SecurityStamp")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("Surname")
-                        .HasColumnName("Surname")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<bool>("TwoFactorEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("TwoFactorEnabled")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnName("UserName")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Email");
-
-                    b.HasIndex("NormalizedEmail");
-
-                    b.HasIndex("NormalizedUserName");
-
-                    b.HasIndex("UserName");
-
-                    b.ToTable("AbpUsers");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ClaimType")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<string>("ClaimValue")
-                        .HasColumnType("nvarchar(1024)")
-                        .HasMaxLength(1024);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AbpUserClaims");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderDisplayName")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(196)")
-                        .HasMaxLength(196);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("UserId", "LoginProvider");
-
-                    b.HasIndex("LoginProvider", "ProviderKey");
-
-                    b.ToTable("AbpUserLogins");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
-                {
-                    b.Property<Guid>("OrganizationUnitId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("OrganizationUnitId", "UserId");
-
-                    b.HasIndex("UserId", "OrganizationUnitId");
-
-                    b.ToTable("AbpUserOrganizationUnits");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("RoleId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("UserId", "RoleId");
-
-                    b.HasIndex("RoleId", "UserId");
-
-                    b.ToTable("AbpUserRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("LoginProvider")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Name")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("UserId", "LoginProvider", "Name");
-
-                    b.ToTable("AbpUserTokens");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasColumnName("Code")
-                        .HasColumnType("nvarchar(95)")
-                        .HasMaxLength(95);
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasColumnName("DisplayName")
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("IsDeleted")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("IsDeleted")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("ParentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Code");
-
-                    b.HasIndex("ParentId");
-
-                    b.ToTable("AbpOrganizationUnits");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
-                {
-                    b.Property<Guid>("OrganizationUnitId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid>("RoleId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("OrganizationUnitId", "RoleId");
-
-                    b.HasIndex("RoleId", "OrganizationUnitId");
-
-                    b.ToTable("AbpOrganizationUnitRoles");
-                });
-
-            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpPermissionGrants");
-                });
-
-            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(128)")
-                        .HasMaxLength(128);
-
-                    b.Property<string>("ProviderKey")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("ProviderName")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(2048)")
-                        .HasMaxLength(2048);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name", "ProviderName", "ProviderKey");
-
-                    b.ToTable("AbpSettings");
-                });
-
-            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("CreatorId")
-                        .HasColumnName("CreatorId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnName("DeleterId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnName("DeletionTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<bool>("IsDeleted")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("IsDeleted")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<DateTime?>("LastModificationTime")
-                        .HasColumnName("LastModificationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid?>("LastModifierId")
-                        .HasColumnName("LastModifierId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Name");
-
-                    b.ToTable("AbpTenants");
-                });
-
-            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
-                {
-                    b.Property<Guid>("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(1024)")
-                        .HasMaxLength(1024);
-
-                    b.HasKey("TenantId", "Name");
-
-                    b.ToTable("AbpTenantConnectionStrings");
-                });
-
-            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("CreatorId")
-                        .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<Guid?>("RepliedCommentId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("Text")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(512)")
-                        .HasMaxLength(512);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("TenantId", "RepliedCommentId");
-
-                    b.HasIndex("TenantId", "EntityType", "EntityId");
-
-                    b.ToTable("CmsComments");
-                });
-
-            modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("CreationTime")
-                        .HasColumnName("CreationTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<Guid>("CreatorId")
-                        .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<string>("ReactionName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(32)")
-                        .HasMaxLength(32);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("TenantId", "EntityType", "EntityId", "ReactionName");
-
-                    b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
-
-                    b.ToTable("CmsUserReactions");
-                });
-
-            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("ConcurrencyStamp")
-                        .IsConcurrencyToken()
-                        .HasColumnName("ConcurrencyStamp")
-                        .HasColumnType("nvarchar(40)")
-                        .HasMaxLength(40);
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnName("Email")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.Property<bool>("EmailConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("EmailConfirmed")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("ExtraProperties")
-                        .HasColumnName("ExtraProperties")
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Name")
-                        .HasColumnName("Name")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<string>("PhoneNumber")
-                        .HasColumnName("PhoneNumber")
-                        .HasColumnType("nvarchar(16)")
-                        .HasMaxLength(16);
-
-                    b.Property<bool>("PhoneNumberConfirmed")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnName("PhoneNumberConfirmed")
-                        .HasColumnType("bit")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("Surname")
-                        .HasColumnName("Surname")
-                        .HasColumnType("nvarchar(64)")
-                        .HasMaxLength(64);
-
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnName("TenantId")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<string>("UserName")
-                        .IsRequired()
-                        .HasColumnName("UserName")
-                        .HasColumnType("nvarchar(256)")
-                        .HasMaxLength(256);
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("TenantId", "Email");
-
-                    b.HasIndex("TenantId", "UserName");
-
-                    b.ToTable("CmsUsers");
-                });
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
-                {
-                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
-                        .WithMany("Actions")
-                        .HasForeignKey("AuditLogId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
-                {
-                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
-                        .WithMany("EntityChanges")
-                        .HasForeignKey("AuditLogId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
-                {
-                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
-                        .WithMany("PropertyChanges")
-                        .HasForeignKey("EntityChangeId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
-                        .WithMany("Claims")
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
-                        .WithMany("Claims")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
-                        .WithMany("Logins")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
-                        .WithMany()
-                        .HasForeignKey("OrganizationUnitId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
-                        .WithMany("OrganizationUnits")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
-                        .WithMany("Roles")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
-                        .WithMany("Tokens")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
-                        .WithMany()
-                        .HasForeignKey("ParentId");
-                });
-
-            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
-                {
-                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
-                        .WithMany("Roles")
-                        .HasForeignKey("OrganizationUnitId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
-                {
-                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
-                        .WithMany("ConnectionStrings")
-                        .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Migrations
+{
+    [DbContext(typeof(UnifiedDbContext))]
+    partial class UnifiedDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+                .HasAnnotation("ProductVersion", "3.1.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasColumnType("nvarchar(96)")
+                        .HasMaxLength(96);
+
+                    b.Property<string>("BrowserInfo")
+                        .HasColumnName("BrowserInfo")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasColumnName("ClientIpAddress")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ClientName")
+                        .HasColumnName("ClientName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Comments")
+                        .HasColumnName("Comments")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnName("Exceptions")
+                        .HasColumnType("nvarchar(4000)")
+                        .HasMaxLength(4000);
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HttpMethod")
+                        .HasColumnName("HttpMethod")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnName("HttpStatusCode")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnName("ImpersonatorTenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnName("ImpersonatorUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("TenantName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Url")
+                        .HasColumnName("Url")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnName("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("UserName")
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnName("ExecutionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MethodName")
+                        .HasColumnName("MethodName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Parameters")
+                        .HasColumnName("Parameters")
+                        .HasColumnType("nvarchar(2000)")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("ServiceName")
+                        .HasColumnName("ServiceName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogActions");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnName("ChangeTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnName("ChangeType")
+                        .HasColumnType("tinyint");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnName("EntityId")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("EntityTypeFullName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("AbpEntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("NewValue")
+                        .HasColumnName("NewValue")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("OriginalValue")
+                        .HasColumnName("OriginalValue")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasColumnName("PropertyName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("PropertyTypeFullName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("AbpEntityPropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpClaimTypes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("AbpRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AbpRoleClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
+                        .HasDefaultValue(0);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("AbpUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AbpUserClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(196)")
+                        .HasMaxLength(196);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("AbpUserLogins");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("OrganizationUnitId", "UserId");
+
+                    b.HasIndex("UserId", "OrganizationUnitId");
+
+                    b.ToTable("AbpUserOrganizationUnits");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("AbpUserRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AbpUserTokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnName("Code")
+                        .HasColumnType("nvarchar(95)")
+                        .HasMaxLength(95);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnName("DisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("AbpOrganizationUnits");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("OrganizationUnitId", "RoleId");
+
+                    b.HasIndex("RoleId", "OrganizationUnitId");
+
+                    b.ToTable("AbpOrganizationUnitRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpPermissionGrants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpSettings");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("AbpTenants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.HasKey("TenantId", "Name");
+
+                    b.ToTable("AbpTenantConnectionStrings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .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<Guid?>("RepliedCommentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "RepliedCommentId");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId");
+
+                    b.ToTable("CmsComments");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<short>("Star")
+                        .HasColumnType("smallint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CmsRatings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .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<string>("ReactionName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(32)")
+                        .HasMaxLength(32);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "EntityType", "EntityId", "ReactionName");
+
+                    b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
+
+                    b.ToTable("CmsUserReactions");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Email");
+
+                    b.HasIndex("TenantId", "UserName");
+
+                    b.ToTable("CmsUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("OrganizationUnits")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("ParentId");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
+                        .WithMany("ConnectionStrings")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/GlobalCmsKitFeatures.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/GlobalCmsKitFeatures.cs
index 646a91ef4f..bb7694262b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/GlobalCmsKitFeatures.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/GlobalCmsKitFeatures.cs
@@ -11,11 +11,14 @@ namespace Volo.CmsKit.GlobalFeatures
 
         public CommentsFeature Comments => GetFeature<CommentsFeature>();
 
+        public RatingsFeature Ratings => GetFeature<RatingsFeature>();
+
         public GlobalCmsKitFeatures([NotNull] GlobalFeatureManager featureManager)
             : base(featureManager)
         {
             AddFeature(new ReactionsFeature(this));
             AddFeature(new CommentsFeature(this));
+            AddFeature(new RatingsFeature(this));
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/RatingsFeature.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/RatingsFeature.cs
new file mode 100644
index 0000000000..b982d6cebb
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/RatingsFeature.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using Volo.Abp.GlobalFeatures;
+
+namespace Volo.CmsKit.GlobalFeatures
+{
+    [GlobalFeatureName(Name)]
+    public class RatingsFeature : GlobalFeature
+    {
+        public const string Name = "CmsKit.Ratings";
+
+        internal RatingsFeature(
+            [NotNull] GlobalCmsKitFeatures cmsKit
+        ) : base(cmsKit)
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
new file mode 100644
index 0000000000..a2f7c779af
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
@@ -0,0 +1,10 @@
+using System;
+using Volo.Abp.Domain.Repositories;
+
+namespace Volo.CmsKit.Ratings
+{
+    public interface IRatingRepository : IBasicRepository<Rating, Guid>
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
new file mode 100644
index 0000000000..4f8cbee8b3
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
@@ -0,0 +1,32 @@
+using System;
+using JetBrains.Annotations;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.CmsKit.Ratings
+{
+    public class Rating : BasicAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator
+    {
+        public virtual short Star { get; protected set; }
+
+        public virtual DateTime CreationTime { get; set; }
+
+        public virtual Guid CreatorId { get; set; }
+
+        protected Rating()
+        {
+            
+        }
+        
+        public Rating(
+            Guid id,
+            [NotNull] short star, 
+            Guid creatorId
+        )
+            : base(id)
+        {
+            Star = star;
+            CreatorId = creatorId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
index a26b22883e..5c9ef3f7fd 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
@@ -8,6 +8,7 @@ using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 using Volo.Abp.Users.EntityFrameworkCore;
 using Volo.CmsKit.GlobalFeatures;
+using Volo.CmsKit.Ratings;
 
 namespace Volo.CmsKit.EntityFrameworkCore
 {
@@ -71,6 +72,18 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     b.HasIndex(x => new { x.TenantId, x.RepliedCommentId });
                 });
             }
+
+            if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>())
+            {
+                builder.Entity<Rating>(r =>
+                {
+                    r.ToTable(options.TablePrefix + "Ratings", options.Schema);
+
+                    r.ConfigureByConvention();
+
+                    r.Property(x => x.Star).IsRequired();
+                });    
+            }
         }
     }
 }
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 c528da7d5e..33e57cab37 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
@@ -3,6 +3,7 @@ using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Modularity;
 using Volo.Abp.Users.EntityFrameworkCore;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 
@@ -22,6 +23,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
                 options.AddRepository<CmsUser, EfCoreCmsUserRepository>();
                 options.AddRepository<UserReaction, EfCoreUserReactionRepository>();
                 options.AddRepository<Comment, EfCoreCommentRepository>();
+                options.AddRepository<Rating, EfCoreRatingRepository>();
             });
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
new file mode 100644
index 0000000000..b05db8fcfb
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
@@ -0,0 +1,14 @@
+using System;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Ratings
+{
+    public class EfCoreRatingRepository : EfCoreRepository<ICmsKitDbContext, Rating, Guid>, IRatingRepository
+    {
+        public EfCoreRatingRepository(IDbContextProvider<ICmsKitDbContext> dbContextProvider) : base(dbContextProvider)
+        {
+        }
+    }
+}
\ No newline at end of file

From 6caab2e051db25e6d1716b30fdefa4d1fb5ae0b3 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Tue, 25 Aug 2020 13:19:31 +0300
Subject: [PATCH 03/17] CmsKit: make property name more descriptive

---
 ...igner.cs => 20200825101525_CmsRatings_Added.Designer.cs} | 6 +++---
 ...2_Rating_Added.cs => 20200825101525_CmsRatings_Added.cs} | 4 ++--
 .../Migrations/UnifiedDbContextModelSnapshot.cs             | 2 +-
 .../src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs    | 6 +++---
 .../CmsKitDbContextModelCreatingExtensions.cs               | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/{20200825083332_Rating_Added.Designer.cs => 20200825101525_CmsRatings_Added.Designer.cs} (97%)
 rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/{20200825083332_Rating_Added.cs => 20200825101525_CmsRatings_Added.cs} (84%)

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs
similarity index 97%
rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs
rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs
index 8a69c9cb89..3de5568a5a 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.Designer.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs
@@ -11,8 +11,8 @@ using Volo.CmsKit.EntityFrameworkCore;
 namespace Volo.CmsKit.Migrations
 {
     [DbContext(typeof(UnifiedDbContext))]
-    [Migration("20200825083332_Rating_Added")]
-    partial class Rating_Added
+    [Migration("20200825101525_CmsRatings_Added")]
+    partial class CmsRatings_Added
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -973,7 +973,7 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnName("CreatorId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<short>("Star")
+                    b.Property<short>("StarCount")
                         .HasColumnType("smallint");
 
                     b.HasKey("Id");
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs
similarity index 84%
rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs
rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs
index e6b7a3dfb3..02ee0c1a53 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825083332_Rating_Added.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Volo.CmsKit.Migrations
 {
-    public partial class Rating_Added : Migration
+    public partial class CmsRatings_Added : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -12,7 +12,7 @@ namespace Volo.CmsKit.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(nullable: false),
-                    Star = table.Column<short>(nullable: false),
+                    StarCount = table.Column<short>(nullable: false),
                     CreationTime = table.Column<DateTime>(nullable: false),
                     CreatorId = table.Column<Guid>(nullable: false)
                 },
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
index 0fd87d6cc2..ebf821eeae 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
@@ -971,7 +971,7 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnName("CreatorId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<short>("Star")
+                    b.Property<short>("StarCount")
                         .HasColumnType("smallint");
 
                     b.HasKey("Id");
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
index 4f8cbee8b3..9384183e7b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
@@ -7,7 +7,7 @@ namespace Volo.CmsKit.Ratings
 {
     public class Rating : BasicAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator
     {
-        public virtual short Star { get; protected set; }
+        public virtual short StarCount { get; protected set; }
 
         public virtual DateTime CreationTime { get; set; }
 
@@ -20,12 +20,12 @@ namespace Volo.CmsKit.Ratings
         
         public Rating(
             Guid id,
-            [NotNull] short star, 
+            [NotNull] short starCount, 
             Guid creatorId
         )
             : base(id)
         {
-            Star = star;
+            StarCount = starCount;
             CreatorId = creatorId;
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
index 5c9ef3f7fd..e013723d18 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
@@ -81,7 +81,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
 
                     r.ConfigureByConvention();
 
-                    r.Property(x => x.Star).IsRequired();
+                    r.Property(x => x.StarCount).IsRequired();
                 });    
             }
         }

From 6708166e68fc2e90c25411549d4bcffbee6fa9b5 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Wed, 26 Aug 2020 09:40:35 +0300
Subject: [PATCH 04/17] CmsKit: CmsRatings updated

---
 ...200826063729_CmsRatings_Added.Designer.cs} | 17 ++++++++++++++-
 ....cs => 20200826063729_CmsRatings_Added.cs} | 12 +++++++++--
 .../UnifiedDbContextModelSnapshot.cs          | 15 +++++++++++++
 .../Volo/CmsKit/Ratings/RatingConsts.cs       | 11 ++++++++++
 .../Volo/CmsKit/Ratings/Rating.cs             | 21 +++++++++++++++----
 .../CmsKitDbContextModelCreatingExtensions.cs |  4 ++++
 6 files changed, 73 insertions(+), 7 deletions(-)
 rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/{20200825101525_CmsRatings_Added.Designer.cs => 20200826063729_CmsRatings_Added.Designer.cs} (96%)
 rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/{20200825101525_CmsRatings_Added.cs => 20200826063729_CmsRatings_Added.cs} (65%)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200826063729_CmsRatings_Added.Designer.cs
similarity index 96%
rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs
rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200826063729_CmsRatings_Added.Designer.cs
index 3de5568a5a..00e1003584 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.Designer.cs
+++ b/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");
                 });
 
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200826063729_CmsRatings_Added.cs
similarity index 65%
rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs
rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200826063729_CmsRatings_Added.cs
index 02ee0c1a53..d753d65865 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200825101525_CmsRatings_Added.cs
+++ b/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)
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
index ebf821eeae..43d834479a 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
+++ b/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");
                 });
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
new file mode 100644
index 0000000000..892b3cef45
--- /dev/null
+++ b/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;
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
index 9384183e7b..a35fd022bf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
+++ b/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, 
-            Guid creatorId
+            [NotNull] string entityType,
+            [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;
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
index e013723d18..d73f60967a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
+++ b/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});
                 });    
             }
         }

From d2458fb2ff293a8b51826390b246e56d5b2509fd Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Wed, 26 Aug 2020 10:54:20 +0300
Subject: [PATCH 05/17] CmsKit: Rating app service and repository
 implementations

---
 .../Volo/CmsKit/Ratings/IRatingRepository.cs  | 10 ++-
 .../Volo/CmsKit/Ratings/Rating.cs             | 14 +++-
 .../CmsKit/Ratings/EfCoreRatingRepository.cs  | 18 ++++
 .../CmsKit/MongoDB/CmsKitMongoDbContext.cs    |  3 +
 .../MongoDB/CmsKitMongoDbContextExtensions.cs |  6 ++
 .../CmsKit/MongoDB/CmsKitMongoDbModule.cs     |  3 +
 .../CmsKit/MongoDB/ICmsKitMongoDbContext.cs   |  3 +
 .../MongoDB/Ratings/MongoRatingRepository.cs  | 31 +++++++
 ...CmsKit.Public.Application.Contracts.csproj | 30 +++----
 .../Public/Ratings/CreateRatingInput.cs       | 10 +++
 .../Public/Ratings/IRatingPublicAppService.cs | 18 ++++
 .../Volo/CmsKit/Public/Ratings/RatingDto.cs   | 19 +++++
 .../Public/Ratings/UpdateRatingInput.cs       | 10 +++
 .../Volo.CmsKit.Public.Application.csproj     | 32 ++++----
 .../Public/Ratings/RatingPublicAppService.cs  | 82 +++++++++++++++++++
 15 files changed, 256 insertions(+), 33 deletions(-)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingDto.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
index a2f7c779af..e7a25b1709 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
@@ -1,10 +1,18 @@
 using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Volo.Abp.Domain.Repositories;
 
 namespace Volo.CmsKit.Ratings
 {
     public interface IRatingRepository : IBasicRepository<Rating, Guid>
     {
-        
+        Task<List<Rating>> GetListAsync(
+            [NotNull] string entityType,
+            [NotNull] string entityId,
+            CancellationToken cancellationToken = default
+        );
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
index a35fd022bf..4567b5d275 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
@@ -37,9 +37,21 @@ namespace Volo.CmsKit.Ratings
         {
             EntityType = Check.NotNullOrWhiteSpace(entityType, nameof(entityType), RatingConsts.MaxEntityTypeLength);
             EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId), RatingConsts.MaxEntityIdLength);
-            StarCount = starCount;
+            SetStarCount(starCount);
             CreatorId = creatorId;
             TenantId = tenantId;
         }
+
+        public virtual void SetStarCount(short starCount)
+        {
+            if(starCount <= 5 && starCount > 0)
+            {
+                StarCount = starCount;
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException("Choosen star must between 1 and 5");
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
index b05db8fcfb..36ed50ad35 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
@@ -1,4 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.CmsKit.EntityFrameworkCore;
@@ -10,5 +17,16 @@ namespace Volo.CmsKit.Ratings
         public EfCoreRatingRepository(IDbContextProvider<ICmsKitDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
+
+        public async Task<List<Rating>> GetListAsync(string entityType, string entityId, CancellationToken cancellationToken = default)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var query = DbSet.Where(r => r.EntityType == entityType && r.EntityId == entityId);
+            var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
+
+            return ratings;
+        }
     }
 }
\ No newline at end of file
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 63bf48a14e..09053167f9 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.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 
@@ -16,6 +17,8 @@ namespace Volo.CmsKit.MongoDB
 
         public IMongoCollection<CmsUser> CmsUsers => Collection<CmsUser>();
 
+        public IMongoCollection<Rating> Ratings => Collection<Rating>();
+
         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 568e136591..2dc4c55a71 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.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 
@@ -35,6 +36,11 @@ namespace Volo.CmsKit.MongoDB
             {
                 x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Comments";
             });
+            
+            builder.Entity<Rating>(x =>
+            {
+                x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Ratings";
+            });
         }
     }
 }
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 736b30ada1..d479821b38 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
@@ -4,8 +4,10 @@ using Volo.Abp.MongoDB;
 using Volo.Abp.Users.MongoDB;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.MongoDB.Comments;
+using Volo.CmsKit.MongoDB.Ratings;
 using Volo.CmsKit.MongoDB.Reactions;
 using Volo.CmsKit.MongoDB.Users;
+using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 
@@ -25,6 +27,7 @@ namespace Volo.CmsKit.MongoDB
                 options.AddRepository<CmsUser, MongoCmsUserRepository>();
                 options.AddRepository<UserReaction, MongoUserReactionRepository>();
                 options.AddRepository<Comment, MongoCommentRepository>();
+                options.AddRepository<Rating, MongoRatingRepository>();
             });
         }
     }
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 16b72c8902..40914a9720 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.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 
@@ -15,5 +16,7 @@ namespace Volo.CmsKit.MongoDB
         IMongoCollection<Comment> Comments { get; }
 
         IMongoCollection<CmsUser> CmsUsers { get; }
+        
+        IMongoCollection<Rating> Ratings { get; }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
new file mode 100644
index 0000000000..a7b5fa33b2
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver;
+using MongoDB.Driver.Linq;
+using Volo.Abp;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+using Volo.CmsKit.Ratings;
+
+namespace Volo.CmsKit.MongoDB.Ratings
+{
+    public class MongoRatingRepository : MongoDbRepository<ICmsKitMongoDbContext, Rating, Guid>, IRatingRepository
+    {
+        public MongoRatingRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        {
+        }
+
+        public async Task<List<Rating>> GetListAsync(string entityType, string entityId, CancellationToken cancellationToken = default)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var query = GetMongoQueryable().Where(r => r.EntityType == entityType && r.EntityId == entityId);
+            var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
+
+            return ratings;
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.csproj
index f44c745740..8515d28e83 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.csproj
@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-  <Import Project="..\..\..\..\configureawait.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\..\common.props" />
+  <Import Project="..\..\..\..\configureawait.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs
new file mode 100644
index 0000000000..88b53d5b0c
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.CmsKit.Public.Ratings
+{
+    public class CreateRatingInput
+    {
+        [Required]
+        public short StarCount { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
new file mode 100644
index 0000000000..d72d9dd365
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Volo.CmsKit.Public.Ratings
+{
+    public interface IRatingPublicAppService : IApplicationService
+    {
+        Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId);
+
+        Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input);
+
+        Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input);
+
+        Task DeleteAsync(Guid id);
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingDto.cs
new file mode 100644
index 0000000000..bf050465c9
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingDto.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Volo.CmsKit.Public.Ratings
+{
+    public class RatingDto
+    {
+        public Guid Id { get; set; }
+
+        public string EntityType { get; set; }
+
+        public string EntityId { get; set; }
+        
+        public short StarCount { get; set; }
+        
+        public Guid CreatorId { get; set; }
+
+        public DateTime CreationTime { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs
new file mode 100644
index 0000000000..e2f77122d4
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.CmsKit.Public.Ratings
+{
+    public class UpdateRatingInput
+    {
+        [Required]
+        public short StarCount { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj
index a8a9613fbf..702523e3c6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-  <Import Project="..\..\..\..\configureawait.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\..\common.props" />
+  <Import Project="..\..\..\..\configureawait.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
new file mode 100644
index 0000000000..4eb5e8e9ed
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Authorization;
+using Volo.Abp.Users;
+using Volo.CmsKit.Ratings;
+using Volo.CmsKit.Users;
+
+namespace Volo.CmsKit.Public.Ratings
+{
+    public class RatingPublicAppService : ApplicationService, IRatingPublicAppService
+    {
+        protected IRatingRepository RatingRepository { get; }
+        public ICmsUserLookupService CmsUserLookupService { get; }
+
+        public RatingPublicAppService(IRatingRepository ratingRepository, ICmsUserLookupService cmsUserLookupService)
+        {
+            RatingRepository = ratingRepository;
+            CmsUserLookupService = cmsUserLookupService;
+        }
+
+        public virtual async Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId)
+        {
+            var ratings = await RatingRepository.GetListAsync(entityType, entityId);
+            var ratingDto = ObjectMapper.Map<List<Rating>, List<RatingDto>>(ratings);
+
+            return new ListResultDto<RatingDto>(ratingDto);
+        }
+
+        [Authorize]
+        public virtual async Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input)
+        {
+            var user = await CmsUserLookupService.GetByIdAsync(CurrentUser.GetId());
+
+            var rating = await RatingRepository.InsertAsync(
+                new Rating(
+                    GuidGenerator.Create(),
+                    entityType,
+                    entityId,
+                    input.StarCount,
+                    user.Id,
+                    CurrentTenant.Id
+                )
+            );
+
+            return ObjectMapper.Map<Rating, RatingDto>(rating);
+        }
+
+        [Authorize]
+        public virtual async Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input)
+        {
+            var rating = await RatingRepository.GetAsync(id);
+
+            if (rating.CreatorId != CurrentUser.GetId())
+            {
+                throw new AbpAuthorizationException();
+            }
+            
+            rating.SetStarCount(input.StarCount);
+
+            var updatedRating = await RatingRepository.UpdateAsync(rating);
+
+            return ObjectMapper.Map<Rating, RatingDto>(updatedRating);
+        }
+
+        [Authorize]
+        public virtual async Task DeleteAsync(Guid id)
+        {
+            var rating = await RatingRepository.GetAsync(id);
+
+            if (rating.CreatorId != CurrentUser.GetId())
+            {
+                throw new AbpAuthorizationException();
+            }
+
+            await RatingRepository.DeleteAsync(id);
+        }
+    }
+}
\ No newline at end of file

From dd13fc2b17624194186fd3c970c4e905e5c4bf1a Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Wed, 26 Aug 2020 16:22:33 +0300
Subject: [PATCH 06/17] CmsKit: GetCurrentUserRatingAsync added

---
 .../Volo/CmsKit/Ratings/IRatingRepository.cs  |  7 +++
 .../CmsKit/Ratings/EfCoreRatingRepository.cs  | 10 ++++
 .../MongoDB/Ratings/MongoRatingRepository.cs  | 13 ++++
 .../Public/Ratings/IRatingPublicAppService.cs |  4 +-
 .../PublicApplicationAutoMapperProfile.cs     |  4 ++
 .../Public/Ratings/RatingPublicAppService.cs  | 10 ++++
 .../Volo.CmsKit.Public.HttpApi.csproj         | 32 +++++-----
 .../Public/Ratings/RatingPublicController.cs  | 59 +++++++++++++++++++
 .../CmsKitPublicWidgetsController.cs          |  4 +-
 .../Components/Rating/RatingViewComponent.cs  | 56 +++++++++++++++++-
 10 files changed, 177 insertions(+), 22 deletions(-)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
index e7a25b1709..d889c4b678 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
@@ -14,5 +14,12 @@ namespace Volo.CmsKit.Ratings
             [NotNull] string entityId,
             CancellationToken cancellationToken = default
         );
+
+        Task<Rating> GetCurrentUserRatingAsync(
+            [NotNull] string entityType,
+            [NotNull] string entityId,
+            Guid userId,
+            CancellationToken cancellationToken = default
+        );
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
index 36ed50ad35..b7e53e9b59 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
@@ -28,5 +28,15 @@ namespace Volo.CmsKit.Ratings
 
             return ratings;
         }
+
+        public async Task<Rating> GetCurrentUserRatingAsync(string entityType, string entityId, Guid userId, CancellationToken cancellationToken = default)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var rating = await DbSet.FirstOrDefaultAsync(r => r.EntityType == entityType && r.EntityId == entityId && r.CreatorId == userId, GetCancellationToken(cancellationToken));
+
+            return rating;
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
index a7b5fa33b2..93509233f0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
@@ -27,5 +27,18 @@ namespace Volo.CmsKit.MongoDB.Ratings
 
             return ratings;
         }
+
+        public async Task<Rating> GetCurrentUserRatingAsync(string entityType, string entityId, Guid userId,
+            CancellationToken cancellationToken = default)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var rating = await GetMongoQueryable()
+                .FirstOrDefaultAsync(r => r.EntityType == entityType && r.EntityId == entityId && r.CreatorId == userId,
+                    GetCancellationToken(cancellationToken));
+            
+            return rating;
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
index d72d9dd365..79785913bb 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
@@ -8,11 +8,13 @@ namespace Volo.CmsKit.Public.Ratings
     public interface IRatingPublicAppService : IApplicationService
     {
         Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId);
-
+        
         Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input);
 
         Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input);
 
         Task DeleteAsync(Guid id);
+        
+        Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId);
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
index e0b64bb0e8..3ac2d1949b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
@@ -2,6 +2,8 @@
 using Volo.Abp.AutoMapper;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.Public.Comments;
+using Volo.CmsKit.Public.Ratings;
+using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.Public
@@ -18,6 +20,8 @@ namespace Volo.CmsKit.Public
             CreateMap<Comment, CommentWithDetailsDto>()
                 .Ignore(x=> x.Replies)
                 .Ignore(x=> x.Author);
+
+            CreateMap<Rating, RatingDto>();
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
index 4eb5e8e9ed..43bc6546aa 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
@@ -78,5 +78,15 @@ namespace Volo.CmsKit.Public.Ratings
 
             await RatingRepository.DeleteAsync(id);
         }
+
+        [Authorize]
+        public virtual async Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId)
+        {
+            var currentUserId = CurrentUser.GetId();
+            
+            var rating = await RatingRepository.GetCurrentUserRatingAsync(entityType, entityId, currentUserId);
+
+            return ObjectMapper.Map<Rating, RatingDto>(rating);
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj
index da54b3d2bf..ec87dac00f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\..\common.props" />
-  <Import Project="..\..\..\..\configureawait.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace />
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\..\common.props" />
+  <Import Project="..\..\..\..\configureawait.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
new file mode 100644
index 0000000000..c6f6355e75
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.GlobalFeatures;
+using Volo.CmsKit.GlobalFeatures;
+
+namespace Volo.CmsKit.Public.Ratings
+{
+    [RequiresGlobalFeature(typeof(RatingsFeature))]
+    [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
+    [Area("cms-kit")]
+    [Route("api/cms-kit-public/ratings")]
+    public class RatingPublicController : CmsKitPublicControllerBase, IRatingPublicAppService
+    {
+        protected IRatingPublicAppService RatingPublicAppService { get; }
+
+        public RatingPublicController(IRatingPublicAppService ratingPublicAppService)
+        {
+            RatingPublicAppService = ratingPublicAppService;
+        }
+        
+        [HttpGet]
+        [Route("{entityType}/{entityId}")]
+        public virtual Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId)
+        {
+            return RatingPublicAppService.GetListAsync(entityType, entityId);
+        }
+
+        [HttpPut]
+        [Route("{entityType}/{entityId}")]
+        public virtual Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input)
+        {
+            return RatingPublicAppService.CreateAsync(entityType, entityId, input);
+        }
+
+        [HttpPut]
+        [Route("{id}")]
+        public virtual Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input)
+        {
+            return RatingPublicAppService.UpdateAsync(id, input);
+        }
+
+        [HttpDelete]
+        [Route("{id}")]
+        public Task DeleteAsync(Guid id)
+        {
+            return RatingPublicAppService.DeleteAsync(id);
+        }
+
+        [HttpGet]
+        [Route("{entityType}/{entityId}")]
+        public Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId)
+        {
+            return RatingPublicAppService.GetCurrentUserRatingAsync(entityType, entityId);
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
index 7cc9c410c4..e0b1f9d6f3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
@@ -18,9 +18,9 @@ namespace Volo.CmsKit.Public.Web.Controllers
             return Task.FromResult((IActionResult)ViewComponent(typeof(CommentingViewComponent), new {entityType, entityId}));
         }
 
-        public Task<IActionResult> Rating()
+        public Task<IActionResult> Rating(string entityType, string entityId)
         {
-            return Task.FromResult((IActionResult) ViewComponent(typeof(RatingViewComponent)));
+            return Task.FromResult((IActionResult) ViewComponent(typeof(RatingViewComponent), new {entityType, entityId}));
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
index f77759ac20..cabae790c0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
@@ -1,6 +1,12 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+using Volo.Abp.Users;
+using Volo.CmsKit.Public.Ratings;
 
 namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 {
@@ -12,9 +18,53 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
     )]
     public class RatingViewComponent : AbpViewComponent
     {
-        public IViewComponentResult Invoke()
+        public IRatingPublicAppService RatingPublicAppService { get; }
+        public AbpMvcUiOptions AbpMvcUiOptions { get; }
+        public ICurrentUser CurrentUser { get; }
+
+        public RatingViewComponent(IRatingPublicAppService ratingPublicAppService, IOptions<AbpMvcUiOptions> options, ICurrentUser currentUser)
+        {
+            RatingPublicAppService = ratingPublicAppService;
+            AbpMvcUiOptions = options.Value;
+            CurrentUser = currentUser;
+        }
+        
+        public virtual async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId)
         {
-            return View("~/Pages/CmsKit/Shared/Components/Rating/Default.cshtml");
+            var ratings = await RatingPublicAppService.GetListAsync(entityType, entityId);
+            
+            RatingDto currentUserRating = null;
+            if (CurrentUser.IsAuthenticated)
+            {
+                currentUserRating = await RatingPublicAppService.GetCurrentUserRatingAsync(entityType, entityId);
+            }
+            
+            var loginUrl =
+                $"{AbpMvcUiOptions.LoginUrl}?returnUrl={HttpContext.Request.Path.ToString()}&returnUrlHash=#cms-comment_{entityType}_{entityId}";
+
+            var viewModel = new RatingViewModel
+            {
+                EntityId = entityId,
+                EntityType = entityType,
+                LoginUrl = loginUrl,
+                Ratings = ratings.Items,
+                CurrentRating = currentUserRating
+            };
+            
+            return View("~/Pages/CmsKit/Shared/Components/Rating/Default.cshtml", viewModel);
         }
     }
+
+    public class RatingViewModel
+    {
+        public string EntityType { get; set; }
+
+        public string EntityId { get; set; }
+
+        public string LoginUrl { get; set; }
+
+        public IReadOnlyList<RatingDto> Ratings { get; set; }
+
+        public RatingDto CurrentRating { get; set; }
+    }
 }
\ No newline at end of file

From 404fe5e8a014a0aae005171305ab31db7cf57b59 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Thu, 27 Aug 2020 11:52:34 +0300
Subject: [PATCH 07/17] CmsKit: ratings group by star count

---
 .../Pages/Index.cshtml                        |  5 ++++
 .../Volo/CmsKit/Ratings/IRatingRepository.cs  |  6 +++++
 .../RatingWithStarCountQueryResultItem.cs     |  9 ++++++++
 .../CmsKit/Ratings/EfCoreRatingRepository.cs  | 21 +++++++++++++++++
 .../MongoDB/Ratings/MongoRatingRepository.cs  | 23 +++++++++++++++++++
 .../Public/Ratings/IRatingPublicAppService.cs |  3 +++
 .../Public/Ratings/RatingWithStarCountDto.cs  |  9 ++++++++
 .../PublicApplicationAutoMapperProfile.cs     |  2 ++
 .../Public/Ratings/RatingPublicAppService.cs  |  7 ++++++
 .../Public/Ratings/RatingPublicController.cs  | 12 ++++++++--
 .../Components/Rating/RatingViewComponent.cs  |  6 ++---
 11 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/RatingWithStarCountQueryResultItem.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
index 253016f03b..ab628d4412 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
@@ -5,6 +5,7 @@
 @using Volo.CmsKit.GlobalFeatures
 @using Volo.CmsKit.Pages
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 @model IndexModel
 @inject IStringLocalizer<AbpUiResource> Localizer
@@ -57,3 +58,7 @@
         }
     </abp-card-footer>
 </abp-card>
+
+<hr>
+@await Component.InvokeAsync(typeof(RatingViewComponent), new { entityType = "quote", entityId = "2" })
+<hr>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
index d889c4b678..29ce07df63 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
@@ -21,5 +21,11 @@ namespace Volo.CmsKit.Ratings
             Guid userId,
             CancellationToken cancellationToken = default
         );
+
+        Task<List<RatingWithStarCountQueryResultItem>> GetGroupedStarCountsAsync(
+            [NotNull] string entityType,
+            [NotNull] string entityId,
+            CancellationToken cancellationToken = default
+        );
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/RatingWithStarCountQueryResultItem.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/RatingWithStarCountQueryResultItem.cs
new file mode 100644
index 0000000000..5f53074b97
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/RatingWithStarCountQueryResultItem.cs
@@ -0,0 +1,9 @@
+namespace Volo.CmsKit.Ratings
+{
+    public class RatingWithStarCountQueryResultItem
+    {
+        public short StarCount { get; set; }
+
+        public int Count { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
index b7e53e9b59..b9f210cdcf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
@@ -38,5 +38,26 @@ namespace Volo.CmsKit.Ratings
 
             return rating;
         }
+
+        public async Task<List<RatingWithStarCountQueryResultItem>> GetGroupedStarCountsAsync(string entityType, string entityId, CancellationToken cancellationToken = default)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var query = from rating in DbSet
+                where rating.EntityType == entityType && rating.EntityId == entityId
+                orderby rating.StarCount descending
+                group rating by rating.StarCount
+                into g
+                select new RatingWithStarCountQueryResultItem
+                {
+                    StarCount = g.Key,
+                    Count = g.Count()
+                };
+
+            var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
+
+            return ratings;
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
index 93509233f0..a58b0517f4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
@@ -40,5 +41,27 @@ namespace Volo.CmsKit.MongoDB.Ratings
             
             return rating;
         }
+
+        public async Task<List<RatingWithStarCountQueryResultItem>> GetGroupedStarCountsAsync(string entityType,
+            string entityId, CancellationToken cancellationToken = default)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var query = from rating in GetMongoQueryable()
+                where rating.EntityType == entityType && rating.EntityId == entityId
+                orderby rating.StarCount descending
+                group rating by rating.StarCount
+                into g
+                select new RatingWithStarCountQueryResultItem
+                {
+                    StarCount = g.Key,
+                    Count = g.Count()
+                };
+
+            var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
+
+            return ratings;
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
index 79785913bb..9e4c8c1f11 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
@@ -16,5 +17,7 @@ namespace Volo.CmsKit.Public.Ratings
         Task DeleteAsync(Guid id);
         
         Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId);
+
+        Task<List<RatingWithStarCountDto>> GetGroupedStarCountsAsync(string entityType, string entityId);
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs
new file mode 100644
index 0000000000..e8f60ea49b
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs
@@ -0,0 +1,9 @@
+namespace Volo.CmsKit.Public.Ratings
+{
+    public class RatingWithStarCountDto
+    {
+        public short StarCount { get; set; }
+
+        public int Count { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
index 3ac2d1949b..0a0a5403b1 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
@@ -22,6 +22,8 @@ namespace Volo.CmsKit.Public
                 .Ignore(x=> x.Author);
 
             CreateMap<Rating, RatingDto>();
+            
+            CreateMap<RatingWithStarCountQueryResultItem, RatingWithStarCountDto>();
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
index 43bc6546aa..7621924727 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
@@ -88,5 +88,12 @@ namespace Volo.CmsKit.Public.Ratings
 
             return ObjectMapper.Map<Rating, RatingDto>(rating);
         }
+
+        public virtual async Task<List<RatingWithStarCountDto>> GetGroupedStarCountsAsync(string entityType, string entityId)
+        {
+            var ratings = await RatingRepository.GetGroupedStarCountsAsync(entityType, entityId);
+
+            return ObjectMapper.Map<List<RatingWithStarCountQueryResultItem>, List<RatingWithStarCountDto>>(ratings);
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
index c6f6355e75..25cc40ea5a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
@@ -44,16 +45,23 @@ namespace Volo.CmsKit.Public.Ratings
 
         [HttpDelete]
         [Route("{id}")]
-        public Task DeleteAsync(Guid id)
+        public virtual Task DeleteAsync(Guid id)
         {
             return RatingPublicAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{entityType}/{entityId}")]
-        public Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId)
+        public virtual Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId)
         {
             return RatingPublicAppService.GetCurrentUserRatingAsync(entityType, entityId);
         }
+        
+        [HttpGet]
+        [Route("{entityType}/{entityId}")]
+        public virtual Task<List<RatingWithStarCountDto>> GetGroupedStarCountsAsync(string entityType, string entityId)
+        {
+            return RatingPublicAppService.GetGroupedStarCountsAsync(entityType, entityId);
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
index cabae790c0..31dedbc532 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
@@ -31,7 +31,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
         
         public virtual async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId)
         {
-            var ratings = await RatingPublicAppService.GetListAsync(entityType, entityId);
+            var ratings = await RatingPublicAppService.GetGroupedStarCountsAsync(entityType, entityId);
             
             RatingDto currentUserRating = null;
             if (CurrentUser.IsAuthenticated)
@@ -47,7 +47,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
                 EntityId = entityId,
                 EntityType = entityType,
                 LoginUrl = loginUrl,
-                Ratings = ratings.Items,
+                Ratings = ratings,
                 CurrentRating = currentUserRating
             };
             
@@ -63,7 +63,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 
         public string LoginUrl { get; set; }
 
-        public IReadOnlyList<RatingDto> Ratings { get; set; }
+        public List<RatingWithStarCountDto> Ratings { get; set; }
 
         public RatingDto CurrentRating { get; set; }
     }

From 3cc99ecd30058d9928a1c498eba5193daee6eed5 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Thu, 27 Aug 2020 12:31:07 +0300
Subject: [PATCH 08/17] CmsKit: order by desc bugfix

---
 .../CmsKit/Ratings/EfCoreRatingRepository.cs  | 20 ++++++++++++-------
 .../MongoDB/Ratings/MongoRatingRepository.cs  | 15 ++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
index b9f210cdcf..577f2e3a7d 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
@@ -18,7 +18,8 @@ namespace Volo.CmsKit.Ratings
         {
         }
 
-        public async Task<List<Rating>> GetListAsync(string entityType, string entityId, CancellationToken cancellationToken = default)
+        public async Task<List<Rating>> GetListAsync(string entityType, string entityId,
+            CancellationToken cancellationToken = default)
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
@@ -29,31 +30,36 @@ namespace Volo.CmsKit.Ratings
             return ratings;
         }
 
-        public async Task<Rating> GetCurrentUserRatingAsync(string entityType, string entityId, Guid userId, CancellationToken cancellationToken = default)
+        public async Task<Rating> GetCurrentUserRatingAsync(string entityType, string entityId, Guid userId,
+            CancellationToken cancellationToken = default)
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
 
-            var rating = await DbSet.FirstOrDefaultAsync(r => r.EntityType == entityType && r.EntityId == entityId && r.CreatorId == userId, GetCancellationToken(cancellationToken));
+            var rating = await DbSet.FirstOrDefaultAsync(
+                r => r.EntityType == entityType && r.EntityId == entityId && r.CreatorId == userId,
+                GetCancellationToken(cancellationToken));
 
             return rating;
         }
 
-        public async Task<List<RatingWithStarCountQueryResultItem>> GetGroupedStarCountsAsync(string entityType, string entityId, CancellationToken cancellationToken = default)
+        public async Task<List<RatingWithStarCountQueryResultItem>> GetGroupedStarCountsAsync(string entityType,
+            string entityId, CancellationToken cancellationToken = default)
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
 
-            var query = from rating in DbSet
+            var query = (
+                from rating in DbSet
                 where rating.EntityType == entityType && rating.EntityId == entityId
-                orderby rating.StarCount descending
                 group rating by rating.StarCount
                 into g
                 select new RatingWithStarCountQueryResultItem
                 {
                     StarCount = g.Key,
                     Count = g.Count()
-                };
+                }
+            ).OrderByDescending(r => r.StarCount);
 
             var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
index a58b0517f4..ecf389cde7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
@@ -14,11 +14,13 @@ namespace Volo.CmsKit.MongoDB.Ratings
 {
     public class MongoRatingRepository : MongoDbRepository<ICmsKitMongoDbContext, Rating, Guid>, IRatingRepository
     {
-        public MongoRatingRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        public MongoRatingRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(
+            dbContextProvider)
         {
         }
 
-        public async Task<List<Rating>> GetListAsync(string entityType, string entityId, CancellationToken cancellationToken = default)
+        public async Task<List<Rating>> GetListAsync(string entityType, string entityId,
+            CancellationToken cancellationToken = default)
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
@@ -38,7 +40,7 @@ namespace Volo.CmsKit.MongoDB.Ratings
             var rating = await GetMongoQueryable()
                 .FirstOrDefaultAsync(r => r.EntityType == entityType && r.EntityId == entityId && r.CreatorId == userId,
                     GetCancellationToken(cancellationToken));
-            
+
             return rating;
         }
 
@@ -48,16 +50,17 @@ namespace Volo.CmsKit.MongoDB.Ratings
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
 
-            var query = from rating in GetMongoQueryable()
+            var query = (
+                from rating in GetMongoQueryable()
                 where rating.EntityType == entityType && rating.EntityId == entityId
-                orderby rating.StarCount descending
                 group rating by rating.StarCount
                 into g
                 select new RatingWithStarCountQueryResultItem
                 {
                     StarCount = g.Key,
                     Count = g.Count()
-                };
+                }
+            ).OrderByDescending(r => r.StarCount);
 
             var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
 

From a57c1b975f36b84e63df1616a47f3a6dbe962580 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Thu, 27 Aug 2020 14:48:55 +0300
Subject: [PATCH 09/17] CmsKit: Rating missing tests

---
 .../Ratings/RatingPublicAppService_Tests.cs   | 103 ++++++++++++++++++
 .../Ratings/RatingRepository_Tests.cs         |   9 ++
 .../MongoDB/Ratings/RatingRepository_Tests.cs |  11 ++
 .../CmsKitDataSeedContributor.cs              |  47 +++++++-
 .../Ratings/RatingRepository_Tests.cs         |  49 +++++++++
 5 files changed, 215 insertions(+), 4 deletions(-)
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Ratings/RatingRepository_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Ratings/RatingRepository_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs

diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs
new file mode 100644
index 0000000000..1a21da8425
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs
@@ -0,0 +1,103 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using Volo.Abp.Users;
+using Volo.CmsKit.Public.Ratings;
+using Xunit;
+
+namespace Volo.CmsKit.Ratings
+{
+    public class RatingPublicAppService_Tests : CmsKitApplicationTestBase
+    {
+        private readonly IRatingPublicAppService _ratingAppService;
+        private ICurrentUser _currentUser;
+        private readonly CmsKitTestData _cmsKitTestData;
+
+        public RatingPublicAppService_Tests()
+        {
+            _ratingAppService = GetRequiredService<IRatingPublicAppService>();
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            _currentUser = Substitute.For<ICurrentUser>();
+            services.AddSingleton(_currentUser);
+        }
+
+        [Fact]
+        public async Task CreateAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            var newRating = await _ratingAppService.CreateAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                new CreateRatingInput
+                {
+                    StarCount = 4
+                });
+
+            UsingDbContext(context =>
+            {
+                var ratings = context.Set<Rating>().Where(x =>
+                    x.EntityId == _cmsKitTestData.EntityId1 && x.EntityType == _cmsKitTestData.EntityType1).ToList();
+                
+                ratings
+                    .Any(c => c.Id == newRating.Id && c.CreatorId == newRating.CreatorId && c.StarCount == newRating.StarCount)
+                    .ShouldBeTrue();
+            });
+        }
+
+        [Fact]
+        public async Task UpdateAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            var rating = await _ratingAppService.CreateAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                new CreateRatingInput
+                {
+                    StarCount = 4
+                });
+
+            await _ratingAppService.UpdateAsync(rating.Id, new UpdateRatingInput
+            {
+                StarCount = 5
+            });
+
+            UsingDbContext(context =>
+            {
+                var updatedRating = context.Set<Rating>().Single(x => x.Id == rating.Id);
+                
+                updatedRating.StarCount.ShouldBe((short)5);
+            });
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+            
+            var rating = await _ratingAppService.CreateAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                new CreateRatingInput
+                {
+                    StarCount = 4
+                });
+
+            await _ratingAppService.DeleteAsync(rating.Id);
+
+            UsingDbContext(context =>
+            {
+                var deletedComment = context.Set<Rating>().FirstOrDefault(x => x.Id == rating.Id);
+
+                deletedComment.ShouldBeNull();
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Ratings/RatingRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Ratings/RatingRepository_Tests.cs
new file mode 100644
index 0000000000..390ddd1cb3
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Ratings/RatingRepository_Tests.cs
@@ -0,0 +1,9 @@
+using Volo.CmsKit.Ratings;
+
+namespace Volo.CmsKit.EntityFrameworkCore.Ratings
+{
+    public class RatingRepository_Tests : RatingRepository_Tests<CmsKitEntityFrameworkCoreTestModule>
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Ratings/RatingRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Ratings/RatingRepository_Tests.cs
new file mode 100644
index 0000000000..c0814253e6
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Ratings/RatingRepository_Tests.cs
@@ -0,0 +1,11 @@
+using Volo.CmsKit.Ratings;
+using Xunit;
+
+namespace Volo.CmsKit.MongoDB.Ratings
+{
+    [Collection(MongoTestCollection.Name)]
+    public class RatingRepository_Tests : RatingRepository_Tests<CmsKitMongoDbTestModule>
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
index 12c6255623..f91e79fb84 100644
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
@@ -4,6 +4,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.Users;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Ratings;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 
@@ -16,19 +17,22 @@ namespace Volo.CmsKit
         private readonly CmsKitTestData _cmsKitTestData;
         private readonly ICommentRepository _commentRepository;
         private readonly ReactionManager _reactionManager;
+        private readonly IRatingRepository _ratingRepository;
 
         public CmsKitDataSeedContributor(
             IGuidGenerator guidGenerator,
             ICmsUserRepository cmsUserRepository,
             CmsKitTestData cmsKitTestData,
             ICommentRepository commentRepository,
-            ReactionManager reactionManager)
+            ReactionManager reactionManager,
+            IRatingRepository ratingRepository)
         {
             _guidGenerator = guidGenerator;
             _cmsUserRepository = cmsUserRepository;
             _cmsKitTestData = cmsKitTestData;
             _commentRepository = commentRepository;
             _reactionManager = reactionManager;
+            _ratingRepository = ratingRepository;
         }
 
         public async Task SeedAsync(DataSeedContext context)
@@ -38,13 +42,17 @@ namespace Volo.CmsKit
             await SeedCommentsAsync();
 
             await SeedReactionsAsync();
+
+            await SeedRatingsAsync();
         }
 
         private async Task SeedUsersAsync()
         {
-            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User1Id, "user1", "user1@volo.com",
+            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User1Id, "user1",
+                "user1@volo.com",
                 "user", "1")));
-            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User2Id, "user2", "user2@volo.com",
+            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User2Id, "user2",
+                "user2@volo.com",
                 "user", "2")));
         }
 
@@ -131,5 +139,36 @@ namespace Volo.CmsKit
                 _cmsKitTestData.EntityId1,
                 StandardReactions.ThumbsUp);
         }
+
+        private async Task SeedRatingsAsync()
+        {
+            await _ratingRepository.InsertAsync(new Rating(_guidGenerator.Create(),
+                    _cmsKitTestData.EntityType1,
+                    _cmsKitTestData.EntityId1,
+                    4,
+                    _cmsKitTestData.User1Id
+                ));
+            
+            await _ratingRepository.InsertAsync(new Rating(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                5,
+                _cmsKitTestData.User1Id
+            ));
+            
+            await _ratingRepository.InsertAsync(new Rating(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType2,
+                _cmsKitTestData.EntityId2,
+                5,
+                _cmsKitTestData.User2Id
+            ));
+            
+            await _ratingRepository.InsertAsync(new Rating(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType2,
+                _cmsKitTestData.EntityId2,
+                1,
+                _cmsKitTestData.User2Id
+            ));
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs
new file mode 100644
index 0000000000..b09b380f8e
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs
@@ -0,0 +1,49 @@
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Xunit;
+
+namespace Volo.CmsKit.Ratings
+{
+    public abstract class RatingRepository_Tests<TStartupModule> : CmsKitTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        private readonly CmsKitTestData _cmsKitTestData;
+        private readonly IRatingRepository _ratingRepository;
+
+        public RatingRepository_Tests()
+        {
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+            _ratingRepository = GetRequiredService<IRatingRepository>();
+        }
+
+        [Fact]
+        public async Task GetListAsync()
+        {
+            var list = await _ratingRepository.GetListAsync(_cmsKitTestData.EntityType1, _cmsKitTestData.EntityId1);
+
+            list.Count.ShouldBeGreaterThan(0);
+        }
+
+        [Fact]
+        public async Task GetCurrentUserRatingAsync()
+        {
+            var userRating = await _ratingRepository.GetCurrentUserRatingAsync(_cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1, _cmsKitTestData.User1Id);
+
+            userRating.ShouldNotBeNull();
+            userRating.EntityId.ShouldBe(_cmsKitTestData.EntityId1);
+            userRating.EntityType.ShouldBe(_cmsKitTestData.EntityType1);
+            userRating.CreatorId.ShouldBe(_cmsKitTestData.User1Id);
+        }
+
+        [Fact]
+        public async Task GetGroupedStarCountsAsync()
+        {
+            var list = await _ratingRepository.GetGroupedStarCountsAsync(_cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1);
+            
+            list.ShouldNotBeNull();
+        }
+    }
+}
\ No newline at end of file

From 23ac23eb6b7afdc2530c0277b8857a7bae7cf8c0 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Thu, 27 Aug 2020 15:21:18 +0300
Subject: [PATCH 10/17] CmsKit: Rating widget

---
 .../Shared/Components/Rating/Default.cshtml   | 86 ++++++++++++++-----
 .../Shared/Components/Rating/default.css      | 36 +-------
 .../Shared/Components/Rating/default.js       | 82 +++++++++++++++++-
 3 files changed, 145 insertions(+), 59 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
index f9cd651ff1..7c02d769a5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -1,27 +1,67 @@
-@using Volo.Abp.Users
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.Users
+@using Volo.CmsKit.Localization
 @inject ICurrentUser CurrentUser
+@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel
+@inject IHtmlLocalizer<CmsKitResource> L
 
-@if (CurrentUser.IsAuthenticated)
-{
-    <div class="my-simple-widget">
-        <h2>My Simple Widget</h2>
-        <p>This is a simple widget!</p>
-    </div>
-}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/star-rating-svg@3.5.0/src/css/star-rating-svg.css">
 
-<div class="rate">
-    <input type="radio" id="star5" name="rate" value="5"/>
-    <label for="star5" title="5 stars"></label>
+<div class="cms-rating-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
+    @if (CurrentUser.IsAuthenticated)
+    {
+        <hr/>
+        <span class="my-rating-5" data-rating="@(Model.CurrentRating != null ? Model.CurrentRating.StarCount : 0)" data-authenticated="@(Model.CurrentRating != null)"></span>
+        <span class="live-rating">@(Model.CurrentRating != null ? Model.CurrentRating.StarCount : 0)</span>
+        if (Model.CurrentRating != null)
+        {
+            <a href="#" class="rating-undo-link" data-id="@Model.CurrentRating.Id">
+                <i class="fa fa-undo"></i> @L["Undo"]
+            </a>
+        }
+        <hr/>
+        <div class="container text-center">
+            <h2 class="mb-5">All Stars</h2>
+            @if (Model.Ratings != null)
+            {
+                <ul class="list-group">
+                    @foreach (var rating in Model.Ratings)
+                    {
+                        <li class="list-group-item d-flex justify-content-between align-items-center">
+                            @rating.StarCount @L["Stars"]
+                            <span class="badge badge-primary badge-pill">@rating.Count</span>
+                        </li>
+                    }
+                </ul>
+            }
+        </div>
+    }
+    else
+    {
+        <div class="float-right mb-2">
+            <a href="@Model.LoginUrl" class="btn btn-primary">@L["LoginToRate"]</a>
+        </div>
+    }
+</div>
 
-    <input type="radio" id="star4" name="rate" value="4"/>
-    <label for="star4" title="4 stars"></label>
-
-    <input type="radio" id="star3" name="rate" value="3"/>
-    <label for="star3" title="3 stars"></label>
-
-    <input type="radio" id="star2" name="rate" value="2"/>
-    <label for="star2" title="2 stars"></label>
-
-    <input type="radio" id="star1" name="rate" value="1"/>
-    <label for="star1" title="1 star"></label>
-</div>
\ No newline at end of file
+<script src="https://code.jquery.com/jquery-3.5.1.js" integrity="sha256-QWo7LDvxbWT2tbbQ97B53yJnYU3WhH/C8ycbRAkjPDc" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/star-rating-svg@3.5.0/dist/jquery.star-rating-svg.min.js"></script>
+<script>
+    var authenticated = $(".my-rating-5").attr("data-authenticated");
+    
+    $(".my-rating-5").starRating({
+    initialRating: 0,
+    disableAfterRate: true,
+    useFullStars: true,
+    readOnly: authenticated === "True",
+    onHover: function(currentIndex, currentRating, $el) {
+        $(".live-rating").text(currentIndex);
+    },
+    onLeave: function(currentIndex, currentRating, $el) {
+      $(".live-rating").text(currentRating);
+    },
+    callback: function(currentRating, $el) {
+      alert(currentRating);
+    }
+    });
+</script>
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
index 0dc4780ee9..5f282702bb 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
@@ -1,35 +1 @@
-.rate {
-    float: left;
-    height: 46px;
-    padding: 0 10px;
-}
-.rate:not(:checked) > input {
-    position:absolute;
-    top:-9999px;
-}
-.rate:not(:checked) > label {
-    float:right;
-    width:1em;
-    overflow:hidden;
-    white-space:nowrap;
-    cursor:pointer;
-    font-size:30px;
-    color:#ccc;
-}
-.rate:not(:checked) > label:before {
-    content: '★ ';
-}
-.rate > input:checked ~ label {
-    color: #ffc700;
-}
-.rate:not(:checked) > label:hover,
-.rate:not(:checked) > label:hover ~ label {
-    color: #deb217;
-}
-.rate > input:checked + label:hover,
-.rate > input:checked + label:hover ~ label,
-.rate > input:checked ~ label:hover,
-.rate > input:checked ~ label:hover ~ label,
-.rate > label:hover ~ input:checked ~ label {
-    color: #c59b08;
-}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
index 5f282702bb..1b29a47190 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
@@ -1 +1,81 @@
-
\ No newline at end of file
+(function () {
+
+    var l = abp.localization.getResource("CmsKit");
+    
+    $(document).ready(function () {
+        abp.widgets.CmsRating = function ($widget) {
+            var widgetManager = $widget.data("abp-widget-manager");
+            var $ratingArea = $widget.find(".cms-rating-area");
+            
+            function getFilters() {
+                return {
+                    entityType: $ratingArea.attr("data-entity-type"),
+                    entityId: $ratingArea.attr("data-entity-id")
+                };
+            }
+            
+            function registerCreateOfNewRating() {
+                $(".my-rating-5").starRating({
+                    initialRating: 0,
+                    disableAfterRate: true,
+                    useFullStars: true,
+                    readOnly: authenticated === "True",
+                    onHover: function(currentIndex, currentRating, $el) {
+                        $(".live-rating").text(currentIndex);
+                    },
+                    onLeave: function(currentIndex, currentRating, $el) {
+                        $(".live-rating").text(currentRating);
+                    },
+                    callback: function(currentRating, $el) {
+                        volo.cmsKit.public.ratings.ratingPublic.create(
+                            $ratingArea.attr("data-entity-type"),
+                            $ratingArea.attr("data-entity-id"),
+                            {
+                                starCount: parseInt(currentRating)
+                            }
+                        ).then(function () {
+                            widgetManager.refresh($widget);
+                        })
+                    }
+                });
+            }
+            
+            function registerUndoLink() {
+                console.log("asdf");
+                $(".rating-undo-link").on('click', '', function (e) {
+                    e.preventDefault();
+                    
+                    abp.message.confirm(l("RatingUndoMessage"), function (ok) {
+                        if(ok) {
+                            var id = $(".rating-undo-link").attr("data-id");
+                            volo.cmsKit.public.ratings.ratingPublic.delete(
+                                id
+                            ).then(function () {
+                                widgetManager.refresh($widget);
+                            });
+                        }
+                    })
+                });
+            }
+            
+            function init() {
+                registerCreateOfNewRating();
+                registerUndoLink();
+            }
+            
+            return {
+                init: init,
+                getFilters: getFilters
+            }
+        };
+        
+        $('.abp-widget-wrapper[data-widget-name="CmsRating"]')
+            .each(function () {
+                var widgetManager = new abp.WidgetManager({
+                    wrapper: $(this),
+                });
+                
+                widgetManager.init($(this));
+            });
+    });
+})(jQuery);
\ No newline at end of file

From 97b3ff113508cb9aede3dbb4bcf7f4f7b418b64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Thu, 27 Aug 2020 15:31:01 +0300
Subject: [PATCH 11/17] added rating style and script contributor

---
 .../star-rating-svg/css/star-rating-svg.css   | 37 +++++++++++++++++++
 .../js/jquery.star-rating-svg.min.js          |  1 +
 .../Shared/Components/Rating/Default.cshtml   | 31 ++++------------
 .../Rating/RatingScriptBundleContributor.cs   |  3 ++
 .../Rating/RatingStyleBundleContributor.cs    |  3 ++
 .../Shared/Components/Rating/default.js       | 17 +++++++++
 6 files changed, 69 insertions(+), 23 deletions(-)
 create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/css/star-rating-svg.css
 create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/js/jquery.star-rating-svg.min.js

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/css/star-rating-svg.css b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/css/star-rating-svg.css
new file mode 100644
index 0000000000..2c0114687f
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/css/star-rating-svg.css
@@ -0,0 +1,37 @@
+.jq-stars {
+    display: inline-block;
+}
+
+.jq-rating-label {
+    font-size: 22px;
+    display: inline-block;
+    position: relative;
+    vertical-align: top;
+    font-family: helvetica, arial, verdana;
+}
+
+.jq-star {
+    width: 100px;
+    height: 100px;
+    display: inline-block;
+    cursor: pointer;
+}
+
+.jq-star-svg {
+    width: 100%;
+    height: 100% ;
+}
+
+.jq-star:hover .fs-star-svg polygon {
+}
+
+.jq-star-svg polygon {
+    stroke: #000;
+    stroke-linejoin: round;
+}
+
+/* un-used */
+.jq-shadow {
+    -webkit-filter: drop-shadow( -2px -2px 2px #888 );
+    filter: drop-shadow( -2px -2px 2px #888 );
+}
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/js/jquery.star-rating-svg.min.js b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/js/jquery.star-rating-svg.min.js
new file mode 100644
index 0000000000..df947cfe2b
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/star-rating-svg/js/jquery.star-rating-svg.min.js
@@ -0,0 +1 @@
+!function(a){"use strict";var b="starRating",c=function(){},d={totalStars:5,useFullStars:!1,emptyColor:"lightgray",hoverColor:"orange",activeColor:"gold",useGradient:!0,readOnly:!1,disableAfterRate:!0,starGradient:{start:"#FEF7CD",end:"#FF9511"},strokeWidth:0,strokeColor:"black",initialRating:0,starSize:40,callback:c,onHover:c,onLeave:c},e=function(c,e){var f;this.element=c,this.$el=a(c),this.settings=a.extend({},d,e),f=this.$el.data("rating")||this.settings.initialRating,this._state={rating:(Math.round(2*f)/2).toFixed(1)},this._uid=Math.floor(999*Math.random()),e.starGradient||this.settings.useGradient||(this.settings.starGradient.start=this.settings.starGradient.end=this.settings.activeColor),this._defaults=d,this._name=b,this.init()},f={init:function(){this.renderMarkup(),this.addListeners(),this.initRating()},addListeners:function(){this.settings.readOnly||(this.$stars.on("mouseover",this.hoverRating.bind(this)),this.$stars.on("mouseout",this.restoreState.bind(this)),this.$stars.on("click",this.handleRating.bind(this)))},hoverRating:function(a){var b=this.getIndex(a);this.paintStars(b,"hovered"),this.settings.onHover(b+1,this._state.rating,this.$el)},handleRating:function(a){var b=this.getIndex(a),c=b+1;this.applyRating(c,this.$el),this.executeCallback(c,this.$el),this.settings.disableAfterRate&&this.$stars.off()},applyRating:function(a){var b=a-1;this.paintStars(b,"active"),this._state.rating=b+1},restoreState:function(a){var b=this.getIndex(a),c=this._state.rating||-1;this.paintStars(c-1,"active"),this.settings.onLeave(b+1,this._state.rating,this.$el)},getIndex:function(b){var c=a(b.currentTarget),d=c.width(),e=a(b.target).attr("data-side");e=e?e:this.getOffsetByPixel(b,c,d),e=this.settings.useFullStars?"right":e;var f=c.index()-("left"===e?.5:0);return f=.5>f&&b.offsetX<d/4?-1:f},getOffsetByPixel:function(a,b,c){var d=a.pageX-b.offset().left;return c/2>=d&&!this.settings.useFullStars?"left":"right"},initRating:function(){this.paintStars(this._state.rating-1,"active")},paintStars:function(b,c){var d,e,f,g;a.each(this.$stars,function(h,i){d=a(i).find('polygon[data-side="left"]'),e=a(i).find('polygon[data-side="right"]'),f=g=b>=h?c:"empty",f=h-b===.5?c:f,d.attr("class","svg-"+f+"-"+this._uid),e.attr("class","svg-"+g+"-"+this._uid)}.bind(this))},renderMarkup:function(){for(var a='<div class="jq-star" style="width:'+this.settings.starSize+"px;  height:"+this.settings.starSize+'px;"><svg version="1.0" class="jq-star-svg" shape-rendering="geometricPrecision" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="305px" height="305px" viewBox="60 -62 309 309" style="enable-background:new 64 -59 305 305; stroke-width:'+this.settings.strokeWidth+'px;" xml:space="preserve"><style type="text/css">.svg-empty-'+this._uid+"{fill:url(#"+this._uid+"_SVGID_1_);}.svg-hovered-"+this._uid+"{fill:url(#"+this._uid+"_SVGID_2_);}.svg-active-"+this._uid+"{fill:url(#"+this._uid+"_SVGID_3_);}</style>"+this.getLinearGradient(this._uid+"_SVGID_1_",this.settings.emptyColor,this.settings.emptyColor)+this.getLinearGradient(this._uid+"_SVGID_2_",this.settings.hoverColor,this.settings.hoverColor)+this.getLinearGradient(this._uid+"_SVGID_3_",this.settings.starGradient.start,this.settings.starGradient.end)+'<polygon data-side="left" class="svg-empty-'+this._uid+'" points="281.1,129.8 364,55.7 255.5,46.8 214,-59 172.5,46.8 64,55.4 146.8,129.7 121.1,241 213.9,181.1 213.9,181 306.5,241 " style="stroke: '+this.settings.strokeColor+'"/><polygon data-side="right" class="svg-empty-'+this._uid+'" points="364,55.7 255.5,46.8 214,-59 213.9,181 306.5,241 281.1,129.8 " style="stroke-dasharray: 230 232 210 0; stroke: '+this.settings.strokeColor+'"/></svg></div>',b="",c=0;c<this.settings.totalStars;c++)b+=a;this.$el.append(b),this.$stars=this.$el.find(".jq-star")},getLinearGradient:function(a,b,c){return'<linearGradient id="'+a+'" gradientUnits="userSpaceOnUse" x1="121.1501" y1="-70.35" x2="121.15" y2="125.0045"><stop  offset="0" style="stop-color:'+b+'"/><stop  offset="1" style="stop-color:'+c+'"/> </linearGradient>'},executeCallback:function(a,b){var c=this.settings.callback;c(a,b)}},g={unload:function(){var c="plugin_"+b,d=a(this),e=d.data(c).$stars;e.off(),d.removeData(c).remove()},setRating:function(c,d){var e="plugin_"+b,f=a(this),g=f.data(e);c>g.settings.totalStars||0>c||(d&&(c=Math.round(c)),g.applyRating(c))},getRating:function(){var c="plugin_"+b,d=a(this),e=d.data(c);return e._state.rating}};a.extend(e.prototype,f),a.fn[b]=function(c){if(!a.isPlainObject(c)){if(g.hasOwnProperty(c))return g[c].apply(this,Array.prototype.slice.call(arguments,1));a.error("Method "+c+" does not exist on "+b+".js")}return this.each(function(){a.data(this,"plugin_"+b)||a.data(this,"plugin_"+b,new e(this,c))})}}(jQuery,window,document);
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
index 7c02d769a5..51b799d2e6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -1,11 +1,18 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.Users
 @using Volo.CmsKit.Localization
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @inject ICurrentUser CurrentUser
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel
 @inject IHtmlLocalizer<CmsKitResource> L
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/star-rating-svg@3.5.0/src/css/star-rating-svg.css">
+@section styles{
+    <abp-style type="typeof(RatingStyleBundleContributor)" />
+}
+
+@section scripts{
+    <abp-script type="typeof(RatingScriptBundleContributor)" />
+}
 
 <div class="cms-rating-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
     @if (CurrentUser.IsAuthenticated)
@@ -43,25 +50,3 @@
         </div>
     }
 </div>
-
-<script src="https://code.jquery.com/jquery-3.5.1.js" integrity="sha256-QWo7LDvxbWT2tbbQ97B53yJnYU3WhH/C8ycbRAkjPDc" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/star-rating-svg@3.5.0/dist/jquery.star-rating-svg.min.js"></script>
-<script>
-    var authenticated = $(".my-rating-5").attr("data-authenticated");
-    
-    $(".my-rating-5").starRating({
-    initialRating: 0,
-    disableAfterRate: true,
-    useFullStars: true,
-    readOnly: authenticated === "True",
-    onHover: function(currentIndex, currentRating, $el) {
-        $(".live-rating").text(currentIndex);
-    },
-    onLeave: function(currentIndex, currentRating, $el) {
-      $(".live-rating").text(currentRating);
-    },
-    callback: function(currentRating, $el) {
-      alert(currentRating);
-    }
-    });
-</script>
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs
index a57ff8294f..4340cea485 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingScriptBundleContributor.cs
@@ -1,8 +1,11 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.StarRatingSvg;
+using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 {
+    [DependsOn(typeof(StarRatingSvgScriptContributor))]
     public class RatingScriptBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs
index dc82f1f5da..bd017f9d1e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingStyleBundleContributor.cs
@@ -1,8 +1,11 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.StarRatingSvg;
+using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 {
+    [DependsOn(typeof(StarRatingSvgStyleContributor))]
     public class RatingStyleBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
index 1b29a47190..6bc8dc763e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
@@ -1,5 +1,22 @@
 (function () {
+    var authenticated = $(".my-rating-5").attr("data-authenticated");
 
+    $(".my-rating-5").starRating({
+        initialRating: 0,
+        disableAfterRate: true,
+        useFullStars: true,
+        readOnly: authenticated === "True",
+        onHover: function(currentIndex, currentRating, $el) {
+            $(".live-rating").text(currentIndex);
+        },
+        onLeave: function(currentIndex, currentRating, $el) {
+            $(".live-rating").text(currentRating);
+        },
+        callback: function(currentRating, $el) {
+            alert(currentRating);
+        }
+    });
+    
     var l = abp.localization.getResource("CmsKit");
     
     $(document).ready(function () {

From e96b5bf26b9888bdf2fd73539ef50524d1e82503 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Thu, 27 Aug 2020 18:16:36 +0300
Subject: [PATCH 12/17] CmsKit: Rating widget design

---
 .../Shared/Components/Rating/Default.cshtml   | 66 +++++++++----------
 .../Components/Rating/RatingViewComponent.cs  |  7 +-
 .../Shared/Components/Rating/default.css      | 45 ++++++++++++-
 .../Shared/Components/Rating/default.js       | 21 +-----
 4 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
index 51b799d2e6..f1d96fa97e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -1,52 +1,46 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.Users
 @using Volo.CmsKit.Localization
-@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @inject ICurrentUser CurrentUser
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel
 @inject IHtmlLocalizer<CmsKitResource> L
 
-@section styles{
-    <abp-style type="typeof(RatingStyleBundleContributor)" />
-}
-
-@section scripts{
-    <abp-script type="typeof(RatingScriptBundleContributor)" />
-}
-
-<div class="cms-rating-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
+<div class="cms-rating-area container" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
     @if (CurrentUser.IsAuthenticated)
     {
-        <hr/>
-        <span class="my-rating-5" data-rating="@(Model.CurrentRating != null ? Model.CurrentRating.StarCount : 0)" data-authenticated="@(Model.CurrentRating != null)"></span>
-        <span class="live-rating">@(Model.CurrentRating != null ? Model.CurrentRating.StarCount : 0)</span>
-        if (Model.CurrentRating != null)
-        {
-            <a href="#" class="rating-undo-link" data-id="@Model.CurrentRating.Id">
-                <i class="fa fa-undo"></i> @L["Undo"]
-            </a>
-        }
-        <hr/>
-        <div class="container text-center">
-            <h2 class="mb-5">All Stars</h2>
-            @if (Model.Ratings != null)
+        <div class="m-auto">
+            <span class="my-rating-5" data-rating="@(Model.CurrentRating != null ? Model.CurrentRating.StarCount : 0)" data-authenticated="@(Model.CurrentRating != null)"></span>
+            <span class="live-rating">@(Model.CurrentRating != null ? Model.CurrentRating.StarCount + " | " : 0 + "")</span>
+            @if (Model.CurrentRating != null)
             {
-                <ul class="list-group">
-                    @foreach (var rating in Model.Ratings)
-                    {
-                        <li class="list-group-item d-flex justify-content-between align-items-center">
-                            @rating.StarCount @L["Stars"]
-                            <span class="badge badge-primary badge-pill">@rating.Count</span>
-                        </li>
-                    }
-                </ul>
+                <a href="#" class="rating-undo-link m-auto" data-id="@Model.CurrentRating.Id">
+                    <i class="fa fa-undo"></i> @L["Undo"]
+                </a>
             }
         </div>
+        if (Model.Ratings != null)
+        {
+            <div class="row text-center col-6 mt-3">
+                @foreach (var rating in Model.Ratings)
+                {
+                    <div class="side col-2">
+                        <div>@rating.StarCount @L["Stars"]</div>
+                    </div>
+                    <div class="middle col-8">
+                        <div class="bar-container">
+                            <div class="bar bar-@rating.StarCount" style="width: @(rating.Count * 100 / Model.TotalRating)%"></div>
+                        </div>
+                    </div>
+                    <div class="side col-2">
+                        <div>@rating.Count</div>
+                    </div>
+                }
+            </div>
+        }
     }
     else
     {
-        <div class="float-right mb-2">
-            <a href="@Model.LoginUrl" class="btn btn-primary">@L["LoginToRate"]</a>
-        </div>
+        <span class="my-rating-5" data-authenticated="True" data-toggle="popover" data-placement="right" data-html="true" data-content="<div class='text-center'><a href='@Model.LoginUrl' class='btn btn-primary btn-block'>@L["LoginToRate"]</a></div>"></span>
+        <span class="rating-login"></span>
     }
-</div>
+</div>
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
index 31dedbc532..7c458d033b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -32,6 +33,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
         public virtual async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId)
         {
             var ratings = await RatingPublicAppService.GetGroupedStarCountsAsync(entityType, entityId);
+            var totalRating = ratings.Sum(x => x.Count);
             
             RatingDto currentUserRating = null;
             if (CurrentUser.IsAuthenticated)
@@ -48,7 +50,8 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
                 EntityType = entityType,
                 LoginUrl = loginUrl,
                 Ratings = ratings,
-                CurrentRating = currentUserRating
+                CurrentRating = currentUserRating,
+                TotalRating = totalRating
             };
             
             return View("~/Pages/CmsKit/Shared/Components/Rating/Default.cshtml", viewModel);
@@ -66,5 +69,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
         public List<RatingWithStarCountDto> Ratings { get; set; }
 
         public RatingDto CurrentRating { get; set; }
+
+        public int TotalRating { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
index 5f282702bb..c38f44cace 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.css
@@ -1 +1,44 @@
-
\ No newline at end of file
+.side {
+    width: 15%;
+    margin-top:10px;
+}
+
+.middle {
+    float: left;
+    width: 70%;
+    margin-top:10px;
+    padding-top: 4px;
+}
+
+.row:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.bar-container {
+    width: 100%;
+    background-color: #f1f1f1;
+    text-align: center;
+    color: white;
+}
+
+.bar {
+    height: 18px;
+}
+
+/* Individual bars */
+.bar-5 { background-color: #173F5F; }
+.bar-4 { background-color: #20639B; }
+.bar-3 { background-color: #3CAEA3; }
+.bar-2 { background-color: #F6D55C; }
+.bar-1 { background-color: #ED553B; }
+
+@media (max-width: 400px) {
+    .side, .middle {
+        width: 100%;
+    }
+    .right {
+        display: none;
+    }
+}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
index 6bc8dc763e..2835e57a3c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
@@ -1,22 +1,4 @@
 (function () {
-    var authenticated = $(".my-rating-5").attr("data-authenticated");
-
-    $(".my-rating-5").starRating({
-        initialRating: 0,
-        disableAfterRate: true,
-        useFullStars: true,
-        readOnly: authenticated === "True",
-        onHover: function(currentIndex, currentRating, $el) {
-            $(".live-rating").text(currentIndex);
-        },
-        onLeave: function(currentIndex, currentRating, $el) {
-            $(".live-rating").text(currentRating);
-        },
-        callback: function(currentRating, $el) {
-            alert(currentRating);
-        }
-    });
-    
     var l = abp.localization.getResource("CmsKit");
     
     $(document).ready(function () {
@@ -32,6 +14,8 @@
             }
             
             function registerCreateOfNewRating() {
+                var authenticated = $(".my-rating-5").attr("data-authenticated");
+
                 $(".my-rating-5").starRating({
                     initialRating: 0,
                     disableAfterRate: true,
@@ -58,7 +42,6 @@
             }
             
             function registerUndoLink() {
-                console.log("asdf");
                 $(".rating-undo-link").on('click', '', function (e) {
                     e.preventDefault();
                     

From bebcd1313de64923d54a74e5326a4d9f424971dc Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Fri, 28 Aug 2020 09:16:28 +0300
Subject: [PATCH 13/17] CmsKit: Rating missing localizations

---
 .../Volo/CmsKit/Localization/Resources/en.json              | 6 +++++-
 .../Volo/CmsKit/Localization/Resources/tr.json              | 6 +++++-
 .../Pages/CmsKit/Shared/Components/Rating/Default.cshtml    | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
index 3e16a17a47..73fd2d52b6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
@@ -13,6 +13,10 @@
     "LoginToAddComment": "Login to add comment",
     "LoginToReply": "Login to reply",
     "MessageDeletionConfirmationMessage": "This comment will be deleted completely.",
-    "CommentAuthorizationExceptionMessage": "Those comments are not allowed for public display."
+    "CommentAuthorizationExceptionMessage": "Those comments are not allowed for public display.",
+    "Undo": "Undo",
+    "RatingUndoMessage": "Your rating will be undo.",
+    "LoginToRate": "Login to rate",
+    "Star": "Star"
   }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
index c1664f9122..777e89c979 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
@@ -13,6 +13,10 @@
     "LoginToAddComment": "Yorum yapmak için giriş yap",
     "LoginToReply": "Cevap vermek için giriş yap",
     "MessageDeletionConfirmationMessage": "Bu yorum tamamen silinecektir",
-    "CommentAuthorizationExceptionMessage": "Bu yorumları görebilmek için yetki gerekir."
+    "CommentAuthorizationExceptionMessage": "Bu yorumları görebilmek için yetki gerekir.",
+    "Undo": "Geri al",
+    "RatingUndoMessage": "Oylamanız geri alınacak.",
+    "LoginToRate": "Oylamak için giriş yapın",
+    "Star": "Yıldız"
   }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
index f1d96fa97e..51c47f93de 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -24,7 +24,7 @@
                 @foreach (var rating in Model.Ratings)
                 {
                     <div class="side col-2">
-                        <div>@rating.StarCount @L["Stars"]</div>
+                        <div>@rating.StarCount @L["Star"]</div>
                     </div>
                     <div class="middle col-8">
                         <div class="bar-container">

From 2b646ff9d6694b0085c5031e74ec21bb7d6ba97f Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Fri, 28 Aug 2020 09:39:08 +0300
Subject: [PATCH 14/17] Update Index.cshtml

---
 .../cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
index ab628d4412..6fc38ba28b 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
@@ -60,5 +60,8 @@
 </abp-card>
 
 <hr>
-@await Component.InvokeAsync(typeof(RatingViewComponent), new { entityType = "quote", entityId = "2" })
+@if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>())
+{
+    @await Component.InvokeAsync(typeof(RatingViewComponent), new { entityType = "quote", entityId = "2" })
+}
 <hr>

From e0c46f9434b13961570cd0a21285768005bb1643 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Mon, 31 Aug 2020 17:59:52 +0300
Subject: [PATCH 15/17] CmsKit: enhancement after reviewing

---
 .../CmsKitWebUnifiedModule.cs                 |   1 +
 .../Volo/CmsKit/Ratings/RatingConsts.cs       |   4 +
 .../Volo/CmsKit/Ratings/IRatingRepository.cs  |   6 --
 .../Volo/CmsKit/Ratings/Rating.cs             |   2 +-
 .../CmsKitDbContextModelCreatingExtensions.cs |   2 +-
 .../CmsKit/Ratings/EfCoreRatingRepository.cs  |  12 ---
 .../MongoDB/Ratings/MongoRatingRepository.cs  |  12 ---
 ...ingInput.cs => CreateUpdateRatingInput.cs} |   4 +-
 .../Public/Ratings/IRatingPublicAppService.cs |   8 +-
 .../Public/Ratings/RatingWithStarCountDto.cs  |   2 +
 .../Public/Ratings/UpdateRatingInput.cs       |  10 --
 .../PublicApplicationAutoMapperProfile.cs     |   2 -
 .../Public/Ratings/RatingPublicAppService.cs  |  69 ++++++------
 .../Public/Ratings/RatingPublicController.cs  |  26 +----
 .../Shared/Components/Rating/Default.cshtml   |   6 +-
 .../Components/Rating/RatingViewComponent.cs  |   8 +-
 .../Shared/Components/Rating/default.js       | 100 ++++++++++--------
 .../Volo.CmsKit.Public.Web.csproj             |   4 -
 .../Ratings/RatingPublicAppService_Tests.cs   |  70 ++++++++----
 .../Ratings/RatingRepository_Tests.cs         |   8 --
 20 files changed, 168 insertions(+), 188 deletions(-)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/{CreateRatingInput.cs => CreateUpdateRatingInput.cs} (63%)
 delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
index 08dadb3dd6..e5d9f23c05 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
index 892b3cef45..27fa9d7584 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
@@ -7,5 +7,9 @@ namespace Volo.CmsKit.Ratings
         public static int MaxEntityTypeLength { get; set; } = CmsEntityConsts.MaxEntityTypeLength;
 
         public static int MaxEntityIdLength { get; set; } = CmsEntityConsts.MaxEntityIdLength;
+
+        public static int MaxRating { get; set; } = 5;
+
+        public static int MinRating { get; set; } = 0;
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
index 29ce07df63..a9f71b0dfb 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/IRatingRepository.cs
@@ -9,12 +9,6 @@ namespace Volo.CmsKit.Ratings
 {
     public interface IRatingRepository : IBasicRepository<Rating, Guid>
     {
-        Task<List<Rating>> GetListAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId,
-            CancellationToken cancellationToken = default
-        );
-
         Task<Rating> GetCurrentUserRatingAsync(
             [NotNull] string entityType,
             [NotNull] string entityId,
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
index 4567b5d275..75f0499db3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
@@ -44,7 +44,7 @@ namespace Volo.CmsKit.Ratings
 
         public virtual void SetStarCount(short starCount)
         {
-            if(starCount <= 5 && starCount > 0)
+            if(starCount <= RatingConsts.MaxRating && starCount > RatingConsts.MinRating)
             {
                 StarCount = starCount;
             }
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
index d73f60967a..adda59c3e2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs
@@ -85,7 +85,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
                     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});
+                    r.HasIndex(x => new {x.TenantId, x.EntityType, x.EntityId, x.CreatorId});
                 });    
             }
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
index 577f2e3a7d..810335b4d6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Ratings/EfCoreRatingRepository.cs
@@ -18,18 +18,6 @@ namespace Volo.CmsKit.Ratings
         {
         }
 
-        public async Task<List<Rating>> GetListAsync(string entityType, string entityId,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
-            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
-
-            var query = DbSet.Where(r => r.EntityType == entityType && r.EntityId == entityId);
-            var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
-
-            return ratings;
-        }
-
         public async Task<Rating> GetCurrentUserRatingAsync(string entityType, string entityId, Guid userId,
             CancellationToken cancellationToken = default)
         {
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
index ecf389cde7..92f7f992da 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Ratings/MongoRatingRepository.cs
@@ -19,18 +19,6 @@ namespace Volo.CmsKit.MongoDB.Ratings
         {
         }
 
-        public async Task<List<Rating>> GetListAsync(string entityType, string entityId,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
-            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
-
-            var query = GetMongoQueryable().Where(r => r.EntityType == entityType && r.EntityId == entityId);
-            var ratings = await query.ToListAsync(GetCancellationToken(cancellationToken));
-
-            return ratings;
-        }
-
         public async Task<Rating> GetCurrentUserRatingAsync(string entityType, string entityId, Guid userId,
             CancellationToken cancellationToken = default)
         {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
similarity index 63%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
index 88b53d5b0c..3018ed8b30 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateRatingInput.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
@@ -2,9 +2,9 @@
 
 namespace Volo.CmsKit.Public.Ratings
 {
-    public class CreateRatingInput
+    public class CreateUpdateRatingInput
     {
-        [Required]
+        [Required, Range(1, 5)]
         public short StarCount { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
index 9e4c8c1f11..aa0aba48b4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/IRatingPublicAppService.cs
@@ -8,13 +8,9 @@ namespace Volo.CmsKit.Public.Ratings
 {
     public interface IRatingPublicAppService : IApplicationService
     {
-        Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId);
-        
-        Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input);
-
-        Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input);
+        Task<RatingDto> CreateAsync(string entityType, string entityId, CreateUpdateRatingInput input);
 
-        Task DeleteAsync(Guid id);
+        Task DeleteAsync(string entityType, string entityId);
         
         Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId);
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs
index e8f60ea49b..981ef2bd6e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/RatingWithStarCountDto.cs
@@ -5,5 +5,7 @@
         public short StarCount { get; set; }
 
         public int Count { get; set; }
+
+        public bool IsSelectedByCurrentUser { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs
deleted file mode 100644
index e2f77122d4..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/UpdateRatingInput.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Volo.CmsKit.Public.Ratings
-{
-    public class UpdateRatingInput
-    {
-        [Required]
-        public short StarCount { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
index 0a0a5403b1..3ac2d1949b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
@@ -22,8 +22,6 @@ namespace Volo.CmsKit.Public
                 .Ignore(x=> x.Author);
 
             CreateMap<Rating, RatingDto>();
-            
-            CreateMap<RatingWithStarCountQueryResultItem, RatingWithStarCountDto>();
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
index 7621924727..848dbeda28 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Ratings/RatingPublicAppService.cs
@@ -22,18 +22,22 @@ namespace Volo.CmsKit.Public.Ratings
             CmsUserLookupService = cmsUserLookupService;
         }
 
-        public virtual async Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId)
+        [Authorize]
+        public virtual async Task<RatingDto> CreateAsync(string entityType, string entityId,
+            CreateUpdateRatingInput input)
         {
-            var ratings = await RatingRepository.GetListAsync(entityType, entityId);
-            var ratingDto = ObjectMapper.Map<List<Rating>, List<RatingDto>>(ratings);
+            var userId = CurrentUser.GetId();
+            var user = await CmsUserLookupService.GetByIdAsync(userId);
 
-            return new ListResultDto<RatingDto>(ratingDto);
-        }
+            var currentUserRating = await RatingRepository.GetCurrentUserRatingAsync(entityType, entityId, userId);
 
-        [Authorize]
-        public virtual async Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input)
-        {
-            var user = await CmsUserLookupService.GetByIdAsync(CurrentUser.GetId());
+            if (currentUserRating != null)
+            {
+                currentUserRating.SetStarCount(input.StarCount);
+                var updatedRating = await RatingRepository.UpdateAsync(currentUserRating);
+
+                return ObjectMapper.Map<Rating, RatingDto>(updatedRating);
+            }
 
             var rating = await RatingRepository.InsertAsync(
                 new Rating(
@@ -50,50 +54,51 @@ namespace Volo.CmsKit.Public.Ratings
         }
 
         [Authorize]
-        public virtual async Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input)
-        {
-            var rating = await RatingRepository.GetAsync(id);
-
-            if (rating.CreatorId != CurrentUser.GetId())
-            {
-                throw new AbpAuthorizationException();
-            }
-            
-            rating.SetStarCount(input.StarCount);
-
-            var updatedRating = await RatingRepository.UpdateAsync(rating);
-
-            return ObjectMapper.Map<Rating, RatingDto>(updatedRating);
-        }
-
-        [Authorize]
-        public virtual async Task DeleteAsync(Guid id)
+        public virtual async Task DeleteAsync(string entityType, string entityId)
         {
-            var rating = await RatingRepository.GetAsync(id);
+            var rating = await RatingRepository.GetCurrentUserRatingAsync(entityType, entityId, CurrentUser.GetId());
 
             if (rating.CreatorId != CurrentUser.GetId())
             {
                 throw new AbpAuthorizationException();
             }
 
-            await RatingRepository.DeleteAsync(id);
+            await RatingRepository.DeleteAsync(rating.Id);
         }
 
         [Authorize]
         public virtual async Task<RatingDto> GetCurrentUserRatingAsync(string entityType, string entityId)
         {
             var currentUserId = CurrentUser.GetId();
-            
+
             var rating = await RatingRepository.GetCurrentUserRatingAsync(entityType, entityId, currentUserId);
 
             return ObjectMapper.Map<Rating, RatingDto>(rating);
         }
 
-        public virtual async Task<List<RatingWithStarCountDto>> GetGroupedStarCountsAsync(string entityType, string entityId)
+        public virtual async Task<List<RatingWithStarCountDto>> GetGroupedStarCountsAsync(string entityType,
+            string entityId)
         {
             var ratings = await RatingRepository.GetGroupedStarCountsAsync(entityType, entityId);
 
-            return ObjectMapper.Map<List<RatingWithStarCountQueryResultItem>, List<RatingWithStarCountDto>>(ratings);
+            var userRatingOrNull = CurrentUser.IsAuthenticated
+                ? await RatingRepository.GetCurrentUserRatingAsync(entityType, entityId, CurrentUser.GetId())
+                : null;
+
+            var ratingWithStarCountDto = new List<RatingWithStarCountDto>();
+
+            foreach (var rating in ratings)
+            {
+                ratingWithStarCountDto.Add(
+                    new RatingWithStarCountDto
+                    {
+                        StarCount = rating.StarCount,
+                        Count = rating.Count,
+                        IsSelectedByCurrentUser = userRatingOrNull != null && userRatingOrNull.StarCount == rating.StarCount
+                    });
+            }
+
+            return ratingWithStarCountDto;
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
index 25cc40ea5a..e136c4564d 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.GlobalFeatures;
 using Volo.CmsKit.GlobalFeatures;
 
@@ -22,32 +20,18 @@ namespace Volo.CmsKit.Public.Ratings
             RatingPublicAppService = ratingPublicAppService;
         }
         
-        [HttpGet]
-        [Route("{entityType}/{entityId}")]
-        public virtual Task<ListResultDto<RatingDto>> GetListAsync(string entityType, string entityId)
-        {
-            return RatingPublicAppService.GetListAsync(entityType, entityId);
-        }
-
         [HttpPut]
         [Route("{entityType}/{entityId}")]
-        public virtual Task<RatingDto> CreateAsync(string entityType, string entityId, CreateRatingInput input)
+        public virtual Task<RatingDto> CreateAsync(string entityType, string entityId, CreateUpdateRatingInput input)
         {
             return RatingPublicAppService.CreateAsync(entityType, entityId, input);
         }
 
-        [HttpPut]
-        [Route("{id}")]
-        public virtual Task<RatingDto> UpdateAsync(Guid id, UpdateRatingInput input)
-        {
-            return RatingPublicAppService.UpdateAsync(id, input);
-        }
-
         [HttpDelete]
-        [Route("{id}")]
-        public virtual Task DeleteAsync(Guid id)
+        [Route("{entityType}/{entityId}")]
+        public virtual Task DeleteAsync(string entityType, string entityId)
         {
-            return RatingPublicAppService.DeleteAsync(id);
+            return RatingPublicAppService.DeleteAsync(entityType, entityId);
         }
 
         [HttpGet]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
index 51c47f93de..b5cfbbfaa9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -9,11 +9,11 @@
     @if (CurrentUser.IsAuthenticated)
     {
         <div class="m-auto">
-            <span class="my-rating-5" data-rating="@(Model.CurrentRating != null ? Model.CurrentRating.StarCount : 0)" data-authenticated="@(Model.CurrentRating != null)"></span>
-            <span class="live-rating">@(Model.CurrentRating != null ? Model.CurrentRating.StarCount + " | " : 0 + "")</span>
+            <span class="my-rating-5" data-rating="@(Model.CurrentRating ?? 0)" data-authenticated="@(Model.CurrentRating != null)"></span>
+            <span class="live-rating">@(Model.CurrentRating != null ? Model.CurrentRating + " | " : 0 + "")</span>
             @if (Model.CurrentRating != null)
             {
-                <a href="#" class="rating-undo-link m-auto" data-id="@Model.CurrentRating.Id">
+                <a href="#" class="rating-undo-link m-auto">
                     <i class="fa fa-undo"></i> @L["Undo"]
                 </a>
             }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
index 7c458d033b..aabbd3c286 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
@@ -34,11 +34,11 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
         {
             var ratings = await RatingPublicAppService.GetGroupedStarCountsAsync(entityType, entityId);
             var totalRating = ratings.Sum(x => x.Count);
-            
-            RatingDto currentUserRating = null;
+
+            short? currentUserRating = null;
             if (CurrentUser.IsAuthenticated)
             {
-                currentUserRating = await RatingPublicAppService.GetCurrentUserRatingAsync(entityType, entityId);
+                currentUserRating = ratings.Find(x => x.IsSelectedByCurrentUser)?.StarCount;
             }
             
             var loginUrl =
@@ -68,7 +68,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 
         public List<RatingWithStarCountDto> Ratings { get; set; }
 
-        public RatingDto CurrentRating { get; set; }
+        public short? CurrentRating { get; set; }
 
         public int TotalRating { get; set; }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
index 2835e57a3c..4416d7fb48 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
@@ -1,81 +1,89 @@
 (function () {
     var l = abp.localization.getResource("CmsKit");
-    
+
     $(document).ready(function () {
         abp.widgets.CmsRating = function ($widget) {
             var widgetManager = $widget.data("abp-widget-manager");
             var $ratingArea = $widget.find(".cms-rating-area");
-            
+
             function getFilters() {
                 return {
                     entityType: $ratingArea.attr("data-entity-type"),
                     entityId: $ratingArea.attr("data-entity-id")
                 };
             }
-            
+
             function registerCreateOfNewRating() {
-                var authenticated = $(".my-rating-5").attr("data-authenticated");
+                $widget.find(".my-rating-5").each(function () {
+                        var authenticated = $(this).attr("data-authenticated");
 
-                $(".my-rating-5").starRating({
-                    initialRating: 0,
-                    disableAfterRate: true,
-                    useFullStars: true,
-                    readOnly: authenticated === "True",
-                    onHover: function(currentIndex, currentRating, $el) {
-                        $(".live-rating").text(currentIndex);
-                    },
-                    onLeave: function(currentIndex, currentRating, $el) {
-                        $(".live-rating").text(currentRating);
-                    },
-                    callback: function(currentRating, $el) {
-                        volo.cmsKit.public.ratings.ratingPublic.create(
-                            $ratingArea.attr("data-entity-type"),
-                            $ratingArea.attr("data-entity-id"),
-                            {
-                                starCount: parseInt(currentRating)
+                        $(this).starRating({
+                            initialRating: 0,
+                            disableAfterRate: true,
+                            useFullStars: true,
+                            readOnly: authenticated === "True",
+                            onHover: function (currentIndex, currentRating, $el) {
+                                $widget.find(".live-rating").text(currentIndex);
+                            },
+                            onLeave: function (currentIndex, currentRating, $el) {
+                                $widget.find(".live-rating").text(currentRating);
+                            },
+                            callback: function (currentRating, $el) {
+                                volo.cmsKit.public.ratings.ratingPublic.create(
+                                    $ratingArea.attr("data-entity-type"),
+                                    $ratingArea.attr("data-entity-id"),
+                                    {
+                                        starCount: parseInt(currentRating)
+                                    }
+                                ).then(function () {
+                                    widgetManager.refresh($widget);
+                                })
                             }
-                        ).then(function () {
-                            widgetManager.refresh($widget);
-                        })
+                        });
                     }
-                });
+                );
             }
-            
+
             function registerUndoLink() {
-                $(".rating-undo-link").on('click', '', function (e) {
-                    e.preventDefault();
-                    
-                    abp.message.confirm(l("RatingUndoMessage"), function (ok) {
-                        if(ok) {
-                            var id = $(".rating-undo-link").attr("data-id");
-                            volo.cmsKit.public.ratings.ratingPublic.delete(
-                                id
-                            ).then(function () {
-                                widgetManager.refresh($widget);
-                            });
-                        }
-                    })
+                $widget.find(".rating-undo-link").each(function () {
+                    $(this).on('click', '', function (e) {
+                        e.preventDefault();
+
+                        abp.message.confirm(l("RatingUndoMessage"), function (ok) {
+                            if (ok) {
+                                volo.cmsKit.public.ratings.ratingPublic.delete(
+                                    $ratingArea.attr("data-entity-type"),
+                                    $ratingArea.attr("data-entity-id")
+                                ).then(function () {
+                                    widgetManager.refresh($widget);
+                                });
+                            }
+                        })
+                    });
                 });
             }
-            
+
             function init() {
                 registerCreateOfNewRating();
                 registerUndoLink();
             }
-            
+
             return {
                 init: init,
                 getFilters: getFilters
             }
-        };
-        
+        }
+        ;
+
         $('.abp-widget-wrapper[data-widget-name="CmsRating"]')
             .each(function () {
                 var widgetManager = new abp.WidgetManager({
                     wrapper: $(this),
                 });
-                
+
                 widgetManager.init($(this));
             });
-    });
-})(jQuery);
\ No newline at end of file
+    })
+    ;
+})
+(jQuery);
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
index 3d52f544e0..6d2f8ff303 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
@@ -27,10 +27,6 @@
     <EmbeddedResource Include="Components\**\*.css" />
     <Content Remove="Components\**\*.js" />
     <Content Remove="Components\**\*.css" />
-    <Content Update="Pages\CmsKit\Shared\Components\Rating\Default.cshtml">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
   </ItemGroup>
 
 </Project>
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs
index 1a21da8425..c8f2acd950 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Ratings/RatingPublicAppService_Tests.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Shouldly;
@@ -34,8 +35,8 @@ namespace Volo.CmsKit.Ratings
 
             var newRating = await _ratingAppService.CreateAsync(
                 _cmsKitTestData.EntityType1,
-                _cmsKitTestData.EntityId1,
-                new CreateRatingInput
+                _cmsKitTestData.EntityId2,
+                new CreateUpdateRatingInput
                 {
                     StarCount = 4
                 });
@@ -44,53 +45,86 @@ namespace Volo.CmsKit.Ratings
             {
                 var ratings = context.Set<Rating>().Where(x =>
                     x.EntityId == _cmsKitTestData.EntityId1 && x.EntityType == _cmsKitTestData.EntityType1).ToList();
-                
+
                 ratings
-                    .Any(c => c.Id == newRating.Id && c.CreatorId == newRating.CreatorId && c.StarCount == newRating.StarCount)
+                    .Any(c => c.Id == newRating.Id && c.CreatorId == newRating.CreatorId &&
+                              c.StarCount == newRating.StarCount)
                     .ShouldBeTrue();
             });
         }
 
         [Fact]
-        public async Task UpdateAsync()
+        public async Task CreateAsync_Should_Update_If_Rating_Is_Exist()
         {
             _currentUser.Id.Returns(_cmsKitTestData.User1Id);
 
-            var rating = await _ratingAppService.CreateAsync(
+            var entity =
+                await _ratingAppService.GetCurrentUserRatingAsync(_cmsKitTestData.EntityType1,
+                    _cmsKitTestData.EntityId1);
+
+            var updatedEntity = await _ratingAppService.CreateAsync(
                 _cmsKitTestData.EntityType1,
                 _cmsKitTestData.EntityId1,
-                new CreateRatingInput
+                new CreateUpdateRatingInput
                 {
-                    StarCount = 4
+                    StarCount = 5
                 });
 
-            await _ratingAppService.UpdateAsync(rating.Id, new UpdateRatingInput
-            {
-                StarCount = 5
-            });
+            entity.Id.ShouldBe(updatedEntity.Id);
+            entity.EntityId.ShouldBe(updatedEntity.EntityId);
+            entity.EntityType.ShouldBe(updatedEntity.EntityType);
+            entity.StarCount.ShouldBe(updatedEntity.StarCount);
+        }
+
+        [Fact]
+        public async Task GetCurrentUserRatingAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            var rating = await _ratingAppService.GetCurrentUserRatingAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1
+            );
 
             UsingDbContext(context =>
             {
-                var updatedRating = context.Set<Rating>().Single(x => x.Id == rating.Id);
-                
-                updatedRating.StarCount.ShouldBe((short)5);
+                var ratings = context.Set<Rating>().Where(x =>
+                    x.EntityId == _cmsKitTestData.EntityId1 && x.EntityType == _cmsKitTestData.EntityType1).ToList();
+
+                ratings
+                    .Any(c => c.Id == rating.Id && c.EntityId == rating.EntityId && c.EntityType == rating.EntityType)
+                    .ShouldBeTrue();
             });
         }
 
+        [Fact]
+        public async Task GetGroupedStarCountsAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            var ratings = await _ratingAppService.GetGroupedStarCountsAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1
+            );
+
+            ratings.ShouldNotBeNull();
+            ratings.Count.ShouldBeGreaterThan(0);
+        }
+
         [Fact]
         public async Task DeleteAsync()
         {
             _currentUser.Id.Returns(_cmsKitTestData.User1Id);
-            
+
             var rating = await _ratingAppService.CreateAsync(
                 _cmsKitTestData.EntityType1,
                 _cmsKitTestData.EntityId1,
-                new CreateRatingInput
+                new CreateUpdateRatingInput
                 {
                     StarCount = 4
                 });
 
-            await _ratingAppService.DeleteAsync(rating.Id);
+            await _ratingAppService.DeleteAsync(_cmsKitTestData.EntityType1, _cmsKitTestData.EntityId1);
 
             UsingDbContext(context =>
             {
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs
index b09b380f8e..19da73cf50 100644
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Ratings/RatingRepository_Tests.cs
@@ -17,14 +17,6 @@ namespace Volo.CmsKit.Ratings
             _ratingRepository = GetRequiredService<IRatingRepository>();
         }
 
-        [Fact]
-        public async Task GetListAsync()
-        {
-            var list = await _ratingRepository.GetListAsync(_cmsKitTestData.EntityType1, _cmsKitTestData.EntityId1);
-
-            list.Count.ShouldBeGreaterThan(0);
-        }
-
         [Fact]
         public async Task GetCurrentUserRatingAsync()
         {

From a542a88a8047ebaea3aeaa81e302a6a2859f6b7b Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Tue, 1 Sep 2020 12:16:46 +0300
Subject: [PATCH 16/17] CmsKit: last changes after review

---
 .../Volo/CmsKit/Ratings/RatingConsts.cs                     | 4 ++--
 .../src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs    | 4 ++--
 .../Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs   | 3 ++-
 .../Pages/CmsKit/Shared/Components/Rating/Default.cshtml    | 2 +-
 .../CmsKit/Shared/Components/Rating/RatingViewComponent.cs  | 2 +-
 .../Pages/CmsKit/Shared/Components/Rating/default.js        | 6 ++----
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
index 27fa9d7584..d52bec599b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
@@ -8,8 +8,8 @@ namespace Volo.CmsKit.Ratings
 
         public static int MaxEntityIdLength { get; set; } = CmsEntityConsts.MaxEntityIdLength;
 
-        public static int MaxRating { get; set; } = 5;
+        public const int MaxStarCount = 5;
 
-        public static int MinRating { get; set; } = 0;
+        public const int MinStarCount = 1;
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
index 75f0499db3..a3575cf0b4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Ratings/Rating.cs
@@ -44,13 +44,13 @@ namespace Volo.CmsKit.Ratings
 
         public virtual void SetStarCount(short starCount)
         {
-            if(starCount <= RatingConsts.MaxRating && starCount > RatingConsts.MinRating)
+            if(starCount <= RatingConsts.MaxStarCount && starCount >= RatingConsts.MinStarCount)
             {
                 StarCount = starCount;
             }
             else
             {
-                throw new ArgumentOutOfRangeException("Choosen star must between 1 and 5");
+                throw new ArgumentOutOfRangeException($"Choosen star must between {RatingConsts.MinStarCount} and {RatingConsts.MaxStarCount}");
             }
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
index 3018ed8b30..c6fa01b7d4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
@@ -1,10 +1,11 @@
 using System.ComponentModel.DataAnnotations;
+using Volo.CmsKit.Ratings;
 
 namespace Volo.CmsKit.Public.Ratings
 {
     public class CreateUpdateRatingInput
     {
-        [Required, Range(1, 5)]
+        [Required, Range(RatingConsts.MinStarCount, RatingConsts.MaxStarCount)]
         public short StarCount { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
index b5cfbbfaa9..82397e49c4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml
@@ -5,7 +5,7 @@
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel
 @inject IHtmlLocalizer<CmsKitResource> L
 
-<div class="cms-rating-area container" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
+<div class="cms-rating-area container" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId" id="cms-rating_{@Model.EntityType}_{@Model.EntityId}">
     @if (CurrentUser.IsAuthenticated)
     {
         <div class="m-auto">
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
index aabbd3c286..cae050ea40 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/RatingViewComponent.cs
@@ -42,7 +42,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
             }
             
             var loginUrl =
-                $"{AbpMvcUiOptions.LoginUrl}?returnUrl={HttpContext.Request.Path.ToString()}&returnUrlHash=#cms-comment_{entityType}_{entityId}";
+                $"{AbpMvcUiOptions.LoginUrl}?returnUrl={HttpContext.Request.Path.ToString()}&returnUrlHash=#cms-rating_{entityType}_{entityId}";
 
             var viewModel = new RatingViewModel
             {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
index 4416d7fb48..431fd7884b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/default.js
@@ -72,8 +72,7 @@
                 init: init,
                 getFilters: getFilters
             }
-        }
-        ;
+        };
 
         $('.abp-widget-wrapper[data-widget-name="CmsRating"]')
             .each(function () {
@@ -83,7 +82,6 @@
 
                 widgetManager.init($(this));
             });
-    })
-    ;
+    });
 })
 (jQuery);
\ No newline at end of file

From abb35daf2466296f57d312f441de7a18a53db087 Mon Sep 17 00:00:00 2001
From: EngincanV <enginveske@gmail.com>
Date: Mon, 7 Sep 2020 09:01:30 +0300
Subject: [PATCH 17/17] CmsKit: Range attribute changes as DynamicRange

---
 .../Volo/CmsKit/Ratings/RatingConsts.cs                       | 4 ++--
 .../Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
index d52bec599b..e3bf6c399d 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Ratings/RatingConsts.cs
@@ -8,8 +8,8 @@ namespace Volo.CmsKit.Ratings
 
         public static int MaxEntityIdLength { get; set; } = CmsEntityConsts.MaxEntityIdLength;
 
-        public const int MaxStarCount = 5;
+        public static int MaxStarCount { get; set; } = 5;
 
-        public const int MinStarCount = 1;
+        public static int MinStarCount { get; set; } = 1;
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
index c6fa01b7d4..0577a97a68 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Ratings/CreateUpdateRatingInput.cs
@@ -1,11 +1,13 @@
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Validation;
 using Volo.CmsKit.Ratings;
 
 namespace Volo.CmsKit.Public.Ratings
 {
     public class CreateUpdateRatingInput
     {
-        [Required, Range(RatingConsts.MinStarCount, RatingConsts.MaxStarCount)]
+        [Required]
+        [DynamicRange(typeof(RatingConsts), typeof(int), nameof(RatingConsts.MinStarCount), nameof(RatingConsts.MaxStarCount))]
         public short StarCount { get; set; }
     }
 }
\ No newline at end of file