From fbf83e57368f7c4df688adf536290f3628f83c2d Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Wed, 15 Oct 2025 15:42:18 +0200
Subject: [PATCH] improvements

---
 .../Domains/DataLayer/FruitBankDbContext.cs   | 24 +++++++++----------
 .../Domains/DataLayer/OrderDtoDbTable.cs      |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs
index 29907ee..4366d46 100644
--- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs
@@ -131,17 +131,17 @@ public class FruitBankDbContext : MgDbContextBase,
         => GetAllProducts(includeDeleted).Select(product => new ProductDto(product));
 
     public IAsyncEnumerable<MeasuringProductDto> GetAllMeasuringProductDtos(bool includeDeleted)
-        => GetAllProducts(includeDeleted).SelectAwait(async product => new MeasuringProductDto(product, await GetMeasuringAttributeValuesByProductIdAsync(product.Id)));
+        => GetAllProducts(includeDeleted).AsEnumerable().SelectAwait(async product => new MeasuringProductDto(product, await GetMeasuringAttributeValuesByProductIdAsync(product.Id)));
 
     public async Task<MeasuringProductDto?> GetMeasuringProductDtoByIdAsync(int productId)
-        => await Products.Table.Where(product => product.Id == productId).SelectAwait(async product => new MeasuringProductDto(product, await GetMeasuringAttributeValuesByProductIdAsync(product.Id))).FirstOrDefaultAsync();
+        => await Products.Table.Where(product => product.Id == productId).AsEnumerable().SelectAwait(async product => new MeasuringProductDto(product, await GetMeasuringAttributeValuesByProductIdAsync(product.Id))).FirstOrDefaultAsync();
 
     public async Task<MeasuringAttributeValues?> GetMeasuringAttributeValuesByProductIdAsync(int productId)
         => await _fruitBankAttributeService.GetMeasuringAttributeValuesAsync<Product>(productId);
 
     public async Task DeleteShippingSafeAsync(Shipping shipping)
     {
-        await TransactionSafeAsync(async tr =>
+        await TransactionSafeAsync(async _ =>
         {
             await Shippings.DeleteAsync(shipping, true);
             return true;
@@ -150,7 +150,7 @@ public class FruitBankDbContext : MgDbContextBase,
 
     public async Task DeleteShippingDocumentSafeAsync(ShippingDocument shippingDocument)
     {
-        await TransactionSafeAsync(async tr =>
+        await TransactionSafeAsync(async _ =>
         {
             await ShippingDocuments.DeleteAsync(shippingDocument, true);
             return true;
@@ -159,7 +159,7 @@ public class FruitBankDbContext : MgDbContextBase,
 
     public async Task DeleteShippingItemSafeAsync(ShippingItem shippingItem)
     {
-        await TransactionSafeAsync(async tr =>
+        await TransactionSafeAsync(async _ =>
         {
             await ShippingItems.DeleteAsync(shippingItem, true);
             return true;
@@ -306,7 +306,7 @@ public class FruitBankDbContext : MgDbContextBase,
     }
 
     public Task<bool> AddShippingItemPalletSafeAsync(ShippingItemPallet shippingItemPallet)
-        => TransactionSafeAsync(async tr => await AddShippingItemPalletAsync(shippingItemPallet) != null);
+        => TransactionSafeAsync(async _ => await AddShippingItemPalletAsync(shippingItemPallet) != null);
 
     public async Task<ShippingItemPallet?> UpdateShippingItemPalletAsync(ShippingItemPallet shippingItemPallet)
     {
@@ -317,13 +317,13 @@ public class FruitBankDbContext : MgDbContextBase,
     }
 
     public Task<bool> UpdateShippingItemPalletSafeAsync(ShippingItemPallet shippingItemPallet)
-        => TransactionSafeAsync(async tr => await UpdateShippingItemPalletAsync(shippingItemPallet) != null);
+        => TransactionSafeAsync(async _ => await UpdateShippingItemPalletAsync(shippingItemPallet) != null);
 
     public Task AddOrUpdateShippingItemPalletsSafeAsync(ShippingItem shippingItem) => AddOrUpdateShippingItemPalletsSafeAsync(shippingItem.ShippingItemPallets!, shippingItem);
 
     public Task<bool> AddOrUpdateShippingItemPalletsSafeAsync(IEnumerable<ShippingItemPallet> shippingItemPallets, ShippingItem parentShippingItem)
     {
-        return TransactionSafeAsync(async tr =>
+        return TransactionSafeAsync(async _ =>
         {
             await AddOrUpdateShippingItemPalletAsync(shippingItemPallets, parentShippingItem);
             return true;
@@ -344,7 +344,7 @@ public class FruitBankDbContext : MgDbContextBase,
     }
 
     public async Task<bool> AddOrUpdateShippingItemPalletSafeAsync(ShippingItemPallet shippingItemPallet)
-        => await TransactionSafeAsync(async tr => await AddOrUpdateShippingItemPalletAsync(shippingItemPallet) != null);
+        => await TransactionSafeAsync(async _ => await AddOrUpdateShippingItemPalletAsync(shippingItemPallet) != null);
 
     public async Task<ShippingItemPallet?> AddOrUpdateShippingItemPalletAsync(ShippingItemPallet shippingItemPallet)
     {
@@ -355,7 +355,7 @@ public class FruitBankDbContext : MgDbContextBase,
 
     public async Task DeleteShippingItemPalletSafeAsync(ShippingItemPallet shippingItemPallet)
     {
-        await TransactionSafeAsync(async tr =>
+        await TransactionSafeAsync(async _ =>
         {
             await ShippingItemPallets.DeleteAsync(shippingItemPallet, false);
             return true;
@@ -363,7 +363,7 @@ public class FruitBankDbContext : MgDbContextBase,
     }
 
     public async Task<bool> SetOrderStatusToCompleteSafe(int orderId)
-        => await TransactionSafeAsync(async tr => await SetOrderStatusToComplete(orderId) != null);
+        => await TransactionSafeAsync(async _ => await SetOrderStatusToComplete(orderId) != null);
 
     public async Task<OrderDto?> SetOrderStatusToComplete(int orderId)
     {
@@ -408,7 +408,7 @@ public class FruitBankDbContext : MgDbContextBase,
     }
 
     public async Task<bool> AddOrUpdateOrderItemPalletSafeAsync(OrderItemPallet orderItemPallet)
-        => await TransactionSafeAsync(async tr => await AddOrUpdateOrderItemPalletAsync(orderItemPallet) != null);
+        => await TransactionSafeAsync(async _ => await AddOrUpdateOrderItemPalletAsync(orderItemPallet) != null);
 
     public async Task<OrderItemPallet?> AddOrUpdateOrderItemPalletAsync(OrderItemPallet orderItemPallet)
     {
diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs
index ae8e980..adc602b 100644
--- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs
@@ -43,6 +43,7 @@ public class OrderDtoDbTable : MgDbTableBase<OrderDto>
     {
         return GetAll()
             .LoadWith(o => o.GenericAttributes)
+            .LoadWith(o => o.Customer)
             .LoadWith(o => o.OrderItemDtos).ThenLoad(oi => oi.ProductDto).ThenLoad(prod => prod.GenericAttributes)
             .LoadWith(o => o.OrderItemDtos).ThenLoad(oi => oi.GenericAttributes)
             .LoadWith(o => o.OrderItemDtos).ThenLoad(oi => oi.OrderItemPallets);