From f6286773930449df45117aa4209b54066e3596f9 Mon Sep 17 00:00:00 2001 From: enisn Date: Mon, 18 Jan 2021 10:09:53 +0300 Subject: [PATCH] CmsKit - Refactor Blogs --- .../Volo/CmsKit/Blogs/Blog.cs | 5 ++++- .../Volo/CmsKit/Blogs/BlogPost.cs | 22 ++++++------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs index 49b5bf9b43..59354c8e59 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/Blog.cs @@ -1,10 +1,13 @@ using System; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Volo.CmsKit.Blogs { - public class Blog : FullAuditedAggregateRoot + public class Blog : FullAuditedAggregateRoot, IMultiTenant { public string Name { get; set; } + + public Guid? TenantId { get; } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs index af3931cbed..3494cff31e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs @@ -3,24 +3,25 @@ using System; using System.Text.RegularExpressions; using Volo.Abp; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; using Volo.CmsKit.Blogs; using Volo.CmsKit.Users; namespace Volo.CmsKit.Blogs { - public class BlogPost : FullAuditedAggregateRootWithUser + public class BlogPost : FullAuditedAggregateRootWithUser , IMultiTenant { public Guid BlogId { get; protected set; } public string Title { get; protected set; } + public string ShortDescription { get; set; } + public string UrlSlug { get; protected set; } public string CoverImageUrl { get; set; } - public bool IsPublished { get; protected set; } - - public DateTime? PublishDate { get; protected set; } + public Guid? TenantId { get; } protected BlogPost() { @@ -30,14 +31,15 @@ namespace Volo.CmsKit.Blogs Guid blogId, [NotNull] string title, [NotNull] string urlSlug, + [CanBeNull] string shortDescription = null, [CanBeNull] string coverImageUrl = null, bool isPublished = true) { BlogId = blogId; SetTitle(title); SetUrlSlug(urlSlug); + ShortDescription = shortDescription; CoverImageUrl = coverImageUrl; - IsPublished = isPublished; } public void SetTitle(string title) @@ -52,16 +54,6 @@ namespace Volo.CmsKit.Blogs UrlSlug = NormalizeUrlSlug(urlSlug); } - public void SetIsPublished(bool isPublished) - { - if (!IsPublished && isPublished) - { - this.PublishDate = DateTime.UtcNow; - } - - IsPublished = IsPublished; - } - private string NormalizeUrlSlug(string value) { value = value.ToLowerInvariant();