diff --git a/University/UniversityDatabaseImplement/Implements/TeacherStorage.cs b/University/UniversityDatabaseImplement/Implements/TeacherStorage.cs index e5b4d81..2720e01 100644 --- a/University/UniversityDatabaseImplement/Implements/TeacherStorage.cs +++ b/University/UniversityDatabaseImplement/Implements/TeacherStorage.cs @@ -54,12 +54,14 @@ namespace UniversityDatabaseImplement.Implements } public TeacherViewModel? Insert(TeacherBindingModel model) { - var newTeacher = Teacher.Create(model); + using var context = new UniversityDatabase(); + var newTeacher = Teacher.Create(context, model); + if (newTeacher == null) { return null; } - using var context = new UniversityDatabase(); + context.Teachers.Add(newTeacher); context.SaveChanges(); return newTeacher.GetViewModel; diff --git a/University/UniversityDatabaseImplement/Models/Teacher.cs b/University/UniversityDatabaseImplement/Models/Teacher.cs index e95ee11..6a2125d 100644 --- a/University/UniversityDatabaseImplement/Models/Teacher.cs +++ b/University/UniversityDatabaseImplement/Models/Teacher.cs @@ -30,7 +30,7 @@ namespace UniversityDatabaseImplement.Models public virtual List Disciplines { get; set; } = new(); [ForeignKey("TeacherId")] public virtual List PlanOfStudyTeachers { get; set; } = new(); - public static Teacher? Create(TeacherBindingModel model) + public static Teacher? Create(UniversityDatabase context, TeacherBindingModel model) { if (model == null) { @@ -40,6 +40,7 @@ namespace UniversityDatabaseImplement.Models { Id = model.Id, UserId = model.UserId, + User = context.Users.First(x => x.Id == model.UserId), Name = model.Name, AcademicDegree = model.AcademicDegree, Position = model.Position, diff --git a/University/UniversityDatabaseImplement/Models/User.cs b/University/UniversityDatabaseImplement/Models/User.cs index fd78e73..96e6291 100644 --- a/University/UniversityDatabaseImplement/Models/User.cs +++ b/University/UniversityDatabaseImplement/Models/User.cs @@ -44,7 +44,8 @@ namespace UniversityDatabaseImplement.Models Id = model.Id, Login = model.Login, Password = model.Password, - Email = model.Email + Email = model.Email, + Role = model.Role }; } diff --git a/University/UniversityDatabaseImplement/UniversityDatabase.cs b/University/UniversityDatabaseImplement/UniversityDatabase.cs index 07213d0..2b73bad 100644 --- a/University/UniversityDatabaseImplement/UniversityDatabase.cs +++ b/University/UniversityDatabaseImplement/UniversityDatabase.cs @@ -11,7 +11,7 @@ namespace UniversityDatabaseImplement if (optionsBuilder.IsConfigured == false) { //Возможно понадобится писать вместо (localdb) название пк, вот пк Егора: DESKTOP-N8BRIPR; other-name: LAPTOP-DYCTATOR; other-name: DyCTaTOR - optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-N8BRIPR\SQLEXPRESS;Initial Catalog=UniversityDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=DyCTaTOR\SQLEXPRESS;Initial Catalog=UniversityDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/University/UniversityRestApi/Controllers/UserController.cs b/University/UniversityRestApi/Controllers/UserController.cs index 4538166..08447de 100644 --- a/University/UniversityRestApi/Controllers/UserController.cs +++ b/University/UniversityRestApi/Controllers/UserController.cs @@ -123,14 +123,5 @@ namespace UniversityRestApi.Controllers throw; } } - [HttpGet] - public List GetAll(UserSearchModel? model) - { - try - { - return _logic.ReadList(model); - } - catch (Exception ex) { throw new Exception(); } - } } }