Merge branch 'release' into 'master'

Release

See merge request yescent/yes.blog!62

Yes.Application/Admins/Articles/ArticleService.cs

@@ -8,7 +8,7 @@ namespace Yes.Application.Admins.Articles
         private readonly BlogDbContext _db = db;
         public async Task<bool> IsSlugInUse(string slug)
         {
-            return await _db.Articles.AnyAsync(x => x.Slug == slug);
+            return await _db.Articles.AnyAsync(x => x.Slug == slug && x.Status!= ArticleStatusEnum.Deleted);
         }
 
         public async Task<string> CreateUniqueSlug()

Yes.Application/Admins/Articles/DeleteArticleCommandHandler.cs

@@ -14,7 +14,7 @@
         public async Task<DeleteArticleCommandResponse> Handle(DeleteArticleCommand request, CancellationToken cancellationToken)
         {
             var article = await _db.Articles.FindAsync(request.Id);
-			if (article != null)
+			if (article != null && article.Status!= ArticleStatusEnum.Deleted)
             {
                 var identityUser = await _db.Users.FindAsync(_identity.Id);
                 if (identityUser == null)

Yes.Application/Admins/Articles/GetArticleQueryHandler.cs

@@ -21,7 +21,7 @@
         public async Task<GetArticleQueryResponse> Handle(GetArticleQuery request, CancellationToken cancellationToken)
         {
 			var article = await _db.Articles.FindAsync(request.Id);
-            if (article == null)
+            if (article == null|| article.Status== ArticleStatusEnum.Deleted)
             {
                 throw new ArticleNotExistsException(request.Id);
             }

Yes.Application/Admins/Articles/GetLatestArticlesQueryHandler.cs

@@ -15,7 +15,7 @@
         private readonly BlogDbContext _db = db;
         public async Task<List<GetLatestArticlesQueryResponse>> Handle(GetLatestArticlesQuery request, CancellationToken cancellationToken)
         {
-            var query = _db.Articles.AsNoTracking().Where(x=>x.Type==ArticleTypeEnum.Article).OrderByDescending(x => x.Id).Select(article =>
+            var query = _db.Articles.AsNoTracking().Where(x=>x.Type==ArticleTypeEnum.Article && x.Status != ArticleStatusEnum.Deleted).OrderByDescending(x => x.Id).Select(article =>
                 new GetLatestArticlesQueryResponse(
                     article.Id,
                     article.Title,

Yes.Application/Admins/Articles/UpdateArticleCommandHandler.cs

@@ -36,7 +36,7 @@
             var categoryObject = ValueObject<CategoryEntity>.Create(request.CategoryId, category);
 
             var article = await _db.Articles.FindAsync(request.Id);
-            if (article == null)
+            if (article == null|| article.Status == ArticleStatusEnum.Deleted)
             {
                 throw new ArticleNotExistsException(request.Id);
             }

Yes.Application/Admins/Articles/UpdateDraftCommandHandler.cs

@@ -30,7 +30,7 @@
             var categoryObject = ValueObject<CategoryEntity>.Create(request.CategoryId, category);
 
             var article = await _db.Articles.FindAsync(request.Id);
-            if (article == null)
+            if (article == null || article.Status == ArticleStatusEnum.Deleted)
             {
                 throw new ArticleNotExistsException(request.Id);
             }

Yes.Application/Admins/Categories/CategorieService.cs

@@ -8,7 +8,7 @@ namespace Yes.Application.Admins.Categories
 		private readonly BlogDbContext _db = db;
 		public async Task<bool> IsSlugInUse(string slug)
 		{
-			return await _db.Articles.AnyAsync(x => x.Slug == slug);
+			return await _db.Articles.AnyAsync(x => x.Slug == slug && x.Status != ArticleStatusEnum.Deleted);
 		}
 
 		public async Task<string> EnsureSlug()

Yes.Application/Admins/Categories/DeleteCategoryCommandHandler.cs

@@ -22,7 +22,7 @@
                 throw new AccessDeniedException();
             }
 
-            var hasArticlesInCategory = await _db.Articles.AnyAsync(x => x.CategoryId == request.Id, cancellationToken);
+            var hasArticlesInCategory = await _db.Articles.AnyAsync(x => x.CategoryId == request.Id && x.Status!= ArticleStatusEnum.Deleted, cancellationToken);
             if (hasArticlesInCategory)
             {
                 throw new DeleteCategoryException("分类下还有文章，无法删除！");

Yes.Application/Admins/Pages/GetPageQueryHandler.cs

@@ -22,7 +22,7 @@
         public async Task<GetPageQueryResponse> Handle(GetPageQuery request, CancellationToken cancellationToken)
         {
 			var page = await _db.Articles.FindAsync(request.Id);
-            if (page == null)
+            if (page == null || page.Status == ArticleStatusEnum.Deleted)
             {
                 throw new PageNotExistsException(request.Id);
             }

Yes.Application/Blogs/BlogService.cs

@@ -422,7 +422,7 @@
             {
                 x.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(10);
 
-                var articles = _db.Articles.Where(x => x.Type == ArticleTypeEnum.Page).OrderByDescending(x => x.Sort).Take(top).Select(x => x.ArticleEntityToSinglePage()).ToList();
+                var articles = _db.Articles.Where(x => x.Type == ArticleTypeEnum.Page && x.Status != ArticleStatusEnum.Deleted).OrderByDescending(x => x.Sort).Take(top).Select(x => x.ArticleEntityToSinglePage()).ToList();
 
                 articles.ForEach(x =>
                 {
@@ -441,7 +441,7 @@
             {
                 articleEntity = await _db.Articles.FirstOrDefaultAsync(x => x.Slug == slug);
             }
-            if (articleEntity == null)
+            if (articleEntity == null || articleEntity.Status == ArticleStatusEnum.Deleted)
             {
                 throw new PageNotFoundException();
             }