Merge pull request #52 from FanrayMedia/dev

1.0.0-beta2 release from dev to master

Author: Ray Fan

README.md

@@ -20,7 +20,7 @@ Either way you will see the blog setup page on app initial launch.
 ## Database
 
 Database is created for you on app initial launch. Out of box it uses SQLite, and SQL Server is also supported.
-To switch to SQL Server, go to `appsettings.json` you will see the following.
+To switch to SQL Server, go to `appsettings.json` and change the Database value on line 3 from `sqlite` to `sqlserver` and update your connection string accordingly.
 
 ```
   "AppSettings": {
@@ -32,11 +32,8 @@ To switch to SQL Server, go to `appsettings.json` you will see the following.
   "ConnectionStrings": {
     "DefaultConnection": "Server=.\\SQLEXPRESS;Database=Fanray;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
-
 ```
 
-Change `sqlite` to `sqlserver` and update your connection string accordingly.
-
 ## Open Live Writer
 
 Right now the only way to post is through [Open Live Writer](http://openlivewriter.org/). To get started,

src/Fan.Blogs/Data/BlogDbContext.cs

@@ -5,12 +5,20 @@
 
 namespace Fan.Blogs.Data
 {
+    /// <summary>
+    /// The DbContext for blog application.
+    /// </summary>
+    /// <remarks>
+    /// It's deriving from IdentityDbContext instead of DbContext because when testing it's still
+    /// required to access User table to seed data.
+    /// </remarks>
     public class BlogDbContext : IdentityDbContext<User, Role, int>
     {
         public virtual DbSet<Post> Posts { get; set; }
         public virtual DbSet<Category> Categories { get; set; }
         public virtual DbSet<Tag> Tags { get; set; }
         public virtual DbSet<PostTag> PostTags { get; set; }
+        public virtual DbSet<Media> Medias { get; set; }
 
         public BlogDbContext(DbContextOptions<BlogDbContext> options) 
             : base(options)
@@ -58,6 +66,12 @@ public static void CreateBlogModel(ModelBuilder builder)
                 entity.ToTable("Blog_PostTag");
                 entity.HasKey(e => new { e.PostId, e.TagId });
             });
+
+            builder.Entity<Media>(entity =>
+            {
+                entity.ToTable("Blog_Media");
+                entity.HasIndex(e => new { e.Type, e.UploadedOn });
+            });
         }
     }
 }

src/Fan.Blogs/Data/ICategoryRepository.cs

@@ -1,4 +1,5 @@
 using Fan.Blogs.Models;
+using Fan.Data;
 using Fan.Models;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -8,13 +9,8 @@ namespace Fan.Blogs.Data
     /// <summary>
     /// Contract for a category repository.
     /// </summary>
-    public interface ICategoryRepository 
+    public interface ICategoryRepository : IRepository<Category>
     {
-        /// <summary>
-        /// Creates a new <see cref="Category"/>.
-        /// </summary>
-        Task<Category> CreateAsync(Category category);
-
         /// <summary>
         /// Deletes a <see cref="Category"/> by id and re-categorize its posts to the given 
         /// default category id.
@@ -30,11 +26,5 @@ public interface ICategoryRepository
         /// Returns all categories or empty list if no categories found.
         /// </summary>
         Task<List<Category>> GetListAsync();
-
-        /// <summary>
-        /// Updates a <see cref="Category"/>.
-        /// </summary>
-        /// <param name="category">Not all implementations use this parameter, such as the Sql ones.</param>
-        Task<Category> UpdateAsync(Category category);
     }
 }

src/Fan.Blogs/Data/IMediaRepository.cs

@@ -0,0 +1,13 @@
+using Fan.Blogs.Models;
+using Fan.Data;
+using System;
+using System.Threading.Tasks;
+
+namespace Fan.Blogs.Data
+{
+    public interface IMediaRepository : IRepository<Media>
+    {
+        Task<Media> GetAsync(int mediaId);
+        Task<Media> GetAsync(string fileName, DateTimeOffset uploadedOn);
+    }
+}

src/Fan.Blogs/Data/IPostRepository.cs

