diff --git a/ConfectioneryDatabaseImplement/PastryStorage.cs b/ConfectioneryDatabaseImplement/PastryStorage.cs index 84af032..aed74f0 100644 --- a/ConfectioneryDatabaseImplement/PastryStorage.cs +++ b/ConfectioneryDatabaseImplement/PastryStorage.cs @@ -4,6 +4,7 @@ using ConfectioneryContracts.StoragesContract; using ConfectioneryContracts.ViewModels; using ConfectioneryDatabaseImplement; using ConfectioneryDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; namespace ConfectioneryDatabaseImplement.Implements { @@ -29,7 +30,10 @@ namespace ConfectioneryDatabaseImplement.Implements return null; } using var context = new ConfectioneryDatabase(); - return context.Pastries.FirstOrDefault + return context.Pastries + .Include(x => x.Components) + .ThenInclude(x => x.Component) + .FirstOrDefault (x => (!string.IsNullOrEmpty(model.PastryName) && x.PastryName == model.PastryName) || (model.Id.HasValue && x.Id == model.Id) )?.GetViewModel;