From bb7b915f5c07776d47094e6d2012838f19fc8b5d Mon Sep 17 00:00:00 2001 From: Satamael Date: Fri, 7 Apr 2023 15:47:44 +0400 Subject: [PATCH] little fix --- .../FurnitureAssemblyDatabase.cs | 5 ----- .../Implements/UserStorage.cs | 7 ------- .../Models/Role.cs | 1 - .../Models/User.cs | 8 ++++---- .../BindingModels/FurnitureBindingModel.cs | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/FurnitureAssemblyDatabase.cs b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/FurnitureAssemblyDatabase.cs index 82c107b..7a76300 100644 --- a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/FurnitureAssemblyDatabase.cs +++ b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/FurnitureAssemblyDatabase.cs @@ -18,16 +18,11 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement } base.OnConfiguring(optionsBuilder); } - public virtual DbSet Sets { get; set; } - public virtual DbSet SetFurnitureModules { get; set; } - public virtual DbSet FurnitureModules { get; set; } - public virtual DbSet FurnitureModuleFurnitures { get; set; } public virtual DbSet Furnitures { get; set; } public virtual DbSet FurnitureMaterials { get; set; } public virtual DbSet Materials { get; set; } public virtual DbSet Roles { get; set; } public virtual DbSet Scopes { get; set; } public virtual DbSet Users { get; set; } - public virtual DbSet Orders { get; set; } } } diff --git a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Implements/UserStorage.cs b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Implements/UserStorage.cs index d017b65..2ead7be 100644 --- a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Implements/UserStorage.cs +++ b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Implements/UserStorage.cs @@ -22,7 +22,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements if (element != null) { var deletedElement = context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .FirstOrDefault(x => x.Id == model.Id) @@ -41,7 +40,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements } using var context = new FurnitureAssemblyDatabase(); return context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) @@ -53,7 +51,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements if (model.Id.HasValue) { return context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .Where(x => x.Id == model.Id) @@ -63,7 +60,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements else if (model.RoleId.HasValue) { return context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .Where(x => x.RoleId == model.RoleId) @@ -79,7 +75,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements { using var context = new FurnitureAssemblyDatabase(); return context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .Select(x => x.GetViewModel) @@ -96,7 +91,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements context.Users.Add(newUser); context.SaveChanges(); return context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .FirstOrDefault(x => x.Id == newUser.Id) @@ -113,7 +107,6 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Implements user.Update(model); context.SaveChanges(); return context.Users - .Include(x => x.Orders) .Include(x => x.Furnitures) .Include(x => x.Materials) .FirstOrDefault(x => x.Id == model.Id) diff --git a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/Role.cs b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/Role.cs index cfed312..6a6a870 100644 --- a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/Role.cs +++ b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/Role.cs @@ -1,7 +1,6 @@ using FurnitureAssembly_Storekeeper_Contracts.BindingModels; using FurnitureAssembly_Storekeeper_Contracts.ViewModels; using FurnitureAssembly_Storekeeper_DataModels.Models; -using FurnitureAssembly_WorkerDatabaseImplement.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/User.cs b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/User.cs index 3496ff5..77e42cd 100644 --- a/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/User.cs +++ b/FurnitureAssembly_Storekeeper/FurnitureAssemblyStorekeeperDatabaseImplement/Models/User.cs @@ -21,10 +21,10 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Models [Required] public string UserName { get; set; } = string.Empty; [Required] + [ForeignKey("RoleId")] public int RoleId { get; set; } public virtual IRole Role { get; set; } - [ForeignKey("UserId")] - public virtual List Orders { get; set; } = new(); + [ForeignKey("FurnitureId")] public virtual List Furnitures { get; set; } = new(); [ForeignKey("MaterialId")] @@ -41,7 +41,7 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Models Login = model.Login, Password = model.Password, UserName = model.UserName, - RoleId = model.Role.Id + Role = model.Role }; } public void Update(UserBindingModel? model) @@ -53,7 +53,7 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement.Models Login = model.Login; Password = model.Password; UserName = model.UserName; - RoleId = model.Role.Id; + Role = model.Role; } public UserViewModel GetViewModel => new() { diff --git a/FurnitureAssembly_Storekeeper/FurnitureAssembly_Storekeeper_Contracts/BindingModels/FurnitureBindingModel.cs b/FurnitureAssembly_Storekeeper/FurnitureAssembly_Storekeeper_Contracts/BindingModels/FurnitureBindingModel.cs index 0d310d9..da0e7ad 100644 --- a/FurnitureAssembly_Storekeeper/FurnitureAssembly_Storekeeper_Contracts/BindingModels/FurnitureBindingModel.cs +++ b/FurnitureAssembly_Storekeeper/FurnitureAssembly_Storekeeper_Contracts/BindingModels/FurnitureBindingModel.cs @@ -15,7 +15,7 @@ namespace FurnitureAssembly_Storekeeper_Contracts.BindingModels public DateTime DateCreate { get; set; } = DateTime.Now; - public Dictionary FurnitureMaterials { get; set} = new(); + public Dictionary FurnitureMaterials { get; set; } = new(); public IUser User { get; set; } = new UserBindingModel();