diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/DocumentStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/DocumentStorage.cs index 631fac6..2fc7f8d 100644 --- a/LawFirm/LawFirmDatabaseImplement/Implements/DocumentStorage.cs +++ b/LawFirm/LawFirmDatabaseImplement/Implements/DocumentStorage.cs @@ -3,6 +3,7 @@ using LawFirmContracts.SearchModels; using LawFirmContracts.StorageContracts; using LawFirmContracts.ViewModels; using LawFirmDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; @@ -21,15 +22,12 @@ namespace LawFirmDatabaseImplement.Implements return null; } using var context = new LawFirmDatabase(); - /*return context.Documents.FirstOrDefault(x => - (!string.IsNullOrEmpty(model.DocumentName) && x.DocumentName == model.DocumentName) - || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;*/ - - var element = context.Documents.FirstOrDefault(x => - (!string.IsNullOrEmpty(model.DocumentName) && x.DocumentName == model.DocumentName) - || (model.Id.HasValue && x.Id == model.Id)); - - return element?.GetViewModel; + return context.Documents.Include(x => x.Blanks) + .ThenInclude(x => x.Blank) + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.DocumentName) && + x.DocumentName == model.DocumentName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; } public List GetFilteredList(DocumentSearchModel model) @@ -39,20 +37,24 @@ namespace LawFirmDatabaseImplement.Implements return new(); } using var context = new LawFirmDatabase(); - /*return context.Documents + return context.Documents + .Include(x => x.Blanks) + .ThenInclude(x => x.Blank) .Where(x => x.DocumentName.Contains(model.DocumentName)) + .ToList() .Select(x => x.GetViewModel) - .ToList();*/ - var filteredList = context.Documents.Where(x => x.DocumentName.Contains(model.DocumentName)).ToList(); - return filteredList.Select(x=> x.GetViewModel).ToList(); + .ToList(); } public List GetFullList() { using var context = new LawFirmDatabase(); - //return context.Documents.Select(x => x.GetViewModel).ToList(); - var fullList = context.Documents.ToList(); - return fullList.Select(x => x.GetViewModel).ToList(); + return context.Documents + .Include(x => x.Blanks) + .ThenInclude(x => x.Blank) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); } public DocumentViewModel? Insert(DocumentBindingModel model) diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Document.cs b/LawFirm/LawFirmDatabaseImplement/Models/Document.cs index ddb5347..1046285 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Document.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Document.cs @@ -42,6 +42,8 @@ namespace LawFirmDatabaseImplement.Models public static Document? Create(LawFirmDatabase context, DocumentBindingModel model) { + var blanks = context.Blanks; + return new Document() { Id = model.Id,