From 3b724de00d419d0804434d82abddb630650c629d Mon Sep 17 00:00:00 2001 From: frog24 Date: Sat, 18 May 2024 19:43:51 +0400 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BB=D0=B0=D0=B1?= =?UTF-8?q?=D1=8B=20+=20=D1=81=D1=80=D0=B0=D0=B7=D1=83=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=20=D0=BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/OrderStorage.cs | 16 ++++++++++++++-- ComputersShop/ComputersShop/Program.cs | 7 ------- .../ComputersShopDatabase.cs | 4 +++- .../ComputersShopDatabaseImplements.csproj | 1 + .../Implements/OrderStorage.cs | 10 +++++++++- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs index 181861d..49f80a5 100644 --- a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs +++ b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs @@ -24,11 +24,17 @@ namespace ComputersShopFileImplements.Implements } public List GetFiltredList(OrderSearchModel model) { - if (!model.Id.HasValue) + if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Status == null) { return new(); } - return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList(); + return source.Orders + .Where(x => x.Id == model.Id || + model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo || + x.ClientId == model.ClientId || + model.Status.Equals(x.Status)) + .Select(x => GetViewModel(x)) + .ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) { @@ -36,6 +42,10 @@ namespace ComputersShopFileImplements.Implements { return null; } + if (model.ImplementerId.HasValue && model.Status != null) + { + return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Status.Equals(x.Status))?.GetViewModel; + } return GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)); } public OrderViewModel? Update(OrderBindingModel model) @@ -77,6 +87,8 @@ namespace ComputersShopFileImplements.Implements var viewModel = order.GetViewModel; var computer = source.Computers.FirstOrDefault(x => x.Id == order.ComputerId); viewModel.ComputerName = computer?.ComputerName; + var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId); + viewModel.ClientFIO = client.ClientFIO; return viewModel; } } diff --git a/ComputersShop/ComputersShop/Program.cs b/ComputersShop/ComputersShop/Program.cs index 598d97d..76256ea 100644 --- a/ComputersShop/ComputersShop/Program.cs +++ b/ComputersShop/ComputersShop/Program.cs @@ -62,13 +62,6 @@ namespace ComputersShop option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); diff --git a/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabase.cs b/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabase.cs index f5abecc..995df44 100644 --- a/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabase.cs +++ b/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabase.cs @@ -15,9 +15,11 @@ namespace ComputersShopDatabaseImplements { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ComputersShopDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseNpgsql(@"Host=localhost;Database=ComputersShop_db;Username=postgres;Password=postgres"); } base.OnConfiguring(optionsBuilder); + AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); + AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true); } public virtual DbSet Components { set; get; } public virtual DbSet Computers { set; get; } diff --git a/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabaseImplements.csproj b/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabaseImplements.csproj index cb049d8..870ba31 100644 --- a/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabaseImplements.csproj +++ b/ComputersShop/ComputersShopDatabaseImplements/ComputersShopDatabaseImplements.csproj @@ -18,6 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs b/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs index 609962e..05536d1 100644 --- a/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs +++ b/ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs @@ -21,7 +21,15 @@ namespace ComputersShopDatabaseImplements.Implements return null; } using var context = new ComputersShopDatabase(); - return context.Orders.Include(x => x.Computer).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + return context.Orders + .Include(x => x.Computer) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => + (model.Status == null || model.Status != null && model.Status.Equals(x.Status)) && + (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) || + (model.Id.HasValue && x.Id == model.Id))? + .GetViewModel; } public List GetFiltredList(OrderSearchModel model) {