From 0ac9228a418abed5dc33cfa187715b080b114187 Mon Sep 17 00:00:00 2001 From: bekodeg Date: Wed, 1 May 2024 18:13:45 +0400 Subject: [PATCH] fix --- ComputerHardwareStore/ComputerHardwareStore.sln | 4 ++++ .../BindingModels/ProductBindingModel.cs | 1 + .../ViewModels/ProductViewModel.cs | 1 + .../Models/IProductModel.cs | 2 +- .../Models/Product.cs | 7 +++++-- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ComputerHardwareStore/ComputerHardwareStore.sln b/ComputerHardwareStore/ComputerHardwareStore.sln index 14229ae..1f6cda1 100644 --- a/ComputerHardwareStore/ComputerHardwareStore.sln +++ b/ComputerHardwareStore/ComputerHardwareStore.sln @@ -35,6 +35,10 @@ Global {D32DEB60-AF40-46AF-8914-DC6A19BD66CD}.Debug|Any CPU.Build.0 = Debug|Any CPU {D32DEB60-AF40-46AF-8914-DC6A19BD66CD}.Release|Any CPU.ActiveCfg = Release|Any CPU {D32DEB60-AF40-46AF-8914-DC6A19BD66CD}.Release|Any CPU.Build.0 = Release|Any CPU + {93BD4E28-48D8-4D3A-87FB-FB96F00DA64B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93BD4E28-48D8-4D3A-87FB-FB96F00DA64B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93BD4E28-48D8-4D3A-87FB-FB96F00DA64B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93BD4E28-48D8-4D3A-87FB-FB96F00DA64B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs index 618993d..7c032c7 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs @@ -8,5 +8,6 @@ namespace ComputerHardwareStoreContracts.BindingModels public string Name { get; set; } = string.Empty; public double Price { get; set; } public Dictionary ProductComponents { get; set; } = new(); + public IStoreKeeperModel StoreKeeper { get; set; } } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs index c1ba122..024c70d 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs @@ -11,5 +11,6 @@ namespace ComputerHardwareStoreContracts.ViewModels [DisplayName("Цена")] public double Price { get; set; } public Dictionary ProductComponents { get; set; } = new(); + public IStoreKeeperModel StoreKeeper { get; set; } } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs b/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs index a0dbef4..5f033a9 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs @@ -4,7 +4,7 @@ { string Name { get; } double Price { get; } - int StoreKeeperId { get; } + public IStoreKeeperModel StoreKeeper { get; } public Dictionary ProductComponents { get; } } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreDatabaseImplement/Models/Product.cs b/ComputerHardwareStore/ComputerHardwareStoreDatabaseImplement/Models/Product.cs index f86ed01..44cc5f1 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreDatabaseImplement/Models/Product.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreDatabaseImplement/Models/Product.cs @@ -14,7 +14,9 @@ namespace ComputerHardwareStoreDatabaseImplement.Models public string Name { get; set; } = string.Empty; [Required] public double Price { get; set; } - public int StoreKeeperId { get; private set; } + [NotMapped] + IStoreKeeperModel IProductModel.StoreKeeper => StoreKeeper; + public virtual StoreKeeper StoreKeeper {get; set;} = new(); private Dictionary? _productComponents = null; [NotMapped] public Dictionary ProductComponents @@ -62,7 +64,8 @@ namespace ComputerHardwareStoreDatabaseImplement.Models Id = Id, Name = Name, Price = Price, - ProductComponents = ProductComponents + ProductComponents = ProductComponents, + StoreKeeper = StoreKeeper, }; public static void UpdateComponents(ComputerHardwareStoreDBContext context, ProductBindingModel model)