diff --git a/OliverBooth/Data/Blog/BlogPost.cs b/OliverBooth/Data/Blog/BlogPost.cs index cfb1110..05ece19 100644 --- a/OliverBooth/Data/Blog/BlogPost.cs +++ b/OliverBooth/Data/Blog/BlogPost.cs @@ -44,7 +44,7 @@ internal sealed class BlogPost : IBlogPost public DateTimeOffset? Updated { get; internal set; } /// - public BlogPostVisibility Visibility { get; internal set; } + public Visibility Visibility { get; internal set; } /// public int? WordPressId { get; set; } diff --git a/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs b/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs index 7c89b2b..607f9d3 100644 --- a/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs +++ b/OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs @@ -26,7 +26,7 @@ internal sealed class BlogPostConfiguration : IEntityTypeConfiguration builder.Property(e => e.DisqusDomain).IsRequired(false); builder.Property(e => e.DisqusIdentifier).IsRequired(false); builder.Property(e => e.DisqusPath).IsRequired(false); - builder.Property(e => e.Visibility).HasConversion(new EnumToStringConverter()).IsRequired(); + builder.Property(e => e.Visibility).HasConversion(new EnumToStringConverter()).IsRequired(); builder.Property(e => e.Password).HasMaxLength(255).IsRequired(false); builder.Property(e => e.Tags).IsRequired() .HasConversion( diff --git a/OliverBooth/Data/Blog/IBlogPost.cs b/OliverBooth/Data/Blog/IBlogPost.cs index a8b9818..d6e4e95 100644 --- a/OliverBooth/Data/Blog/IBlogPost.cs +++ b/OliverBooth/Data/Blog/IBlogPost.cs @@ -85,7 +85,7 @@ public interface IBlogPost /// Gets the visibility of the post. /// /// The visibility of the post. - BlogPostVisibility Visibility { get; } + Visibility Visibility { get; } /// /// Gets the WordPress ID of the post. diff --git a/OliverBooth/Data/Blog/BlogPostVisibility.cs b/OliverBooth/Data/Visibility.cs similarity index 88% rename from OliverBooth/Data/Blog/BlogPostVisibility.cs rename to OliverBooth/Data/Visibility.cs index d8e982a..6f96339 100644 --- a/OliverBooth/Data/Blog/BlogPostVisibility.cs +++ b/OliverBooth/Data/Visibility.cs @@ -1,9 +1,9 @@ -namespace OliverBooth.Data.Blog; +namespace OliverBooth.Data; /// /// An enumeration of the possible visibilities of a blog post. /// -public enum BlogPostVisibility +public enum Visibility { /// /// The post is private and only visible to the author, or those with the password. diff --git a/OliverBooth/Pages/Blog/Article.cshtml b/OliverBooth/Pages/Blog/Article.cshtml index 9bb648c..5e32ba8 100644 --- a/OliverBooth/Pages/Blog/Article.cshtml +++ b/OliverBooth/Pages/Blog/Article.cshtml @@ -1,5 +1,6 @@ @page "/blog/{year:int}/{month:int}/{day:int}/{slug}" @using Humanizer +@using OliverBooth.Data @using OliverBooth.Data.Blog @using OliverBooth.Services @inject IBlogPostService BlogPostService @@ -44,13 +45,13 @@ @switch (post.Visibility) { - case BlogPostVisibility.Private: + case Visibility.Private: break; - case BlogPostVisibility.Unlisted: + case Visibility.Unlisted: diff --git a/OliverBooth/Services/BlogPostService.cs b/OliverBooth/Services/BlogPostService.cs index aa2a4a1..8bdda24 100644 --- a/OliverBooth/Services/BlogPostService.cs +++ b/OliverBooth/Services/BlogPostService.cs @@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Humanizer; using Markdig; using Microsoft.EntityFrameworkCore; +using OliverBooth.Data; using OliverBooth.Data.Blog; namespace OliverBooth.Services; @@ -44,7 +45,7 @@ internal sealed class BlogPostService : IBlogPostService { using BlogContext context = _dbContextFactory.CreateDbContext(); IQueryable ordered = context.BlogPosts - .Where(p => p.Visibility == BlogPostVisibility.Published) + .Where(p => p.Visibility == Visibility.Published) .OrderByDescending(post => post.Published); if (limit > -1) { @@ -59,7 +60,7 @@ internal sealed class BlogPostService : IBlogPostService { using BlogContext context = _dbContextFactory.CreateDbContext(); return context.BlogPosts - .Where(p => p.Visibility == BlogPostVisibility.Published) + .Where(p => p.Visibility == Visibility.Published) .OrderByDescending(post => post.Published) .Skip(page * pageSize) .Take(pageSize) @@ -71,7 +72,7 @@ internal sealed class BlogPostService : IBlogPostService { using BlogContext context = _dbContextFactory.CreateDbContext(); return context.BlogPosts - .Where(p => p.Visibility == BlogPostVisibility.Published) + .Where(p => p.Visibility == Visibility.Published) .OrderBy(post => post.Published) .FirstOrDefault(post => post.Published > blogPost.Published); } @@ -81,7 +82,7 @@ internal sealed class BlogPostService : IBlogPostService { using BlogContext context = _dbContextFactory.CreateDbContext(); return context.BlogPosts - .Where(p => p.Visibility == BlogPostVisibility.Published) + .Where(p => p.Visibility == Visibility.Published) .OrderByDescending(post => post.Published) .FirstOrDefault(post => post.Published < blogPost.Published); }