Code Cleanup

Make fields readonly
Remove unnecessary casts
Format document
Remove unnecessary usings
Sort usings
Use file-level namespaces
Order modifiers

Source/DataLayer/QueryObjects/BookQueries.cs

@@ -1,55 +1,54 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Microsoft.EntityFrameworkCore;
 
-namespace DataLayer
+namespace DataLayer;
+
+// only library importing should use tracking. All else should be NoTracking.
+// only library importing should directly query Book. All else should use LibraryBook
+public static class BookQueries
 {
-    // only library importing should use tracking. All else should be NoTracking.
-    // only library importing should directly query Book. All else should use LibraryBook
-    public static class BookQueries
-    {
-        public static Book? GetBook_Flat_NoTracking(this LibationContext context, string productId)
-            => context
-                .Books
-                .AsNoTrackingWithIdentityResolution()
-                .GetBook(productId);
+	public static Book? GetBook_Flat_NoTracking(this LibationContext context, string productId)
+		=> context
+			.Books
+			.AsNoTrackingWithIdentityResolution()
+			.GetBook(productId);
 
-        public static Book? GetBook(this IQueryable<Book> books, string productId)
-            => books
-                .GetBooks()
-                // 'Single' is more accurate but 'First' is faster and less error prone
-                .FirstOrDefault(b => b.AudibleProductId == productId);
+	public static Book? GetBook(this IQueryable<Book> books, string productId)
+		=> books
+			.GetBooks()
+			// 'Single' is more accurate but 'First' is faster and less error prone
+			.FirstOrDefault(b => b.AudibleProductId == productId);
 
-        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
-        public static IQueryable<Book> GetBooks(this IQueryable<Book> books, Expression<Func<Book, bool>> predicate)
-            => books
-                .GetBooks()
-                .Where(predicate);
+	/// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
+	public static IQueryable<Book> GetBooks(this IQueryable<Book> books, Expression<Func<Book, bool>> predicate)
+		=> books
+			.GetBooks()
+			.Where(predicate);
 
-        /// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
-        public static IQueryable<Book> GetBooks(this IQueryable<Book> books)
-            => books
-                // owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
-                .Include(b => b.SeriesLink).ThenInclude(sb => sb.Series)
-                .Include(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
-                .Include(b => b.CategoriesLink).ThenInclude(c => c.CategoryLadder).ThenInclude(c => c._categories);
+	/// <summary>This is still IQueryable. YOU MUST CALL ToList() YOURSELF</summary>
+	public static IQueryable<Book> GetBooks(this IQueryable<Book> books)
+		=> books
+			// owned items are always loaded. eg: book.UserDefinedItem, book.Supplements
+			.Include(b => b.SeriesLink).ThenInclude(sb => sb.Series)
+			.Include(b => b.ContributorsLink).ThenInclude(c => c.Contributor)
+			.Include(b => b.CategoriesLink).ThenInclude(c => c.CategoryLadder).ThenInclude(c => c._categories);
 
-        public static bool IsProduct(this Book book)
-            => book.ContentType is not ContentType.Episode and not ContentType.Parent;
+	public static bool IsProduct(this Book book)
+		=> book.ContentType is not ContentType.Episode and not ContentType.Parent;
 
-        public static bool IsEpisodeChild(this Book book)
-            => book.ContentType is ContentType.Episode;
+	public static bool IsEpisodeChild(this Book book)
+		=> book.ContentType is ContentType.Episode;
 
-        public static bool IsEpisodeParent(this Book book)
-            => book.ContentType is ContentType.Parent;
+	public static bool IsEpisodeParent(this Book book)
+		=> book.ContentType is ContentType.Parent;
 
-        public static IEnumerable<LibraryBook> WithoutParents(this IEnumerable<LibraryBook> libraryBooks)
-            => libraryBooks.Where(lb => !lb.Book.IsEpisodeParent());
+	public static IEnumerable<LibraryBook> WithoutParents(this IEnumerable<LibraryBook> libraryBooks)
+		=> libraryBooks.Where(lb => !lb.Book.IsEpisodeParent());
 
-		public static bool HasLiberated(this Book book)
-            => book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated ||
-            book.UserDefinedItem.PdfStatus is not null and LiberatedStatus.Liberated;
-    }
+	public static bool HasLiberated(this Book book)
+			=> book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated ||
+			book.UserDefinedItem.PdfStatus is not null and LiberatedStatus.Liberated;
 }

Source/DataLayer/QueryObjects/CategoryQueries.cs

@@ -1,11 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 
-namespace DataLayer
+namespace DataLayer;
+
+public static class CategoryQueries
 {
-	public static class CategoryQueries
-	{
-		public static IQueryable<CategoryLadder> GetCategoryLadders(this LibationContext context)
-			=> context.CategoryLadders.Include(c => c._categories);
-	}
+	public static IQueryable<CategoryLadder> GetCategoryLadders(this LibationContext context)
+		=> context.CategoryLadders.Include(c => c._categories);
 }

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
+using Dinah.Core;
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace DataLayer;