From d07365e746e73d4476c3f3ffd631c215c394bec3 Mon Sep 17 00:00:00 2001
From: MaxKarme <91691525+MaxKarme@users.noreply.github.com>
Date: Sun, 9 Apr 2023 01:11:16 +0400
Subject: [PATCH] add statements in database discipline model

---
 .../Implements/DisciplineStorage.cs               |  9 +++++++--
 University/DatabaseImplement/Models/Discipline.cs | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/University/DatabaseImplement/Implements/DisciplineStorage.cs b/University/DatabaseImplement/Implements/DisciplineStorage.cs
index de5a49f..4ff387a 100644
--- a/University/DatabaseImplement/Implements/DisciplineStorage.cs
+++ b/University/DatabaseImplement/Implements/DisciplineStorage.cs
@@ -3,6 +3,7 @@ using UniversityContracts.SearchModels;
 using UniversityContracts.StoragesContracts;
 using UniversityContracts.ViewModels;
 using UniversityDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
 
 namespace UniversityDatabaseImplement.Implements
 {
@@ -11,12 +12,15 @@ namespace UniversityDatabaseImplement.Implements
         public List<DisciplineViewModel> GetFullList()
         {
             using var context = new UniversityDatabase();
-            return context.Disciplines.Select(x => x.GetViewModel).ToList();
+            return context.Disciplines
+                .Include(x => x.Statements)
+                .Select(x => x.GetViewModel).ToList();
         }
         public List<DisciplineViewModel> GetFilteredList(DisciplineSearchModel model)
         {
             using var context = new UniversityDatabase();
             return context.Disciplines
+                .Include(x => x.Statements)
                 .Where(x => (
                         (!model.Id.HasValue || x.Id == model.Id) &&
                         (string.IsNullOrEmpty(model.Name) || x.Name.Contains(model.Name))
@@ -33,7 +37,8 @@ namespace UniversityDatabaseImplement.Implements
             }
             using var context = new UniversityDatabase();
             return context.Disciplines
-            .FirstOrDefault(x => (!string.IsNullOrEmpty(model.Name) && x.Name == model.Name) ||
+                .Include(x => x.Statements)
+                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.Name) && x.Name == model.Name) ||
                                  (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
         }
         public DisciplineViewModel? Insert(DisciplineBindingModel model)
diff --git a/University/DatabaseImplement/Models/Discipline.cs b/University/DatabaseImplement/Models/Discipline.cs
index 6aa5679..3c35ca6 100644
--- a/University/DatabaseImplement/Models/Discipline.cs
+++ b/University/DatabaseImplement/Models/Discipline.cs
@@ -17,6 +17,21 @@ namespace UniversityDatabaseImplement.Models
         public virtual List<Statement> Statements { get; set; } = new();
         [ForeignKey("DisciplineId")]
         public virtual List<ReportTypeDiscipline> ReportTypeDisciplines { get; set; } = new();
+        private Dictionary<int, IStatementModel>? _disciplineStatements;
+        [NotMapped]
+        public Dictionary<int, IStatementModel> DisciplineStatements
+        {
+            get
+            {
+                if (_disciplineStatements == null)
+                {
+                    _disciplineStatements = Statements.ToDictionary(
+                        x => x.Id, x => x as IStatementModel);
+                }
+
+                return _disciplineStatements;
+            }
+        }
 
         public static Discipline Create(DisciplineBindingModel model)
         {