litecharms/components
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 114 Wiki Activity

Wrote tests for most services, applied EF core optimisations

Browse Source
This commit is contained in:
Khwezi Mngoma
2026-05-29 01:05:22 +02:00
parent 4e53ff8a37
commit 2546c34ffc
22 changed files with 793 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiteCharms.Features.MidrandBooks/AuthorBooks/BooksService.cs
+18 -16
View File
@@ -7,23 +7,21 @@ namespace LiteCharms.Features.MidrandBooks.AuthorBooks;
public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : IService
{
public async ValueTask<Result> UpdateBookStatusAsync(long bookId, bool isEnabled, CancellationToken cancellationToken)
public async ValueTask<Result> UpdateBookStatusAsync(long bookId, bool isEnabled, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var book = await context.Books.FirstOrDefaultAsync(b => b.Id == bookId, cancellationToken);
var rowsUpdated = await context.Books
.Where(b => b.Id == bookId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(b => b.Enabled, isEnabled)
.SetProperty(b => b.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (book is null)
return Result.Fail(new Error($"Book with ID {bookId} not found"));
book.UpdatedAt = DateTime.UtcNow;
book.Enabled = isEnabled;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error($"Failed to change status of book with ID {bookId}"));
: Result.Fail(new Error($"Book with ID {bookId} not found"));
}
catch (Exception ex)
{
@@ -45,8 +43,9 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
var book = context.Books.Add(new Entities.AuthorBook
{
CreatedAt = DateTime.UtcNow,
AuthorId = authorId,
ProductId = productId,
ProductId = productId
});
return await context.SaveChangesAsync(cancellationToken) > 0
@@ -68,7 +67,8 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
var book = await context.Books
.AsNoTracking()
.Include(b => b.Author)
.Include(b => b.Product!.Price)
.Include(b => b.Product)
.ThenInclude(b => b!.Prices)
.Include(b => b.Pages)
.FirstOrDefaultAsync(b => b.Id == bookId, cancellationToken);
@@ -86,7 +86,7 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
{
try
{
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if(!await context.Authors.AnyAsync(a => a.Id == authorId, cancellationToken))
return Result.Fail<AuthorBook[]>(new Error($"Author with ID {authorId} not found"));
@@ -94,7 +94,8 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
var books = await context.Books
.AsNoTracking()
.Include(b => b.Author)
.Include(b => b.Product!.Price)
.Include(b => b.Product)
.ThenInclude(b => b.Prices)
.OrderByDescending(b => b.CreatedAt)
.Where(b => b.AuthorId == authorId)
.ToListAsync(cancellationToken);
@@ -118,9 +119,10 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
var books = await context.Books
.AsNoTracking()
.Include(b => b.Author)
.Include(b => b.Product!.Price)
.Include(b => b.Product)
.ThenInclude(b => b!.Prices)
.Include(b => b.Pages)
.Where(b => b.Enabled && b.Product!.Enabled && b.Author.Enabled)
.Where(b => b.Enabled && b.Product!.Enabled && b.Author!.Enabled)
.OrderByDescending(b => b.Ranking)
.ThenByDescending(b => b.Ranking)
.ThenByDescending(b => b.CreatedAt)
LiteCharms.Features.MidrandBooks/AuthorBooks/Entities/AuthorBook.cs
+1 -1
View File
@@ -6,7 +6,7 @@ namespace LiteCharms.Features.MidrandBooks.AuthorBooks.Entities;
public class AuthorBook : Models.AuthorBook
{
public virtual Author Author { get; set; } = new();
public virtual Author? Author { get; set; }
public new virtual Product? Product { get; set; }
LiteCharms.Features.MidrandBooks/Authors/AuthorService.cs
+15 -54
View File
@@ -1,5 +1,4 @@
using LiteCharms.Features.MidrandBooks.Abstractions;
using LiteCharms.Features.MidrandBooks.AuthorBooks.Models;
using LiteCharms.Features.MidrandBooks.Authors.Models;
using LiteCharms.Features.MidrandBooks.Extensions;
using LiteCharms.Features.MidrandBooks.Postgres;
@@ -9,53 +8,21 @@ namespace LiteCharms.Features.MidrandBooks.Authors;
public sealed class AuthorService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : IService
{
public async ValueTask<Result<AuthorBook[]>> GetAuthorBooksAsync(long authorId, CancellationToken cancellationToken)
public async ValueTask<Result> UpdateAuthorStatusAsync(long authorId, bool isEnabled, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var author = await context.Authors.FirstOrDefaultAsync(a => a.Id == authorId, cancellationToken);
var rowsUpdated = await context.Authors
.Where(a => a.Id == authorId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(a => a.Enabled, isEnabled)
.SetProperty(a => a.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (author is null)
return Result.Fail<AuthorBook[]>(new Error($"Author with ID {authorId} not found"));
var books = await context.Books
.AsNoTracking()
.Include(b => b.Author)
.Include(b => b.Product!.Price)
.OrderByDescending(b => b.CreatedAt)
.Where(p => p.AuthorId == authorId)
.AsSplitQuery()
.ToArrayAsync(cancellationToken);
return books?.Length > 0
? Result.Ok(books.Select(b => b.ToModel()).ToArray())
: Result.Fail<AuthorBook[]>(new Error($"No books found for author with ID {authorId}"));
}
catch (Exception ex)
{
return Result.Fail<AuthorBook[]>(new Error(ex.Message).CausedBy(ex));
}
}
public async ValueTask<Result> UpdateAuthorStatusAsync(long authorId, bool isEnabled, CancellationToken cancellationToken)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var author = await context.Authors.FirstOrDefaultAsync(a => a.Id == authorId, cancellationToken);
if (author is null)
return Result.Fail(new Error($"Author with ID {authorId} not found"));
author.UpdatedAt = DateTime.UtcNow;
author.Enabled = isEnabled;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error($"Failed to change status of author with ID {authorId}"));
: Result.Fail(new Error($"Author with ID {authorId} not found"));
}
catch (Exception ex)
{
@@ -81,12 +48,12 @@ public sealed class AuthorService(IDbContextFactory<MidrandBooksDbContext> conte
}
}
public async ValueTask<Result<Author[]>> GetAuthors(DateRange range, CancellationToken cancellationToken)
public async ValueTask<Result<Author[]>> GetAuthorsAsync(DateRange range, CancellationToken cancellationToken = default)
{
try
{
var fromDate = range.From.ToDateTime(TimeOnly.MinValue);
var toDate = range.To.ToDateTime(TimeOnly.MaxValue);
var fromDate = range.From.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc);
var toDate = range.To.ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
@@ -107,18 +74,12 @@ public sealed class AuthorService(IDbContextFactory<MidrandBooksDbContext> conte
}
}
public async ValueTask<Result> UpdateAuthorAsync(long authorId, UpdateAuthor request, CancellationToken cancellationToken)
public async ValueTask<Result> UpdateAuthorAsync(long authorId, UpdateAuthor request, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (await context.Authors.AnyAsync(a => a.Name == request.Name && a.LastName == request.LastName, cancellationToken))
return Result.Fail(new Error($"An author with the name {request.Name} {request.LastName} already exists"));
if (await context.Authors.AnyAsync(a => a.Email == request.Email, cancellationToken))
return Result.Fail(new Error($"An author with the email {request.Email} already exists"));
var author = await context.Authors.FirstOrDefaultAsync(a => a.Id == authorId, cancellationToken);
if (author is null)
@@ -151,12 +112,12 @@ public sealed class AuthorService(IDbContextFactory<MidrandBooksDbContext> conte
{
try
{
using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if(await context.Authors.AnyAsync(a => a.Name == request.Name && a.LastName == request.LastName, cancellationToken))
if (await context.Authors.AnyAsync(a => a.Name == request.Name && a.LastName == request.LastName, cancellationToken))
return Result.Fail<long>(new Error($"An author with the name {request.Name} {request.LastName} already exists"));
if(await context.Authors.AnyAsync(a => a.Email == request.Email, cancellationToken))
if (await context.Authors.AnyAsync(a => a.Email == request.Email, cancellationToken))
return Result.Fail<long>(new Error($"An author with the email {request.Email} already exists"));
var newAuthor = context.Authors.Add(new Entities.Author
LiteCharms.Features.MidrandBooks/Authors/Models/Author.cs
+1 -1
View File
@@ -30,7 +30,7 @@ public class Author
public string? ThumbnailImageUrl { get; set; }
public SocialMedia[]? SocialMedia { get; set; }
public ICollection<SocialMedia>? SocialMedia { get; set; }
public bool Enabled { get; set; }
}
LiteCharms.Features.MidrandBooks/Customers/CustomerService.cs
+51 -61
View File
@@ -13,7 +13,7 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (await context.Customers.AnyAsync(c => c.Email!.Equals(request.Email, StringComparison.OrdinalIgnoreCase), cancellationToken))
if (await context.Customers.AnyAsync(c => EF.Functions.ILike(c.Email!, $"%{request.Email}%"), cancellationToken))
return Result.Fail<long>(new Error($"Customer with email '{request.Email}' already exists."));
var customer = context.Customers.Add(new Entities.Customer
@@ -46,7 +46,7 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
if (!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken))
return Result.Fail<long>(new Error($"Customer with ID '{customerId}' does not exist."));
if (await context.Contacts.AnyAsync(cc => cc.CustomerId == customerId && cc.Email!.Equals(request.Email, StringComparison.OrdinalIgnoreCase), cancellationToken))
if (await context.Contacts.AnyAsync(cc => cc.CustomerId == customerId && EF.Functions.ILike(cc.Email!, $"%{request.Email}%"), cancellationToken))
return Result.Fail<long>(new Error($"Contact with email '{request.Email}' already exists for this customer."));
var contact = context.Contacts.Add(new Entities.Contact
@@ -139,21 +139,19 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var contact = await context.Contacts.FirstOrDefaultAsync(cc => cc.Id == contactId, cancellationToken);
var rowsUpdated = await context.Contacts
.Where(cc => cc.Id == contactId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(cc => cc.Name, request.Name)
.SetProperty(cc => cc.LastName, request.LastName)
.SetProperty(cc => cc.Email, request.Email)
.SetProperty(cc => cc.Phone, request.Phone)
.SetProperty(cc => cc.Type, request.Type)
.SetProperty(cc => cc.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (contact is null)
return Result.Fail(new Error($"Contact with ID '{contactId}' does not exist."));
contact.UpdatedAt = DateTime.UtcNow;
contact.Name = request.Name;
contact.LastName = request.LastName;
contact.Email = request.Email;
contact.Phone = request.Phone;
contact.Type = request.Type;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error("Failed to update customer contact."));
: Result.Fail(new Error($"Contact with ID '{contactId}' does not exist."));
}
catch (Exception ex)
{
@@ -167,25 +165,23 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var address = await context.Addresses.FirstOrDefaultAsync(a => a.Id == addressId, cancellationToken);
var rowsUpdated = await context.Addresses
.Where(a => a.Id == addressId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(a => a.Street, request.Street)
.SetProperty(a => a.City, request.City)
.SetProperty(a => a.State, request.State)
.SetProperty(a => a.PostalCode, request.PostalCode)
.SetProperty(a => a.Country, request.Country)
.SetProperty(a => a.Type, request.Type)
.SetProperty(a => a.BuildingType, request.BuildingType)
.SetProperty(a => a.IsPrimary, request.IsPrimary)
.SetProperty(a => a.Name, request.Name)
.SetProperty(a => a.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (address is null)
return Result.Fail(new Error($"Address with ID '{addressId}' does not exist."));
address.UpdatedAt = DateTime.UtcNow;
address.Street = request.Street;
address.City = request.City;
address.State = request.State;
address.PostalCode = request.PostalCode;
address.Country = request.Country;
address.Type = request.Type;
address.BuildingType = request.BuildingType;
address.IsPrimary = request.IsPrimary;
address.Name = request.Name;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error("Failed to update customer address."));
: Result.Fail(new Error($"Address with ID '{addressId}' does not exist."));
}
catch (Exception ex)
{
@@ -199,17 +195,15 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var customer = await context.Customers.FirstOrDefaultAsync(c => c.Id == customerId, cancellationToken);
var rowsUpdated = await context.Customers
.Where(c => c.Id == customerId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(c => c.Enabled, enabled)
.SetProperty(c => c.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (customer is null)
return Result.Fail(new Error($"Customer with ID '{customerId}' does not exist."));
customer.Enabled = enabled;
customer.UpdatedAt = DateTime.UtcNow;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error("Failed to update customer status."));
: Result.Fail(new Error($"Customer with ID '{customerId}' does not exist."));
}
catch (Exception ex)
{
@@ -223,18 +217,16 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var contact = await context.Contacts.FirstOrDefaultAsync(cc => cc.Id == contactId, cancellationToken);
var rowsUpdated = await context.Contacts
.Where(cc => cc.Id == contactId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(cc => cc.Enabled, enabled)
.SetProperty(cc => cc.IsPrimary, isPrimary)
.SetProperty(cc => cc.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (contact is null)
return Result.Fail(new Error($"Contact with ID '{contactId}' does not exist."));
contact.Enabled = enabled;
contact.IsPrimary = isPrimary;
contact.UpdatedAt = DateTime.UtcNow;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error("Failed to update customer contact status."));
: Result.Fail(new Error($"Contact with ID '{contactId}' does not exist."));
}
catch (Exception ex)
{
@@ -248,18 +240,16 @@ public sealed class CustomerService(IDbContextFactory<MidrandBooksDbContext> con
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var address = await context.Addresses.FirstOrDefaultAsync(a => a.Id == addressId, cancellationToken);
var rowsUpdated = await context.Addresses
.Where(a => a.Id == addressId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(a => a.Enabled, enabled)
.SetProperty(a => a.IsPrimary, isPrimary)
.SetProperty(a => a.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (address is null)
return Result.Fail(new Error($"Address with ID '{addressId}' does not exist."));
address.Enabled = enabled;
address.IsPrimary = isPrimary;
address.UpdatedAt = DateTime.UtcNow;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error("Failed to update customer address status."));
: Result.Fail(new Error($"Address with ID '{addressId}' does not exist."));
}
catch (Exception ex)
{
LiteCharms.Features.MidrandBooks/Customers/Models/Customer.cs
+1 -1
View File
@@ -20,7 +20,7 @@ public class Customer
public string? Phone { get; set; }
public SocialMedia[]? SocialMedia { get; set; }
public ICollection<SocialMedia>? SocialMedia { get; set; }
public bool Enabled { get; set; }
}
LiteCharms.Features.MidrandBooks/Customers/Models/Records.cs
+1 -1
View File
@@ -14,7 +14,7 @@ public record CreateCustomer
public string? Phone { get; set; }
public SocialMedia[]? SocialMedia { get; set; }
public ICollection<SocialMedia>? SocialMedia { get; set; }
}
public sealed record UpdateCustomer : CreateCustomer;
LiteCharms.Features.MidrandBooks/Orders/Models/Records.cs
+1 -1
View File
@@ -1,6 +1,6 @@
namespace LiteCharms.Features.MidrandBooks.Orders.Models;
public sealed record CreateOrder(long CustomerId, decimal TotalPrice, string? Notes);
public sealed record CreateOrder(decimal TotalPrice, string? Notes);
public sealed record CreateOrderItem(long AuthorBookId, long ProductPriceId, int Quantity);
LiteCharms.Features.MidrandBooks/Orders/OrderService.cs
+78 -80
View File
@@ -49,6 +49,17 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
if (!await context.Prices.AnyAsync(pp => pp.Id == request.ProductPriceId, cancellationToken))
return Result.Fail<long>("Product price not found.");
var existingItem = await context.OrderItems.FirstOrDefaultAsync(i => i.ProductPriceId == request.ProductPriceId && i.OrderId == orderId, cancellationToken);
if(existingItem is not null)
{
existingItem.Quantity += request.Quantity;
return await context.SaveChangesAsync(cancellationToken) > 0
? Result.Ok(existingItem.Id)
: Result.Fail<long>("Update existing order item.");
}
var orderItem = context.OrderItems.Add(new Entities.OrderItem
{
OrderId = orderId,
@@ -78,9 +89,6 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
return Result.Fail("Order not found.");
var existingItems = context.OrderItems.Where(oi => oi.OrderId == orderId);
context.OrderItems.RemoveRange(existingItems);
foreach (var item in items)
{
@@ -90,18 +98,23 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
if (!await context.Prices.AnyAsync(pp => pp.Id == item.ProductPriceId, cancellationToken))
return Result.Fail($"Product price with ID {item.ProductPriceId} not found.");
context.OrderItems.Add(new Entities.OrderItem
{
OrderId = orderId,
AuthorBookId = item.AuthorBookId,
ProductPriceId = item.ProductPriceId,
Quantity = item.Quantity
});
var existingItem = await context.OrderItems.FirstOrDefaultAsync(i => i.ProductPriceId == item.ProductPriceId && i.OrderId == orderId, cancellationToken);
if (existingItem is not null)
existingItem.Quantity += item.Quantity;
else
context.OrderItems.Add(new Entities.OrderItem
{
OrderId = orderId,
AuthorBookId = item.AuthorBookId,
ProductPriceId = item.ProductPriceId,
Quantity = item.Quantity
});
await context.SaveChangesAsync(cancellationToken);
}
return await context.SaveChangesAsync(cancellationToken) > 0
? Result.Ok()
: Result.Fail("Failed to add items to order.");
return Result.Ok();
}
catch (Exception ex)
{
@@ -115,16 +128,13 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var orderItem = await context.OrderItems.FirstOrDefaultAsync(oi => oi.Id == orderItemId && oi.OrderId == orderId, cancellationToken);
var rowsDeleted = await context.OrderItems
.Where(oi => oi.Id == orderItemId && oi.OrderId == orderId)
.ExecuteDeleteAsync(cancellationToken);
if (orderItem is null)
return Result.Fail("Order item not found.");
context.OrderItems.Remove(orderItem);
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsDeleted > 0
? Result.Ok()
: Result.Fail("Failed to remove item from order.");
: Result.Fail("Order item not found or failed to remove.");
}
catch (Exception ex)
{
@@ -132,15 +142,14 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
}
}
public async ValueTask<Result> ClearOrderItemasAsync(long orderId, CancellationToken cancellationToken = default)
public async ValueTask<Result> ClearOrderItemsAsync(long orderId, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var orderItems = context.OrderItems.Where(oi => oi.OrderId == orderId);
context.OrderItems.RemoveRange(orderItems);
var deletedItems = await context.OrderItems.Where(oi => oi.OrderId == orderId)
.ExecuteDeleteAsync(cancellationToken);
return await context.SaveChangesAsync(cancellationToken) > 0
? Result.Ok()
@@ -199,12 +208,15 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{
try
{
var fromDate = range.From.ToDateTime(TimeOnly.MinValue, DateTimeKind.Utc);
var toDate = range.To.ToDateTime(TimeOnly.MaxValue, DateTimeKind.Utc);
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var orders = await context.Orders
.AsNoTracking()
.Where(o => o.CreatedAt >= range.From.ToDateTime(TimeOnly.MinValue) && o.CreatedAt <= range.To.ToDateTime(TimeOnly.MaxValue))
.Skip(index * range.MaxRecords)
.Where(o => o.CreatedAt >= fromDate && o.CreatedAt <= toDate)
.Skip(index).Take(range.MaxRecords)
.ToListAsync(cancellationToken);
return Result.Ok(orders.Select(o => o.ToModel()).ToArray());
@@ -221,17 +233,15 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var order = await context.Orders.FirstOrDefaultAsync(o => o.Id == orderId, cancellationToken);
var rowsUpdated = await context.Orders
.Where(o => o.Id == orderId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(o => o.Status, newStatus)
.SetProperty(o => o.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (order is null)
return Result.Fail("Order not found.");
order.UpdatedAt = DateTime.UtcNow;
order.Status = newStatus;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail("Failed to update order status.");
: Result.Fail("Order not found or status update failed.");
}
catch (Exception ex)
{
@@ -282,17 +292,16 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var shipping = await context.Shippings.FirstOrDefaultAsync(s => s.OrderId == orderId, cancellationToken);
var rowsUpdated = await context.Shippings
.Where(s => s.OrderId == orderId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(s => s.Status, newStatus)
.SetProperty(s => s.UpdatedAt, DateTime.UtcNow),
cancellationToken);
if (shipping is null)
return Result.Fail("Shipping not found for this order.");
shipping.UpdatedAt = DateTime.UtcNow;
shipping.Status = newStatus;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail("Failed to update shipping status.");
: Result.Fail("Shipping not found for this order or status update failed.");
}
catch (Exception ex)
{
@@ -325,21 +334,14 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var rowsDeleted = await context.Shippings
.Where(s => s.Id == shippingId && s.OrderId == orderId)
.ExecuteDeleteAsync(cancellationToken);
if(!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
return Result.Fail("Order not found.");
var shipping = await context.Shippings.AsNoTracking()
.FirstOrDefaultAsync(s => s.OrderId == orderId && s.Id == shippingId, cancellationToken);
if (shipping is null)
return Result.Fail("Shipping not found for this order.");
context.Shippings.Remove(shipping);
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsDeleted > 0
? Result.Ok()
: Result.Fail("Failed to remove shipping from order.");
: Result.Fail("Shipping record not found for this order.");
}
catch (Exception ex)
{
@@ -353,17 +355,15 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var shipping = await context.Shippings.FirstOrDefaultAsync(s => s.OrderId == orderId && s.Id == shippingId, cancellationToken);
var rowsUpdated = await context.Shippings
.Where(s => s.Id == shippingId && s.OrderId == orderId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(s => s.TrackingNumber, trackingNumber)
.SetProperty(s => s.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (shipping is null)
return Result.Fail("Shipping not found for this order.");
shipping.UpdatedAt = DateTime.UtcNow;
shipping.TrackingNumber = trackingNumber;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail("Failed to update shipping tracking number.");
: Result.Fail("Shipping record not found for this order.");
}
catch (Exception ex)
{
@@ -440,24 +440,22 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var provider = await context.ShippingProviders.FirstOrDefaultAsync(sp => sp.Id == request.ProviderId, cancellationToken);
var rowsUpdated = await context.ShippingProviders
.Where(sp => sp.Id == request.ProviderId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(sp => sp.Name, request.Name)
.SetProperty(sp => sp.Price, request.Price)
.SetProperty(sp => sp.TrackingUrl, request.TrackingUrl)
.SetProperty(sp => sp.Enabled, request.Enabled)
.SetProperty(sp => sp.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (provider is null)
return Result.Fail("Shipping provider not found.");
provider.UpdatedAt = DateTime.UtcNow;
provider.Enabled = request.Enabled;
provider.Name = request.Name;
provider.Price = request.Price;
provider.TrackingUrl = request.TrackingUrl;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail("Failed to update shipping provider status.");
: Result.Fail("Shipping provider not found.");
}
catch (Exception ex)
{
return Result.Fail(new Error(ex.Message).CausedBy(ex));
}
}
}
}
LiteCharms.Features.MidrandBooks/Pages/Models/BookPage.cs
+1 -1
View File
@@ -22,7 +22,7 @@ public class BookPage
public string[]? Notes { get; set; }
public PageReference[]? References { get; set; }
public ICollection<PageReference>? References { get; set; }
public bool Enabled { get; set; }
}
LiteCharms.Features.MidrandBooks/Pages/Models/CreateBookPage.cs
+1 -1
View File
@@ -14,5 +14,5 @@ public class CreateBookPage
public string[]? Notes { get; set; }
public PageReference[]? References { get; set; }
public ICollection<PageReference>? References { get; set; }
}
LiteCharms.Features.MidrandBooks/Pages/PageService.cs
+35 -51
View File
@@ -13,19 +13,13 @@ public sealed class PageService(IDbContextFactory<MidrandBooksDbContext> context
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (!await context.Books.AnyAsync(b => b.Id == authorBookId, cancellationToken))
return Result.Fail("Book not found");
var rowsDeleted = await context.Pages
.Where(p => p.AuthorBookId == authorBookId)
.ExecuteDeleteAsync(cancellationToken);
var pages = await context.Pages.Where(p => p.AuthorBookId == authorBookId).ToListAsync(cancellationToken);
if (pages.Count == 0)
return Result.Fail("No pages found for the specified book");
context.Pages.RemoveRange(pages);
await context.SaveChangesAsync(cancellationToken);
return Result.Ok();
return rowsDeleted > 0
? Result.Ok()
: Result.Fail("No pages found for the specified book");
}
catch (Exception ex)
{
@@ -39,16 +33,13 @@ public sealed class PageService(IDbContextFactory<MidrandBooksDbContext> context
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var page = await context.Pages.FirstOrDefaultAsync(p => p.AuthorBookId == authorBookId && p.Number == pageNumber && p.Type == pageType, cancellationToken);
var rowsDeleted = await context.Pages
.Where(p => p.AuthorBookId == authorBookId && p.Number == pageNumber && p.Type == pageType)
.ExecuteDeleteAsync(cancellationToken);
if (page is null)
return Result.Fail("Page not found");
context.Pages.Remove(page);
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsDeleted > 0
? Result.Ok()
: Result.Fail("Failed to delete page");
: Result.Fail("Page not found");
}
catch (Exception ex)
{
@@ -62,17 +53,15 @@ public sealed class PageService(IDbContextFactory<MidrandBooksDbContext> context
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var page = await context.Pages.FirstOrDefaultAsync(p => p.Id == bookPageId, cancellationToken);
var rowsUpdated = await context.Pages
.Where(p => p.Id == bookPageId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(p => p.Enabled, enabled)
.SetProperty(p => p.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (page is null)
return Result.Fail("Page not found");
page.UpdatedAt = DateTime.UtcNow;
page.Enabled = enabled;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail("Failed to update page status");
: Result.Fail("Page not found");
}
catch (Exception ex)
{
@@ -86,16 +75,13 @@ public sealed class PageService(IDbContextFactory<MidrandBooksDbContext> context
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var page = await context.Pages.FirstOrDefaultAsync(p => p.Id == bookPageId, cancellationToken);
var rowsDeleted = await context.Pages
.Where(p => p.Id == bookPageId)
.ExecuteDeleteAsync(cancellationToken);
if (page is null)
return Result.Fail("Page not found");
context.Pages.Remove(page);
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsDeleted > 0
? Result.Ok()
: Result.Fail("Failed to delete page");
: Result.Fail("Page not found");
}
catch (Exception ex)
{
@@ -109,22 +95,20 @@ public sealed class PageService(IDbContextFactory<MidrandBooksDbContext> context
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var page = await context.Pages.FirstOrDefaultAsync(p => p.Id == bookPageId, cancellationToken);
var rowsUpdated = await context.Pages
.Where(p => p.Id == bookPageId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(p => p.Type, request.Type)
.SetProperty(p => p.ContentType, request.ContentType)
.SetProperty(p => p.Number, request.Number)
.SetProperty(p => p.Content, request.Content)
.SetProperty(p => p.Notes, request.Notes)
.SetProperty(p => p.References, request.References)
.SetProperty(p => p.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (page is null)
return Result.Fail("Page not found");
page.UpdatedAt = DateTime.UtcNow;
page.Type = request.Type;
page.ContentType = request.ContentType;
page.Number = request.Number;
page.Content = request.Content;
page.Notes = request.Notes;
page.References = request.References;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail("Failed to update page");
: Result.Fail("Page not found");
}
catch (Exception ex)
{
LiteCharms.Features.MidrandBooks/Postgres/Migrations/MidrandBooksDbContextModelSnapshot.cs
+7 -7
View File
@@ -57,7 +57,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b.HasIndex("ProductId");
b.ToTable("Books");
b.ToTable("Books", (string)null);
});
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Authors.Entities.Author", b =>
@@ -454,7 +454,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b.HasKey("Id");
b.ToTable("ShippingProviders");
b.ToTable("ShippingProviders", (string)null);
});
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.Pages.Entities.BookPage", b =>
@@ -677,7 +677,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b.HasIndex("ProductId")
.IsUnique();
b.ToTable("ProductPrice");
b.ToTable("ProductPrice", (string)null);
});
modelBuilder.Entity("LiteCharms.Features.MidrandBooks.AuthorBooks.Entities.AuthorBook", b =>
@@ -718,7 +718,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b1.HasKey("AuthorId", "__synthesizedOrdinal");
b1.ToTable("Authors");
b1.ToTable("Authors", (string)null);
b1
.ToJson("SocialMedia")
@@ -772,7 +772,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b1.HasKey("CustomerId", "__synthesizedOrdinal");
b1.ToTable("Customers");
b1.ToTable("Customers", (string)null);
b1
.ToJson("SocialMedia")
@@ -862,7 +862,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b1.HasKey("BookPageId", "__synthesizedOrdinal");
b1.ToTable("BookPages");
b1.ToTable("BookPages", (string)null);
b1
.ToJson("References")
@@ -904,7 +904,7 @@ namespace LiteCharms.Features.MidrandBooks.Postgres.Migrations
b1.HasKey("ProductId");
b1.ToTable("Products");
b1.ToTable("Products", (string)null);
b1
.ToJson("Metadata")
LiteCharms.Features.MidrandBooks/Products/ProductService.cs
+14 -18
View File
@@ -14,17 +14,15 @@ public sealed class ProductService(IDbContextFactory<MidrandBooksDbContext> cont
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var productPrice = await context.Prices.FirstOrDefaultAsync(p => p.Id == productPriceId, cancellationToken);
var rowsUpdated = await context.Prices
.Where(p => p.Id == productPriceId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(p => p.Enabled, isEnabled)
.SetProperty(p => p.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (productPrice is null)
return Result.Fail(new Error($"Product price with ID {productPriceId} not found"));
productPrice.UpdatedAt = DateTime.UtcNow;
productPrice.Enabled = isEnabled;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error($"Failed to change status of product price with ID {productPriceId}"));
: Result.Fail(new Error($"Product price with ID {productPriceId} not found"));
}
catch (Exception ex)
{
@@ -38,17 +36,15 @@ public sealed class ProductService(IDbContextFactory<MidrandBooksDbContext> cont
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var product = await context.Products.FirstOrDefaultAsync(p => p.Id == productId, cancellationToken);
var rowsUpdated = await context.Products
.Where(p => p.Id == productId)
.ExecuteUpdateAsync(setters => setters
.SetProperty(p => p.Enabled, isEnabled)
.SetProperty(p => p.UpdatedAt, DateTime.UtcNow), cancellationToken);
if (product is null)
return Result.Fail(new Error($"Product with ID {productId} not found"));
product.UpdatedAt = DateTime.UtcNow;
product.Enabled = isEnabled;
return await context.SaveChangesAsync(cancellationToken) > 0
return rowsUpdated > 0
? Result.Ok()
: Result.Fail(new Error($"Failed to change status of product with ID {productId}"));
: Result.Fail(new Error($"Product with ID {productId} not found"));
}
catch (Exception ex)
{