little fix
This commit is contained in:
parent
074b729966
commit
bb7b915f5c
@ -18,16 +18,11 @@ namespace FurnitureAssemblyStorekeeperDatabaseImplement
|
||||
}
|
||||
base.OnConfiguring(optionsBuilder);
|
||||
}
|
||||
public virtual DbSet<Set> Sets { get; set; }
|
||||
public virtual DbSet<SetFurnitureModule> SetFurnitureModules { get; set; }
|
||||
public virtual DbSet<FurnitureModule> FurnitureModules { get; set; }
|
||||
public virtual DbSet<FurnitureModuleFurniture> FurnitureModuleFurnitures { get; set; }
|
||||
public virtual DbSet<Furniture> Furnitures { get; set; }
|
||||
public virtual DbSet<FurnitureMaterial> FurnitureMaterials { get; set; }
|
||||
public virtual DbSet<Material> Materials { get; set; }
|
||||
public virtual DbSet<Role> Roles { get; set; }
|
||||
public virtual DbSet<Scope> Scopes { get; set; }
|
||||
public virtual DbSet<User> Users { get; set; }
|
||||
public virtual DbSet<Order> Orders { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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<Order> Orders { get; set; } = new();
|
||||
|
||||
[ForeignKey("FurnitureId")]
|
||||
public virtual List<Furniture> 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()
|
||||
{
|
||||
|
@ -15,7 +15,7 @@ namespace FurnitureAssembly_Storekeeper_Contracts.BindingModels
|
||||
|
||||
public DateTime DateCreate { get; set; } = DateTime.Now;
|
||||
|
||||
public Dictionary<int, (IMaterial, int)> FurnitureMaterials { get; set} = new();
|
||||
public Dictionary<int, (IMaterial, int)> FurnitureMaterials { get; set; } = new();
|
||||
|
||||
public IUser User { get; set; } = new UserBindingModel();
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user