Fix: Manually load ProductVariants with separate query instead of Include

**Root Cause**: EF Core Include() was not properly materializing the Variants navigation
property despite correct SQL JOIN generation.

**Solution**: Load variants separately and manually group by ProductId for DTO mapping.
This bypasses EF Core's navigation property fixup issues.

🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
SysAdmin 2025-10-05 16:33:33 +01:00
parent 53ba1f4079
commit 8d1e3d153c

View File

@ -22,11 +22,19 @@ public class ProductService : IProductService
.Include(p => p.Category) .Include(p => p.Category)
.Include(p => p.Photos) .Include(p => p.Photos)
.Include(p => p.MultiBuys) .Include(p => p.MultiBuys)
.Include(p => p.Variants)
.Where(p => p.IsActive) .Where(p => p.IsActive)
.AsSplitQuery()
.ToListAsync(); .ToListAsync();
// Manually load variants for all products
var productIds = products.Select(p => p.Id).ToList();
var allVariants = await _context.ProductVariants
.Where(v => productIds.Contains(v.ProductId))
.ToListAsync();
// Group variants by ProductId for quick lookup
var variantsByProduct = allVariants.GroupBy(v => v.ProductId)
.ToDictionary(g => g.Key, g => g.ToList());
return products.Select(p => new ProductDto return products.Select(p => new ProductDto
{ {
Id = p.Id, Id = p.Id,
@ -63,19 +71,21 @@ public class ProductService : IProductService
CreatedAt = mb.CreatedAt, CreatedAt = mb.CreatedAt,
UpdatedAt = mb.UpdatedAt UpdatedAt = mb.UpdatedAt
}).ToList(), }).ToList(),
Variants = p.Variants.Select(v => new ProductVariantDto Variants = variantsByProduct.ContainsKey(p.Id)
{ ? variantsByProduct[p.Id].Select(v => new ProductVariantDto
Id = v.Id, {
ProductId = v.ProductId, Id = v.Id,
VariantType = v.VariantType, ProductId = v.ProductId,
Name = v.Name, VariantType = v.VariantType,
Price = v.Price, Name = v.Name,
StockLevel = v.StockLevel, Price = v.Price,
SortOrder = v.SortOrder, StockLevel = v.StockLevel,
IsActive = v.IsActive, SortOrder = v.SortOrder,
CreatedAt = v.CreatedAt, IsActive = v.IsActive,
UpdatedAt = v.UpdatedAt CreatedAt = v.CreatedAt,
}).ToList() UpdatedAt = v.UpdatedAt
}).ToList()
: new List<ProductVariantDto>()
}).ToList(); }).ToList();
} }
@ -85,11 +95,19 @@ public class ProductService : IProductService
.Include(p => p.Category) .Include(p => p.Category)
.Include(p => p.Photos) .Include(p => p.Photos)
.Include(p => p.MultiBuys) .Include(p => p.MultiBuys)
.Include(p => p.Variants)
.Where(p => p.IsActive && p.CategoryId == categoryId) .Where(p => p.IsActive && p.CategoryId == categoryId)
.AsSplitQuery()
.ToListAsync(); .ToListAsync();
// Manually load variants for all products
var productIds = products.Select(p => p.Id).ToList();
var allVariants = await _context.ProductVariants
.Where(v => productIds.Contains(v.ProductId))
.ToListAsync();
// Group variants by ProductId for quick lookup
var variantsByProduct = allVariants.GroupBy(v => v.ProductId)
.ToDictionary(g => g.Key, g => g.ToList());
return products.Select(p => new ProductDto return products.Select(p => new ProductDto
{ {
Id = p.Id, Id = p.Id,
@ -126,19 +144,21 @@ public class ProductService : IProductService
CreatedAt = mb.CreatedAt, CreatedAt = mb.CreatedAt,
UpdatedAt = mb.UpdatedAt UpdatedAt = mb.UpdatedAt
}).ToList(), }).ToList(),
Variants = p.Variants.Select(v => new ProductVariantDto Variants = variantsByProduct.ContainsKey(p.Id)
{ ? variantsByProduct[p.Id].Select(v => new ProductVariantDto
Id = v.Id, {
ProductId = v.ProductId, Id = v.Id,
VariantType = v.VariantType, ProductId = v.ProductId,
Name = v.Name, VariantType = v.VariantType,
Price = v.Price, Name = v.Name,
StockLevel = v.StockLevel, Price = v.Price,
SortOrder = v.SortOrder, StockLevel = v.StockLevel,
IsActive = v.IsActive, SortOrder = v.SortOrder,
CreatedAt = v.CreatedAt, IsActive = v.IsActive,
UpdatedAt = v.UpdatedAt CreatedAt = v.CreatedAt,
}).ToList() UpdatedAt = v.UpdatedAt
}).ToList()
: new List<ProductVariantDto>()
}).ToList(); }).ToList();
} }