From 9bf66b97c434030a3afd537b22bb54074e5a8e73 Mon Sep 17 00:00:00 2001 From: Danil Markov Date: Fri, 7 Apr 2023 19:38:26 +0400 Subject: [PATCH] fix --- .../Implements/UserStorage.cs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/UniversityDataBaseImplemet/Implements/UserStorage.cs b/UniversityDataBaseImplemet/Implements/UserStorage.cs index d33aeb1..658a5ca 100644 --- a/UniversityDataBaseImplemet/Implements/UserStorage.cs +++ b/UniversityDataBaseImplemet/Implements/UserStorage.cs @@ -20,8 +20,7 @@ namespace UniversityDataBaseImplemet.Implements { using var context = new Database(); var user = context.User - .Include(record => record.Login) - .Include(record => record.RoleId) + .Include(record => record.Role) .FirstOrDefault(record => record.Id.Equals(model.Id)); if (user == null) { @@ -40,8 +39,7 @@ namespace UniversityDataBaseImplemet.Implements } using var context = new Database(); return context.User - .Include(record => record.Login) - .Include(record => record.Id) + .Include(record => record.Role) .FirstOrDefault(record => record.Id.Equals(model.Id)) ?.GetViewModel; } @@ -52,8 +50,7 @@ namespace UniversityDataBaseImplemet.Implements if (model.Id.HasValue) { return context.User - .Include(record => record.Login) - .Include(record => record.RoleId) + .Include(record => record.Role) .Where(record => record.Id.Equals(model.Id)) .Select(record => record.GetViewModel) .ToList(); @@ -65,8 +62,7 @@ namespace UniversityDataBaseImplemet.Implements { using var context = new Database(); return context.User - .Include(record => record.Login) - .Include(record => record.RoleId) + .Include(record => record.Role) .Select(record => record.GetViewModel) .ToList(); } @@ -91,8 +87,7 @@ namespace UniversityDataBaseImplemet.Implements try { var user = context.User - .Include(record => record.Login) - .Include(record => record.RoleId) + .Include(record => record.Role) .FirstOrDefault(record => record.Id.Equals(model.Id)); if (user == null) {