Default article rename bugfix (#338)

* Check for id, not slug constant

* Add IsHomePage property to Domain Article

* Forbid access to <default_article>/delete

* Update DetailsModel

* Use automapper in SearchModel

Author: danielmpetrov

CoreWiki.Application/Articles/Managing/Dto/ArticleManageDto.cs

@@ -5,6 +5,7 @@ namespace CoreWiki.Application.Articles.Managing.Dto
 {
 	public class ArticleManageDto
 	{
+		public bool IsHomePage { get; set; }
 		public string Content { get; set; }
 		public int Id { get; set; }
 		public string Slug { get; set; }

CoreWiki.Application/Articles/Reading/Dto/ArticleReadingDto.cs

@@ -5,6 +5,7 @@ namespace CoreWiki.Application.Articles.Reading.Dto
 {
 	public class ArticleReadingDto
 	{
+		public bool IsHomePage { get; set; }
 		public string Content { get; set; }
 		public int Id { get; set; }
 		public string Slug { get; set; }

CoreWiki.Application/Articles/Search/Dto/ArticleSearchDto.cs

@@ -5,6 +5,7 @@ namespace CoreWiki.Application.Articles.Search.Dto
 {
 	public class ArticleSearchDto
 	{
+		public bool IsHomePage { get; set; }
 		public string Content { get; set; }
 		public int Id { get; set; }
 		public string Slug { get; set; }

CoreWiki.Core/Domain/Article.cs

@@ -37,6 +37,8 @@ public string Topic { get
 
 		public string Content { get; set; }
 
+		public bool IsHomePage => Id == 1;
+
 		public virtual ICollection<Comment> Comments { get; set; }
 
 		public virtual ICollection<ArticleHistory> History { get; set; }

CoreWiki.Data/ApplicationDbContext.cs

@@ -23,7 +23,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 				Id = 1,
 				Topic = "Home Page",
 				Slug = "home-page",
-				Content = "This is the default home page.  Please change me!",
+				Content = "This is the default home page. Please change me!",
 				Published = Instant.FromDateTimeUtc(new DateTime(2018, 6, 19, 14, 31, 2, 265, DateTimeKind.Utc)),
 				AuthorId = Guid.Empty
 			};

CoreWiki.FirstStart/StartupExtensions.cs

@@ -36,7 +36,7 @@ public static IApplicationBuilder UseFirstStartConfiguration(this IApplicationBu
 
 		private static bool IsFirstStartIncomplete(HttpContext context)
 		{
-			return true;
+			return false;
 		}
 	}
 

CoreWiki.Test/Pages/SearchTests.cs

@@ -1,5 +1,6 @@
 using CoreWiki.Application.Articles.Search.Dto;
 using CoreWiki.Application.Articles.Search.Queries;
+using CoreWiki.Configuration.Startup;
 using CoreWiki.Pages;
 using MediatR;
 using Moq;
@@ -30,7 +31,7 @@ public async Task OnGetAsync_WithPageNumberEqualsTo2And12Posts_ShouldReturnCurre
 				}));
 
 			// Act
-			var searchModel = new SearchModel(mediator.Object);
+			var searchModel = new SearchModel(mediator.Object, ConfigureAutomapperServices.ConfigureAutomapper(null));
 
 			var result = await searchModel.OnGetAsync(query: "test", pageNumber: 2);
 

CoreWiki/Configuration/Startup/CoreWikiWebsiteProfile.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.Security.Claims;
 using AutoMapper;
 using CoreWiki.Application.Articles.Managing.Commands;
 using CoreWiki.Application.Articles.Reading.Commands;
 using CoreWiki.Application.Articles.Reading.Dto;
+using CoreWiki.Application.Articles.Search.Dto;
 using CoreWiki.Application.Common;
 using CoreWiki.ViewModels;
 
@@ -37,6 +39,10 @@ public CoreWikiWebsiteProfile()
 			CreateMap<ClaimsPrincipal, EditArticleCommand>(MemberList.None)
 				.ForMember(d => d.AuthorId, m => m.MapFrom(s => Guid.Parse(s.FindFirstValue(ClaimTypes.NameIdentifier))))
 				.ForMember(d => d.AuthorName, m => m.MapFrom(s => s.Identity.Name));
+
+			CreateMap<IList<ArticleReadingDto>, SearchResultDto<ArticleSummary>>(MemberList.None)
+				.ForMember(d => d.Results, m => m.MapFrom(s => s))
+				.ForMember(d => d.TotalResults, m => m.MapFrom(s => s.Count));
 		}
 	}
 }

CoreWiki/Pages/Delete.cshtml.cs

@@ -44,7 +44,7 @@ public async Task<IActionResult> OnGetAsync(string slug)
 				return NotFound();
 			}
 
