Compare commits

..

13 Commits

Author SHA1 Message Date
khwezi db431e1682 Merge pull request 'Ensure uninherited types are sealed' (#130) from taskcancellation into master
Reviewed-on: #130
2026-06-15 10:28:41 +02:00
khwezi ad2ea48592 Merge pull request 'Hardened certificate loading' (#129) from dataprotection into master
Reviewed-on: #129
2026-06-14 23:34:59 +02:00
khwezi 0a9a459892 Merge pull request 'Refactored AddLiteCharmsWebSecurity to force a session recycling of keys on other pods' (#128) from dataprotection into master
Reviewed-on: #128
2026-06-14 23:10:42 +02:00
khwezi f5a69de0a0 Merge pull request 'Refactored CheckSameSite' (#127) from dataprotection into master
Reviewed-on: #127
2026-06-14 22:52:05 +02:00
khwezi fc4db32f20 Merge pull request 'dataprotection' (#126) from dataprotection into master
Reviewed-on: #126
2026-06-14 13:12:20 +02:00
khwezi a9aa0a675a Merge pull request 'Added cookie policies on AddLiteCharmsWebSecurity' (#125) from dataprotection into master
Reviewed-on: #125
2026-06-14 12:51:25 +02:00
khwezi a763e5e40e Merge pull request 'Added certificate protected data protection keys' (#124) from dataprotection into master
Reviewed-on: #124
2026-06-14 11:27:32 +02:00
khwezi 1ef5e52ed9 Merge pull request 'Refactored AddDataProtectionDatabase' (#123) from dataprotection into master
Reviewed-on: #123
2026-06-14 10:12:08 +02:00
khwezi c06cf13add Merge pull request 'Added data protection database based support' (#122) from dataprotection into master
Reviewed-on: #122
2026-06-14 09:58:17 +02:00
khwezi 92c60e6616 Merge pull request 'Refactored AddLiteCharmsWebSecurity to be OS aware when it handles data protection keys' (#121) from dataprotection into master
Reviewed-on: #121
2026-06-13 23:41:30 +02:00
khwezi 21788c66a3 Merge pull request 'Added data protection keys to web iodc middleware regirtration method' (#120) from dataprotection into master
Reviewed-on: #120
2026-06-13 23:34:35 +02:00
khwezi 54ef7a6e5f Merge pull request 'Fixed cookie and header collision issue on signout' (#119) from logout-fix into master
Reviewed-on: #119
2026-06-13 23:07:22 +02:00
khwezi 6594e0aecd Merge pull request 'Fixed the redirect URI on logout so its passed by the caller' (#118) from logout-fix into master
Reviewed-on: #118
2026-06-13 22:51:48 +02:00
@@ -43,7 +43,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken)) if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
return Result.Fail<long>("Order not found."); return Result.Fail<long>("Order not found.");
if (!await context.Books.AnyAsync(ab => ab.Id == request.AuthorBookId, cancellationToken)) if(!await context.Books.AnyAsync(ab => ab.Id == request.AuthorBookId, cancellationToken))
return Result.Fail<long>("Author book not found."); return Result.Fail<long>("Author book not found.");
if (!await context.Prices.AnyAsync(pp => pp.Id == request.ProductPriceId, cancellationToken)) if (!await context.Prices.AnyAsync(pp => pp.Id == request.ProductPriceId, cancellationToken))
@@ -51,7 +51,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
var existingItem = await context.OrderItems.FirstOrDefaultAsync(i => i.ProductPriceId == request.ProductPriceId && i.OrderId == orderId, cancellationToken); var existingItem = await context.OrderItems.FirstOrDefaultAsync(i => i.ProductPriceId == request.ProductPriceId && i.OrderId == orderId, cancellationToken);
if (existingItem is not null) if(existingItem is not null)
{ {
existingItem.Quantity += request.Quantity; existingItem.Quantity += request.Quantity;
@@ -82,7 +82,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{ {
try try
{ {
if (items.Length == 0) if(items.Length == 0)
return Result.Fail("No items to add."); return Result.Fail("No items to add.");
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken); await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
@@ -203,33 +203,13 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
} }
} }
public async ValueTask<Result<OrderItem[]>> GetOrderItemsAsync(long orderId, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var orderItems = await context.OrderItems
.Where(o => o.OrderId == orderId)
.ToListAsync(cancellationToken);
return orderItems.Count > 0
? Result.Ok(orderItems.Select(i => i.ToModel()).ToArray())
: Result.Fail<OrderItem[]>($"Order items not found for order ID {orderId}");
}
catch (Exception ex)
{
return Result.Fail(new Error(ex.Message).CausedBy(ex));
}
}
public async ValueTask<Result<Order[]>> GetOrdersByCustomerAsync(long customerId, CancellationToken cancellationToken = default) public async ValueTask<Result<Order[]>> GetOrdersByCustomerAsync(long customerId, CancellationToken cancellationToken = default)
{ {
try try
{ {
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken); await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken)) if(!await context.Customers.AnyAsync(c => c.Id == customerId, cancellationToken))
return Result.Fail<Order[]>("Customer not found."); return Result.Fail<Order[]>("Customer not found.");
var orders = await context.Orders var orders = await context.Orders
@@ -296,16 +276,16 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{ {
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken); await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken)) if(!await context.Orders.AnyAsync(o => o.Id == orderId, cancellationToken))
return Result.Fail("Order not found."); return Result.Fail("Order not found.");
if (!await context.Addresses.AnyAsync(a => a.Id == request.AddressId, cancellationToken)) if(!await context.Addresses.AnyAsync(a => a.Id == request.AddressId, cancellationToken))
return Result.Fail("Address not found."); return Result.Fail("Address not found.");
if (!await context.ShippingProviders.AnyAsync(sp => sp.Id == request.ShippingProviderId && sp.Enabled, cancellationToken)) if(!await context.ShippingProviders.AnyAsync(sp => sp.Id == request.ShippingProviderId && sp.Enabled, cancellationToken))
return Result.Fail("Shipping provider not found or disabled."); return Result.Fail("Shipping provider not found or disabled.");
if (await context.Shippings.AnyAsync(s => s.OrderId == orderId, cancellationToken)) if(await context.Shippings.AnyAsync(s => s.OrderId == orderId, cancellationToken))
return Result.Fail("Shipping already exists for this order."); return Result.Fail("Shipping already exists for this order.");
var shipping = context.Shippings.Add(new Entities.Shipping var shipping = context.Shippings.Add(new Entities.Shipping
@@ -418,7 +398,7 @@ public sealed class OrderService(IDbContextFactory<MidrandBooksDbContext> contex
{ {
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken); await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
if (await context.ShippingProviders.AnyAsync(sp => sp.Type == request.Type, cancellationToken)) if(await context.ShippingProviders.AnyAsync(sp => sp.Type == request.Type, cancellationToken))
return Result.Fail("Shipping provider with the same type already exists."); return Result.Fail("Shipping provider with the same type already exists.");
var shippingProvider = context.ShippingProviders.Add(new Entities.ShippingProvider var shippingProvider = context.ShippingProviders.Add(new Entities.ShippingProvider