@@ -1,7 +1,6 @@
 using Fan.Blogs.Enums;
 using Fan.Blogs.Models;
-using Fan.Enums;
-using Fan.Models;
+using Fan.Data;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -10,26 +9,14 @@ namespace Fan.Blogs.Data
     /// <summary>
     /// Contract for a post repository.
     /// </summary>
-    public interface IPostRepository
+    public interface IPostRepository : IRepository<Post>
     {
-        /// <summary>
-        /// Creates a new <see cref="Post"/>
-        /// </summary>
-        Task<Post> CreateAsync(Post post);
-
         /// <summary>
         /// Deletes a <see cref="Post"/> by Id, if the post is a root page, 
         /// it will also delete all child pages.
         /// </summary>
         Task DeleteAsync(int id);
 
-        /// <summary>
-        /// Updates a <see cref="Post"/>.
-        /// </summary>
-        /// <param name="post">Not all implementations use this parameter, such as the Sql ones.</param>
-        /// <returns></returns>
-        Task<Post> UpdateAsync(Post post);
-
         /// <summary>
         /// Returns a <see cref="Post"/> by id. If it is a BlogPost it'll return together with its 
         /// <see cref="Category"/> and <see cref="Tag"/>. Returns null if it's not found.

src/Fan.Blogs/Data/ITagRepository.cs

@@ -1,5 +1,5 @@
 using Fan.Blogs.Models;
-using Fan.Models;
+using Fan.Data;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -8,15 +8,8 @@ namespace Fan.Blogs.Data
     /// <summary>
     /// Contract for a tag repository.
     /// </summary>
-    public interface ITagRepository
+    public interface ITagRepository : IRepository<Tag>
     {
-        /// <summary>
-        /// Creates a <see cref="Tag"/>.
-        /// </summary>
-        /// <param name="tag"></param>
-        /// <returns></returns>
-        Task<Tag> CreateAsync(Tag tag);
-
         /// <summary>
         /// Deletes a tag and its associated posts.
         /// </summary>
@@ -26,11 +19,5 @@ public interface ITagRepository
         /// Returns all tags or empty list if no tags found.
         /// </summary>
         Task<List<Tag>> GetListAsync();
-
-        /// <summary>
-        /// Updates a <see cref="Tag"/>.
-        /// </summary>
-        /// <param name="tag">Not all implementations use this parameter, such as the Sql ones.</param>
-        Task<Tag> UpdateAsync(Tag tag);
     }
 }

src/Fan.Blogs/Data/SqlCategoryRepository.cs

@@ -1,5 +1,6 @@
 using Fan.Blogs.Enums;
 using Fan.Blogs.Models;
+using Fan.Data;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,24 +11,17 @@ namespace Fan.Blogs.Data
     /// <summary>
     /// Sql implementation of the <see cref="ICategoryRepository"/> contract.
     /// </summary>
-    public class SqlCategoryRepository : ICategoryRepository
+    /// <remarks>
+    /// Category specific data access methods.
+    /// </remarks>
+    public class SqlCategoryRepository : EFRepository<Category>, ICategoryRepository
     {
         private readonly BlogDbContext _db;
-        public SqlCategoryRepository(BlogDbContext db)
+        public SqlCategoryRepository(BlogDbContext db) : base(db)
         {
             _db = db;
         }
 
-        /// <summary>
-        /// Creates a new <see cref="Category"/>, the returned object is tracked.
-        /// </summary>
-        public async Task<Category> CreateAsync(Category category)
-        {
-            await _db.AddAsync(category);
-            await _db.SaveChangesAsync();
-            return category;
-        }
-
         /// <summary>
         /// Deletes a <see cref="Category"/> by id and re-categorize its posts to the given 
         /// default category id.
@@ -73,15 +67,5 @@ public async Task<List<Category>> GetListAsync()
                         Count = _db.Posts.Where(p => p.CategoryId == c.Id && p.Status == EPostStatus.Published).Count(),
                     }).ToListAsync();
         }
-
-        /// <summary>
-        /// Updates a <see cref="Category"/>.
-        /// </summary>
-        /// <param name="category">this parm is not used just being returned.</param>
-        public async Task<Category> UpdateAsync(Category category)
-        {
-            await _db.SaveChangesAsync();
-            return category;
-        }
     }
 }