-			if (article.Slug == UrlHelpers.HomePageSlug)
+			if (article.IsHomePage)
 			{
 				await _mediator.Publish(new DeleteHomePageAttemptNotification());
 				return Forbid();

CoreWiki/Pages/Details.cshtml

@@ -42,7 +42,7 @@
 	<div>
 		<a asp-page="/Edit" asp-route-slug="@Model.Article.Slug" asp-policy="@PolicyConstants.CanEditArticles" class="btn btn-outline-info">@Localizer["Edit"]</a>
 
-		@if (Model.Article.Slug != UrlHelpers.HomePageSlug)
+		@if (!Model.Article.IsHomePage)
 		{
 			<a href="~/" class="btn btn-secondary">@Localizer["GoHome"]</a>
 		}

CoreWiki/Pages/Details.cshtml.cs

@@ -26,7 +26,7 @@ public DetailsModel(IMediator mediator, IMapper mapper)
 
 		public ArticleDetails Article { get; set; }
 
-		[ViewDataAttribute]
+		[ViewData]
 		public string Slug { get; set; }
 
 		public async Task<IActionResult> OnGetAsync(string slug)

CoreWiki/Pages/Search.cshtml.cs

@@ -1,24 +1,26 @@
 using CoreWiki.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using System.Linq;
 using System.Threading.Tasks;
 using CoreWiki.Application.Articles.Reading.Queries;
 using CoreWiki.Application.Articles.Search.Dto;
 using CoreWiki.Application.Articles.Search.Queries;
 using MediatR;
+using AutoMapper;
 
 namespace CoreWiki.Pages
 {
 	public class SearchModel : PageModel
 	{
 		private readonly IMediator _mediator;
+		private readonly IMapper _mapper;
 		public SearchResultDto<ArticleSummary> SearchResult;
 		private const int ResultsPerPage = 10;
 
-		public SearchModel(IMediator mediator)
+		public SearchModel(IMediator mediator, IMapper mapper)
 		{
 			_mediator = mediator;
+			_mapper = mapper;
 		}
 
 		public string RequestedPage => Request.Path.Value.ToLowerInvariant().Substring(1);
@@ -29,28 +31,10 @@ public async Task<IActionResult> OnGetAsync([FromQuery(Name = "Query")]string qu
 			{
 				return Page();
 			}
-			var qry = new SearchArticlesQuery(query,
-				pageNumber,
-				ResultsPerPage);
+			var qry = new SearchArticlesQuery(query, pageNumber, ResultsPerPage);
 			var result = await _mediator.Send(qry);
 
-			//todo: use automapper
-			SearchResult = new SearchResultDto<ArticleSummary>
-			{
-				Query = result.Query,
-				TotalResults = result.TotalResults,
-				ResultsPerPage = result.ResultsPerPage,
-				CurrentPage = result.CurrentPage,
-				Results = (from article in result.Results
-					select new ArticleSummary
-					{
-						Slug = article.Slug,
-						Topic = article.Topic,
-						Published = article.Published,
-						ViewCount = article.ViewCount
-					}).ToList()
-			};
-			//SearchResult.CurrentPage = 1;
+			SearchResult = _mapper.Map<SearchResultDto<ArticleSummary>>(result);
 
 			return Page();
 		}
@@ -60,20 +44,10 @@ public async Task<IActionResult> OnGetLatestChangesAsync()
 			var qry = new GetLatestArticlesQuery(10);
 			var results = await _mediator.Send(qry);
 
-			SearchResult = new SearchResultDto<ArticleSummary>
-			{
-				Results = (from article in results
-									 select new ArticleSummary
-									 {
-										 Slug = article.Slug,
-										 Topic = article.Topic,
-										 Published = article.Published,
-										 ViewCount = article.ViewCount
-									 }).ToList(),
-				ResultsPerPage = 11,
-				CurrentPage = 1
-			};
-			SearchResult.TotalResults = SearchResult.Results.Count;
+			SearchResult = _mapper.Map<SearchResultDto<ArticleSummary>>(results);
+			SearchResult.ResultsPerPage = 11;
+			SearchResult.CurrentPage = 1;
+
 			return Page();
 		}
 	}

CoreWiki/Pages/_ArticleRow.cshtml

@@ -16,7 +16,7 @@
 			<h6 class="card-subtitle mb-2 text-muted">@Localizer["ViewCount"]: <span> @Model.ViewCount</span></h6>
 
 			<a class="card-link btn btn-outline-info btn-sm" asp-page="/Edit" asp-route-slug="@Model.Slug">@Localizer["Edit"]</a>
-			@if (Model.Slug != UrlHelpers.HomePageSlug)
+			@if (!Model.IsHomePage)
 			{
 				<a class="card-link btn btn-outline-danger btn-sm" asp-policy="CanDeleteArticles" asp-policy-message="You do not have permission to delete this article." asp-page="/Delete" asp-route-slug="@Model.Slug">@Localizer["Delete"]</a>
 			}

CoreWiki/ViewModels/ArticleDetails.cs

@@ -6,6 +6,7 @@ namespace CoreWiki.ViewModels
 {
 	public class ArticleDetails
 	{
+		public bool IsHomePage { get; set; }
 		public int Id { get; set; }
 		public Guid AuthorId { get; set; }
 		public string Slug { get; set; }

CoreWiki/ViewModels/ArticleSummary.cs

@@ -4,6 +4,7 @@ namespace CoreWiki.ViewModels
 {
 	public class ArticleSummary
 	{
+		public bool IsHomePage { get; set; }
 		public string Slug { get; set; }
 		public string Topic { get; set; }
 		public Instant Published { get; set; }