From 969f679f58ec1da19b743ac8d7550ece073ccce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=9C=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=D1=84=D0=B5=D0=B5=D0=B2?= Date: Sun, 28 Apr 2024 11:11:22 +0400 Subject: [PATCH] =?UTF-8?q?SearchModels=20+=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/CarBindingModel.cs | 3 ++- .../BindingModels/FeatureBindingModel.cs | 1 - .../CarCenterContracts/CarCenterContracts.csproj | 1 - .../SearchModels/BundlingSearchModel.cs | 13 +++++++++++++ .../SearchModels/CarSearchModel.cs | 14 ++++++++++++++ .../SearchModels/FeatureSearchModel.cs | 13 +++++++++++++ .../SearchModels/StorekeeperSearchModel.cs | 14 ++++++++++++++ CarCenter/CarCenterDataModels/Models/ICarModel.cs | 3 ++- .../CarCenterDataModels/Models/IFeatureModel.cs | 1 - 9 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 CarCenter/CarCenterContracts/SearchModels/BundlingSearchModel.cs create mode 100644 CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs create mode 100644 CarCenter/CarCenterContracts/SearchModels/FeatureSearchModel.cs create mode 100644 CarCenter/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/CarBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/CarBindingModel.cs index 6a516c0..af96b89 100644 --- a/CarCenter/CarCenterContracts/BindingModels/CarBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/CarBindingModel.cs @@ -16,7 +16,8 @@ namespace CarCenterContracts.BindingModels public CarClass CarClass { get; set; } public int Year { get; set; } public double Price { get; set; } - public int VINnumber { get; set; } + public long VINnumber { get; set; } + public int FeatureID { get; set; } public Dictionary CarBundlings { get; set; } = new(); } } diff --git a/CarCenter/CarCenterContracts/BindingModels/FeatureBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/FeatureBindingModel.cs index 6a4bc7d..f1b2a48 100644 --- a/CarCenter/CarCenterContracts/BindingModels/FeatureBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/FeatureBindingModel.cs @@ -15,6 +15,5 @@ namespace CarCenterContracts.BindingModels public string CabinColor { get; set; } = string.Empty; public DriveTypes DriveType { get; set; } public double Price { get; set; } - public int CarID { get; set; } } } diff --git a/CarCenter/CarCenterContracts/CarCenterContracts.csproj b/CarCenter/CarCenterContracts/CarCenterContracts.csproj index 9f6ecee..ac912f3 100644 --- a/CarCenter/CarCenterContracts/CarCenterContracts.csproj +++ b/CarCenter/CarCenterContracts/CarCenterContracts.csproj @@ -8,7 +8,6 @@ - diff --git a/CarCenter/CarCenterContracts/SearchModels/BundlingSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/BundlingSearchModel.cs new file mode 100644 index 0000000..42e31ba --- /dev/null +++ b/CarCenter/CarCenterContracts/SearchModels/BundlingSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.SearchModels +{ + public class BundlingSearchModel + { + public int? Id { get; set; } + } +} diff --git a/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs new file mode 100644 index 0000000..f304e36 --- /dev/null +++ b/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.SearchModels +{ + public class CarSearchModel + { + public int? Id { get; set; } + public long? VINnumber { get; set; } + } +} diff --git a/CarCenter/CarCenterContracts/SearchModels/FeatureSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/FeatureSearchModel.cs new file mode 100644 index 0000000..b11b48f --- /dev/null +++ b/CarCenter/CarCenterContracts/SearchModels/FeatureSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.SearchModels +{ + public class FeatureSearchModel + { + public int? Id { get; set; } + } +} diff --git a/CarCenter/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs new file mode 100644 index 0000000..6483bc9 --- /dev/null +++ b/CarCenter/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.SearchModels +{ + public class StorekeeperSearchModel + { + public int? Id { get; set; } + + } +} diff --git a/CarCenter/CarCenterDataModels/Models/ICarModel.cs b/CarCenter/CarCenterDataModels/Models/ICarModel.cs index fd7cc10..9f40a00 100644 --- a/CarCenter/CarCenterDataModels/Models/ICarModel.cs +++ b/CarCenter/CarCenterDataModels/Models/ICarModel.cs @@ -14,7 +14,8 @@ namespace CarCenterDataModels.Models CarClass CarClass { get; } int Year { get; } double Price { get; } - int VINnumber { get; } + long VINnumber { get; } + int FeatureID { get; } Dictionary CarBundlings { get; } } } diff --git a/CarCenter/CarCenterDataModels/Models/IFeatureModel.cs b/CarCenter/CarCenterDataModels/Models/IFeatureModel.cs index 408e46a..f472138 100644 --- a/CarCenter/CarCenterDataModels/Models/IFeatureModel.cs +++ b/CarCenter/CarCenterDataModels/Models/IFeatureModel.cs @@ -13,6 +13,5 @@ namespace CarCenterDataModels.Models string CabinColor { get; } DriveTypes DriveType { get; } double Price { get; } - int CarID { get; } } }