src/Fan.Blogs/Data/SqlMediaRepository.cs

@@ -0,0 +1,30 @@
+using Fan.Blogs.Models;
+using Fan.Data;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Threading.Tasks;
+
+namespace Fan.Blogs.Data
+{
+    public class SqlMediaRepository : EFRepository<Media>, IMediaRepository
+    {
+        private readonly BlogDbContext _db;
+        public SqlMediaRepository(BlogDbContext db) : base(db)
+        {
+            _db = db;
+        }
+
+        public async Task<Media> GetAsync(string fileName, DateTimeOffset uploadedOn)
+        {
+            return await _db.Medias.SingleOrDefaultAsync(m =>
+                        m.FileName.Equals(fileName, StringComparison.InvariantCultureIgnoreCase) &&
+                        m.UploadedOn.Year == uploadedOn.Year &&
+                        m.UploadedOn.Month == uploadedOn.Month);
+        }
+
+        public async Task<Media> GetAsync(int mediaId)
+        {
+            return await _db.Medias.SingleAsync(m => m.Id == mediaId);
+        }
+    }
+}

src/Fan.Blogs/Data/SqlPostRepository.cs

@@ -1,5 +1,6 @@
 using Fan.Blogs.Enums;
 using Fan.Blogs.Models;
+using Fan.Data;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -11,26 +12,14 @@ namespace Fan.Blogs.Data
     /// <summary>
     /// Sql implementation of the <see cref="IPostRepository"/> contract.
     /// </summary>
-    public class SqlPostRepository : IPostRepository
+    public class SqlPostRepository : EFRepository<Post>, IPostRepository
     {
         private readonly BlogDbContext _db;
-        public SqlPostRepository(BlogDbContext db)
+        public SqlPostRepository(BlogDbContext db) : base(db)
         {
             _db = db;
         }
 
-        /// <summary>
-        /// Creates a new <see cref="Post"/>.
-        /// </summary>
-        /// <param name="post"></param>
-        /// <returns></returns>
-        public async Task<Post> CreateAsync(Post post)
-        {
-            await _db.Posts.AddAsync(post);
-            await _db.SaveChangesAsync();
-            return post;
-        }
-
         /// <summary>
         /// Deletes a <see cref="Post"/> by Id, if the post is a root page, 
         /// it will also delete all child pages.
@@ -166,16 +155,5 @@ from pt in p.PostTags
 
             return (posts: posts, totalCount: postCount);
         }
-
-        /// <summary>
-        /// Updates a post.
-        /// </summary>
-        /// <param name="post">Not used just being returned.</param>
-        /// <returns></returns>
-        public async Task<Post> UpdateAsync(Post post)
-        {
-            await _db.SaveChangesAsync();
-            return post;
-        }
     }
 }

src/Fan.Blogs/Data/SqlTagRepository.cs

@@ -1,5 +1,6 @@
 using Fan.Blogs.Enums;
 using Fan.Blogs.Models;
+using Fan.Data;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,21 +11,14 @@ namespace Fan.Blogs.Data
     /// <summary>
     /// Sql implementation of the <see cref="ITagRepository"/> contract.
     /// </summary>
-    public class SqlTagRepository : ITagRepository
+    public class SqlTagRepository : EFRepository<Tag>, ITagRepository
     {
         private readonly BlogDbContext _db;
-        public SqlTagRepository(BlogDbContext db)
+        public SqlTagRepository(BlogDbContext db) : base(db)
         {
             _db = db;
         }
 
-        public async Task<Tag> CreateAsync(Tag tag)
-        {
-            await _db.Tags.AddAsync(tag);
-            await _db.SaveChangesAsync();
-            return tag;
-        }
-
         /// <summary>
         /// Deletes a tag and its associated posts.
         /// </summary>
@@ -56,11 +50,5 @@ from pt in p.PostTags
                                        select pt).Count(),
                           }).ToListAsync();
         }
-
-        public async Task<Tag> UpdateAsync(Tag tag)
-        {
-            await _db.SaveChangesAsync();
-            return tag;
-        }
     }
 }